Commit 0842d64d authored by Volker Krause's avatar Volker Krause

Don't abuse the KPIM namespace.

svn path=/trunk/KDE/kdepim/mailtransport/; revision=620786
parent 74f61164
......@@ -3,7 +3,6 @@ Mail Transport TODO
General
-------
- use own namespace
- compile without QT3_SUPPORT
Migration
......
......@@ -24,7 +24,7 @@
#include "legacydecrypt.h"
using namespace KPIM;
using namespace MailTransport;
QString Legacy::decryptKMail(const QString & data)
{
......
......@@ -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.
......
......@@ -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
......
......@@ -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>
......
......@@ -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 ),
......
......@@ -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.
......
......@@ -27,7 +27,7 @@
#include <qbuffer.h>
using namespace KPIM;
using namespace MailTransport;
SendmailJob::SendmailJob(Transport * transport, QObject * parent) :
TransportJob( transport, parent )
......
......@@ -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.
......
......@@ -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;
......
......@@ -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.
......
......@@ -31,7 +31,7 @@
#include <QPushButton>
#include <QTextEdit>
using namespace KPIM;
using namespace MailTransport;
TransportMgr::TransportMgr() :
mCurrentJob( 0 )
......
......@@ -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;
......
......@@ -28,7 +28,7 @@
#include <kstringhandler.h>
#include <kwallet.h>
using namespace KPIM;
using namespace MailTransport;
using namespace KWallet;
Transport::Transport( const QString &cfgGroup ) :
......
......@@ -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.
......
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
......@@ -25,7 +25,7 @@
#include <qlineedit.h>
using namespace KPIM;
using namespace MailTransport;
TransportComboBox::TransportComboBox(QWidget * parent) :
KComboBox( parent )
......
......@@ -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.
......
......@@ -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)) );
......
......@@ -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;
......
......@@ -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 );
......
......@@ -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;
......
......@@ -26,7 +26,7 @@
#include "transportconfigdialog.h"
#include "transporttypedialog.h"
using namespace KPIM;
using namespace MailTransport;
class TransportManagementWidget::Private
{
......
......@@ -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.
......
<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>
......
......@@ -38,7 +38,7 @@
#include <QRegExp>
#include <QStringList>
using namespace KPIM;
using namespace MailTransport;
using namespace KWallet;
TransportManager* TransportManager::mInstance = 0;
......
......@@ -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;
......
......@@ -22,7 +22,7 @@
#include "transporttypedialog.h"
#include "ui_transporttypedialog.h"
using namespace KPIM;
using namespace MailTransport;
TransportTypeDialog::TransportTypeDialog(QWidget * parent) :
KDialog( parent )
......
......@@ -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.
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment