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

[Gilles Caulier]

SVN commit 853498 by cgilles:

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


 M  +1 -2      Makefile.am  
 A             antivignettingtool.cpp   imageeffect_antivignetting.cpp#853347 [License: GPL (v2+)]
 A             antivignettingtool.h   imageeffect_antivignetting.h#853347 [License: GPL (v2+)]
 D             imageeffect_antivignetting.cpp  
 D             imageeffect_antivignetting.h  
 M  +8 -7      imageplugin_antivignetting.cpp  
 M  +7 -7      imageplugin_antivignetting.h  


--- branches/extragear/kde3/graphics/digikam/imageplugins/antivignetting/Makefile.am #853497:853498
@@ -18,8 +18,7 @@
 	       $(all_includes) 
 
 digikamimageplugin_antivignetting_la_SOURCES = imageplugin_antivignetting.cpp \
-	                                           imageeffect_antivignetting.cpp \
-					                           antivignetting.cpp 
+	                                           antivignettingtool.cpp antivignetting.cpp 
 
 digikamimageplugin_antivignetting_la_LIBADD = $(LIB_KPARTS) \
 	                                          $(top_builddir)/digikam/digikam/libdigikam.la 
--- branches/extragear/kde3/graphics/digikam/imageplugins/antivignetting/imageplugin_antivignetting.cpp #853497:853498
@@ -7,7 +7,7 @@
  * Description : a digiKam image plugin to reduce
  *               vignetting on an image.
  *
- * Copyright (C) 2004-2007 by Gilles Caulier <caulier dot gilles at gmail dot com>
+ * Copyright (C) 2004-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
@@ -33,13 +33,15 @@
 // Local includes.
 
 #include "ddebug.h"
-#include "imageeffect_antivignetting.h"
+#include "antivignettingtool.h"
 #include "imageplugin_antivignetting.h"
 #include "imageplugin_antivignetting.moc"
 
-K_EXPORT_COMPONENT_FACTORY( digikamimageplugin_antivignetting,
-                            KGenericFactory<ImagePlugin_AntiVignetting>("digikamimageplugin_antivignetting"));
+using namespace DigikamAntiVignettingImagesPlugin;
 
+K_EXPORT_COMPONENT_FACTORY(digikamimageplugin_antivignetting,
+                           KGenericFactory<ImagePlugin_AntiVignetting>("digikamimageplugin_antivignetting"));
+
 ImagePlugin_AntiVignetting::ImagePlugin_AntiVignetting(QObject *parent, const char*, const QStringList &)
                           : Digikam::ImagePlugin(parent, "ImagePlugin_AntiVignetting")
 {
@@ -63,7 +65,6 @@
 
 void ImagePlugin_AntiVignetting::slotAntiVignetting()
 {
-    DigikamAntiVignettingImagesPlugin::ImageEffect_AntiVignetting dlg(parentWidget());
-    dlg.exec();
+    AntiVignettingTool *tool = new AntiVignettingTool(this);
+    loadTool(tool);
 }
-
--- branches/extragear/kde3/graphics/digikam/imageplugins/antivignetting/imageplugin_antivignetting.h #853497:853498
@@ -6,20 +6,20 @@
  * Date        : 2004-12-25
  * Description : a digiKam image plugin to reduce 
  *               vignetting on an image.
- * 
- * Copyright (C) 2004-2007 by Gilles Caulier <caulier dot gilles at gmail dot com>
  *
+ * Copyright (C) 2004-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_ANTIVIGNETTING_H
@@ -35,13 +35,13 @@
 class DIGIKAMIMAGEPLUGINS_EXPORT ImagePlugin_AntiVignetting : public Digikam::ImagePlugin
 {
     Q_OBJECT
-    
+
 public:
 
     ImagePlugin_AntiVignetting(QObject *parent, const char* name,
                                const QStringList &args);
     ~ImagePlugin_AntiVignetting();
-    
+
     void setEnabledActions(bool enable);
 
 private slots:
@@ -52,5 +52,5 @@
 
     KAction *m_antivignettingAction;
 };
-    
+
 #endif /* IMAGEPLUGIN_ANTIVIGNETTING_H */