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

Valerio Fuoglio valerio.fuoglio at kdemail.net
Mon Nov 20 01:27:34 CET 2006


SVN commit 606317 by vfuoglio:

Used new KPAboutData

CCMAIL: kde-imaging at kde.org

 M  +1 -1      Makefile.am  
 M  +13 -15    cameraselection.cpp  
 M  +6 -0      cameraselection.h  
 M  +14 -15    cameraui.cpp  
 M  +3 -0      cameraui.h  
 M  +14 -16    setupcamera.cpp  
 M  +6 -0      setupcamera.h  


--- trunk/extragear/libs/kipi-plugins/kameraklient/Makefile.am #606316:606317
@@ -8,7 +8,7 @@
 
 kipiplugin_kameraklient_la_LIBADD = $(LIB_GPHOTO) $(LIBKIPI_LIBS) $(LIB_KIO) $(LIB_KDEUI) $(LIB_KDECORE) $(LIB_QT)
 
-kipiplugin_kameraklient_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries)
+kipiplugin_kameraklient_la_LDFLAGS = $(KIPI_PLUGINS_COMMON_LDFLAGS) -module $(KDE_PLUGIN) $(all_libraries) -lkipiplugins
 
 kde_services_DATA = kipiplugin_kameraklient.desktop
 
--- trunk/extragear/libs/kipi-plugins/kameraklient/cameraselection.cpp #606316:606317
@@ -32,7 +32,6 @@
 
 #include <klocale.h>
 #include <kapplication.h>
-#include <kaboutdata.h>
 #include <khelpmenu.h>
 #include <kiconloader.h>
 #include <kpopupmenu.h>
@@ -44,6 +43,7 @@
 
 // Local includes.
 
+#include "kpaboutdata.h"
 #include "cameraselection.h"
 #include "gpiface.h"
 
@@ -56,24 +56,21 @@
 {
     // About data and help button.
 
-    KAboutData* about = new KAboutData("kipiplugins",
-                                       I18N_NOOP("KameraKlient"),
-                                       kipi_version,
-                                       I18N_NOOP("A Digital camera interface Kipi plugin"),
-                                       KAboutData::License_GPL,
-                                       "(c) 2003-2004, Renchi Raju\n"
-                                       "(c) 2004, Tudor Calin",
-                                       0,
-                                       "http://extragear.kde.org/apps/kipi");
+    m_about = new KIPIPlugins::KPAboutData(I18N_NOOP("KameraKlient"),
+                                           NULL,
+                                           KAboutData::License_GPL,
+                                           I18N_NOOP("A Digital camera interface Kipi plugin"),
+                                           "(c) 2003-2004, Renchi Raju\n"
+                                           "(c) 2004, Tudor Calin");
 
-    about->addAuthor("Renchi Raju", I18N_NOOP("Original author from Digikam project"),
-                     "renchi at pooh.tam.uiuc.edu");
+    m_about->addAuthor("Renchi Raju", I18N_NOOP("Original author from Digikam project"),
+                        "renchi at pooh.tam.uiuc.edu");
 
-    about->addAuthor("Tudor Calin", I18N_NOOP("Porting the Digikam GPhoto2 interface to Kipi. Maintainer"),
-                     "tudor at 1xtech.com");
+    m_about->addAuthor("Tudor Calin", I18N_NOOP("Porting the Digikam GPhoto2 interface to Kipi. Maintainer"),
+                        "tudor at 1xtech.com");
 
     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("KameraKlient Handbook"), this, SLOT(slotHelp()), 0, -1, 0);
     helpButton_->setPopup( helpMenu->menu() );
@@ -174,6 +171,7 @@
 }
 
 CameraSelection::~CameraSelection() {
+    delete m_about;
 }
 
 void CameraSelection::slotHelp()
--- trunk/extragear/libs/kipi-plugins/kameraklient/cameraselection.h #606316:606317
@@ -25,6 +25,10 @@
 
 #include <kdialogbase.h>
 
+// Local includes
+
+#include "kpaboutdata.h"
+
 class QComboBox;
 class QListView;
 class QListViewItem;
@@ -69,6 +73,8 @@
     QStringList    serialPortList_;
     
     QPushButton*   helpButton_;
+    
+    KIPIPlugins::KPAboutData*   m_about;
 
 private slots:
     
--- trunk/extragear/libs/kipi-plugins/kameraklient/cameraui.cpp #606316:606317
@@ -70,13 +70,13 @@
 #include <kstdaccel.h>
 #include <kurl.h>
 #include <kapplication.h>
-#include <kaboutdata.h>
 #include <khelpmenu.h>
 #include <kiconloader.h>
 #include <kguiitem.h>
 
 // Local includes.
 
+#include "kpaboutdata.h"
 #include "pluginsversion.h"
 #include "camerafolderitem.h"
 #include "cameraiconview.h"
@@ -167,23 +167,20 @@
     mhelpButton->setMinimumSize(QSize(100, 0));
     mBtnBoxLayout->addWidget(mhelpButton);
 
-    KAboutData* about = new KAboutData("kipiplugins",
-                                       I18N_NOOP("KameraKlient"),
-                                       kipiplugins_version,
-                                       I18N_NOOP("A Digital camera interface Kipi plugin"),
-                                       KAboutData::License_GPL,
-                                       "(c) 2003-2004, Renchi Raju\n"
-                                       "(c) 2004, Tudor Calin",
-                                       0,
-                                       "http://extragear.kde.org/apps/kipi");
+    m_about = new KIPIPlugins::KPAboutData(I18N_NOOP("KameraKlient"),
+                                           NULL,
+                                           KAboutData::License_GPL,
+                                           I18N_NOOP("A Digital camera interface Kipi plugin"),
+                                           "(c) 2003-2004, Renchi Raju\n"
+                                           "(c) 2004, Tudor Calin");
 
