[Digikam-devel] extragear/graphics/digikam/imageplugins/channelmixer [POSSIBLY UNSAFE]

[Andi Clemens]

SVN commit 854723 by aclemens:

digiKam from trunk: Channel Mixer plugin is now ported to Editor Tool API.
CCMAIL: digikam-devel at kde.org

 M  +1 -1      CMakeLists.txt  
 D             channelmixer.cpp  
 D             channelmixer.h  
 A             channelmixertool.cpp   channelmixer.cpp#854704 [POSSIBLY UNSAFE: scanf] [License: GPL (v2+)]
 A             channelmixertool.h   channelmixer.h#854704 [License: GPL (v2+)]
 M  +7 -5      imageplugin_channelmixer.cpp  


--- trunk/extragear/graphics/digikam/imageplugins/channelmixer/CMakeLists.txt #854722:854723
@@ -1,6 +1,6 @@
 
 SET(digikamimageplugin_channelmixer_PART_SRCS imageplugin_channelmixer.cpp
-                                              channelmixer.cpp
+                                              channelmixertool.cpp
    )
 
 
--- trunk/extragear/graphics/digikam/imageplugins/channelmixer/imageplugin_channelmixer.cpp #854722:854723
@@ -34,10 +34,12 @@
 // Local includes.
 
 #include "ddebug.h"
-#include "channelmixer.h"
+#include "channelmixertool.h"
 #include "imageplugin_channelmixer.h"
 #include "imageplugin_channelmixer.moc"
 
+using namespace DigikamChannelMixerImagesPlugin;
+
 K_PLUGIN_FACTORY( ChannelMixerFactory, registerPlugin<ImagePlugin_ChannelMixer>(); )
 K_EXPORT_PLUGIN ( ChannelMixerFactory("digikamimageplugin_channelmixer") )
 
@@ -48,11 +50,11 @@
     m_channelMixerAction->setShortcut(QKeySequence(Qt::CTRL+Qt::Key_H));
     actionCollection()->addAction("imageplugin_channelmixer", m_channelMixerAction );
 
-    connect(m_channelMixerAction, SIGNAL(triggered(bool)), 
+    connect(m_channelMixerAction, SIGNAL(triggered(bool)),
             this, SLOT(slotChannelMixer()));
 
     setXMLFile("digikamimageplugin_channelmixer_ui.rc");
-    
+
     DDebug() << "ImagePlugin_ChannelMixer plugin loaded" << endl;
 }
 
@@ -67,6 +69,6 @@
 
 void ImagePlugin_ChannelMixer::slotChannelMixer()
 {
-    DigikamChannelMixerImagesPlugin::ChannelMixerDialog dlg(kapp->activeWindow());
-    dlg.exec();
+    ChannelMixerTool *tool = new ChannelMixerTool(kapp->activeWindow());
+    loadTool(tool);
 }