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

[Gilles Caulier]

SVN commit 852715 by cgilles:

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


 M  +1 -1      Makefile.am  
 D             channelmixer.cpp  
 D             channelmixer.h  
 A             channelmixertool.cpp   channelmixer.cpp#852686 [POSSIBLY UNSAFE: scanf] [License: GPL (v2+)]
 A             channelmixertool.h   channelmixer.h#852686 [License: GPL (v2+)]
 M  +9 -8      imageplugin_channelmixer.cpp  
 M  +7 -7      imageplugin_channelmixer.h  


--- branches/extragear/kde3/graphics/digikam/imageplugins/channelmixer/Makefile.am #852714:852715
@@ -18,7 +18,7 @@
 	       $(all_includes) 
 
 digikamimageplugin_channelmixer_la_SOURCES = imageplugin_channelmixer.cpp \
-	                                         channelmixer.cpp 
+	                                         channelmixertool.cpp 
 
 digikamimageplugin_channelmixer_la_LIBADD = $(LIB_KPARTS) \
 	                                        $(top_builddir)/digikam/digikam/libdigikam.la 
--- branches/extragear/kde3/graphics/digikam/imageplugins/channelmixer/imageplugin_channelmixer.cpp #852714:852715
@@ -6,19 +6,19 @@
  * Date        : 2005-02-26
  * Description : image channels mixer.
  *
- * Copyright (C) 2005-2007 by Gilles Caulier <caulier dot gilles at gmail dot com>
+ * Copyright (C) 2005-2008 by Gilles Caulier <caulier dot gilles at gmail dot com>
  *
  * This program is free software; you can redistribute it
  * and/or modify it under the terms of the GNU General
  * Public License as published by the Free Software Foundation;
  * either version 2, or (at your option)
  * any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- * 
+ *
  * ============================================================ */
 
 // KDE includes.
@@ -32,10 +32,12 @@
 // Local includes.
 
 #include "ddebug.h"
-#include "channelmixer.h"
+#include "channelmixertool.h"
 #include "imageplugin_channelmixer.h"
 #include "imageplugin_channelmixer.moc"
 
+using namespace DigikamChannelMixerImagesPlugin;
+
 K_EXPORT_COMPONENT_FACTORY(digikamimageplugin_channelmixer,
                            KGenericFactory<ImagePlugin_ChannelMixer>("digikamimageplugin_channelmixer"))
 
@@ -49,7 +51,7 @@
                                actionCollection(), "imageplugin_channelmixer");
 
     setXMLFile("digikamimageplugin_channelmixer_ui.rc");
-    
+
     DDebug() << "ImagePlugin_ChannelMixer plugin loaded" << endl;
 }
 
@@ -64,7 +66,6 @@
 
 void ImagePlugin_ChannelMixer::slotChannelMixer()
 {
-    DigikamChannelMixerImagesPlugin::ChannelMixerDialog dlg(parentWidget());
-    dlg.exec();
+    ChannelMixerTool *cm = new ChannelMixerTool(this);
+    loadTool(cm);
 }
-
--- branches/extragear/kde3/graphics/digikam/imageplugins/channelmixer/imageplugin_channelmixer.h #852714:852715
@@ -6,19 +6,19 @@
  * Date        : 2005-02-26
  * Description : image channels mixer.
  *
- * Copyright (C) 2005-2007 by Gilles Caulier <caulier dot gilles at gmail dot com>
+ * Copyright (C) 2005-2008 by Gilles Caulier <caulier dot gilles at gmail dot com>
  *
  * This program is free software; you can redistribute it
  * and/or modify it under the terms of the GNU General
  * Public License as published by the Free Software Foundation;
  * either version 2, or (at your option)
  * any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- * 
+ *
  * ============================================================ */
 
 #ifndef IMAGEPLUGIN_CHANNELMIXER_H
@@ -34,15 +34,15 @@
 class DIGIKAMIMAGEPLUGINS_EXPORT ImagePlugin_ChannelMixer : public Digikam::ImagePlugin
 {
     Q_OBJECT
-    
+
 public:
 
     ImagePlugin_ChannelMixer(QObject *parent, const char* name,
                              const QStringList &args);
     ~ImagePlugin_ChannelMixer();
-    
+
     void setEnabledActions(bool enable);
-   
+
 private slots:
 
     void slotChannelMixer();
@@ -51,5 +51,5 @@
 
     KAction *m_channelMixerAction;
 };
-    
+
 #endif /* IMAGEPLUGIN_CHANNELMIXER_H */