Don't abuse the KPIM namespace.

svn path=/trunk/KDE/kdepim/mailtransport/; revision=620786

TODO

@@ -3,7 +3,6 @@ Mail Transport TODO
 
 General
 -------
-- use own namespace
 - compile without QT3_SUPPORT
 
 Migration

legacydecrypt.cpp

@@ -24,7 +24,7 @@
 
 #include "legacydecrypt.h"
 
-using namespace KPIM;
+using namespace MailTransport;
 
 QString Legacy::decryptKMail(const QString & data)
 {

legacydecrypt.h

@@ -22,12 +22,12 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 */
 
-#ifndef KPIM_LEGACYDECRYPT_H
-#define KPIM_LEGACYDECRYPT_H
+#ifndef MAILTRANSPORT_LEGACYDECRYPT_H
+#define MAILTRANSPORT_LEGACYDECRYPT_H
 
 #include <qstring.h>
 
-namespace KPIM {
+namespace MailTransport {
 
 /**
   Methods to read passwords from config files still using legacy encryption.

mailtransport_defs.h

@@ -17,8 +17,8 @@
     02110-1301, USA.
 */
 
-#ifndef KPIM_MAILTRANSPORT_DEFS_H
-#define KPIM_MAILTRANSPORT_DEFS_H
+#ifndef MAILTRANSPORT_MAILTRANSPORT_DEFS_H
+#define MAILTRANSPORT_MAILTRANSPORT_DEFS_H
 
 /**
   @file mailtransport_defs.h

mailtransport_export.h

@@ -17,8 +17,8 @@
     02110-1301, USA.
 */
 
-#ifndef KPIM_MAILTRANSPORT_EXPORT_H
-#define KPIM_MAILTRANSPORT_EXPORT_H
+#ifndef MAILTRANSPORT_MAILTRANSPORT_EXPORT_H
+#define MAILTRANSPORT_MAILTRANSPORT_EXPORT_H
 
 #include <kdemacros.h>
 

precommandjob.cpp

@@ -25,7 +25,7 @@
 #include <klocale.h>
 #include <kprocess.h>
 
-using namespace KPIM;
+using namespace MailTransport;
 
 PrecommandJob::PrecommandJob(const QString & precommand, QObject * parent) :
     KJob( parent ),

precommandjob.h

@@ -20,14 +20,14 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 */
 
-#ifndef KPIM_PRECOMMANDJOB_H
-#define KPIM_PRECOMMANDJOB_H
+#ifndef MAILTRANSPORT_PRECOMMANDJOB_H
+#define MAILTRANSPORT_PRECOMMANDJOB_H
 
 #include <kjob.h>
 
 class KProcess;
 
-namespace KPIM {
+namespace MailTransport {
 
 /**
   Job to execute commands before connecting to an account.

sendmailjob.cpp

@@ -27,7 +27,7 @@
 
 #include <qbuffer.h>
 
-using namespace KPIM;
+using namespace MailTransport;
 
 SendmailJob::SendmailJob(Transport * transport, QObject * parent) :
     TransportJob( transport, parent )

sendmailjob.h

@@ -19,14 +19,14 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 */
 
-#ifndef KPIM_SENDMAILJOB_H
-#define KPIM_SENDMAILJOB_H
+#ifndef MailTransport_SENDMAILJOB_H
+#define MailTransport_SENDMAILJOB_H
 
 #include <mailtransport/transportjob.h>
 
 class KProcess;
 
-namespace KPIM {
+namespace MailTransport {
 
 /**
   Mail transport job for sendmail.

smtpjob.cpp

@@ -34,7 +34,7 @@
 #include <qbuffer.h>
 #include <qhash.h>
 
-using namespace KPIM;
+using namespace MailTransport;
 
 static int slavePoolRef = 0;
 static QHash<int,KIO::Slave*> slavePool;

smtpjob.h

@@ -19,8 +19,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 */
 
-#ifndef KPIM_SMTPJOB_H
-#define KPIM_SMTPJOB_H
+#ifndef MAILTRANSPORT_SMTPJOB_H
+#define MAILTRANSPORT_SMTPJOB_H
 
 #include <mailtransport/transportjob.h>
 
@@ -29,7 +29,7 @@ class Job;
 class Slave;
 }
 
-namespace KPIM {
+namespace MailTransport {
 
 /**
   Mail transport job for SMTP.

tests/transportmgr.cpp

@@ -31,7 +31,7 @@
 #include <QPushButton>
 #include <QTextEdit>
 
-using namespace KPIM;
+using namespace MailTransport;
 
 TransportMgr::TransportMgr() :
     mCurrentJob( 0 )

tests/transportmgr.h

@@ -43,7 +43,7 @@ class TransportMgr : public KVBox
     void jobInfoMessage( KJob* job, const QString &info, const QString &info2 );
 
   private:
-    KPIM::TransportComboBox* mComboBox;
+    MailTransport::TransportComboBox* mComboBox;
     KLineEdit *mSenderEdit, *mToEdit, *mCcEdit, *mBccEdit;
     QTextEdit *mMailEdit;
     KJob *mCurrentJob;

transport.cpp

@@ -28,7 +28,7 @@
 #include <kstringhandler.h>
 #include <kwallet.h>
 
-using namespace KPIM;
+using namespace MailTransport;
 using namespace KWallet;
 
 Transport::Transport( const QString &cfgGroup ) :

transport.h

@@ -17,15 +17,15 @@
     02110-1301, USA.
 */
 
-#ifndef KPIM_TRANSPORT_H
-#define KPIM_TRANSPORT_H
+#ifndef MAILTRANSPORT_TRANSPORT_H
+#define MAILTRANSPORT_TRANSPORT_H
 
 #include <mailtransport/transportbase.h>
 #include <mailtransport/mailtransport_export.h>
 
 #include <kconfigbase.h>
 
-namespace KPIM {
+namespace MailTransport {
 
 /**
   Represents the settings of a specific mail transport.

transportbase.kcfgc

 File=mailtransport.kcfg
 ClassName=TransportBase
-NameSpace=KPIM
+NameSpace=MailTransport
 Mutators=true
 ItemAccessors=true
 SetUserTexts=true
 Visibility=MAILTRANSPORT_EXPORT
-IncludeFiles=mailtransport/mailtransport_export.h
\ No newline at end of file
+IncludeFiles=mailtransport/mailtransport_export.h

transportcombobox.cpp

@@ -25,7 +25,7 @@
 
 #include <qlineedit.h>
 
-using namespace KPIM;
+using namespace MailTransport;
 
 TransportComboBox::TransportComboBox(QWidget * parent) :
     KComboBox( parent )

transportcombobox.h

@@ -17,13 +17,13 @@
     02110-1301, USA.
 */
 
-#ifndef KPIM_TRANSPORTCOMBO_H
-#define KPIM_TRANSPORTCOMBO_H
+#ifndef MAILTRANSPORT_TRANSPORTCOMBO_H
+#define MAILTRANSPORT_TRANSPORTCOMBO_H
 
 #include <mailtransport/mailtransport_export.h>
 #include <kcombobox.h>
 
-namespace KPIM {
+namespace MailTransport {
 
 /**
   A combo-box for selecting a mail transport.

transportconfigdialog.cpp

@@ -37,9 +37,9 @@
 
 #include <QButtonGroup>
 
-using namespace KPIM;
+using namespace MailTransport;
 
-class KPIM::TransportConfigDialog::Private
+class MailTransport::TransportConfigDialog::Private
 {
   public:
     Transport *transport;
@@ -49,7 +49,7 @@ class KPIM::TransportConfigDialog::Private
 
     KConfigDialogManager* manager;
     KLineEdit* passwordEdit;
-    ServerTest* serverTest;
+    KPIM::ServerTest* serverTest;
     QButtonGroup* encryptionGroup;
     QButtonGroup* authGroup;
 
@@ -164,7 +164,7 @@ void TransportConfigDialog::checkSmtpCapabilities()
   Q_ASSERT( d->transport->type() == Transport::EnumType::SMTP );
 
   delete d->serverTest;
-  d->serverTest = new ServerTest( SMTP_PROTOCOL, d->smtp.kcfg_host->text(), d->smtp.kcfg_port->value() );
+  d->serverTest = new KPIM::ServerTest( SMTP_PROTOCOL, d->smtp.kcfg_host->text(), d->smtp.kcfg_port->value() );
   connect( d->serverTest,
            SIGNAL( capabilities(QStringList,QStringList,QString,QString,QString)),
            SLOT( smtpCapabilities(QStringList,QStringList,QString,QString,QString)) );

transportconfigdialog.h

@@ -19,13 +19,13 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 */
 
-#ifndef KPIM_TRANSPORTCONFIGDIALOG_H
-#define KPIM_TRANSPORTCONFIGDIALOG_H
+#ifndef MAILTRANSPORT_TRANSPORTCONFIGDIALOG_H
+#define MAILTRANSPORT_TRANSPORTCONFIGDIALOG_H
 
 #include <mailtransport/mailtransport_export.h>
 #include <kdialog.h>
 
-namespace KPIM {
+namespace MailTransport {
 
 class Transport;
 

transportjob.cpp

@@ -24,9 +24,9 @@
 
 #include <qbuffer.h>
 
-using namespace KPIM;
+using namespace MailTransport;
 
-class KPIM::TransportJob::Private
+class MailTransport::TransportJob::Private
 {
   public:
     Transport* transport;
@@ -117,7 +117,7 @@ QBuffer* TransportJob::buffer()
   return d->buffer;
 }
 
-void KPIM::TransportJob::start()
+void TransportJob::start()
 {
   if ( !transport()->isValid() ) {
     setError( UserDefinedError );

transportjob.h

@@ -17,8 +17,8 @@
     02110-1301, USA.
 */
 
-#ifndef KPIM_TRANSPORTJOB_H
-#define KPIM_TRANSPORTJOB_H
+#ifndef MAILTRANSPORT_TRANSPORTJOB_H
+#define MAILTRANSPORT_TRANSPORTJOB_H
 
 #include <mailtransport/mailtransport_export.h>
 #include <kcompositejob.h>
@@ -26,7 +26,7 @@
 
 class QBuffer;
 
-namespace KPIM {
+namespace MailTransport {
 
 class Transport;
 

transportmanagementwidget.cpp

@@ -26,7 +26,7 @@
 #include "transportconfigdialog.h"
 #include "transporttypedialog.h"
 
-using namespace KPIM;
+using namespace MailTransport;
 
 class TransportManagementWidget::Private
 {

transportmanagementwidget.h

@@ -19,13 +19,13 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 */
 
-#ifndef KPIM_TRANSPORTMANAGEMENTWIDGET_H
-#define KPIM_TRANSPORTMANAGEMENTWIDGET_H
+#ifndef MAILTRANSPORT_TRANSPORTMANAGEMENTWIDGET_H
+#define MAILTRANSPORT_TRANSPORTMANAGEMENTWIDGET_H
 
 #include <mailtransport/mailtransport_export.h>
 #include <QtGui/QWidget>
 
-namespace KPIM {
+namespace MailTransport {
 
 /**
   A widget to manage mail transports.

transportmanagementwidget.ui

 <ui version="4.0" >
- <class>KPIM::TransportManagementWidget</class>
- <widget class="QWidget" name="KPIM::TransportManagementWidget" >
+ <class>MailTransport::TransportManagementWidget</class>
+ <widget class="QWidget" name="MailTransport::TransportManagementWidget" >
   <property name="geometry" >
    <rect>
     <x>0</x>

transportmanager.cpp

@@ -38,7 +38,7 @@
 #include <QRegExp>
 #include <QStringList>
 
-using namespace KPIM;
+using namespace MailTransport;
 using namespace KWallet;
 
 TransportManager* TransportManager::mInstance = 0;

transportmanager.h

@@ -17,8 +17,8 @@
     02110-1301, USA.
 */
 
-#ifndef KPIM_TRANSPORTMANAGER_H
-#define KPIM_TRANSPORTMANAGER_H
+#ifndef MAILTRANSPORT_TRANSPORTMANAGER_H
+#define MAILTRANSPORT_TRANSPORTMANAGER_H
 
 #include <mailtransport/mailtransport_export.h>
 
@@ -32,7 +32,7 @@ namespace KWallet {
   class Wallet;
 }
 
-namespace KPIM {
+namespace MailTransport {
 
 class Transport;
 class TransportJob;

transporttypedialog.cpp

@@ -22,7 +22,7 @@
 #include "transporttypedialog.h"
 #include "ui_transporttypedialog.h"
 
-using namespace KPIM;
+using namespace MailTransport;
 
 TransportTypeDialog::TransportTypeDialog(QWidget * parent) :
     KDialog( parent )

transporttypedialog.h

@@ -19,15 +19,15 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 */
 
-#ifndef KPIM_TRANSPORTTYPEDIALOG_H
-#define KPIM_TRANSPORTTYPEDIALOG_H
+#ifndef MAILTRANSPORT_TRANSPORTTYPEDIALOG_H
+#define MAILTRANSPORT_TRANSPORTTYPEDIALOG_H
 
 #include <mailtransport/mailtransport_export.h>
 #include <kdialog.h>
 
 class KButtonGroup;
 
-namespace KPIM {
+namespace MailTransport {
 
 /**
   Dialog to select the type of a new transport.