-    about->addAuthor("Renchi Raju", I18N_NOOP("Original author from Digikam project"),
-                     "renchi at pooh.tam.uiuc.edu");
+    m_about->addAuthor("Renchi Raju", I18N_NOOP("Original author from Digikam project"),
+                       "renchi at pooh.tam.uiuc.edu");
 
-    about->addAuthor("Tudor Calin", I18N_NOOP("Porting the Digikam GPhoto2 interface to Kipi. Maintainer"),
-                     "tudor at 1xtech.com");
+    m_about->addAuthor("Tudor Calin", I18N_NOOP("Porting the Digikam GPhoto2 interface to Kipi. Maintainer"),
+                       "tudor at 1xtech.com");
 
-    KHelpMenu* helpMenu = new KHelpMenu(this, about, false);
+    KHelpMenu* helpMenu = new KHelpMenu(this, m_about, false);
     helpMenu->menu()->removeItemAt(0);
     helpMenu->menu()->insertItem(i18n("KameraKlient Handbook"), this, SLOT(slotHelp()), 0, -1, 0);
     mhelpButton->setPopup( helpMenu->menu() );
@@ -250,6 +247,8 @@
     delete container_;
     mFolderView->clear();
     mIconView->clear();
+
+    delete m_about;
 }
 
 
--- trunk/extragear/libs/kipi-plugins/kameraklient/cameraui.h #606316:606317
@@ -35,6 +35,7 @@
 
 // Local includes.
 
+#include "kpaboutdata.h"
 #include "gpfileiteminfo.h"
 #include "cameratype.h"
 
@@ -178,6 +179,8 @@
     bool                cameraConnected_;
     
     QLineEdit           *mDownloadDirectoryEdit;
+
+    KIPIPlugins::KPAboutData    *m_about;
 };
 
 }  // NameSpace KIPIKameraKlientPlugin
--- trunk/extragear/libs/kipi-plugins/kameraklient/setupcamera.cpp #606316:606317
@@ -34,7 +34,6 @@
 #include <klocale.h>
 #include <kmessagebox.h>
 #include <kapplication.h>
-#include <kaboutdata.h>
 #include <khelpmenu.h>
 #include <kiconloader.h>
 #include <kpopupmenu.h>
@@ -46,6 +45,7 @@
 
 // Local includes.
 
+#include "kpaboutdata.h"
 #include "setupcamera.h"
 #include "cameraselection.h"
 #include "cameralist.h"
@@ -60,25 +60,22 @@
                          Help|Ok|Cancel, Ok, true) 
 {
     // About data and help button.
+
+    m_about = new KIPIPlugins::KPAboutData(I18N_NOOP("KameraKlient"),
+                                           NULL,
+                                           KAboutData::License_GPL,
+                                           I18N_NOOP("An Digital camera interface Kipi plugin"),
+                                           "(c) 2003-2004, Renchi Raju\n"
+                                           "(c) 2004, Tudor Calin");
     
-    KAboutData* about = new KAboutData("kipiplugins",
-                                       I18N_NOOP("KameraKlient"), 
-                                       kipi_version,
-                                       I18N_NOOP("An Digital camera interface Kipi plugin"),
-                                       KAboutData::License_GPL,
-                                       "(c) 2003-2004, Renchi Raju\n"
-                                       "(c) 2004, Tudor Calin", 
-                                       0,
-                                       "http://extragear.kde.org/apps/kipi");
-    
-    about->addAuthor("Renchi Raju", I18N_NOOP("Original author from Digikam project"),
-                     "renchi at pooh.tam.uiuc.edu");
+    m_about->addAuthor("Renchi Raju", I18N_NOOP("Original author from Digikam project"),
+                       "renchi at pooh.tam.uiuc.edu");
 
-    about->addAuthor("Tudor Calin", I18N_NOOP("Porting the Digikam GPhoto2 interface to Kipi. Maintainer"),
-                     "tudor at 1xtech.com");
+    m_about->addAuthor("Tudor Calin", I18N_NOOP("Porting the Digikam GPhoto2 interface to Kipi. Maintainer"),
+                       "tudor at 1xtech.com");
 
     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("KameraKlient Handbook"), this, SLOT(slotHelp()), 0, -1, 0);
     helpButton_->setPopup( helpMenu->menu() );
@@ -166,6 +163,7 @@
 }
 
 SetupCamera::~SetupCamera() {
+    delete m_about;
 }
 
 void SetupCamera::slotHelp()
--- trunk/extragear/libs/kipi-plugins/kameraklient/setupcamera.h #606316:606317
@@ -26,6 +26,10 @@
 
 #include <kdialogbase.h>
 
+// Local includes
+
+#include "kpaboutdata.h"
+
 class QListView;
 class QListViewItem;
 class QPushButton;
@@ -53,6 +57,8 @@
     QPushButton* editButton_;
     QPushButton* autoDetectButton_;
     QPushButton* helpButton_;
+    
+    KIPIPlugins::KPAboutData* m_about;
 
 private slots:
         


More information about the Kde-imaging mailing list