diff options
author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2010-07-31 19:53:50 +0000 |
---|---|---|
committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2010-07-31 19:53:50 +0000 |
commit | 7be55ffa061c026e35e2d6a0effe1161ddb0d41f (patch) | |
tree | 8474f9b444b2756228600050f07a7ff25de532b2 /kpilot/conduits/malconduit | |
parent | f587f20a6d09f1729dd0a8c1cd8ee0110aec7451 (diff) | |
download | tdepim-7be55ffa061c026e35e2d6a0effe1161ddb0d41f.tar.gz tdepim-7be55ffa061c026e35e2d6a0effe1161ddb0d41f.zip |
Trinity Qt initial conversion
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdepim@1157655 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kpilot/conduits/malconduit')
-rw-r--r-- | kpilot/conduits/malconduit/mal-conduit.cc | 26 | ||||
-rw-r--r-- | kpilot/conduits/malconduit/mal-conduit.h | 4 | ||||
-rw-r--r-- | kpilot/conduits/malconduit/mal-factory.cc | 8 | ||||
-rw-r--r-- | kpilot/conduits/malconduit/mal-factory.h | 8 | ||||
-rw-r--r-- | kpilot/conduits/malconduit/mal-setup.cc | 46 | ||||
-rw-r--r-- | kpilot/conduits/malconduit/mal-setup.h | 4 |
6 files changed, 48 insertions, 48 deletions
diff --git a/kpilot/conduits/malconduit/mal-conduit.cc b/kpilot/conduits/malconduit/mal-conduit.cc index 73a77a141..95c4d64b5 100644 --- a/kpilot/conduits/malconduit/mal-conduit.cc +++ b/kpilot/conduits/malconduit/mal-conduit.cc @@ -34,7 +34,7 @@ #include "options.h" -#include <qregexp.h> +#include <tqregexp.h> #include <kconfig.h> #include <kdebug.h> @@ -109,7 +109,7 @@ static int32 cbItem (void */*out*/, MALConduit::MALConduit(KPilotLink * o, const char *n, - const QStringList & a) : + const TQStringList & a) : ConduitAction(o, n, a) { FUNCTIONSETUP; @@ -144,7 +144,7 @@ void MALConduit::readConfig() void MALConduit::saveConfig() { FUNCTIONSETUP; - MALConduitSettings::setLastMALSync( QDateTime::currentDateTime() ); + MALConduitSettings::setLastMALSync( TQDateTime::currentDateTime() ); MALConduitSettings::self()->writeConfig(); } @@ -152,8 +152,8 @@ void MALConduit::saveConfig() bool MALConduit::skip() { - QDateTime now=QDateTime::currentDateTime(); - QDateTime lastSync=MALConduitSettings::lastMALSync(); + TQDateTime now=TQDateTime::currentDateTime(); + TQDateTime lastSync=MALConduitSettings::lastMALSync(); if (!lastSync.isValid() || !now.isValid()) return false; @@ -203,9 +203,9 @@ bool MALConduit::skip() return false; } - QString proxyServer( MALConduitSettings::proxyServer() ); + TQString proxyServer( MALConduitSettings::proxyServer() ); int proxyPort( MALConduitSettings::proxyPort() ); - QString syncMessage; + TQString syncMessage; bool canContinue = true; // Set all proxy settings switch (MALConduitSettings::proxyType()) @@ -222,7 +222,7 @@ bool MALConduit::skip() #ifdef DEBUG DEBUGKPILOT<<" Using HTTP proxy server \""<<proxyServer<< "\", Port "<<proxyPort<<", User "<<MALConduitSettings::proxyUser()<< - ", Password "<<( (MALConduitSettings::proxyPassword().isEmpty())?QString("not "):QString())<<"set" + ", Password "<<( (MALConduitSettings::proxyPassword().isEmpty())?TQString("not "):TQString())<<"set" <<endl; #endif #ifdef LIBMAL20 @@ -261,7 +261,7 @@ bool MALConduit::skip() } syncMessage = i18n("Using SOCKS proxy: %1").arg(proxyServer); #ifdef DEBUG - DEBUGKPILOT<<" Using SOCKS proxy server \""<<proxyServer<<"\", Port "<<proxyPort<<", User "<<MALConduitSettings::proxyUser()<<", Password "<<( (MALConduitSettings::proxyPassword().isEmpty())?QString("not "):QString() )<<"set"<<endl; + DEBUGKPILOT<<" Using SOCKS proxy server \""<<proxyServer<<"\", Port "<<proxyPort<<", User "<<MALConduitSettings::proxyUser()<<", Password "<<( (MALConduitSettings::proxyPassword().isEmpty())?TQString("not "):TQString() )<<"set"<<endl; #endif #ifdef LIBMAL20 setSocksProxy( const_cast<char *>(proxyServer.latin1()) ); @@ -304,13 +304,13 @@ bool MALConduit::skip() return delayDone(); } -void MALConduit::printLogMessage(QString msg) +void MALConduit::printLogMessage(TQString msg) { FUNCTIONSETUP; // Remove the pseudo-progressbar: - QString newmsg(msg); - newmsg.replace( QRegExp("^\\s*\\.*\\s*"), ""); - newmsg.replace( QRegExp("\\s*\\.*\\s*$"), ""); + TQString newmsg(msg); + newmsg.replace( TQRegExp("^\\s*\\.*\\s*"), ""); + newmsg.replace( TQRegExp("\\s*\\.*\\s*$"), ""); if (newmsg.length()>0) { emit logMessage(newmsg); diff --git a/kpilot/conduits/malconduit/mal-conduit.h b/kpilot/conduits/malconduit/mal-conduit.h index 83f72ace1..3f5c14a04 100644 --- a/kpilot/conduits/malconduit/mal-conduit.h +++ b/kpilot/conduits/malconduit/mal-conduit.h @@ -42,9 +42,9 @@ public: MALConduit( KPilotLink *o, const char *n = 0L, - const QStringList &a = QStringList() ); + const TQStringList &a = TQStringList() ); virtual ~MALConduit(); - void printLogMessage(QString msg); + void printLogMessage(TQString msg); virtual bool exec(); protected: diff --git a/kpilot/conduits/malconduit/mal-factory.cc b/kpilot/conduits/malconduit/mal-factory.cc index f9a8bcafb..3e363d269 100644 --- a/kpilot/conduits/malconduit/mal-factory.cc +++ b/kpilot/conduits/malconduit/mal-factory.cc @@ -60,7 +60,7 @@ unsigned long version_conduit_mal = Pilot::PLUGIN_API; // KAboutData *MALConduitFactory::fAbout = 0L; -MALConduitFactory::MALConduitFactory(QObject *p, const char *n) : +MALConduitFactory::MALConduitFactory(TQObject *p, const char *n) : KLibFactory(p,n) { FUNCTIONSETUP; @@ -90,10 +90,10 @@ MALConduitFactory::~MALConduitFactory() KPILOT_DELETE(fAbout); } -/* virtual */ QObject *MALConduitFactory::createObject( QObject *p, +/* virtual */ TQObject *MALConduitFactory::createObject( TQObject *p, const char *n, const char *c, - const QStringList &a) + const TQStringList &a) { FUNCTIONSETUP; @@ -106,7 +106,7 @@ MALConduitFactory::~MALConduitFactory() if (qstrcmp(c,"ConduitConfigBase")==0) { - QWidget *w = dynamic_cast<QWidget *>(p); + TQWidget *w = dynamic_cast<TQWidget *>(p); if (w) { diff --git a/kpilot/conduits/malconduit/mal-factory.h b/kpilot/conduits/malconduit/mal-factory.h index 82631e1ac..a15316381 100644 --- a/kpilot/conduits/malconduit/mal-factory.h +++ b/kpilot/conduits/malconduit/mal-factory.h @@ -42,16 +42,16 @@ class MALConduitFactory : public KLibFactory Q_OBJECT public: - MALConduitFactory(QObject * = 0L,const char * = 0L); + MALConduitFactory(TQObject * = 0L,const char * = 0L); virtual ~MALConduitFactory(); static KAboutData *about() { return fAbout; } ; protected: - virtual QObject* createObject( QObject* parent = 0, + virtual TQObject* createObject( TQObject* parent = 0, const char* name = 0, - const char* classname = "QObject", - const QStringList &args = QStringList() ); + const char* classname = "TQObject", + const TQStringList &args = TQStringList() ); private: KInstance *fInstance; static KAboutData *fAbout; diff --git a/kpilot/conduits/malconduit/mal-setup.cc b/kpilot/conduits/malconduit/mal-setup.cc index d2652b035..1d1f89ff2 100644 --- a/kpilot/conduits/malconduit/mal-setup.cc +++ b/kpilot/conduits/malconduit/mal-setup.cc @@ -32,11 +32,11 @@ #include "options.h" -#include <qtabwidget.h> -#include <qradiobutton.h> -#include <qbuttongroup.h> -#include <qlineedit.h> -#include <qcheckbox.h> +#include <tqtabwidget.h> +#include <tqradiobutton.h> +#include <tqbuttongroup.h> +#include <tqlineedit.h> +#include <tqcheckbox.h> #include <kcombobox.h> #include <knuminput.h> @@ -53,7 +53,7 @@ #include "malconduitSettings.h" -MALWidgetSetup::MALWidgetSetup(QWidget *w, const char *n) : +MALWidgetSetup::MALWidgetSetup(TQWidget *w, const char *n) : ConduitConfigBase(w,n), fConfigWidget(new MALWidget(w)) { @@ -65,21 +65,21 @@ MALWidgetSetup::MALWidgetSetup(QWidget *w, const char *n) : fConfigWidget->tabWidget->adjustSize(); fConfigWidget->resize(fConfigWidget->tabWidget->size()); -#define CM(a,b) connect(fConfigWidget->a,b,this,SLOT(modified())); - CM( syncTime, SIGNAL(clicked(int)) ); - CM( proxyType, SIGNAL(clicked(int)) ); - - CM( proxyServerName, SIGNAL(textChanged(const QString &)) ); - CM( proxyCustomPortCheck, SIGNAL(clicked()) ); - CM( proxyCustomPort, SIGNAL(valueChanged(int)) ); - CM( proxyUserName, SIGNAL(textChanged(const QString &)) ); - CM( proxyPassword, SIGNAL(textChanged(const QString &)) ); - - CM( malServerName, SIGNAL(textChanged(const QString &)) ); - CM( malCustomPortCheck, SIGNAL(clicked()) ); - CM( malCustomPort, SIGNAL(valueChanged(int)) ); - CM( malUserName, SIGNAL(textChanged(const QString &)) ); - CM( malPassword, SIGNAL(textChanged(const QString &)) ); +#define CM(a,b) connect(fConfigWidget->a,b,this,TQT_SLOT(modified())); + CM( syncTime, TQT_SIGNAL(clicked(int)) ); + CM( proxyType, TQT_SIGNAL(clicked(int)) ); + + CM( proxyServerName, TQT_SIGNAL(textChanged(const TQString &)) ); + CM( proxyCustomPortCheck, TQT_SIGNAL(clicked()) ); + CM( proxyCustomPort, TQT_SIGNAL(valueChanged(int)) ); + CM( proxyUserName, TQT_SIGNAL(textChanged(const TQString &)) ); + CM( proxyPassword, TQT_SIGNAL(textChanged(const TQString &)) ); + + CM( malServerName, TQT_SIGNAL(textChanged(const TQString &)) ); + CM( malCustomPortCheck, TQT_SIGNAL(clicked()) ); + CM( malCustomPort, TQT_SIGNAL(valueChanged(int)) ); + CM( malUserName, TQT_SIGNAL(textChanged(const TQString &)) ); + CM( malPassword, TQT_SIGNAL(textChanged(const TQString &)) ); #undef CM } @@ -150,7 +150,7 @@ MALWidgetSetup::~MALWidgetSetup() fConfigWidget->proxyCustomPort->setValue(proxyPortNr); } fConfigWidget->proxyUserName->setText(MALConduitSettings::proxyUser()); - fConfigWidget->proxyPassword->setText(QString::null); + fConfigWidget->proxyPassword->setText(TQString::null); fConfigWidget->proxyPassword->insert(MALConduitSettings::proxyPassword()); #ifdef DEBUG @@ -178,7 +178,7 @@ MALWidgetSetup::~MALWidgetSetup() unmodified(); } -/* static */ ConduitConfigBase *MALWidgetSetup::create(QWidget *w, const char *n) +/* static */ ConduitConfigBase *MALWidgetSetup::create(TQWidget *w, const char *n) { return new MALWidgetSetup(w,n); } diff --git a/kpilot/conduits/malconduit/mal-setup.h b/kpilot/conduits/malconduit/mal-setup.h index 78b6a0ee2..6a6337496 100644 --- a/kpilot/conduits/malconduit/mal-setup.h +++ b/kpilot/conduits/malconduit/mal-setup.h @@ -41,11 +41,11 @@ class MALWidgetSetup : public ConduitConfigBase { Q_OBJECT public: - MALWidgetSetup(QWidget *,const char *); + MALWidgetSetup(TQWidget *,const char *); virtual ~MALWidgetSetup(); virtual void load(); virtual void commit(); - static ConduitConfigBase *create(QWidget *, const char *); + static ConduitConfigBase *create(TQWidget *, const char *); private: MALWidget *fConfigWidget; } ; |