diff options
Diffstat (limited to 'kopete/protocols/jabber/ui')
24 files changed, 216 insertions, 216 deletions
diff --git a/kopete/protocols/jabber/ui/dlgjabberbrowse.cpp b/kopete/protocols/jabber/ui/dlgjabberbrowse.cpp index f8e2b4ce..be558388 100644 --- a/kopete/protocols/jabber/ui/dlgjabberbrowse.cpp +++ b/kopete/protocols/jabber/ui/dlgjabberbrowse.cpp @@ -17,9 +17,9 @@ ***************************************************************************/ #include <kpushbutton.h> -#include <qgroupbox.h> -#include <qtable.h> -#include <qlabel.h> +#include <tqgroupbox.h> +#include <tqtable.h> +#include <tqlabel.h> #include <kmessagebox.h> #include <klocale.h> @@ -30,7 +30,7 @@ #include "jabberformtranslator.h" #include "dlgjabberbrowse.h" -dlgJabberBrowse::dlgJabberBrowse (JabberAccount *account, const XMPP::Jid & jid, QWidget * parent, const char *name):dlgBrowse (parent, name) +dlgJabberBrowse::dlgJabberBrowse (JabberAccount *account, const XMPP::Jid & jid, TQWidget * parent, const char *name):dlgBrowse (parent, name) { m_account = account; @@ -41,11 +41,11 @@ dlgJabberBrowse::dlgJabberBrowse (JabberAccount *account, const XMPP::Jid & jid, tblResults->setNumRows (0); // disable user selections - tblResults->setSelectionMode (QTable::NoSelection); + tblResults->setSelectionMode (TQTable::NoSelection); XMPP::JT_Search * task = new XMPP::JT_Search (m_account->client()->rootTask ()); - connect (task, SIGNAL (finished ()), this, SLOT (slotGotForm ())); + connect (task, TQT_SIGNAL (finished ()), this, TQT_SLOT (slotGotForm ())); task->get (jid); task->go (true); @@ -83,7 +83,7 @@ void dlgJabberBrowse::slotGotForm () tblResults->setColumnStretchable (i, true); } - connect (btnSearch, SIGNAL (clicked ()), this, SLOT (slotSendForm ())); + connect (btnSearch, TQT_SIGNAL (clicked ()), this, TQT_SLOT (slotSendForm ())); } @@ -92,7 +92,7 @@ void dlgJabberBrowse::slotSendForm () XMPP::JT_Search * task = new XMPP::JT_Search (m_account->client()->rootTask ()); - connect (task, SIGNAL (finished ()), this, SLOT (slotSentForm ())); + connect (task, TQT_SIGNAL (finished ()), this, TQT_SLOT (slotSentForm ())); task->set (translator->resultData ()); task->go (true); @@ -120,7 +120,7 @@ void dlgJabberBrowse::slotSentForm () int row = 0; - for (QValueList < XMPP::SearchResult >::const_iterator it = task->results ().begin (); it != task->results ().end (); ++it) + for (TQValueList < XMPP::SearchResult >::const_iterator it = task->results ().begin (); it != task->results ().end (); ++it) { tblResults->setText (row, 0, (*it).jid ().userHost ()); tblResults->setText (row, 1, (*it).first ()); diff --git a/kopete/protocols/jabber/ui/dlgjabberbrowse.h b/kopete/protocols/jabber/ui/dlgjabberbrowse.h index 8a8b6cc1..20886005 100644 --- a/kopete/protocols/jabber/ui/dlgjabberbrowse.h +++ b/kopete/protocols/jabber/ui/dlgjabberbrowse.h @@ -19,7 +19,7 @@ #ifndef DLGJABBERBROWSE_H #define DLGJABBERBROWSE_H -#include <qwidget.h> +#include <tqwidget.h> #include "xmpp_tasks.h" @@ -37,7 +37,7 @@ class dlgJabberBrowse:public dlgBrowse Q_OBJECT public: - dlgJabberBrowse (JabberAccount *account, const XMPP::Jid & jid, QWidget * parent = 0, const char *name = 0); + dlgJabberBrowse (JabberAccount *account, const XMPP::Jid & jid, TQWidget * parent = 0, const char *name = 0); ~dlgJabberBrowse (); private slots: diff --git a/kopete/protocols/jabber/ui/dlgjabberchangepassword.cpp b/kopete/protocols/jabber/ui/dlgjabberchangepassword.cpp index 9f6ae65d..948a594e 100644 --- a/kopete/protocols/jabber/ui/dlgjabberchangepassword.cpp +++ b/kopete/protocols/jabber/ui/dlgjabberchangepassword.cpp @@ -23,14 +23,14 @@ #include <klocale.h> #include <kpassdlg.h> #include <kmessagebox.h> -#include <qlabel.h> -#include <qlineedit.h> +#include <tqlabel.h> +#include <tqlineedit.h> #include <kopetepassword.h> #include <xmpp_tasks.h> #include "jabberaccount.h" #include "dlgchangepassword.h" -DlgJabberChangePassword::DlgJabberChangePassword ( JabberAccount *account, QWidget *parent, const char *name ) +DlgJabberChangePassword::DlgJabberChangePassword ( JabberAccount *account, TQWidget *parent, const char *name ) : KDialogBase ( parent, name, true, i18n("Change Jabber Password"), KDialogBase::Ok | KDialogBase::Cancel, KDialogBase::Ok, true ) { @@ -80,7 +80,7 @@ void DlgJabberChangePassword::slotOk () i18n ( "Your account needs to be connected before the password can be changed. Do you want to try to connect now?" ), i18n ( "Jabber Password Change" ), i18n("Connect"), i18n("Stay Offline") ) == KMessageBox::Yes ) { - connect ( m_account, SIGNAL ( isConnectedChanged () ), this, SLOT ( slotChangePassword () ) ); + connect ( m_account, TQT_SIGNAL ( isConnectedChanged () ), this, TQT_SLOT ( slotChangePassword () ) ); m_account->connect (); } } @@ -102,7 +102,7 @@ void DlgJabberChangePassword::slotChangePassword () { XMPP::JT_Register *task = new XMPP::JT_Register ( m_account->client()->rootTask () ); - QObject::connect ( task, SIGNAL ( finished () ), this, SLOT ( slotChangePasswordDone () ) ); + TQObject::connect ( task, TQT_SIGNAL ( finished () ), this, TQT_SLOT ( slotChangePasswordDone () ) ); task->changepw ( m_mainWidget->peNewPassword1->password () ); task->go ( true ); @@ -116,7 +116,7 @@ void DlgJabberChangePassword::slotChangePasswordDone () if ( task->success () ) { - KMessageBox::queuedMessageBox ( dynamic_cast<QWidget*>(parent()), KMessageBox::Information, + KMessageBox::queuedMessageBox ( dynamic_cast<TQWidget*>(parent()), KMessageBox::Information, i18n ( "Your password has been changed successfully. Please note that the change may not be instantaneous. If you have problems logging in with your new password, please contact the administrator." ), i18n ( "Jabber Password Change" ) ); @@ -124,7 +124,7 @@ void DlgJabberChangePassword::slotChangePasswordDone () } else { - KMessageBox::queuedMessageBox ( dynamic_cast<QWidget*>(parent()), KMessageBox::Sorry, + KMessageBox::queuedMessageBox ( dynamic_cast<TQWidget*>(parent()), KMessageBox::Sorry, i18n ( "Your password could not be changed. Either your server does not support this feature or the administrator does not allow you to change your password." ) ); } diff --git a/kopete/protocols/jabber/ui/dlgjabberchangepassword.h b/kopete/protocols/jabber/ui/dlgjabberchangepassword.h index 84e880c5..023485ec 100644 --- a/kopete/protocols/jabber/ui/dlgjabberchangepassword.h +++ b/kopete/protocols/jabber/ui/dlgjabberchangepassword.h @@ -34,7 +34,7 @@ class DlgJabberChangePassword : public KDialogBase Q_OBJECT public: - DlgJabberChangePassword ( JabberAccount *account, QWidget *parent = 0, const char *name = 0); + DlgJabberChangePassword ( JabberAccount *account, TQWidget *parent = 0, const char *name = 0); ~DlgJabberChangePassword(); private slots: diff --git a/kopete/protocols/jabber/ui/dlgjabberchatjoin.cpp b/kopete/protocols/jabber/ui/dlgjabberchatjoin.cpp index 620bff03..9d69beae 100644 --- a/kopete/protocols/jabber/ui/dlgjabberchatjoin.cpp +++ b/kopete/protocols/jabber/ui/dlgjabberchatjoin.cpp @@ -18,8 +18,8 @@ #include <kdebug.h> #include <klocale.h> -#include <qlineedit.h> -#include <qpushbutton.h> +#include <tqlineedit.h> +#include <tqpushbutton.h> #include "jabberaccount.h" #include "jabberclient.h" @@ -27,7 +27,7 @@ #include "dlgjabberchatjoin.h" -dlgJabberChatJoin::dlgJabberChatJoin(JabberAccount *account, QWidget* parent, const char* name) : +dlgJabberChatJoin::dlgJabberChatJoin(JabberAccount *account, TQWidget* parent, const char* name) : dlgChatJoin(parent, name), m_account(account) { @@ -77,7 +77,7 @@ void dlgJabberChatJoin::slotBowse() void dlgJabberChatJoin::checkDefaultChatroomServer() { XMPP::JT_GetServices *serviceTask = new XMPP::JT_GetServices(m_account->client()->rootTask()); - connect(serviceTask, SIGNAL (finished()), this, SLOT (slotQueryFinished())); + connect(serviceTask, TQT_SIGNAL (finished()), this, TQT_SLOT (slotQueryFinished())); serviceTask->get(m_account->server()); serviceTask->go(true); @@ -97,7 +97,7 @@ void dlgJabberChatJoin::slotQueryFinished() for (XMPP::AgentList::const_iterator it = task->agents().begin(); it != task->agents().end(); ++it) { XMPP::JT_DiscoInfo *discoTask = new XMPP::JT_DiscoInfo(m_account->client()->rootTask()); - connect(discoTask, SIGNAL (finished()), this, SLOT (slotDiscoFinished())); + connect(discoTask, TQT_SIGNAL (finished()), this, TQT_SLOT (slotDiscoFinished())); discoTask->get((*it).jid().full()); discoTask->go(true); diff --git a/kopete/protocols/jabber/ui/dlgjabberchatjoin.h b/kopete/protocols/jabber/ui/dlgjabberchatjoin.h index fad58fcb..d68ae78e 100644 --- a/kopete/protocols/jabber/ui/dlgjabberchatjoin.h +++ b/kopete/protocols/jabber/ui/dlgjabberchatjoin.h @@ -27,7 +27,7 @@ class dlgJabberChatJoin : public dlgChatJoin Q_OBJECT public: - dlgJabberChatJoin(JabberAccount *account, QWidget* parent = 0, const char* name = 0); + dlgJabberChatJoin(JabberAccount *account, TQWidget* parent = 0, const char* name = 0); ~dlgJabberChatJoin(); /*$PUBLIC_FUNCTIONS$*/ diff --git a/kopete/protocols/jabber/ui/dlgjabberchatroomslist.cpp b/kopete/protocols/jabber/ui/dlgjabberchatroomslist.cpp index aea2843f..1803a013 100644 --- a/kopete/protocols/jabber/ui/dlgjabberchatroomslist.cpp +++ b/kopete/protocols/jabber/ui/dlgjabberchatroomslist.cpp @@ -13,15 +13,15 @@ #include <klocale.h> #include <kdebug.h> -#include <qtable.h> -#include <qlineedit.h> -#include <qpushbutton.h> -#include <qlabel.h> +#include <tqtable.h> +#include <tqlineedit.h> +#include <tqpushbutton.h> +#include <tqlabel.h> #include "dlgjabberchatroomslist.h" #include "jabberprotocol.h" -dlgJabberChatRoomsList::dlgJabberChatRoomsList(JabberAccount* account, const QString& server, const QString &nick, QWidget *parent, const char *name) : +dlgJabberChatRoomsList::dlgJabberChatRoomsList(JabberAccount* account, const TQString& server, const TQString &nick, TQWidget *parent, const char *name) : dlgChatRoomsList(parent, name), m_account(account) , m_selectedRow(-1) , m_nick(nick) { @@ -74,7 +74,7 @@ void dlgJabberChatRoomsList::slotQuery() tblChatRoomsList->setNumRows(0); XMPP::JT_DiscoItems *discoTask = new XMPP::JT_DiscoItems(m_account->client()->rootTask()); - connect (discoTask, SIGNAL(finished()), this, SLOT(slotQueryFinished())); + connect (discoTask, TQT_SIGNAL(finished()), this, TQT_SLOT(slotQueryFinished())); m_chatServer = leServer->text(); discoTask->get(leServer->text()); @@ -102,13 +102,13 @@ void dlgJabberChatRoomsList::slotQueryFinished() } } -void dlgJabberChatRoomsList::slotDoubleClick(int row, int /*col*/, int /*button*/, const QPoint& /*mousePos*/) +void dlgJabberChatRoomsList::slotDoubleClick(int row, int /*col*/, int /*button*/, const TQPoint& /*mousePos*/) { m_selectedRow = row; slotJoin(); } -void dlgJabberChatRoomsList::slotClick(int row, int /*col*/, int /*button*/, const QPoint& /*mousePos*/) +void dlgJabberChatRoomsList::slotClick(int row, int /*col*/, int /*button*/, const TQPoint& /*mousePos*/) { m_selectedRow = row; } diff --git a/kopete/protocols/jabber/ui/dlgjabberchatroomslist.h b/kopete/protocols/jabber/ui/dlgjabberchatroomslist.h index 1db296d7..6b1dce7b 100644 --- a/kopete/protocols/jabber/ui/dlgjabberchatroomslist.h +++ b/kopete/protocols/jabber/ui/dlgjabberchatroomslist.h @@ -23,7 +23,7 @@ class dlgJabberChatRoomsList : public dlgChatRoomsList Q_OBJECT public: - dlgJabberChatRoomsList(JabberAccount* account, const QString& server = QString::null, const QString& nick = QString::null, QWidget* parent = 0, const char* name = 0); + dlgJabberChatRoomsList(JabberAccount* account, const TQString& server = TQString::null, const TQString& nick = TQString::null, TQWidget* parent = 0, const char* name = 0); ~dlgJabberChatRoomsList(); /*$PUBLIC_FUNCTIONS$*/ @@ -31,8 +31,8 @@ public slots: /*$PUBLIC_SLOTS$*/ virtual void slotJoin(); virtual void slotQuery(); - virtual void slotDoubleClick(int row, int col, int button, const QPoint& mousePos); - virtual void slotClick(int row, int col, int button, const QPoint& mousePos); + virtual void slotDoubleClick(int row, int col, int button, const TQPoint& mousePos); + virtual void slotClick(int row, int col, int button, const TQPoint& mousePos); protected: /*$PROTECTED_FUNCTIONS$*/ @@ -46,8 +46,8 @@ private: JabberAccount *m_account; int m_selectedRow; - QString m_chatServer; - QString m_nick; + TQString m_chatServer; + TQString m_nick; }; #endif diff --git a/kopete/protocols/jabber/ui/dlgjabberregister.cpp b/kopete/protocols/jabber/ui/dlgjabberregister.cpp index e16b5652..ff324085 100644 --- a/kopete/protocols/jabber/ui/dlgjabberregister.cpp +++ b/kopete/protocols/jabber/ui/dlgjabberregister.cpp @@ -16,7 +16,7 @@ * * ***************************************************************************/ -#include <qpushbutton.h> +#include <tqpushbutton.h> #include <kmessagebox.h> #include <klocale.h> @@ -26,13 +26,13 @@ #include "jabberclient.h" #include "dlgjabberregister.h" -dlgJabberRegister::dlgJabberRegister (JabberAccount *account, const XMPP::Jid & jid, QWidget * parent, const char *name):dlgRegister (parent, name) +dlgJabberRegister::dlgJabberRegister (JabberAccount *account, const XMPP::Jid & jid, TQWidget * parent, const char *name):dlgRegister (parent, name) { m_account = account; XMPP::JT_Register * task = new XMPP::JT_Register(m_account->client()->rootTask ()); - connect (task, SIGNAL (finished ()), this, SLOT (slotGotForm ())); + connect (task, TQT_SIGNAL (finished ()), this, TQT_SLOT (slotGotForm ())); task->getForm (jid); task->go (true); @@ -59,14 +59,14 @@ void dlgJabberRegister::slotGotForm () // translate the form and create it inside the box widget translator = new JabberFormTranslator (task->form (), grpForm); - static_cast<QBoxLayout*>(grpForm->layout())->insertWidget(1, translator); + static_cast<TQBoxLayout*>(grpForm->layout())->insertWidget(1, translator); translator->show(); resize(sizeHint()); // enable the send button btnRegister->setEnabled (true); - connect (btnRegister, SIGNAL (clicked ()), this, SLOT (slotSendForm ())); + connect (btnRegister, TQT_SIGNAL (clicked ()), this, TQT_SLOT (slotSendForm ())); } @@ -76,7 +76,7 @@ void dlgJabberRegister::slotSendForm () return; XMPP::JT_Register * task = new XMPP::JT_Register (m_account->client()->rootTask ()); - connect (task, SIGNAL (finished ()), this, SLOT (slotSentForm ())); + connect (task, TQT_SIGNAL (finished ()), this, TQT_SLOT (slotSentForm ())); task->setForm (translator->resultData ()); task->go (true); diff --git a/kopete/protocols/jabber/ui/dlgjabberregister.h b/kopete/protocols/jabber/ui/dlgjabberregister.h index 36bc0bab..5cb0af67 100644 --- a/kopete/protocols/jabber/ui/dlgjabberregister.h +++ b/kopete/protocols/jabber/ui/dlgjabberregister.h @@ -19,10 +19,10 @@ #ifndef DLGJABBERREGISTER_H #define DLGJABBERREGISTER_H -#include <qwidget.h> -#include <qlayout.h> -#include <qgroupbox.h> -#include <qlabel.h> +#include <tqwidget.h> +#include <tqlayout.h> +#include <tqgroupbox.h> +#include <tqlabel.h> #include "im.h" #include "xmpp.h" @@ -41,7 +41,7 @@ class dlgJabberRegister:public dlgRegister Q_OBJECT public: - dlgJabberRegister (JabberAccount *account, const XMPP::Jid & jid, QWidget * parent = 0, const char *name = 0); + dlgJabberRegister (JabberAccount *account, const XMPP::Jid & jid, TQWidget * parent = 0, const char *name = 0); ~dlgJabberRegister (); private slots: diff --git a/kopete/protocols/jabber/ui/dlgjabbersendraw.cpp b/kopete/protocols/jabber/ui/dlgjabbersendraw.cpp index 17b2d181..4b9192dc 100644 --- a/kopete/protocols/jabber/ui/dlgjabbersendraw.cpp +++ b/kopete/protocols/jabber/ui/dlgjabbersendraw.cpp @@ -18,20 +18,20 @@ #include "dlgjabbersendraw.h" -#include <qcombobox.h> -#include <qpushbutton.h> -#include <qtextedit.h> +#include <tqcombobox.h> +#include <tqpushbutton.h> +#include <tqtextedit.h> #include <kdebug.h> #include "jabberclient.h" -dlgJabberSendRaw::dlgJabberSendRaw ( JabberClient *client, QWidget *parent, const char *name ) +dlgJabberSendRaw::dlgJabberSendRaw ( JabberClient *client, TQWidget *parent, const char *name ) : DlgSendRaw (parent, name) { // Connect the GUI elements to things that do stuff - connect (btnSend, SIGNAL (clicked ()), this, SLOT (slotSend ())); - connect (btnClose, SIGNAL (clicked ()), this, SLOT (slotCancel ())); - connect (btnClear, SIGNAL (clicked ()), this, SLOT (slotClear ())); - connect (inputWidget, SIGNAL (activated (int)), this, SLOT (slotCreateMessage (int))); + connect (btnSend, TQT_SIGNAL (clicked ()), this, TQT_SLOT (slotSend ())); + connect (btnClose, TQT_SIGNAL (clicked ()), this, TQT_SLOT (slotCancel ())); + connect (btnClear, TQT_SIGNAL (clicked ()), this, TQT_SLOT (slotClear ())); + connect (inputWidget, TQT_SIGNAL (activated (int)), this, TQT_SLOT (slotCreateMessage (int))); m_client = client; @@ -58,7 +58,7 @@ void dlgJabberSendRaw::slotCreateMessage(int index) { switch (index) { case 1: - tePacket->setText(QString("<iq type='set' to='%1'>\n<query xmlns='jabber:iq:register'><remove/>\n</query>\n</iq>") + tePacket->setText(TQString("<iq type='set' to='%1'>\n<query xmlns='jabber:iq:register'><remove/>\n</query>\n</iq>") .arg ( m_client->jid().domain () ) ); break; case 2: @@ -68,11 +68,11 @@ void dlgJabberSendRaw::slotCreateMessage(int index) tePacket->setText("<iq type='get' to='USER@DOMAIN'>\n<query xmlns='jabber:iq:last'/></iq>"); break; case 4: - tePacket->setText(QString("<message to='USER@DOMAIN' from='%1@%2/%3'>\n<body>Body text</body>\n</message>") + tePacket->setText(TQString("<message to='USER@DOMAIN' from='%1@%2/%3'>\n<body>Body text</body>\n</message>") .arg ( m_client->jid().node (), m_client->jid().domain (), m_client->jid().resource () ) ); break; case 5: - tePacket->setText(QString("<message to='USER@DOMAIN' from='%1@%2/%3'>\n<subject>Subject</subject><body>Body text</body>\n</message>") + tePacket->setText(TQString("<message to='USER@DOMAIN' from='%1@%2/%3'>\n<subject>Subject</subject><body>Body text</body>\n</message>") .arg ( m_client->jid().node (), m_client->jid().domain (), m_client->jid().resource () ) ); break; diff --git a/kopete/protocols/jabber/ui/dlgjabbersendraw.h b/kopete/protocols/jabber/ui/dlgjabbersendraw.h index 6570363b..44e1a9ad 100644 --- a/kopete/protocols/jabber/ui/dlgjabbersendraw.h +++ b/kopete/protocols/jabber/ui/dlgjabbersendraw.h @@ -19,7 +19,7 @@ #ifndef DLGJABBERSENDRAW_H #define DLGJABBERSENDRAW_H -#include <qwidget.h> +#include <tqwidget.h> #include "dlgsendraw.h" class JabberClient; @@ -27,7 +27,7 @@ class JabberClient; /** * A dialog to send raw strings to the jabber server. * - * It comes with a QComboBox to choose some "template" strings + * It comes with a TQComboBox to choose some "template" strings * like "Availability Status", "Subscription",... * * @author Till Gerken <till@tantalo.net> @@ -38,7 +38,7 @@ class dlgJabberSendRaw:public DlgSendRaw Q_OBJECT public: - dlgJabberSendRaw ( JabberClient *client, QWidget * parent = 0, const char *name = 0); + dlgJabberSendRaw ( JabberClient *client, TQWidget * parent = 0, const char *name = 0); virtual ~ dlgJabberSendRaw (); public slots: diff --git a/kopete/protocols/jabber/ui/dlgjabberservices.cpp b/kopete/protocols/jabber/ui/dlgjabberservices.cpp index 00e99f45..1bd1310c 100644 --- a/kopete/protocols/jabber/ui/dlgjabberservices.cpp +++ b/kopete/protocols/jabber/ui/dlgjabberservices.cpp @@ -20,9 +20,9 @@ #include <klocale.h> #include <kdebug.h> -#include <qpushbutton.h> -#include <qlineedit.h> -#include <qtable.h> +#include <tqpushbutton.h> +#include <tqlineedit.h> +#include <tqtable.h> #include "jabberaccount.h" #include "jabberclient.h" @@ -32,7 +32,7 @@ #include "dlgjabberservices.moc" -dlgJabberServices::dlgJabberServices (JabberAccount *account, QWidget *parent, const char *name):dlgServices (parent, name) +dlgJabberServices::dlgJabberServices (JabberAccount *account, TQWidget *parent, const char *name):dlgServices (parent, name) { m_account = account; @@ -57,22 +57,22 @@ dlgJabberServices::dlgJabberServices (JabberAccount *account, QWidget *parent, c //tblServices->setColumnStretchable (1, true); // disable user selections - //tblServices->setSelectionMode (QTable::NoSelection); + //tblServices->setSelectionMode (TQTable::NoSelection); // name table headers //tblServices->horizontalHeader ()->setLabel (0, i18n ("Name")); //tblServices->horizontalHeader ()->setLabel (1, i18n ("Address")); - connect (btnQuery, SIGNAL (clicked ()), this, SLOT (slotDisco ())); - //connect (tblServices, SIGNAL (clicked (int, int, int, const QPoint &)), this, SLOT (slotSetSelection (int, int, int, const QPoint &))); - connect (lvServices, SIGNAL (selectionChanged (QListViewItem *)), this, SLOT (slotSetSelection (QListViewItem *))); + connect (btnQuery, TQT_SIGNAL (clicked ()), this, TQT_SLOT (slotDisco ())); + //connect (tblServices, TQT_SIGNAL (clicked (int, int, int, const TQPoint &)), this, TQT_SLOT (slotSetSelection (int, int, int, const TQPoint &))); + connect (lvServices, TQT_SIGNAL (selectionChanged (TQListViewItem *)), this, TQT_SLOT (slotSetSelection (TQListViewItem *))); - connect (btnRegister, SIGNAL (clicked ()), this, SLOT (slotRegister ())); - connect (btnBrowse, SIGNAL (clicked ()), this, SLOT (slotBrowse ())); + connect (btnRegister, TQT_SIGNAL (clicked ()), this, TQT_SLOT (slotRegister ())); + connect (btnBrowse, TQT_SIGNAL (clicked ()), this, TQT_SLOT (slotBrowse ())); } -void dlgJabberServices::slotSetSelection (QListViewItem *it) +void dlgJabberServices::slotSetSelection (TQListViewItem *it) { dlgJabberServies_item *item=dynamic_cast<dlgJabberServies_item*>(it); if(!item) @@ -99,7 +99,7 @@ void dlgJabberServices::slotService () } XMPP::JT_GetServices *serviceTask = new XMPP::JT_GetServices (m_account->client()->rootTask ()); - connect (serviceTask, SIGNAL (finished ()), this, SLOT (slotServiceFinished ())); + connect (serviceTask, TQT_SIGNAL (finished ()), this, TQT_SLOT (slotServiceFinished ())); /* populate server field if it is empty */ if(leServer->text().isEmpty()) @@ -121,7 +121,7 @@ void dlgJabberServices::slotServiceFinished () if (!task->success ()) { - QString error = task->statusString(); + TQString error = task->statusString(); KMessageBox::queuedMessageBox (this, KMessageBox::Error, i18n ("Unable to retrieve the list of services.\nReason: %1").arg(error), i18n ("Jabber Error")); return; } @@ -148,13 +148,13 @@ void dlgJabberServices::slotDisco() } JT_DiscoItems *jt = new JT_DiscoItems(m_account->client()->rootTask()); - connect(jt, SIGNAL(finished()), this, SLOT(slotDiscoFinished())); + connect(jt, TQT_SIGNAL(finished()), this, TQT_SLOT(slotDiscoFinished())); /* populate server field if it is empty */ if(leServer->text().isEmpty()) leServer->setText(m_account->server()); - jt->get(leServer->text() , QString()); + jt->get(leServer->text() , TQString()); jt->go(true); } @@ -168,11 +168,11 @@ void dlgJabberServices::slotDiscoFinished( ) if ( jt->success() ) { - QValueList<XMPP::DiscoItem> list = jt->items(); + TQValueList<XMPP::DiscoItem> list = jt->items(); lvServices->clear(); - for(QValueList<XMPP::DiscoItem>::ConstIterator it = list.begin(); it != list.end(); ++it) + for(TQValueList<XMPP::DiscoItem>::ConstIterator it = list.begin(); it != list.end(); ++it) { const XMPP::DiscoItem a = *it; dlgJabberServies_item *item=new dlgJabberServies_item( lvServices , (*it).jid ().userHost () , (*it).name ()); @@ -211,10 +211,10 @@ dlgJabberServices::~dlgJabberServices () { } -void dlgJabberServies_item::updateInfo( const XMPP::Jid & jid , const QString & node , JabberAccount *account ) +void dlgJabberServies_item::updateInfo( const XMPP::Jid & jid , const TQString & node , JabberAccount *account ) { XMPP::JT_DiscoInfo *jt = new XMPP::JT_DiscoInfo(account->client()->rootTask()); - connect(jt, SIGNAL(finished()),this, SLOT(slotDiscoFinished())); + connect(jt, TQT_SIGNAL(finished()),this, TQT_SLOT(slotDiscoFinished())); jt->get(jid, node); jt->go(true); diff --git a/kopete/protocols/jabber/ui/dlgjabberservices.h b/kopete/protocols/jabber/ui/dlgjabberservices.h index f2d4cedc..c64fb045 100644 --- a/kopete/protocols/jabber/ui/dlgjabberservices.h +++ b/kopete/protocols/jabber/ui/dlgjabberservices.h @@ -19,13 +19,13 @@ #ifndef DLGJABBERSERVICES_H #define DLGJABBERSERVICES_H -#include <qwidget.h> +#include <tqwidget.h> #include "jabberaccount.h" #include "xmpp_tasks.h" #include "dlgservices.h" -#include <qlistview.h> +#include <tqlistview.h> /** *@author Till Gerken <till@tantalo.net> @@ -36,11 +36,11 @@ class dlgJabberServices:public dlgServices Q_OBJECT public: - dlgJabberServices (JabberAccount *account, QWidget *parent = 0, const char *name = 0); + dlgJabberServices (JabberAccount *account, TQWidget *parent = 0, const char *name = 0); ~dlgJabberServices (); private slots: - void slotSetSelection (QListViewItem *); + void slotSetSelection (TQListViewItem *); void slotService (); void slotServiceFinished (); void slotRegister (); @@ -56,16 +56,16 @@ private: }; -class dlgJabberServies_item : protected QObject, public QListViewItem +class dlgJabberServies_item : protected TQObject, public TQListViewItem { Q_OBJECT public: - dlgJabberServies_item( QListView *parent , const QString &s1 , const QString &s2 ) - : QListViewItem(parent,s1,s2), can_browse(false) , can_register(false) {} + dlgJabberServies_item( TQListView *parent , const TQString &s1 , const TQString &s2 ) + : TQListViewItem(parent,s1,s2), can_browse(false) , can_register(false) {} bool can_browse, can_register; XMPP::Jid jid; - void updateInfo(const XMPP::Jid& jid, const QString &node , JabberAccount *account); + void updateInfo(const XMPP::Jid& jid, const TQString &node , JabberAccount *account); private slots: void slotDiscoFinished(); }; diff --git a/kopete/protocols/jabber/ui/dlgjabbervcard.cpp b/kopete/protocols/jabber/ui/dlgjabbervcard.cpp index b35e091a..19070798 100644 --- a/kopete/protocols/jabber/ui/dlgjabbervcard.cpp +++ b/kopete/protocols/jabber/ui/dlgjabbervcard.cpp @@ -23,10 +23,10 @@ #include "dlgjabbervcard.h" // Qt includes -#include <qtextedit.h> -#include <qwidgetstack.h> -#include <qregexp.h> -#include <qbuffer.h> +#include <tqtextedit.h> +#include <tqwidgetstack.h> +#include <tqregexp.h> +#include <tqbuffer.h> // KDE includes #include <kdebug.h> @@ -60,7 +60,7 @@ * name 'name' * */ -dlgJabberVCard::dlgJabberVCard (JabberAccount *account, JabberBaseContact *contact, QWidget * parent, const char *name) +dlgJabberVCard::dlgJabberVCard (JabberAccount *account, JabberBaseContact *contact, TQWidget * parent, const char *name) : KDialogBase (parent, name, false, i18n("Jabber vCard"), Close | User1 | User2, Close, false, i18n("&Save User Info"), i18n("&Fetch vCard") ) { @@ -70,14 +70,14 @@ dlgJabberVCard::dlgJabberVCard (JabberAccount *account, JabberBaseContact *conta m_mainWidget = new dlgVCard(this); setMainWidget(m_mainWidget); - connect (this, SIGNAL (user1Clicked()), this, SLOT (slotSaveVCard ())); - connect (this, SIGNAL( user2Clicked()), this, SLOT (slotGetVCard ())); + connect (this, TQT_SIGNAL (user1Clicked()), this, TQT_SLOT (slotSaveVCard ())); + connect (this, TQT_SIGNAL( user2Clicked()), this, TQT_SLOT (slotGetVCard ())); - connect (m_mainWidget->btnSelectPhoto, SIGNAL (clicked()), this, SLOT (slotSelectPhoto())); - connect (m_mainWidget->btnClearPhoto, SIGNAL (clicked()), this, SLOT (slotClearPhoto())); - connect (m_mainWidget->urlHomeEmail, SIGNAL (leftClickedURL(const QString &)), this, SLOT (slotOpenURL (const QString &))); - connect (m_mainWidget->urlWorkEmail, SIGNAL (leftClickedURL(const QString &)), this, SLOT (slotOpenURL (const QString &))); - connect (m_mainWidget->urlHomepage, SIGNAL (leftClickedURL(const QString &)), this, SLOT (slotOpenURL (const QString &))); + connect (m_mainWidget->btnSelectPhoto, TQT_SIGNAL (clicked()), this, TQT_SLOT (slotSelectPhoto())); + connect (m_mainWidget->btnClearPhoto, TQT_SIGNAL (clicked()), this, TQT_SLOT (slotClearPhoto())); + connect (m_mainWidget->urlHomeEmail, TQT_SIGNAL (leftClickedURL(const TQString &)), this, TQT_SLOT (slotOpenURL (const TQString &))); + connect (m_mainWidget->urlWorkEmail, TQT_SIGNAL (leftClickedURL(const TQString &)), this, TQT_SLOT (slotOpenURL (const TQString &))); + connect (m_mainWidget->urlHomepage, TQT_SIGNAL (leftClickedURL(const TQString &)), this, TQT_SLOT (slotOpenURL (const TQString &))); assignContactProperties(); @@ -120,7 +120,7 @@ void dlgJabberVCard::assignContactProperties () m_mainWidget->leBirthday->setText (m_contact->property(m_account->protocol()->propBirthday).value().toString()); m_mainWidget->leTimezone->setText (m_contact->property(m_account->protocol()->propTimezone).value().toString()); - QString homepage = m_contact->property(m_account->protocol()->propHomepage).value().toString(); + TQString homepage = m_contact->property(m_account->protocol()->propHomepage).value().toString(); m_mainWidget->leHomepage->setText (homepage); m_mainWidget->urlHomepage->setText (homepage); m_mainWidget->urlHomepage->setURL (homepage); @@ -130,7 +130,7 @@ void dlgJabberVCard::assignContactProperties () m_photoPath = m_contact->property(m_account->protocol()->propPhoto).value().toString(); if( !m_photoPath.isEmpty() ) { - m_mainWidget->lblPhoto->setPixmap( QPixmap(m_photoPath) ); + m_mainWidget->lblPhoto->setPixmap( TQPixmap(m_photoPath) ); } // addresses @@ -152,8 +152,8 @@ void dlgJabberVCard::assignContactProperties () m_mainWidget->urlWorkEmail->setUseCursor ( false ); m_mainWidget->urlHomeEmail->setUseCursor ( false ); - QString workEmail = m_contact->property(m_account->protocol()->propWorkEmailAddress).value().toString(); - QString homeEmail = m_contact->property(m_account->protocol()->propEmailAddress).value().toString(); + TQString workEmail = m_contact->property(m_account->protocol()->propWorkEmailAddress).value().toString(); + TQString homeEmail = m_contact->property(m_account->protocol()->propEmailAddress).value().toString(); m_mainWidget->leWorkEmail->setText (workEmail); m_mainWidget->urlWorkEmail->setText (workEmail); m_mainWidget->urlWorkEmail->setURL ("mailto:" + workEmail); @@ -358,7 +358,7 @@ void dlgJabberVCard::slotSaveVCard() // work information tab XMPP::VCard::Org org; org.name = m_mainWidget->leCompany->text(); - org.unit = QStringList::split(",", m_mainWidget->leDepartment->text()); + org.unit = TQStringList::split(",", m_mainWidget->leDepartment->text()); vCard.setOrg(org); vCard.setTitle( m_mainWidget->lePosition->text() ); vCard.setRole( m_mainWidget->leRole->text() ); @@ -393,10 +393,10 @@ void dlgJabberVCard::slotSaveVCard() // Set contact photo as a binary value (if he has set a photo) if( !m_photoPath.isEmpty() ) { - QString photoPath = m_photoPath; - QImage image( photoPath ); - QByteArray ba; - QBuffer buffer( ba ); + TQString photoPath = m_photoPath; + TQImage image( photoPath ); + TQByteArray ba; + TQBuffer buffer( ba ); buffer.open( IO_WriteOnly ); image.save( &buffer, "PNG" ); vCard.setPhoto( ba ); @@ -407,7 +407,7 @@ void dlgJabberVCard::slotSaveVCard() XMPP::JT_VCard *task = new XMPP::JT_VCard( m_account->client()->rootTask() ); // signal to ourselves when the vCard data arrived - QObject::connect(task, SIGNAL(finished()), this, SLOT(slotVCardSaved())); + TQObject::connect(task, TQT_SIGNAL(finished()), this, TQT_SLOT(slotVCardSaved())); task->set(vCard); task->go(true); } @@ -438,7 +438,7 @@ void dlgJabberVCard::slotGetVCard() XMPP::JT_VCard *task = new XMPP::JT_VCard ( m_account->client()->rootTask() ); // signal to ourselves when the vCard data arrived - QObject::connect( task, SIGNAL ( finished () ), this, SLOT ( slotGotVCard () ) ); + TQObject::connect( task, TQT_SIGNAL ( finished () ), this, TQT_SLOT ( slotGotVCard () ) ); task->get ( m_contact->rosterItem().jid().full() ); task->go ( true ); } @@ -467,9 +467,9 @@ void dlgJabberVCard::slotGotVCard() void dlgJabberVCard::slotSelectPhoto() { - QString path; + TQString path; bool remoteFile = false; - KURL filePath = KFileDialog::getImageOpenURL( QString::null, this, i18n( "Jabber Photo" ) ); + KURL filePath = KFileDialog::getImageOpenURL( TQString::null, this, i18n( "Jabber Photo" ) ); if( filePath.isEmpty() ) return; @@ -485,15 +485,15 @@ void dlgJabberVCard::slotSelectPhoto() else path = filePath.path(); - QImage img( path ); - img = KPixmapRegionSelectorDialog::getSelectedImage( QPixmap(img), 96, 96, this ); + TQImage img( path ); + img = KPixmapRegionSelectorDialog::getSelectedImage( TQPixmap(img), 96, 96, this ); if( !img.isNull() ) { if(img.width() > 96 || img.height() > 96) { // Scale and crop the picture. - img = img.smoothScale( 96, 96, QImage::ScaleMin ); + img = img.smoothScale( 96, 96, TQImage::ScaleMin ); // crop image if not square if(img.width() < img.height()) img = img.copy((img.width()-img.height())/2, 0, 96, 96); @@ -504,7 +504,7 @@ void dlgJabberVCard::slotSelectPhoto() else if (img.width() < 32 || img.height() < 32) { // Scale and crop the picture. - img = img.smoothScale( 32, 32, QImage::ScaleMin ); + img = img.smoothScale( 32, 32, TQImage::ScaleMin ); // crop image if not square if(img.width() < img.height()) img = img.copy((img.width()-img.height())/2, 0, 32, 32); @@ -520,14 +520,14 @@ void dlgJabberVCard::slotSelectPhoto() img = img.copy(0, (img.height()-img.width())/2, img.height(), img.height()); } - m_photoPath = locateLocal("appdata", "jabberphotos/" + m_contact->rosterItem().jid().full().lower().replace(QRegExp("[./~]"),"-") +".png"); + m_photoPath = locateLocal("appdata", "jabberphotos/" + m_contact->rosterItem().jid().full().lower().replace(TQRegExp("[./~]"),"-") +".png"); if( img.save(m_photoPath, "PNG") ) { - m_mainWidget->lblPhoto->setPixmap( QPixmap(img) ); + m_mainWidget->lblPhoto->setPixmap( TQPixmap(img) ); } else { - m_photoPath = QString::null; + m_photoPath = TQString::null; } } else @@ -541,13 +541,13 @@ void dlgJabberVCard::slotSelectPhoto() void dlgJabberVCard::slotClearPhoto() { - m_mainWidget->lblPhoto->setPixmap( QPixmap() ); - m_photoPath = QString::null; + m_mainWidget->lblPhoto->setPixmap( TQPixmap() ); + m_photoPath = TQString::null; } -void dlgJabberVCard::slotOpenURL(const QString &url) +void dlgJabberVCard::slotOpenURL(const TQString &url) { - if ( !url.isEmpty () || (url == QString::fromLatin1("mailto:") ) ) + if ( !url.isEmpty () || (url == TQString::fromLatin1("mailto:") ) ) new KRun(KURL( url ) ); } diff --git a/kopete/protocols/jabber/ui/dlgjabbervcard.h b/kopete/protocols/jabber/ui/dlgjabbervcard.h index 2bea5a2b..05a80940 100644 --- a/kopete/protocols/jabber/ui/dlgjabbervcard.h +++ b/kopete/protocols/jabber/ui/dlgjabbervcard.h @@ -55,7 +55,7 @@ public: * @param widget Parent widget. * @param name widget name. */ - dlgJabberVCard (JabberAccount *account, JabberBaseContact *contact, QWidget * parent = 0, const char *name = 0); + dlgJabberVCard (JabberAccount *account, JabberBaseContact *contact, TQWidget * parent = 0, const char *name = 0); ~dlgJabberVCard (); private slots: @@ -83,7 +83,7 @@ private slots: /** * Open a link. (ex: the homepage link or the email address) */ - void slotOpenURL(const QString &url); + void slotOpenURL(const TQString &url); /** * Retrieve vCard information for the current contact. @@ -99,7 +99,7 @@ private: JabberAccount *m_account; JabberBaseContact *m_contact; dlgVCard *m_mainWidget; - QString m_photoPath; + TQString m_photoPath; void assignContactProperties(); void setReadOnly(bool state); diff --git a/kopete/protocols/jabber/ui/jabberaddcontactpage.cpp b/kopete/protocols/jabber/ui/jabberaddcontactpage.cpp index 950d5680..076b92b8 100644 --- a/kopete/protocols/jabber/ui/jabberaddcontactpage.cpp +++ b/kopete/protocols/jabber/ui/jabberaddcontactpage.cpp @@ -20,11 +20,11 @@ #include "jabberaddcontactpage.h" -#include <qlayout.h> +#include <tqlayout.h> #include <klineedit.h> #include <klocale.h> #include <kopeteaccount.h> -#include <qlabel.h> +#include <tqlabel.h> #include <kopetegroup.h> #include <kopetemetacontact.h> @@ -35,9 +35,9 @@ #include "jabberclient.h" #include "xmpp_tasks.h" -JabberAddContactPage::JabberAddContactPage (Kopete::Account * owner, QWidget * parent, const char *name):AddContactPage (parent, name) +JabberAddContactPage::JabberAddContactPage (Kopete::Account * owner, TQWidget * parent, const char *name):AddContactPage (parent, name) { - (new QVBoxLayout (this))->setAutoAdd (true); + (new TQVBoxLayout (this))->setAutoAdd (true); JabberTransport *transport=dynamic_cast<JabberTransport*>(owner); JabberAccount *jaccount= transport ? transport->account() : dynamic_cast<JabberAccount*>(owner); @@ -51,7 +51,7 @@ JabberAddContactPage::JabberAddContactPage (Kopete::Account * owner, QWidget * p { jabData->textLabel1->setText( i18n("Loading instruction from gateway...") ); XMPP::JT_Gateway * gatewayTask = new XMPP::JT_Gateway ( jaccount->client()->rootTask () ); - QObject::connect (gatewayTask, SIGNAL (finished ()), this, SLOT (slotPromtReceived())); + TQObject::connect (gatewayTask, TQT_SIGNAL (finished ()), this, TQT_SLOT (slotPromtReceived())); gatewayTask->get ( transport->myself()->contactId() ); gatewayTask->go ( true ); } @@ -59,8 +59,8 @@ JabberAddContactPage::JabberAddContactPage (Kopete::Account * owner, QWidget * p } else { - noaddMsg1 = new QLabel (i18n ("You need to be connected to be able to add contacts."), this); - noaddMsg2 = new QLabel (i18n ("Connect to the Jabber network and try again."), this); + noaddMsg1 = new TQLabel (i18n ("You need to be connected to be able to add contacts."), this); + noaddMsg2 = new TQLabel (i18n ("Connect to the Jabber network and try again."), this); canadd = false; } @@ -84,26 +84,26 @@ bool JabberAddContactPage::apply ( Kopete::Account *account, Kopete::MetaContact JabberTransport *transport=dynamic_cast<JabberTransport*>(account); JabberAccount *jaccount=transport?transport->account():dynamic_cast<JabberAccount*>(account); - QString contactId = jabData->addID->text (); + TQString contactId = jabData->addID->text (); if(transport) { XMPP::JT_Gateway * gatewayTask = new XMPP::JT_Gateway ( jaccount->client()->rootTask () ); JabberAddContactPage_there_is_no_possibility_to_add_assync_WORKAROUND *workaround = new JabberAddContactPage_there_is_no_possibility_to_add_assync_WORKAROUND( transport , parentContact , gatewayTask ); - QObject::connect (gatewayTask, SIGNAL (finished ()), workaround, SLOT (slotJidReceived())); + TQObject::connect (gatewayTask, TQT_SIGNAL (finished ()), workaround, TQT_SLOT (slotJidReceived())); gatewayTask->set ( transport->myself()->contactId() , contactId ); gatewayTask->go ( true ); return true; } - QString displayName = parentContact->displayName (); + TQString displayName = parentContact->displayName (); /* if ( displayName.isEmpty () ) displayName = contactId; */ // collect all group names - QStringList groupNames; + TQStringList groupNames; Kopete::GroupList groupList = parentContact->groups(); for(Kopete::Group *group = groupList.first(); group; group = groupList.next()) groupNames += group->displayName(); @@ -151,8 +151,8 @@ void JabberAddContactPage::slotPromtReceived( ) } } -JabberAddContactPage_there_is_no_possibility_to_add_assync_WORKAROUND::JabberAddContactPage_there_is_no_possibility_to_add_assync_WORKAROUND( JabberTransport *t, Kopete::MetaContact * mc, QObject* task ) - : QObject(task) , metacontact(mc) , transport(t) +JabberAddContactPage_there_is_no_possibility_to_add_assync_WORKAROUND::JabberAddContactPage_there_is_no_possibility_to_add_assync_WORKAROUND( JabberTransport *t, Kopete::MetaContact * mc, TQObject* task ) + : TQObject(task) , metacontact(mc) , transport(t) {} void JabberAddContactPage_there_is_no_possibility_to_add_assync_WORKAROUND::slotJidReceived( ) @@ -165,7 +165,7 @@ void JabberAddContactPage_there_is_no_possibility_to_add_assync_WORKAROUND::slot // maybe we should show an error message, but i don't like showing error message - Olivier } - QString contactId=task->prompt(); + TQString contactId=task->prompt(); Kopete::MetaContact* parentContact=metacontact; JabberAccount *jaccount=transport->account();; @@ -174,13 +174,13 @@ void JabberAddContactPage_there_is_no_possibility_to_add_assync_WORKAROUND::slot * this is a copy of the end of JabberAddContactPage::apply \*/ - QString displayName = parentContact->displayName (); + TQString displayName = parentContact->displayName (); /* if ( displayName.isEmpty () ) displayName = contactId; */ // collect all group names - QStringList groupNames; + TQStringList groupNames; Kopete::GroupList groupList = parentContact->groups(); for(Kopete::Group *group = groupList.first(); group; group = groupList.next()) groupNames += group->displayName(); diff --git a/kopete/protocols/jabber/ui/jabberaddcontactpage.h b/kopete/protocols/jabber/ui/jabberaddcontactpage.h index 8081d0ad..77109c3d 100644 --- a/kopete/protocols/jabber/ui/jabberaddcontactpage.h +++ b/kopete/protocols/jabber/ui/jabberaddcontactpage.h @@ -34,13 +34,13 @@ class JabberAddContactPage:public AddContactPage Q_OBJECT public: - JabberAddContactPage (Kopete::Account * owner, QWidget * parent = 0, const char *name = 0); + JabberAddContactPage (Kopete::Account * owner, TQWidget * parent = 0, const char *name = 0); ~JabberAddContactPage (); virtual bool validateData (); virtual bool apply (Kopete::Account *, Kopete::MetaContact *); dlgAddContact *jabData; - QLabel *noaddMsg1; - QLabel *noaddMsg2; + TQLabel *noaddMsg1; + TQLabel *noaddMsg2; bool canadd; public slots: void slotPromtReceived(); @@ -55,7 +55,7 @@ class JabberTransport; class JabberAddContactPage_there_is_no_possibility_to_add_assync_WORKAROUND : public QObject { Q_OBJECT public: - JabberAddContactPage_there_is_no_possibility_to_add_assync_WORKAROUND( JabberTransport * , Kopete::MetaContact *mc, QObject *parent); + JabberAddContactPage_there_is_no_possibility_to_add_assync_WORKAROUND( JabberTransport * , Kopete::MetaContact *mc, TQObject *parent); Kopete::MetaContact *metacontact; JabberTransport *transport; public slots: diff --git a/kopete/protocols/jabber/ui/jabberchooseserver.cpp b/kopete/protocols/jabber/ui/jabberchooseserver.cpp index 66598432..63339158 100644 --- a/kopete/protocols/jabber/ui/jabberchooseserver.cpp +++ b/kopete/protocols/jabber/ui/jabberchooseserver.cpp @@ -24,8 +24,8 @@ #include <kio/global.h> #include <kio/job.h> #include <kio/jobclasses.h> -#include <qtable.h> -#include <qlabel.h> +#include <tqtable.h> +#include <tqlabel.h> #include "jabberprotocol.h" #include "dlgjabberchooseserver.h" #include "jabberregisteraccount.h" @@ -48,11 +48,11 @@ JabberChooseServer::JabberChooseServer ( JabberRegisterAccount *parent, const ch // retrieve server list mTransferJob = KIO::get ( "http://www.jabber.org/servers.xml" ); - connect ( mTransferJob, SIGNAL ( result ( KIO::Job* ) ), this, SLOT ( slotTransferResult ( KIO::Job* ) ) ); - connect ( mTransferJob, SIGNAL ( data ( KIO::Job*, const QByteArray& ) ), this, SLOT ( slotTransferData ( KIO::Job*, const QByteArray& ) ) ); + connect ( mTransferJob, TQT_SIGNAL ( result ( KIO::Job* ) ), this, TQT_SLOT ( slotTransferResult ( KIO::Job* ) ) ); + connect ( mTransferJob, TQT_SIGNAL ( data ( KIO::Job*, const TQByteArray& ) ), this, TQT_SLOT ( slotTransferData ( KIO::Job*, const TQByteArray& ) ) ); - connect ( mMainWidget->listServers, SIGNAL ( pressed ( int, int, int, const QPoint & ) ), this, SLOT ( slotSetSelection ( int ) ) ); - connect ( mMainWidget->listServers, SIGNAL ( doubleClicked ( int, int, int, const QPoint & ) ), this, SLOT ( slotOk () ) ); + connect ( mMainWidget->listServers, TQT_SIGNAL ( pressed ( int, int, int, const TQPoint & ) ), this, TQT_SLOT ( slotSetSelection ( int ) ) ); + connect ( mMainWidget->listServers, TQT_SIGNAL ( doubleClicked ( int, int, int, const TQPoint & ) ), this, TQT_SLOT ( slotOk () ) ); enableButtonOK ( false ); @@ -90,7 +90,7 @@ void JabberChooseServer::slotSetSelection ( int row ) } -void JabberChooseServer::slotTransferData ( KIO::Job */*job*/, const QByteArray &data ) +void JabberChooseServer::slotTransferData ( KIO::Job */*job*/, const TQByteArray &data ) { unsigned oldSize = xmlServerList.size (); @@ -119,7 +119,7 @@ void JabberChooseServer::slotTransferResult ( KIO::Job *job ) mMainWidget->lblStatus->setText ( "" ); // parse XML list - QDomDocument doc; + TQDomDocument doc; if ( !doc.setContent ( xmlServerList ) ) { @@ -127,14 +127,14 @@ void JabberChooseServer::slotTransferResult ( KIO::Job *job ) return; } - QDomElement docElement = doc.documentElement (); + TQDomElement docElement = doc.documentElement (); mMainWidget->listServers->setNumRows ( docElement.childNodes().count () ); int listIndex = 0; - for( QDomNode node = docElement.firstChild (); !node.isNull (); node = node.nextSibling (), listIndex++ ) + for( TQDomNode node = docElement.firstChild (); !node.isNull (); node = node.nextSibling (), listIndex++ ) { - QDomNamedNodeMap attributes = node.attributes (); + TQDomNamedNodeMap attributes = node.attributes (); mMainWidget->listServers->setText ( listIndex, 0, attributes.namedItem ( "jid" ).nodeValue () ); mMainWidget->listServers->setText ( listIndex, 1, attributes.namedItem ( "name" ).nodeValue () ); } diff --git a/kopete/protocols/jabber/ui/jabberchooseserver.h b/kopete/protocols/jabber/ui/jabberchooseserver.h index 0cc8045d..cc64040b 100644 --- a/kopete/protocols/jabber/ui/jabberchooseserver.h +++ b/kopete/protocols/jabber/ui/jabberchooseserver.h @@ -21,7 +21,7 @@ #define JABBERCHOOSESERVER_H #include <kdialogbase.h> -#include <qcstring.h> +#include <tqcstring.h> class JabberRegisterAccount; class DlgJabberChooseServer; @@ -48,7 +48,7 @@ public: private slots: void slotOk (); void slotCancel (); - void slotTransferData ( KIO::Job *job, const QByteArray &data ); + void slotTransferData ( KIO::Job *job, const TQByteArray &data ); void slotTransferResult ( KIO::Job *job ); void slotSetSelection ( int row ); @@ -56,7 +56,7 @@ private: DlgJabberChooseServer *mMainWidget; JabberRegisterAccount *mParentWidget; KIO::TransferJob *mTransferJob; - QByteArray xmlServerList; + TQByteArray xmlServerList; int mSelectedRow; diff --git a/kopete/protocols/jabber/ui/jabbereditaccountwidget.cpp b/kopete/protocols/jabber/ui/jabbereditaccountwidget.cpp index b0284e41..6c928ad6 100644 --- a/kopete/protocols/jabber/ui/jabbereditaccountwidget.cpp +++ b/kopete/protocols/jabber/ui/jabbereditaccountwidget.cpp @@ -18,12 +18,12 @@ ***************************************************************************/ #include <kdebug.h> -#include <qlineedit.h> -#include <qcheckbox.h> -#include <qpushbutton.h> -#include <qspinbox.h> -#include <qcombobox.h> -#include <qlabel.h> +#include <tqlineedit.h> +#include <tqcheckbox.h> +#include <tqpushbutton.h> +#include <tqspinbox.h> +#include <tqcombobox.h> +#include <tqlabel.h> #include <kconfig.h> #include <kmessagebox.h> @@ -40,18 +40,18 @@ #include "jabberregisteraccount.h" #include "dlgjabberchangepassword.h" -JabberEditAccountWidget::JabberEditAccountWidget (JabberProtocol * proto, JabberAccount * ident, QWidget * parent, const char *name) +JabberEditAccountWidget::JabberEditAccountWidget (JabberProtocol * proto, JabberAccount * ident, TQWidget * parent, const char *name) : DlgJabberEditAccountWidget (parent, name), KopeteEditAccountWidget (ident) { m_protocol = proto; - connect (mID, SIGNAL (textChanged (const QString &)), this, SLOT (updateServerField ())); - connect (cbCustomServer, SIGNAL (toggled (bool)), this, SLOT (updateServerField ())); + connect (mID, TQT_SIGNAL (textChanged (const TQString &)), this, TQT_SLOT (updateServerField ())); + connect (cbCustomServer, TQT_SIGNAL (toggled (bool)), this, TQT_SLOT (updateServerField ())); - connect (cbUseSSL, SIGNAL (toggled (bool)), this, SLOT (sslToggled (bool))); + connect (cbUseSSL, TQT_SIGNAL (toggled (bool)), this, TQT_SLOT (sslToggled (bool))); - connect (btnChangePassword, SIGNAL ( clicked() ), this, SLOT ( slotChangePasswordClicked () )); + connect (btnChangePassword, TQT_SIGNAL ( clicked() ), this, TQT_SLOT ( slotChangePasswordClicked () )); if (account()) { @@ -63,7 +63,7 @@ JabberEditAccountWidget::JabberEditAccountWidget (JabberProtocol * proto, Jabber { // this is a new account btnChangePassword->setEnabled ( false ); - connect (btnRegister, SIGNAL (clicked ()), this, SLOT (registerClicked ())); + connect (btnRegister, TQT_SIGNAL (clicked ()), this, TQT_SLOT (registerClicked ())); } } @@ -88,15 +88,15 @@ void JabberEditAccountWidget::reopen () mPass->load (&account()->password ()); cbAutoConnect->setChecked (account()->excludeConnect()); - mResource->setText (account()->configGroup()->readEntry ("Resource", QString::fromLatin1("Kopete"))); + mResource->setText (account()->configGroup()->readEntry ("Resource", TQString::fromLatin1("Kopete"))); mPriority->setValue (account()->configGroup()->readNumEntry ("Priority", 5)); - mServer->setText (account()->configGroup()->readEntry ("Server", QString::null)); + mServer->setText (account()->configGroup()->readEntry ("Server", TQString::null)); cbUseSSL->setChecked (account()->configGroup()->readBoolEntry( "UseSSL", false)); mPort->setValue (account()->configGroup()->readNumEntry("Port", 5222)); - QString auth = account()->configGroup()->readEntry("AuthType", QString::null); + TQString auth = account()->configGroup()->readEntry("AuthType", TQString::null); cbCustomServer->setChecked (account()->configGroup()->readBoolEntry("CustomServer",false)); @@ -119,7 +119,7 @@ void JabberEditAccountWidget::reopen () leLocalIP->setText (KGlobal::config()->readEntry("LocalIP", "")); sbLocalPort->setValue (KGlobal::config()->readNumEntry("LocalPort", 8010)); - leProxyJID->setText (account()->configGroup()->readEntry("ProxyJID", QString::null)); + leProxyJID->setText (account()->configGroup()->readEntry("ProxyJID", TQString::null)); // Privacy cbSendEvents->setChecked( account()->configGroup()->readBoolEntry("SendEvents", true) ); @@ -173,8 +173,8 @@ void JabberEditAccountWidget::writeConfig () account()->configGroup()->writeEntry("AllowPlainTextPassword", cbAllowPlainTextPassword->isChecked()); account()->configGroup()->writeEntry("Server", mServer->text ()); account()->configGroup()->writeEntry("Resource", mResource->text ()); - account()->configGroup()->writeEntry("Priority", QString::number (mPriority->value ())); - account()->configGroup()->writeEntry("Port", QString::number (mPort->value ())); + account()->configGroup()->writeEntry("Priority", TQString::number (mPriority->value ())); + account()->configGroup()->writeEntry("Port", TQString::number (mPort->value ())); account()->setExcludeConnect(cbAutoConnect->isChecked()); @@ -217,7 +217,7 @@ void JabberEditAccountWidget::updateServerField () if(!cbCustomServer->isChecked()) { - QString newServer = mID->text().section("@", 1); + TQString newServer = mID->text().section("@", 1); mPort->setValue(5222); // check if ssl is enabled and set the port correctly sslToggled(cbUseSSL->isChecked()); @@ -258,7 +258,7 @@ void JabberEditAccountWidget::slotChangePasswordClicked () DlgJabberChangePassword *passwordDlg = new DlgJabberChangePassword ( account (), this ); - connect ( passwordDlg, SIGNAL ( destroyed () ), this, SLOT ( slotChangePasswordFinished () ) ); + connect ( passwordDlg, TQT_SIGNAL ( destroyed () ), this, TQT_SLOT ( slotChangePasswordFinished () ) ); passwordDlg->show (); diff --git a/kopete/protocols/jabber/ui/jabbereditaccountwidget.h b/kopete/protocols/jabber/ui/jabbereditaccountwidget.h index 1f3ba378..e56dcbd2 100644 --- a/kopete/protocols/jabber/ui/jabbereditaccountwidget.h +++ b/kopete/protocols/jabber/ui/jabbereditaccountwidget.h @@ -20,7 +20,7 @@ #ifndef JABBEREDITACCOUNTWIDEGET_H #define JABBEREDITACCOUNTWIDEGET_H -#include <qwidget.h> +#include <tqwidget.h> #include <kprogress.h> #include "editaccountwidget.h" #include "jabberaccount.h" @@ -37,7 +37,7 @@ class JabberEditAccountWidget:public DlgJabberEditAccountWidget, public KopeteEd Q_OBJECT public: - JabberEditAccountWidget (JabberProtocol * proto, JabberAccount *, QWidget * parent = 0, const char *name = 0); + JabberEditAccountWidget (JabberProtocol * proto, JabberAccount *, TQWidget * parent = 0, const char *name = 0); ~JabberEditAccountWidget (); virtual bool validateData (); virtual Kopete::Account *apply (); diff --git a/kopete/protocols/jabber/ui/jabberregisteraccount.cpp b/kopete/protocols/jabber/ui/jabberregisteraccount.cpp index f5142736..bb20611b 100644 --- a/kopete/protocols/jabber/ui/jabberregisteraccount.cpp +++ b/kopete/protocols/jabber/ui/jabberregisteraccount.cpp @@ -28,10 +28,10 @@ #include <kpassdlg.h> #include <knuminput.h> #include <kpushbutton.h> -#include <qlabel.h> -#include <qcheckbox.h> -#include <qtimer.h> -#include <qregexp.h> +#include <tqlabel.h> +#include <tqcheckbox.h> +#include <tqtimer.h> +#include <tqregexp.h> #include "qca.h" #include "xmpp.h" @@ -68,9 +68,9 @@ JabberRegisterAccount::JabberRegisterAccount ( JabberEditAccountWidget *parent, // clear variables jabberClient = new JabberClient (); - connect ( jabberClient, SIGNAL ( csError ( int ) ), this, SLOT ( slotCSError ( int ) ) ); - connect ( jabberClient, SIGNAL ( tlsWarning ( int ) ), this, SLOT ( slotHandleTLSWarning ( int ) ) ); - connect ( jabberClient, SIGNAL ( connected () ), this, SLOT ( slotConnected () ) ); + connect ( jabberClient, TQT_SIGNAL ( csError ( int ) ), this, TQT_SLOT ( slotCSError ( int ) ) ); + connect ( jabberClient, TQT_SIGNAL ( tlsWarning ( int ) ), this, TQT_SLOT ( slotHandleTLSWarning ( int ) ) ); + connect ( jabberClient, TQT_SIGNAL ( connected () ), this, TQT_SLOT ( slotConnected () ) ); jidRegExp.setPattern ( "[\\w\\d.+_-]{1,}@[\\w\\d.-]{1,}" ); hintPixmap = KGlobal::iconLoader()->loadIcon ( "jabber_online", KIcon::Small ); @@ -86,16 +86,16 @@ JabberRegisterAccount::JabberRegisterAccount ( JabberEditAccountWidget *parent, mMainWidget->cbUseSSL->setChecked ( parent->cbUseSSL->isChecked () ); // connect buttons to slots, ok is already connected by default - connect ( this, SIGNAL ( cancelClicked () ), this, SLOT ( slotDeleteDialog () ) ); - connect ( mMainWidget->btnChooseServer, SIGNAL ( clicked () ), this, SLOT ( slotChooseServer () ) ); - connect ( mMainWidget->leServer, SIGNAL ( textChanged ( const QString & ) ), this, SLOT ( slotJIDInformation () ) ); - connect ( mMainWidget->leJID, SIGNAL ( textChanged ( const QString & ) ), this, SLOT ( slotJIDInformation () ) ); - connect ( mMainWidget->cbUseSSL, SIGNAL ( toggled ( bool ) ), this, SLOT ( slotSSLToggled () ) ); + connect ( this, TQT_SIGNAL ( cancelClicked () ), this, TQT_SLOT ( slotDeleteDialog () ) ); + connect ( mMainWidget->btnChooseServer, TQT_SIGNAL ( clicked () ), this, TQT_SLOT ( slotChooseServer () ) ); + connect ( mMainWidget->leServer, TQT_SIGNAL ( textChanged ( const TQString & ) ), this, TQT_SLOT ( slotJIDInformation () ) ); + connect ( mMainWidget->leJID, TQT_SIGNAL ( textChanged ( const TQString & ) ), this, TQT_SLOT ( slotJIDInformation () ) ); + connect ( mMainWidget->cbUseSSL, TQT_SIGNAL ( toggled ( bool ) ), this, TQT_SLOT ( slotSSLToggled () ) ); - connect ( mMainWidget->leServer, SIGNAL ( textChanged ( const QString & ) ), this, SLOT ( validateData () ) ); - connect ( mMainWidget->leJID, SIGNAL ( textChanged ( const QString & ) ), this, SLOT ( validateData () ) ); - connect ( mMainWidget->lePassword, SIGNAL ( textChanged ( const QString & ) ), this, SLOT ( validateData () ) ); - connect ( mMainWidget->lePasswordVerify, SIGNAL ( textChanged ( const QString & ) ), this, SLOT ( validateData () ) ); + connect ( mMainWidget->leServer, TQT_SIGNAL ( textChanged ( const TQString & ) ), this, TQT_SLOT ( validateData () ) ); + connect ( mMainWidget->leJID, TQT_SIGNAL ( textChanged ( const TQString & ) ), this, TQT_SLOT ( validateData () ) ); + connect ( mMainWidget->lePassword, TQT_SIGNAL ( textChanged ( const TQString & ) ), this, TQT_SLOT ( validateData () ) ); + connect ( mMainWidget->lePasswordVerify, TQT_SIGNAL ( textChanged ( const TQString & ) ), this, TQT_SLOT ( validateData () ) ); // display JID info now slotJIDInformation (); @@ -146,8 +146,8 @@ void JabberRegisterAccount::validateData () } if ( valid && - ( QString::fromLatin1 ( mMainWidget->lePassword->password () ).isEmpty () || - QString::fromLatin1 ( mMainWidget->lePasswordVerify->password () ).isEmpty () ) ) + ( TQString::fromLatin1 ( mMainWidget->lePassword->password () ).isEmpty () || + TQString::fromLatin1 ( mMainWidget->lePasswordVerify->password () ).isEmpty () ) ) { mMainWidget->lblStatusMessage->setText ( i18n ( "Please enter the same password twice." ) ); valid = false; @@ -155,8 +155,8 @@ void JabberRegisterAccount::validateData () } if ( valid && - ( QString::fromLatin1 ( mMainWidget->lePassword->password () ) != - QString::fromLatin1 ( mMainWidget->lePasswordVerify->password () ) ) ) + ( TQString::fromLatin1 ( mMainWidget->lePassword->password () ) != + TQString::fromLatin1 ( mMainWidget->lePasswordVerify->password () ) ) ) { mMainWidget->lblStatusMessage->setText ( i18n ( "Password entries do not match." ) ); valid = false; @@ -228,11 +228,11 @@ void JabberRegisterAccount::slotChooseServer () } -void JabberRegisterAccount::setServer ( const QString &server ) +void JabberRegisterAccount::setServer ( const TQString &server ) { mMainWidget->leServer->setText ( server ); - mMainWidget->leJID->setText ( QString ( "@%1" ).arg ( server ) ); + mMainWidget->leJID->setText ( TQString ( "@%1" ).arg ( server ) ); } @@ -259,7 +259,7 @@ void JabberRegisterAccount::slotOk () jabberClient->setOverrideHost ( true, mMainWidget->leServer->text (), mMainWidget->sbPort->value () ); // start connection, no authentication - switch ( jabberClient->connect ( XMPP::Jid ( mMainWidget->leJID->text () ), QString::null, false ) ) + switch ( jabberClient->connect ( XMPP::Jid ( mMainWidget->leJID->text () ), TQString::null, false ) ) { case JabberClient::NoTLS: // no SSL support, at the connecting stage this means the problem is client-side @@ -327,7 +327,7 @@ void JabberRegisterAccount::slotConnected () mMainWidget->lblStatusMessage->setText ( i18n ( "Connected successfully, registering new account..." ) ); XMPP::JT_Register * task = new XMPP::JT_Register (jabberClient->rootTask ()); - QObject::connect (task, SIGNAL (finished ()), this, SLOT (slotRegisterUserDone ())); + TQObject::connect (task, TQT_SIGNAL (finished ()), this, TQT_SLOT (slotRegisterUserDone ())); task->reg (mMainWidget->leJID->text().section("@", 0, 0), mMainWidget->lePassword->password ()); task->go (true); @@ -369,7 +369,7 @@ void JabberRegisterAccount::slotRegisterUserDone () // rewire buttons enableButtonOK ( false ); setButtonCancel ( KStdGuiItem::close () ); - connect ( this, SIGNAL ( closeClicked () ), this, SLOT ( slotDeleteDialog () ) ); + connect ( this, TQT_SIGNAL ( closeClicked () ), this, TQT_SLOT ( slotDeleteDialog () ) ); } else { @@ -382,7 +382,7 @@ void JabberRegisterAccount::slotRegisterUserDone () // FIXME: this is required because Iris crashes if we try // to disconnect here. Hopefully Justin can fix this. - QTimer::singleShot(0, this, SLOT(disconnect ())); + TQTimer::singleShot(0, this, TQT_SLOT(disconnect ())); } diff --git a/kopete/protocols/jabber/ui/jabberregisteraccount.h b/kopete/protocols/jabber/ui/jabberregisteraccount.h index 40d643a7..727d61fb 100644 --- a/kopete/protocols/jabber/ui/jabberregisteraccount.h +++ b/kopete/protocols/jabber/ui/jabberregisteraccount.h @@ -21,8 +21,8 @@ #define JABBERREGISTER_H #include <kdialogbase.h> -#include <qregexp.h> -#include <qpixmap.h> +#include <tqregexp.h> +#include <tqpixmap.h> class DlgJabberRegisterAccount; class JabberProtocol; @@ -42,7 +42,7 @@ public: ~JabberRegisterAccount (); - void setServer ( const QString &server ); + void setServer ( const TQString &server ); private slots: void slotChooseServer (); @@ -64,8 +64,8 @@ private: DlgJabberRegisterAccount *mMainWidget; JabberEditAccountWidget *mParentWidget; - QRegExp jidRegExp; - QPixmap hintPixmap; + TQRegExp jidRegExp; + TQPixmap hintPixmap; JabberClient *jabberClient; |