[Kde-imaging] extragear/libs/kipi-plugins/findimages

[Valerio Fuoglio]

SVN commit 606306 by vfuoglio:

Used new KPAboutData

CCMAIL: kde-imaging at kde.org

 M  +1 -1      Makefile.am  
 M  +15 -17    displaycompare.cpp  
 M  +6 -0      displaycompare.h  
 M  +15 -17    finddupplicatedialog.cpp  
 M  +6 -0      finddupplicatedialog.h  


--- trunk/extragear/libs/kipi-plugins/findimages/Makefile.am #606305:606306
@@ -16,7 +16,7 @@
 kipiplugin_findimages_la_LIBADD = -lkdefx $(LIBKIPI_LIBS) $(LIB_KIO) $(LIB_KDEUI) $(LIB_KDECORE) $(LIB_QT)
 
 # LD flags for the plugin
-kipiplugin_findimages_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries)
+kipiplugin_findimages_la_LDFLAGS = $(KIPI_PLUGINS_COMMON_LDFLAGS) -module $(KDE_PLUGIN) $(all_libraries) -lkipiplugins
 
 # Install the desktop file needed to detect the plugin
 kde_services_DATA = kipiplugin_findimages.desktop
--- trunk/extragear/libs/kipi-plugins/findimages/displaycompare.cpp #606305:606306
@@ -55,7 +55,6 @@
 #include <kio/global.h>
 #include <kimageio.h>
 #include <kio/previewjob.h>
-#include <kaboutdata.h>
 #include <khelpmenu.h>
 #include <kpopupmenu.h>
 #include <kstandarddirs.h>
@@ -66,6 +65,7 @@
 
 // Local include files
 
+#include "kpaboutdata.h"
 #include "displaycompare.h"
 
 namespace KIPIFindDupplicateImagesPlugin
@@ -131,27 +131,24 @@
 
     // About data and help button.
 
-    KAboutData* about = new KAboutData("kipiplugins",
-                                       I18N_NOOP("Find Duplicate Images"),
-                                       kipi_version,
-                                       I18N_NOOP("A Kipi plugin to find duplicate images\n"
-                                                 "This plugin is based on ShowImg implementation algorithm"),
-                                       KAboutData::License_GPL,
-                                       "(c) 2003-2004, Gilles Caulier",
-                                       0,
-                                       "http://extragear.kde.org/apps/kipi");
+    m_about = new KIPIPlugins::KPAboutData(I18N_NOOP("Find Duplicate Images"),
+                                           NULL,
+                                           KAboutData::License_GPL,
+                                           I18N_NOOP("A Kipi plugin to find duplicate images\n"
+                                                     "This plugin is based on ShowImg implementation algorithm"),
+                                           "(c) 2003-2004, Gilles Caulier");
 
-    about->addAuthor("Jesper K. Pedersen", I18N_NOOP("Maintainer"),
-                     "blackie atkde dot org");
+    m_about->addAuthor("Jesper K. Pedersen", I18N_NOOP("Maintainer"),
+                       "blackie atkde dot org");
 
-    about->addAuthor("Gilles Caulier", I18N_NOOP("Original author"),
-                     "caulier dot gilles at free.fr");
+    m_about->addAuthor("Gilles Caulier", I18N_NOOP("Original author"),
+                       "caulier dot gilles at free.fr");
 
-    about->addAuthor("Richard Groult", I18N_NOOP("Find duplicate images algorithm"),
-                     "rgroult at jalix.org");
+    m_about->addAuthor("Richard Groult", I18N_NOOP("Find duplicate images algorithm"),
+                       "rgroult at jalix.org");
 
     m_helpButton = actionButton( Help );
-    KHelpMenu* helpMenu = new KHelpMenu(this, about, false);
+    KHelpMenu* helpMenu = new KHelpMenu(this, m_about, false);
     helpMenu->menu()->removeItemAt(0);
     helpMenu->menu()->insertItem(i18n("Find Duplicate Images Handbook"), this, SLOT(slotHelp()), 0, -1, 0);
     m_helpButton->setPopup( helpMenu->menu() );
@@ -309,6 +306,7 @@
 
 DisplayCompare::~DisplayCompare()
 {
+    delete m_about;
 }
 
 
