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

[Valerio Fuoglio]

SVN commit 606309 by vfuoglio:

Used new KPAboutData

CCMAIL: kde-imaging at kde.org

 M  +1 -1      Makefile.am  
 M  +11 -12    flickrwindow.cpp  
 M  +6 -0      flickrwindow.h  


--- trunk/extragear/libs/kipi-plugins/flickrexport/Makefile.am #606308:606309
@@ -14,7 +14,7 @@
 
 kipiplugin_flickrexport_la_LIBADD = $(LIBKIPI_LIBS) $(LIB_KIO) $(LIB_KDEUI) $(LIB_KDECORE) $(LIB_QT)
 
-kipiplugin_flickrexport_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries)
+kipiplugin_flickrexport_la_LDFLAGS = $(KIPI_PLUGINS_COMMON_LDFLAGS) -module $(KDE_PLUGIN) $(all_libraries) -lkipiplugins
 
 kde_services_DATA = kipiplugin_flickrexport.desktop
 
--- trunk/extragear/libs/kipi-plugins/flickrexport/flickrwindow.cpp #606308:606309
@@ -35,7 +35,6 @@
 
 // Include files for KDE
 
-#include <kaboutdata.h>
 #include <khelpmenu.h>
 #include <kpopupmenu.h>
 #include <klocale.h>
@@ -59,6 +58,7 @@
 
 // Local includes.
 
+#include "kpaboutdata.h"
 #include "pluginsversion.h"
 #include "flickrtalker.h"
 #include "flickritem.h"
@@ -81,20 +81,17 @@
 
     // About data and help button.
 
-    KAboutData* about = new KAboutData("kipiplugins",
-                                       I18N_NOOP("Flickr Export"),
-                                       kipiplugins_version,
-                                       I18N_NOOP("A Kipi plugin to export image collection to Flickr web service."),
-                                       KAboutData::License_GPL,
-                                       "(c) 2005, Vardhman Jain",
-                                       0,
-                                       "http://extragear.kde.org/apps/kipi");
+    m_about = new KIPIPlugins::KPAboutData(I18N_NOOP("Flickr Export"),
+                                           NULL,
+                                           KAboutData::License_GPL,
+                                           I18N_NOOP("A Kipi plugin to export image collection to Flickr web service."),
+                                           "(c) 2005, Vardhman Jain");
 
-    about->addAuthor("Vardhman Jain", I18N_NOOP("Author and maintainer"),
+    m_about->addAuthor("Vardhman Jain", I18N_NOOP("Author and maintainer"),
                      "Vardhman at gmail dot com");
 
     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("Flickr Export Handbook"), this, SLOT(slotHelp()), 0, -1, 0);
     m_helpButton->setPopup( helpMenu->menu() );
@@ -218,7 +215,9 @@
 	delete m_progressDlg;
     delete m_authProgressDlg;
     delete m_talker;
-    delete m_widget;    
+    delete m_widget;
+
+    delete m_about;
 }
 
 void FlickrWindow::slotHelp()
--- trunk/extragear/libs/kipi-plugins/flickrexport/flickrwindow.h #606308:606309
@@ -27,7 +27,11 @@
 #include <libkipi/interface.h>
 #include <libkipi/imagedialog.h>
 
+// Local includes
 
+#include "kpaboutdata.h"
+
+
 class QListView;
 class QPushButton;
 class QSpinBox;
@@ -103,6 +107,8 @@
     unsigned int                          m_uploadTotal;
     QValueList< QPair<QString,FPhotoInfo> >  m_uploadQueue;
 
+    KIPIPlugins::KPAboutData    *m_about; 
+
 private slots:
     void slotTokenObtained(const QString& token);
     void slotDoLogin();