diff options
author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2010-07-31 19:48:06 +0000 |
---|---|---|
committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2010-07-31 19:48:06 +0000 |
commit | 47c8a359c5276062c4bc17f0e82410f29081b502 (patch) | |
tree | 2d54a5f60a5b74067632f9ef6df58c2bc38155e6 /kopete/protocols/meanwhile | |
parent | 6f82532777a35e0e60bbd2b290b2e93e646f349b (diff) | |
download | tdenetwork-47c8a359c5276062c4bc17f0e82410f29081b502.tar.gz tdenetwork-47c8a359c5276062c4bc17f0e82410f29081b502.zip |
Trinity Qt initial conversion
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdenetwork@1157648 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kopete/protocols/meanwhile')
-rw-r--r-- | kopete/protocols/meanwhile/meanwhileaccount.cpp | 36 | ||||
-rw-r--r-- | kopete/protocols/meanwhile/meanwhileaccount.h | 20 | ||||
-rw-r--r-- | kopete/protocols/meanwhile/meanwhileaddcontactpage.cpp | 16 | ||||
-rw-r--r-- | kopete/protocols/meanwhile/meanwhileaddcontactpage.h | 4 | ||||
-rw-r--r-- | kopete/protocols/meanwhile/meanwhilecontact.cpp | 24 | ||||
-rw-r--r-- | kopete/protocols/meanwhile/meanwhilecontact.h | 14 | ||||
-rw-r--r-- | kopete/protocols/meanwhile/meanwhileeditaccountwidget.cpp | 22 | ||||
-rw-r--r-- | kopete/protocols/meanwhile/meanwhileeditaccountwidget.h | 4 | ||||
-rw-r--r-- | kopete/protocols/meanwhile/meanwhileplugin.cpp | 10 | ||||
-rw-r--r-- | kopete/protocols/meanwhile/meanwhileplugin.h | 6 | ||||
-rw-r--r-- | kopete/protocols/meanwhile/meanwhileprotocol.cpp | 30 | ||||
-rw-r--r-- | kopete/protocols/meanwhile/meanwhileprotocol.h | 14 | ||||
-rw-r--r-- | kopete/protocols/meanwhile/meanwhilesession.cpp | 54 | ||||
-rw-r--r-- | kopete/protocols/meanwhile/meanwhilesession.h | 14 |
14 files changed, 134 insertions, 134 deletions
diff --git a/kopete/protocols/meanwhile/meanwhileaccount.cpp b/kopete/protocols/meanwhile/meanwhileaccount.cpp index c130475b..9dba56f2 100644 --- a/kopete/protocols/meanwhile/meanwhileaccount.cpp +++ b/kopete/protocols/meanwhile/meanwhileaccount.cpp @@ -32,11 +32,11 @@ #include "kopeteaway.h" #include <kinputdialog.h> #include <kmessagebox.h> -#include <qdict.h> +#include <tqdict.h> MeanwhileAccount::MeanwhileAccount( MeanwhileProtocol *parent, - const QString &accountID, + const TQString &accountID, const char *name) : Kopete::PasswordedAccount(parent, accountID, 0, name) { @@ -62,7 +62,7 @@ void MeanwhileAccount::setPlugin(MeanwhilePlugin *plugin) } bool MeanwhileAccount::createContact( - const QString & contactId , + const TQString & contactId , Kopete::MetaContact * parentContact) { MeanwhileContact* newContact = new MeanwhileContact(contactId, @@ -78,7 +78,7 @@ bool MeanwhileAccount::createContact( return newContact != 0L; } -void MeanwhileAccount::connectWithPassword(const QString &password) +void MeanwhileAccount::connectWithPassword(const TQString &password) { if (password.isEmpty()) { disconnect(Kopete::Account::Manual); @@ -92,12 +92,12 @@ void MeanwhileAccount::connectWithPassword(const QString &password) return; } - QObject::connect(m_session, - SIGNAL(sessionStateChange(Kopete::OnlineStatus)), - this, SLOT(slotSessionStateChange(Kopete::OnlineStatus))); - QObject::connect(m_session, - SIGNAL(serverNotification(const QString &)), - this, SLOT(slotServerNotification(const QString&))); + TQObject::connect(m_session, + TQT_SIGNAL(sessionStateChange(Kopete::OnlineStatus)), + this, TQT_SLOT(slotSessionStateChange(Kopete::OnlineStatus))); + TQObject::connect(m_session, + TQT_SIGNAL(serverNotification(const TQString &)), + this, TQT_SLOT(slotServerNotification(const TQString&))); } @@ -138,15 +138,15 @@ KActionMenu * MeanwhileAccount::actionMenu() menu->popupMenu()->insertSeparator(); #if 0 - menu->insert(new KAction(i18n("&Change Status Message"), QString::null, 0, - this, SLOT(meanwhileChangeStatus()), this, + menu->insert(new KAction(i18n("&Change Status Message"), TQString::null, 0, + this, TQT_SLOT(meanwhileChangeStatus()), this, "meanwhileChangeStatus")); //infoPlugin->addCustomMenus(theMenu); #endif return menu; } -QString MeanwhileAccount::getServerName() +TQString MeanwhileAccount::getServerName() { return configGroup()->readEntry("Server"); } @@ -156,7 +156,7 @@ int MeanwhileAccount::getServerPort() return configGroup()->readNumEntry("Port"); } -void MeanwhileAccount::setServerName(const QString &server) +void MeanwhileAccount::setServerName(const TQString &server) { configGroup()->writeEntry("Server", server); } @@ -198,25 +198,25 @@ bool MeanwhileAccount::getClientIDParams(int *clientID, return custom_id; } -void MeanwhileAccount::slotServerNotification(const QString &mesg) +void MeanwhileAccount::slotServerNotification(const TQString &mesg) { KMessageBox::queuedMessageBox(0, KMessageBox::Error , mesg, i18n("Meanwhile Plugin: Message from server"), KMessageBox::Notify); } -QString MeanwhileAccount::meanwhileId() const +TQString MeanwhileAccount::meanwhileId() const { return m_meanwhileId; } -void MeanwhileAccount::setAway(bool away, const QString &reason) +void MeanwhileAccount::setAway(bool away, const TQString &reason) { MeanwhileProtocol *p = static_cast<MeanwhileProtocol *>(protocol()); setOnlineStatus(away ? p->statusIdle : p->statusOnline, reason); } void MeanwhileAccount::setOnlineStatus(const Kopete::OnlineStatus &status, - const QString &reason) + const TQString &reason) { HERE; Kopete::OnlineStatus oldstatus = myself()->onlineStatus(); diff --git a/kopete/protocols/meanwhile/meanwhileaccount.h b/kopete/protocols/meanwhile/meanwhileaccount.h index d08b07c5..ba747212 100644 --- a/kopete/protocols/meanwhile/meanwhileaccount.h +++ b/kopete/protocols/meanwhile/meanwhileaccount.h @@ -37,15 +37,15 @@ public: * @param accountID The (meanwhile) account id of this account * @param name The name of this account */ - MeanwhileAccount(MeanwhileProtocol *protocol, const QString &accountID, + MeanwhileAccount(MeanwhileProtocol *protocol, const TQString &accountID, const char *name = 0L); ~MeanwhileAccount(); - virtual bool createContact(const QString &contactId, + virtual bool createContact(const TQString &contactId, Kopete::MetaContact *parentContact); - virtual void connectWithPassword(const QString &password); + virtual void connectWithPassword(const TQString &password); virtual void disconnect(); @@ -54,11 +54,11 @@ public: virtual KActionMenu *actionMenu(); /** Get the server host name */ - QString getServerName(); + TQString getServerName(); /** Get the server port */ int getServerPort(); /** Set the server host name */ - void setServerName(const QString &server); + void setServerName(const TQString &server); /** Set the server port */ void setServerPort(int port); /** Provide an information plugin for this account */ @@ -89,7 +89,7 @@ public: * Get the meanwhile id for this account * @return The meanwhile ID for the account */ - QString meanwhileId() const; + TQString meanwhileId() const; public slots: /** @@ -100,12 +100,12 @@ public slots: /** * Called by the session when a notification message has been received */ - void slotServerNotification(const QString &mesg); + void slotServerNotification(const TQString &mesg); /** Reimplemented from Kopete::Account */ void setOnlineStatus(const Kopete::OnlineStatus& status, - const QString &reason = QString::null); - void setAway(bool away, const QString&reason = QString::null); + const TQString &reason = TQString::null); + void setAway(bool away, const TQString&reason = TQString::null); private: /** Current online status */ @@ -115,7 +115,7 @@ private: MeanwhileSession *m_session; /* The user id for this account */ - QString m_meanwhileId; + TQString m_meanwhileId; }; #endif diff --git a/kopete/protocols/meanwhile/meanwhileaddcontactpage.cpp b/kopete/protocols/meanwhile/meanwhileaddcontactpage.cpp index 8709700b..44b10bbc 100644 --- a/kopete/protocols/meanwhile/meanwhileaddcontactpage.cpp +++ b/kopete/protocols/meanwhile/meanwhileaddcontactpage.cpp @@ -15,30 +15,30 @@ ************************************************************************* */ #include "meanwhileaddcontactpage.h" -#include <qpushbutton.h> -#include <qlayout.h> +#include <tqpushbutton.h> +#include <tqlayout.h> #include <kopeteaccount.h> #include <kopetemetacontact.h> -#include <qlineedit.h> +#include <tqlineedit.h> #include "meanwhileprotocol.h" #include "meanwhileaccount.h" #include "meanwhileplugin.h" MeanwhileAddContactPage::MeanwhileAddContactPage( - QWidget* parent, + TQWidget* parent, Kopete::Account *_account) : AddContactPage(parent, 0L), theAccount(_account), theParent(parent) { - ( new QVBoxLayout( this ) )->setAutoAdd( true ); + ( new TQVBoxLayout( this ) )->setAutoAdd( true ); theDialog = new MeanwhileAddContactBase(this); MeanwhileAccount *account = static_cast<MeanwhileAccount *>(_account); if (account->infoPlugin->canProvideMeanwhileId()) { - QObject::connect(theDialog->btnFindUser, SIGNAL(clicked()), - SLOT(slotFindUser())); + TQObject::connect(theDialog->btnFindUser, TQT_SIGNAL(clicked()), + TQT_SLOT(slotFindUser())); } else theDialog->btnFindUser->setDisabled(true); @@ -61,7 +61,7 @@ bool MeanwhileAddContactPage::apply( Kopete::Account* a, Kopete::MetaContact* m ) { - QString displayName = theDialog->contactID->text(); + TQString displayName = theDialog->contactID->text(); MeanwhileAccount* myAccount = static_cast<MeanwhileAccount*>(a); return myAccount->addContact(displayName, m, Kopete::Account::ChangeKABC ); } diff --git a/kopete/protocols/meanwhile/meanwhileaddcontactpage.h b/kopete/protocols/meanwhile/meanwhileaddcontactpage.h index 889b2707..fdf6445c 100644 --- a/kopete/protocols/meanwhile/meanwhileaddcontactpage.h +++ b/kopete/protocols/meanwhile/meanwhileaddcontactpage.h @@ -27,7 +27,7 @@ class MeanwhileAddContactPage : public AddContactPage { Q_OBJECT public: - MeanwhileAddContactPage( QWidget* parent = 0, + MeanwhileAddContactPage( TQWidget* parent = 0, Kopete::Account *account=0); ~MeanwhileAddContactPage(); @@ -37,7 +37,7 @@ public: protected: MeanwhileAddContactBase *theDialog; Kopete::Account *theAccount; - QWidget *theParent; + TQWidget *theParent; public slots: void slotFindUser(); }; diff --git a/kopete/protocols/meanwhile/meanwhilecontact.cpp b/kopete/protocols/meanwhile/meanwhilecontact.cpp index fd30bc46..e77d470a 100644 --- a/kopete/protocols/meanwhile/meanwhilecontact.cpp +++ b/kopete/protocols/meanwhile/meanwhilecontact.cpp @@ -29,7 +29,7 @@ #include "meanwhilecontact.h" #include "meanwhileplugin.h" -MeanwhileContact::MeanwhileContact(QString userId, QString nickname, +MeanwhileContact::MeanwhileContact(TQString userId, TQString nickname, MeanwhileAccount *account, Kopete::MetaContact *parent) : Kopete::Contact(account, userId, parent) { @@ -49,8 +49,8 @@ bool MeanwhileContact::isReachable() return isOnline(); } -void MeanwhileContact::serialize(QMap<QString, QString> &serializedData, - QMap<QString, QString> &addressBookData) +void MeanwhileContact::serialize(TQMap<TQString, TQString> &serializedData, + TQMap<TQString, TQString> &addressBookData) { Kopete::Contact::serialize(serializedData, addressBookData); } @@ -70,25 +70,25 @@ Kopete::ChatSession* MeanwhileContact::manager(CanCreateFlags canCreate) if (m_msgManager != 0L || canCreate == Kopete::Contact::CannotCreate) return m_msgManager; - QPtrList<Kopete::Contact> contacts; + TQPtrList<Kopete::Contact> contacts; contacts.append(this); m_msgManager = Kopete::ChatSessionManager::self()-> create(account()->myself(), contacts, protocol()); connect(m_msgManager, - SIGNAL(messageSent(Kopete::Message&, Kopete::ChatSession*)), - this, SLOT(sendMessage(Kopete::Message&))); + TQT_SIGNAL(messageSent(Kopete::Message&, Kopete::ChatSession*)), + this, TQT_SLOT(sendMessage(Kopete::Message&))); - connect(m_msgManager, SIGNAL(myselfTyping(bool)), - this, SLOT(slotSendTyping(bool))); + connect(m_msgManager, TQT_SIGNAL(myselfTyping(bool)), + this, TQT_SLOT(slotSendTyping(bool))); - connect(m_msgManager, SIGNAL(destroyed()), - this, SLOT(slotChatSessionDestroyed())); + connect(m_msgManager, TQT_SIGNAL(destroyed()), + this, TQT_SLOT(slotChatSessionDestroyed())); return m_msgManager; } -QString MeanwhileContact::meanwhileId() const +TQString MeanwhileContact::meanwhileId() const { return m_meanwhileId; } @@ -104,7 +104,7 @@ void MeanwhileContact::slotSendTyping(bool isTyping) sendTyping(this, isTyping); } -void MeanwhileContact::receivedMessage(const QString &message) +void MeanwhileContact::receivedMessage(const TQString &message) { Kopete::ContactPtrList contactList; contactList.append(account()->myself()); diff --git a/kopete/protocols/meanwhile/meanwhilecontact.h b/kopete/protocols/meanwhile/meanwhilecontact.h index eface094..048a4b0f 100644 --- a/kopete/protocols/meanwhile/meanwhilecontact.h +++ b/kopete/protocols/meanwhile/meanwhilecontact.h @@ -17,7 +17,7 @@ #ifndef MEANWHILECONTACT_H #define MEANWHILECONTACT_H -#include <qmap.h> +#include <tqmap.h> #include "kopetecontact.h" #include "kopetemessage.h" #include "meanwhileaccount.h" @@ -33,26 +33,26 @@ class MeanwhileContact : public Kopete::Contact Q_OBJECT public: - MeanwhileContact(QString userId, QString nickname, + MeanwhileContact(TQString userId, TQString nickname, MeanwhileAccount *account, Kopete::MetaContact *parent); ~MeanwhileContact(); virtual bool isReachable(); - virtual void serialize(QMap<QString, QString> &serializedData, - QMap<QString, QString> &addressBookData); + virtual void serialize(TQMap<TQString, TQString> &serializedData, + TQMap<TQString, TQString> &addressBookData); virtual Kopete::ChatSession *manager( CanCreateFlags canCreate = CanCreate); - QString meanwhileId() const; + TQString meanwhileId() const; virtual void sync(unsigned int changed = 0xff); public slots: void sendMessage( Kopete::Message &message ); - void receivedMessage( const QString &message ); + void receivedMessage( const TQString &message ); virtual void slotUserInfo(); protected slots: @@ -61,7 +61,7 @@ protected slots: void slotSendTyping(bool isTyping); private: - QString m_meanwhileId; + TQString m_meanwhileId; Kopete::ChatSession *m_msgManager; }; diff --git a/kopete/protocols/meanwhile/meanwhileeditaccountwidget.cpp b/kopete/protocols/meanwhile/meanwhileeditaccountwidget.cpp index f3d05710..edaa66f6 100644 --- a/kopete/protocols/meanwhile/meanwhileeditaccountwidget.cpp +++ b/kopete/protocols/meanwhile/meanwhileeditaccountwidget.cpp @@ -14,12 +14,12 @@ * * ************************************************************************* */ -#include <qlayout.h> -#include <qlineedit.h> -#include <qcheckbox.h> -#include <qpushbutton.h> -#include <qspinbox.h> -#include <qcombobox.h> +#include <tqlayout.h> +#include <tqlineedit.h> +#include <tqcheckbox.h> +#include <tqpushbutton.h> +#include <tqspinbox.h> +#include <tqcombobox.h> #include <kdebug.h> #include <kopeteaccount.h> #include <kopetepasswordwidget.h> @@ -39,8 +39,8 @@ void MeanwhileEditAccountWidget::setupClientList() int i = 0; for (id = MeanwhileSession::getClientIDs(); id->name; id++, i++) { - QString name = QString("%1 (0x%2)") - .arg(QString(id->name)) + TQString name = TQString("%1 (0x%2)") + .arg(TQString(id->name)) .arg(id->id, 0, 16); mClientID->insertItem(name, i); @@ -64,7 +64,7 @@ void MeanwhileEditAccountWidget::selectClientListItem(int selectedID) } MeanwhileEditAccountWidget::MeanwhileEditAccountWidget( - QWidget* parent, + TQWidget* parent, Kopete::Account* theAccount, MeanwhileProtocol *theProtocol) : MeanwhileEditAccountBase(parent), @@ -106,8 +106,8 @@ MeanwhileEditAccountWidget::MeanwhileEditAccountWidget( slotSetServer2Default(); } - QObject::connect(btnServerDefaults, SIGNAL(clicked()), - SLOT(slotSetServer2Default())); + TQObject::connect(btnServerDefaults, TQT_SIGNAL(clicked()), + TQT_SLOT(slotSetServer2Default())); show(); } diff --git a/kopete/protocols/meanwhile/meanwhileeditaccountwidget.h b/kopete/protocols/meanwhile/meanwhileeditaccountwidget.h index 9e05465b..e71a8bcc 100644 --- a/kopete/protocols/meanwhile/meanwhileeditaccountwidget.h +++ b/kopete/protocols/meanwhile/meanwhileeditaccountwidget.h @@ -17,7 +17,7 @@ #ifndef MEANWHILEEDITACCOUNTWIDGET_H #define MEANWHILEEDITACCOUNTWIDGET_H -#include <qwidget.h> +#include <tqwidget.h> #include <editaccountwidget.h> #include "meanwhileeditaccountbase.h" @@ -30,7 +30,7 @@ class MeanwhileEditAccountWidget : { Q_OBJECT public: - MeanwhileEditAccountWidget( QWidget* parent, + MeanwhileEditAccountWidget( TQWidget* parent, Kopete::Account* account, MeanwhileProtocol *protocol); diff --git a/kopete/protocols/meanwhile/meanwhileplugin.cpp b/kopete/protocols/meanwhile/meanwhileplugin.cpp index d8f617cb..4ee995dd 100644 --- a/kopete/protocols/meanwhile/meanwhileplugin.cpp +++ b/kopete/protocols/meanwhile/meanwhileplugin.cpp @@ -14,12 +14,12 @@ * * ************************************************************************* */ -#include <qwidget.h> -#include <qlineedit.h> +#include <tqwidget.h> +#include <tqlineedit.h> #include "meanwhileplugin.h" -void MeanwhilePlugin::getMeanwhileId(QWidget * /*parent*/, - QLineEdit * /*fillThis*/) +void MeanwhilePlugin::getMeanwhileId(TQWidget * /*parent*/, + TQLineEdit * /*fillThis*/) { } @@ -28,7 +28,7 @@ bool MeanwhilePlugin::canProvideMeanwhileId() return false; } -void MeanwhilePlugin::showUserInfo(const QString &/*userid*/) +void MeanwhilePlugin::showUserInfo(const TQString &/*userid*/) { } diff --git a/kopete/protocols/meanwhile/meanwhileplugin.h b/kopete/protocols/meanwhile/meanwhileplugin.h index b2ddbdcb..a5c82829 100644 --- a/kopete/protocols/meanwhile/meanwhileplugin.h +++ b/kopete/protocols/meanwhile/meanwhileplugin.h @@ -17,7 +17,7 @@ #ifndef __MEANWHILE_PLUGIN_H__ #define __MEANWHILE_PLUGIN_H__ -#include "qstring.h" +#include "tqstring.h" #include <kaction.h> class QLineEdit; @@ -29,14 +29,14 @@ public: * - like do lookups in company databases * when done fill 'fillThis' with the id of the contact */ - virtual void getMeanwhileId(QWidget *parent,QLineEdit *fillThis); + virtual void getMeanwhileId(TQWidget *parent,TQLineEdit *fillThis); /* can this plugin provide the above functionality */ virtual bool canProvideMeanwhileId(); /* show user info has been selected - the meanwhile server doesnt * seem to have any info...maybe you can find it somewhere else */ - virtual void showUserInfo(const QString &userid); + virtual void showUserInfo(const TQString &userid); /* if you want to provide more functions on the rightclick dropdown * menu...implement this diff --git a/kopete/protocols/meanwhile/meanwhileprotocol.cpp b/kopete/protocols/meanwhile/meanwhileprotocol.cpp index 434de2f3..b9915e94 100644 --- a/kopete/protocols/meanwhile/meanwhileprotocol.cpp +++ b/kopete/protocols/meanwhile/meanwhileprotocol.cpp @@ -29,17 +29,17 @@ typedef KGenericFactory<MeanwhileProtocol> MeanwhileProtocolFactory; K_EXPORT_COMPONENT_FACTORY(kopete_meanwhile, MeanwhileProtocolFactory("kopete_meanwhile")) -MeanwhileProtocol::MeanwhileProtocol(QObject* parent, const char *name, - const QStringList &/*args*/) +MeanwhileProtocol::MeanwhileProtocol(TQObject* parent, const char *name, + const TQStringList &/*args*/) : Kopete::Protocol(MeanwhileProtocolFactory::instance(), parent, name), - statusOffline(Kopete::OnlineStatus::Offline, 25, this, 0, QString::null, + statusOffline(Kopete::OnlineStatus::Offline, 25, this, 0, TQString::null, i18n("Offline"), i18n("Offline"), Kopete::OnlineStatusManager::Offline, Kopete::OnlineStatusManager::DisabledIfOffline), statusOnline(Kopete::OnlineStatus::Online, 25, this, mwStatus_ACTIVE, - QString::null, i18n("Online"), i18n("Online"), + TQString::null, i18n("Online"), i18n("Online"), Kopete::OnlineStatusManager::Online, 0), statusAway(Kopete::OnlineStatus::Away, 20, this, mwStatus_AWAY, @@ -57,10 +57,10 @@ MeanwhileProtocol::MeanwhileProtocol(QObject* parent, const char *name, Kopete::OnlineStatusManager::Idle, 0), statusAccountOffline(Kopete::OnlineStatus::Offline, 0, this, 0, - QString::null, i18n("Account Offline")), + TQString::null, i18n("Account Offline")), - statusMessage(QString::fromLatin1("statusMessage"), - i18n("Status Message"), QString::null, false, true), + statusMessage(TQString::fromLatin1("statusMessage"), + i18n("Status Message"), TQString::null, false, true), awayMessage(Kopete::Global::Properties::self()->awayMessage()) { @@ -73,31 +73,31 @@ MeanwhileProtocol::~MeanwhileProtocol() { } -AddContactPage * MeanwhileProtocol::createAddContactWidget(QWidget *parent, +AddContactPage * MeanwhileProtocol::createAddContactWidget(TQWidget *parent, Kopete::Account *account ) { return new MeanwhileAddContactPage(parent, account); } KopeteEditAccountWidget * MeanwhileProtocol::createEditAccountWidget( - Kopete::Account *account, QWidget *parent ) + Kopete::Account *account, TQWidget *parent ) { return new MeanwhileEditAccountWidget(parent, account, this); } -Kopete::Account *MeanwhileProtocol::createNewAccount(const QString &accountId) +Kopete::Account *MeanwhileProtocol::createNewAccount(const TQString &accountId) { return new MeanwhileAccount(this, accountId, accountId.ascii()); } Kopete::Contact *MeanwhileProtocol::deserializeContact( Kopete::MetaContact *metaContact, - const QMap<QString, - QString> &serializedData, - const QMap<QString, QString> & /* addressBookData */ ) + const TQMap<TQString, + TQString> &serializedData, + const TQMap<TQString, TQString> & /* addressBookData */ ) { - QString contactId = serializedData[ "contactId" ]; - QString accountId = serializedData[ "accountId" ]; + TQString contactId = serializedData[ "contactId" ]; + TQString accountId = serializedData[ "accountId" ]; MeanwhileAccount *theAccount = static_cast<MeanwhileAccount*>( diff --git a/kopete/protocols/meanwhile/meanwhileprotocol.h b/kopete/protocols/meanwhile/meanwhileprotocol.h index aa7a9861..343d443f 100644 --- a/kopete/protocols/meanwhile/meanwhileprotocol.h +++ b/kopete/protocols/meanwhile/meanwhileprotocol.h @@ -39,23 +39,23 @@ class MeanwhileProtocol : public Kopete::Protocol { Q_OBJECT public: - MeanwhileProtocol(QObject *parent, const char *name, - const QStringList &args); + MeanwhileProtocol(TQObject *parent, const char *name, + const TQStringList &args); ~MeanwhileProtocol(); - virtual AddContactPage *createAddContactWidget(QWidget *parent, + virtual AddContactPage *createAddContactWidget(TQWidget *parent, Kopete::Account *account); virtual KopeteEditAccountWidget *createEditAccountWidget( - Kopete::Account *account, QWidget *parent); + Kopete::Account *account, TQWidget *parent); - virtual Kopete::Account *createNewAccount(const QString &accountId); + virtual Kopete::Account *createNewAccount(const TQString &accountId); virtual Kopete::Contact *deserializeContact( Kopete::MetaContact *metaContact, - const QMap<QString,QString> &serializedData, - const QMap<QString, QString> &addressBookData); + const TQMap<TQString,TQString> &serializedData, + const TQMap<TQString, TQString> &addressBookData); const Kopete::OnlineStatus accountOfflineStatus(); diff --git a/kopete/protocols/meanwhile/meanwhilesession.cpp b/kopete/protocols/meanwhile/meanwhilesession.cpp index 974ca4af..c7121875 100644 --- a/kopete/protocols/meanwhile/meanwhilesession.cpp +++ b/kopete/protocols/meanwhile/meanwhilesession.cpp @@ -181,11 +181,11 @@ void MeanwhileSession::getDefaultClientIDParams(int *clientID, } /* external interface called by meanwhileaccount */ -void MeanwhileSession::connect(QString password) +void MeanwhileSession::connect(TQString password) { int port, clientID, versionMajor, versionMinor; bool useCustomID; - QString host; + TQString host; HERE; @@ -207,10 +207,10 @@ void MeanwhileSession::connect(QString password) socket = sock; /* we want to receive signals when there is data to read */ sock->enableRead(true); - QObject::connect(sock, SIGNAL(readyRead()), this, - SLOT(slotSocketDataAvailable())); - QObject::connect(sock, SIGNAL(closed(int)), this, - SLOT(slotSocketClosed(int))); + TQObject::connect(sock, TQT_SIGNAL(readyRead()), this, + TQT_SLOT(slotSocketDataAvailable())); + TQObject::connect(sock, TQT_SIGNAL(closed(int)), this, + TQT_SLOT(slotSocketClosed(int))); /* set login details */ mwSession_setProperty(session, mwSession_AUTH_USER_ID, @@ -266,13 +266,13 @@ static void free_id_block(void *data, void *p) free(id); } -void MeanwhileSession::addContacts(const QDict<Kopete::Contact>& contacts) +void MeanwhileSession::addContacts(const TQDict<Kopete::Contact>& contacts) { HERE; - QDictIterator<Kopete::Contact> it(contacts); + TQDictIterator<Kopete::Contact> it(contacts); GList *buddies = 0L; - /** Convert our QDict of kopete contact to a GList of meanwhile buddies */ + /** Convert our TQDict of kopete contact to a GList of meanwhile buddies */ for( ; it.current(); ++it) { MeanwhileContact *contact = static_cast<MeanwhileContact *>(it.current()); @@ -370,7 +370,7 @@ void MeanwhileSession::sendTyping(MeanwhileContact *contact, bool isTyping) } void MeanwhileSession::setStatus(Kopete::OnlineStatus status, - const QString msg) + const TQString msg) { HERE; mwDebug() << "setStatus: " << status.description() << "(" @@ -404,7 +404,7 @@ void MeanwhileSession::syncContactsToServer() mwSametimeGroup_DYNAMIC, "People"); mwSametimeGroup_setOpen(topstgroup, true); - QDictIterator<Kopete::Contact> it(account->contacts()); + TQDictIterator<Kopete::Contact> it(account->contacts()); for( ; it.current(); ++it ) { MeanwhileContact *contact = static_cast<MeanwhileContact *>(it.current()); @@ -498,7 +498,7 @@ void MeanwhileSession::slotSocketClosed(int reason) if (reason & KExtendedSocket::involuntary) emit serverNotification( - QString("Lost connection with Meanwhile server")); + TQString("Lost connection with Meanwhile server")); if (socket) { delete socket; @@ -545,14 +545,14 @@ void MeanwhileSession::resolveContactNickname(MeanwhileContact *contact) _handleResolveLookupResults, contact, NULL); } -QString MeanwhileSession::getNickName(struct mwLoginInfo *logininfo) +TQString MeanwhileSession::getNickName(struct mwLoginInfo *logininfo) { if (logininfo == 0L || logininfo->user_name == 0L) - return QString::null; + return TQString::null; return getNickName(logininfo->user_name); } -QString MeanwhileSession::getNickName(QString name) +TQString MeanwhileSession::getNickName(TQString name) { int index = name.find(" - "); @@ -572,13 +572,13 @@ MeanwhileContact *MeanwhileSession::conversationContact( if (target == 0L || target->user == 0L) { return 0L; } - QString user(target->user); + TQString user(target->user); MeanwhileContact *contact = static_cast<MeanwhileContact *>(account->contacts()[user]); struct mwLoginInfo *logininfo = mwConversation_getTargetInfo(conv); - QString name = getNickName(logininfo); + TQString name = getNickName(logininfo); if (!contact) { account->addContact(user, name, 0L, Kopete::Account::Temporary); @@ -625,7 +625,7 @@ void MeanwhileSession::handleSessionStateChange( if (info == INCORRECT_LOGIN) account->password().setWrong(); char *reason = mwError(info); - emit serverNotification(QString(reason)); + emit serverNotification(TQString(reason)); free(reason); } } @@ -665,14 +665,14 @@ int MeanwhileSession::handleSessionIOWrite(const guchar *buffer, void MeanwhileSession::handleSessionAdmin(const char *text) { HERE; - emit serverNotification(QString(text)); + emit serverNotification(TQString(text)); } void MeanwhileSession::handleSessionAnnounce(struct mwLoginInfo *from, gboolean /* may_reply */, const char *text) { HERE; - QString message; + TQString message; message.sprintf("Announcement from %s:\n%s", from->user_id, text); emit serverNotification(message); } @@ -694,8 +694,8 @@ void MeanwhileSession::handleSessionIOClose() if (socket == 0L) return; - QObject::disconnect(socket, SIGNAL(closed(int)), - this, SLOT(slotSocketClosed(int))); + TQObject::disconnect(socket, TQT_SIGNAL(closed(int)), + this, TQT_SLOT(slotSocketClosed(int))); socket->flush(); socket->closeNow(); @@ -748,7 +748,7 @@ void MeanwhileSession::handleAwareListAware(struct mwAwareSnapshot *snapshot) 0 : snapshot->status.time; if (idletime != 0) { contact->setStatusDescription(statusDesc + "[" + - QString::number(idletime/60)+" mins]"); + TQString::number(idletime/60)+" mins]"); } } else contact->setStatusDescription(snapshot->status.desc); @@ -775,7 +775,7 @@ struct MeanwhileSession::ConversationData cd->chat = contact->manager(Kopete::Contact::CanCreate); cd->chat->ref(); if (createQueue) - cd->queue = new QValueList<Kopete::Message>(); + cd->queue = new TQValueList<Kopete::Message>(); mwConversation_setClientData(conv, cd, 0L); @@ -800,7 +800,7 @@ void MeanwhileSession::handleImConvOpened(struct mwConversation *conv) } else if (convdata->queue && !convdata->queue->isEmpty()) { /* send any messages that were waiting for the conversation to open */ - QValueList<Kopete::Message>::iterator it; + TQValueList<Kopete::Message>::iterator it; for (it = convdata->queue->begin(); it != convdata->queue->end(); ++it) { mwConversation_send(conv, mwImSend_PLAIN, @@ -853,7 +853,7 @@ void MeanwhileSession::handleImConvReceived(struct mwConversation *conv, case mwImSend_PLAIN: { Kopete::Message message(convdata->contact, account->myself(), - QString((char *)msg), Kopete::Message::Inbound); + TQString((char *)msg), Kopete::Message::Inbound); convdata->chat->appendMessage(message); } break; @@ -948,7 +948,7 @@ MEANWHILE_HOOK_CONFERENCE(conference_invite, (conf, inviter, invite)) { HERE; - QString message; + TQString message; message.sprintf("%s has invited you to a conference called \"%s\"\n" "However, this version of the meanwhile plugin does " diff --git a/kopete/protocols/meanwhile/meanwhilesession.h b/kopete/protocols/meanwhile/meanwhilesession.h index 0e2a3558..b7d7f8c7 100644 --- a/kopete/protocols/meanwhile/meanwhilesession.h +++ b/kopete/protocols/meanwhile/meanwhilesession.h @@ -55,7 +55,7 @@ public: * the connection process is ascychronous - a loginDone() signal will be * emitted when sucessfully logged in. */ - void connect(QString password); + void connect(TQString password); /** * Disconnect from the server. @@ -70,7 +70,7 @@ public: * @param msg a custom message to use, if required */ void setStatus(Kopete::OnlineStatus status, - const QString msg = QString::null); + const TQString msg = TQString::null); /** * Add a single contact to be registered for status updates @@ -82,7 +82,7 @@ public: * Add a list of contacts to be registered for status updates * @param contact The list of contacts to register */ - void addContacts(const QDict<Kopete::Contact>& contacts); + void addContacts(const TQDict<Kopete::Contact>& contacts); /** * Send a message (with recipient specified). @@ -126,7 +126,7 @@ signals: * out-of-band data (eg, the password is incorrect). * @param mesgString A description of the notification */ - void serverNotification(const QString &mesgString); + void serverNotification(const TQString &mesgString); private: /** Main libmeanwhile session object */ @@ -174,7 +174,7 @@ private: struct ConversationData { MeanwhileContact *contact; Kopete::ChatSession *chat; - QValueList<Kopete::Message> *queue; + TQValueList<Kopete::Message> *queue; }; /** (To be) stored in the mwConference struct */ @@ -217,7 +217,7 @@ private: * @param name the extened username to parse * @return just the name part of the username info */ - QString getNickName(QString name); + TQString getNickName(TQString name); /** * Convenience method to call the above from a mwLoginInfo struct. All is @@ -225,7 +225,7 @@ private: * @param logininfo the login info for a contact * @return just the name part of the login info data */ - QString getNickName(struct mwLoginInfo *logininfo); + TQString getNickName(struct mwLoginInfo *logininfo); /** * Resolve a contact to find (and set) the display name. This requires the |