--- trunk/extragear/libs/kipi-plugins/findimages/displaycompare.h #606305:606306
@@ -38,6 +38,10 @@
 
 #include <libkipi/interface.h>
 
+// Local includes
+
+#include "kpaboutdata.h"
+
 class QVBoxLayout;
 class QHBoxLayout;
 class QGridLayout;
@@ -103,6 +107,8 @@
    QPushButton        *m_helpButton;
 
    KIPI::Interface    *m_interface;
+
+   KIPIPlugins::KPAboutData *m_about;
 };
 
 }  // NameSpace KIPIFindDupplicateImagesPlugin
--- trunk/extragear/libs/kipi-plugins/findimages/finddupplicatedialog.cpp #606305:606306
@@ -55,7 +55,6 @@
 #include <ksqueezedtextlabel.h>
 #include <kio/global.h>
 #include <klistview.h>
-#include <kaboutdata.h>
 #include <khelpmenu.h>
 #include <kpopupmenu.h>
 
@@ -66,6 +65,7 @@
 
 // Local include files
 
+#include "kpaboutdata.h"
 #include "pluginsversion.h"
 #include "finddupplicatedialog.h"
 #include "finddupplicatedialog.moc"
@@ -86,27 +86,24 @@
 
     // About data and help button.
 
-    KAboutData* about = new KAboutData("kipiplugins",
-                                       I18N_NOOP("Find Duplicate Images"),
-                                       kipiplugins_version,
-                                       I18N_NOOP("A Kipi plugin to find duplicate images\n"
-                                                 "This plugin is based on ShowImg implementation algorithm"),
-                                       KAboutData::License_GPL,
-                                       "(c) 2003-2004, Gilles Caulier",
-                                       0,
-                                       "http://extragear.kde.org/apps/kipi");
+    m_about = new KIPIPlugins::KPAboutData(I18N_NOOP("Find Duplicate Images"),
+                                           NULL,
+                                           KAboutData::License_GPL,
+                                           I18N_NOOP("A Kipi plugin to find duplicate images\n"
+                                                     "This plugin is based on ShowImg implementation algorithm"),
+                                           "(c) 2003-2004, Gilles Caulier");
 
-    about->addAuthor("Jesper K. Pedersen", I18N_NOOP("Maintainer"),
-                     "blackie at kde dot org");
+    m_about->addAuthor("Jesper K. Pedersen", I18N_NOOP("Maintainer"),
+                       "blackie at kde dot org");
 
-    about->addAuthor("Gilles Caulier", I18N_NOOP("Original author"),
-                     "caulier dot gilles at free.fr");
+    m_about->addAuthor("Gilles Caulier", I18N_NOOP("Original author"),
+                       "caulier dot gilles at free.fr");
 
-    about->addAuthor("Richard Groult", I18N_NOOP("Find duplicate images algorithm"),
-                     "rgroult at jalix.org");
+    m_about->addAuthor("Richard Groult", I18N_NOOP("Find duplicate images algorithm"),
+                       "rgroult at jalix.org");
 
     m_helpButton = actionButton( Help );
-    KHelpMenu* helpMenu = new KHelpMenu(this, about, false);
+    KHelpMenu* helpMenu = new KHelpMenu(this, m_about, false);
     helpMenu->menu()->removeItemAt(0);
     helpMenu->menu()->insertItem(i18n("Find Duplicate Images Handbook"), this, SLOT(slotHelp()), 0, -1, 0);
     m_helpButton->setPopup( helpMenu->menu() );
@@ -117,6 +114,7 @@
 
 FindDuplicateDialog::~FindDuplicateDialog()
 {
+    delete m_about;
 }
 
 
--- trunk/extragear/libs/kipi-plugins/findimages/finddupplicatedialog.h #606305:606306
@@ -36,6 +36,10 @@
 
 #include <libkipi/interface.h>
 
+// Local includes
+
+#include "kpaboutdata.h"
+
 class QComboBox;
 class QFrame;
 class QPushButton;
@@ -103,6 +107,8 @@
   KIPI::Interface               *m_interface;
   
   KIPI::ImageCollectionSelector     *m_imageCollectionSelector;
+  
+  KIPIPlugins::KPAboutData      *m_about;
 
  private :