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

[Valerio Fuoglio]

SVN commit 606294 by vfuoglio:

Used new KPAboutData

CCMAIL: kde-imaging at kde.org

 M  +1 -1      Makefile.am  
 M  +13 -14    calwizard.cpp  
 M  +6 -0      calwizard.h  


--- trunk/extragear/libs/kipi-plugins/calendar/Makefile.am #606293:606294
@@ -12,7 +12,7 @@
 
 kipiplugin_calendar_la_LIBADD = $(LIB_KDEPRINT) $(LIBKIPI_LIBS) $(LIB_KIO) $(LIB_KDEUI) $(LIB_KDECORE) $(LIB_QT)
 
-kipiplugin_calendar_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries)
+kipiplugin_calendar_la_LDFLAGS = $(KIPI_PLUGINS_COMMON_LDFLAGS) -module $(KDE_PLUGIN) $(all_libraries) -lkipiplugins
 
 kde_services_DATA = kipiplugin_calendar.desktop
 
--- trunk/extragear/libs/kipi-plugins/calendar/calwizard.cpp #606293:606294
@@ -41,7 +41,6 @@
 #include <klocale.h>
 #include <kprinter.h>
 #include <kapplication.h>
-#include <kaboutdata.h>
 #include <khelpmenu.h>
 #include <kiconloader.h>
 #include <kpopupmenu.h>
@@ -55,6 +54,7 @@
 
 // Local includes.
 
+#include "kpaboutdata.h"
 #include "pluginsversion.h"
 #include "caltemplate.h"
 #include "calselect.h"
@@ -163,23 +163,20 @@
 
     // About data and help button.
 
-    KAboutData* about = new KAboutData("kipiplugins",
-                                       I18N_NOOP("Calendar"),
-                                       kipiplugins_version,
-                                       I18N_NOOP("A Kipi plugin to create a calendar"),
-                                       KAboutData::License_GPL,
-                                       "(c) 2003-2004, Renchi Raju, (c) 2006 Tom Albers",
-                                       0,
-                                       "http://extragear.kde.org/apps/kipi");
+    m_about = new KIPIPlugins::KPAboutData(I18N_NOOP("Calendar"),
+                                           NULL,
+                                           KAboutData::License_GPL,
+                                           I18N_NOOP("A Kipi plugin to create a calendar"),
+                                           "(c) 2003-2004, Renchi Raju, (c) 2006 Tom Albers");
 
-    about->addAuthor("Tom Albers", I18N_NOOP("Author and maintainer"),
-                     "tomalbers at kde.nl");
+    m_about->addAuthor("Tom Albers", I18N_NOOP("Author and maintainer"),
+                       "tomalbers at kde.nl");
 
-    about->addAuthor("Renchi Raju", I18N_NOOP("Former Author and maintainer"),
-                     "renchi at pooh.tam.uiuc.edu");
+    m_about->addAuthor("Renchi Raju", I18N_NOOP("Former Author and maintainer"),
+                       "renchi at pooh.tam.uiuc.edu");
 
     m_helpButton = helpButton();
-    KHelpMenu* helpMenu = new KHelpMenu(this, about, false);
+    KHelpMenu* helpMenu = new KHelpMenu(this, m_about, false);
     helpMenu->menu()->removeItemAt(0);
     helpMenu->menu()->insertItem(i18n("Calendar Handbook"), this, SLOT(slotHelp()), 0, -1, 0);
     m_helpButton->setPopup( helpMenu->menu() );
@@ -202,6 +199,8 @@
     if (painter_) delete painter_;
     if (printer_) delete printer_;
     delete cSettings_;
+
+    delete m_about;
 }
 
 void CalWizard::slotHelp()
--- trunk/extragear/libs/kipi-plugins/calendar/calwizard.h #606293:606294
@@ -35,6 +35,10 @@
 
 #include <libkipi/interface.h>
 
+// Local includes
+
+#include "kpaboutdata.h"
+
 class QLabel;
 class QVBox;
 class QPainter;
@@ -84,6 +88,8 @@
     QGuardedPtr<CalBlockPainter> cb_;
     KIPI::Interface* interface_;
 
+    KIPIPlugins::KPAboutData    *m_about;
+
 private slots:
 
     void slotPageSelected(const QString& name);