[Digikam-devel] branches/extragear/kde3/graphics/digikam/imageplugins/infrared

[Gilles Caulier]

SVN commit 854585 by cgilles:

digiKam from KDE3 branch : Infrared image plugin is now ported to Editor Tool API
CCMAIL: digikam-devel at kde.org


 M  +1 -1      Makefile.am  
 D             imageeffect_infrared.cpp  
 D             imageeffect_infrared.h  
 M  +5 -3      imageplugin_infrared.cpp  
 A             infraredtool.cpp   imageeffect_infrared.cpp#854290 [License: GPL (v2+)]
 A             infraredtool.h   imageeffect_infrared.h#854290 [License: GPL (v2+)]


--- branches/extragear/kde3/graphics/digikam/imageplugins/infrared/Makefile.am #854584:854585
@@ -18,7 +18,7 @@
 	       $(all_includes) 
 
 digikamimageplugin_infrared_la_SOURCES = imageplugin_infrared.cpp \
-	                                     imageeffect_infrared.cpp infrared.cpp 
+	                                     infraredtool.cpp infrared.cpp 
 
 digikamimageplugin_infrared_la_LIBADD = $(LIB_KPARTS) \
 	                                    $(top_builddir)/digikam/digikam/libdigikam.la
--- branches/extragear/kde3/graphics/digikam/imageplugins/infrared/imageplugin_infrared.cpp #854584:854585
@@ -34,10 +34,12 @@
 // Local includes.
 
 #include "ddebug.h"
-#include "imageeffect_infrared.h"
+#include "infraredtool.h"
 #include "imageplugin_infrared.h"
 #include "imageplugin_infrared.moc"
 
+using namespace DigikamInfraredImagesPlugin;
+
 K_EXPORT_COMPONENT_FACTORY(digikamimageplugin_infrared,
                            KGenericFactory<ImagePlugin_Infrared>("digikamimageplugin_infrared"));
 
@@ -64,6 +66,6 @@
 
 void ImagePlugin_Infrared::slotInfrared()
 {
-    DigikamInfraredImagesPlugin::ImageEffect_Infrared dlg(kapp->activeWindow());
-    dlg.exec();
+    InfraredTool *tool = new InfraredTool(this);
+    loadTool(tool);
 }