[Kde-imaging] kdeextragear-libs-1/kipi-plugins/acquireimages

[Gilles Caulier]

CVS commit by cgilles: 

Added namespace for AcquireImages plugins 
CCMAIL: kde-imaging at kde.org 


  M +3 -0      acquireimagedialog.cpp   1.19
  M +5 -0      acquireimagedialog.h   1.9
  M +5 -3      plugin_acquireimages.cpp   1.13
  M +6 -5      plugin_acquireimages.h   1.8
  M +4 -0      screenshotdialog.cpp   1.6
  M +5 -0      screenshotdialog.h   1.3


--- kdeextragear-libs-1/kipi-plugins/acquireimages/acquireimagedialog.cpp  #1.18:1.19
@@ -82,4 +82,6 @@ extern "C"
 #include <qvgroupbox.h>
 
+namespace KIPIAcquireImagesPlugin
+{
 
 class AlbumItem : public QListBoxText
@@ -645,4 +647,5 @@ bool AcquireImageDialog::QImageToTiff(co
 }
 
+}  // NameSpace KIPIAcquireImagesPlugin
 
 #include "acquireimagedialog.moc"

--- kdeextragear-libs-1/kipi-plugins/acquireimages/acquireimagedialog.h  #1.8:1.9
@@ -54,4 +54,7 @@ class KIntNumInput;
 class KSqueezedTextLabel;
 
+namespace KIPIAcquireImagesPlugin
+{
+
 class AcquireImageDialog : public KDialogBase
 {
@@ -121,3 +124,5 @@ Q_OBJECT
 };
 
+}  // NameSpace KIPIAcquireImagesPlugin
+
 #endif  // ACQUIREIMAGEDIALOG_H

--- kdeextragear-libs-1/kipi-plugins/acquireimages/plugin_acquireimages.cpp  #1.12:1.13
@@ -45,7 +45,7 @@
 // Local includes
 
-#include "plugin_acquireimages.h"
 #include "screenshotdialog.h"
 #include "acquireimagedialog.h"
+#include "plugin_acquireimages.h"
 
 typedef KGenericFactory<Plugin_AcquireImages> Factory;
@@ -107,4 +107,5 @@ void Plugin_AcquireImages::slotActivate(
            {
            m_scanDialog->setMinimumSize(400, 300);
+           
            connect(m_scanDialog, SIGNAL(finalImage(const QImage &, int)),
                    this, SLOT(slotAcquireImageDone(const QImage &)));
@@ -123,5 +124,6 @@ void Plugin_AcquireImages::slotActivate(
     else if (from == "screenshot_images")
        {
-       m_screenshotDialog = new ScreenGrabDialog(interface, kapp->activeWindow(), "KIPI ScreenshotImagesDialog");
+       m_screenshotDialog = new KIPIAcquireImagesPlugin::ScreenGrabDialog(interface,
+                                                         kapp->activeWindow(), "KIPI ScreenshotImagesDialog");
        m_screenshotDialog->show();
        }
@@ -139,5 +141,5 @@ void Plugin_AcquireImages::slotAcquireIm
 {
     KIPI::Interface* interface = static_cast<KIPI::Interface*>( parent() );
-    m_acquireImageDialog = new AcquireImageDialog( interface, 0, img);
+    m_acquireImageDialog = new KIPIAcquireImagesPlugin::AcquireImageDialog( interface, 0, img);
     m_acquireImageDialog->setMinimumWidth(400);
     m_acquireImageDialog->exec();

--- kdeextragear-libs-1/kipi-plugins/acquireimages/plugin_acquireimages.h  #1.7:1.8
@@ -54,6 +54,7 @@ private:
   KAction            *m_action_screenshotimages;
   KScanDialog        *m_scanDialog;
-  AcquireImageDialog *m_acquireImageDialog;
-  ScreenGrabDialog   *m_screenshotDialog;
+  
+  KIPIAcquireImagesPlugin::AcquireImageDialog *m_acquireImageDialog;
+  KIPIAcquireImagesPlugin::ScreenGrabDialog   *m_screenshotDialog;
 };
 

--- kdeextragear-libs-1/kipi-plugins/acquireimages/screenshotdialog.cpp  #1.5:1.6
@@ -57,4 +57,7 @@ extern "C"
 #include "acquireimagedialog.h"
 
+namespace KIPIAcquireImagesPlugin
+{
+
 //////////////////////////////////// CONSTRUCTOR ////////////////////////////////////////////
 
@@ -285,4 +288,5 @@ bool ScreenGrabDialog::eventFilter( QObj
 }
 
+}  // NameSpace KIPIAcquireImagesPlugin
 
 #include "screenshotdialog.moc"

--- kdeextragear-libs-1/kipi-plugins/acquireimages/screenshotdialog.h  #1.2:1.3
@@ -54,4 +54,7 @@ class KConfig;
 class KIntNumInput;
 
+namespace KIPIAcquireImagesPlugin
+{
+
 class AcquireImageDialog;
 
@@ -87,3 +90,5 @@ protected:
 };
 
+}  // NameSpace KIPIAcquireImagesPlugin
+
 #endif  // SCREENSHOOTDIALOG_H