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

[Gilles Caulier]

CVS commit by cgilles: 

Added namespace in Sendimages plugin 
CCMAIL: kde-imaging at kde.org 


  M +8 -3      listimageserrordialog.cpp   1.3
  M +5 -0      listimageserrordialog.h   1.2
  M +4 -2      plugin_sendimages.cpp   1.10
  M +4 -4      plugin_sendimages.h   1.5
  M +5 -4      sendimagesdialog.cpp   1.9
  M +6 -0      sendimagesdialog.h   1.4


--- kdeextragear-libs-1/kipi-plugins/sendimages/listimageserrordialog.cpp  #1.2:1.3
@@ -21,6 +21,4 @@
 //////////////////////////////////////////////////////////////////////////////
 
-#include "listimageserrordialog.h"
-
 // Qt includes
 
@@ -37,4 +35,11 @@
 #include <klistview.h>
 
+// Local includes.
+
+#include "listimageserrordialog.h"
+
+namespace KIPISendimagesPlugin
+{
+
 /////////////////////////////////////////////////////////////////////////////////////////////
 
@@ -87,5 +92,5 @@ listImagesErrorDialog::~listImagesErrorD
 }
 
-
+}  // NameSpace KIPISendimagesPlugin
 
 #include "listimageserrordialog.moc"

--- kdeextragear-libs-1/kipi-plugins/sendimages/listimageserrordialog.h  #1.1:1.2
@@ -31,4 +31,7 @@
 class KListView;
 
+namespace KIPISendimagesPlugin
+{
+
 class listImagesErrorDialog : public KDialogBase
 {
@@ -45,4 +48,6 @@ private:
 };
 
+}  // NameSpace KIPISendimagesPlugin
+
 #endif  // LISTIMAGESERRORDIALOG_included
 

--- kdeextragear-libs-1/kipi-plugins/sendimages/plugin_sendimages.cpp  #1.9:1.10
@@ -3,5 +3,5 @@
  * Author: Gilles Caulier <caulier dot gilles at free.fr>
  * Date  : 2003-11-04
- * Description : KIPI Send Mail Images Plugin.
+ * Description : KIPI E-Mail Images Plugin.
  *
  * This program is free software; you can redistribute it
@@ -70,4 +70,5 @@ void Plugin_SendImages::setup( QWidget* 
 {
     KIPI::Plugin::setup( widget );
+    
     m_action_sendimages = new KAction (i18n("E-mail Images..."),     // Menu message.
                                         "mail_new",                  // Menu icon.
@@ -94,4 +95,5 @@ void Plugin_SendImages::slotActivate()
     KIPI::Interface* interface = dynamic_cast<KIPI::Interface*>( parent() );
     KIPI::ImageCollection images = interface->currentScope();
+    
     if ( !images.isValid() )
         return;
@@ -100,5 +102,5 @@ void Plugin_SendImages::slotActivate()
     QString Tmp = dir.saveLocation("tmp", "kipi-sendimages-" + QString::number(getpid()) + "/");
 
-    m_sendImagesDialog = new SendImagesDialog(0, Tmp, interface, images);
+    m_sendImagesDialog = new KIPISendimagesPlugin::SendImagesDialog(0, Tmp, interface, images);
     m_sendImagesDialog->show();
 }

--- kdeextragear-libs-1/kipi-plugins/sendimages/plugin_sendimages.h  #1.4:1.5
@@ -3,5 +3,5 @@
  * Author: Gilles Caulier <caulier dot gilles at free.fr>
  * Date  : 2003-11-04
- * Description : KIPI Send Mail Images Plugin.
+ * Description : KIPI E-Mail Images Plugin.
  *
  * This program is free software; you can redistribute it
@@ -26,5 +26,5 @@
 
 class KAction;
-class SendImagesDialog;
+class KIPISendimagesPlugin::SendImagesDialog;
 
 class Plugin_SendImages : public KIPI::Plugin
@@ -42,5 +42,5 @@ public slots:
 private:
   KAction            *m_action_sendimages;
-  SendImagesDialog   *m_sendImagesDialog;
+  KIPISendimagesPlugin::SendImagesDialog   *m_sendImagesDialog;
 };
 

--- kdeextragear-libs-1/kipi-plugins/sendimages/sendimagesdialog.cpp  #1.8:1.9
@@ -63,7 +63,5 @@
 #include <kbuttonbox.h>
 #include <ksqueezedtextlabel.h>
-
-// Include files for KIPI
-
+#include <kio/previewjob.h>
 
 // Local include files
@@ -71,5 +69,7 @@
 #include "sendimagesdialog.h"
 #include "listimageserrordialog.h"
-#include <kio/previewjob.h>
+
+namespace KIPISendimagesPlugin
+{
 
 /////////////////////////////////////////////////////////////////////////////////////////////
@@ -1202,4 +1202,5 @@ return true;
 }
 
+}  // NameSpace KIPISendimagesPlugin
 
 #include "sendimagesdialog.moc"

--- kdeextragear-libs-1/kipi-plugins/sendimages/sendimagesdialog.h  #1.3:1.4
@@ -57,4 +58,7 @@ class KListBox;
 class KSqueezedTextLabel;
 
+namespace KIPISendimagesPlugin
+{
+
 class ListImageItems : public KListBox
 {
@@ -162,3 +166,5 @@ protected:
 };
 
+}  // NameSpace KIPISendimagesPlugin
+
 #endif  // SENDIMAGESDIALOG_H