diff options
| author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-06-22 00:30:31 +0000 |
|---|---|---|
| committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-06-22 00:30:31 +0000 |
| commit | 69cac65817d949cda2672ec4f0aa73d5e66a0ba1 (patch) | |
| tree | 073fde0496ea90eb5bf5cffe66a8da43a9f55fbc /kopete/protocols/jabber/ui | |
| parent | 3467e6464beac3a162839bf7078e22e3a74d73e7 (diff) | |
| download | tdenetwork-69cac65817d949cda2672ec4f0aa73d5e66a0ba1.tar.gz tdenetwork-69cac65817d949cda2672ec4f0aa73d5e66a0ba1.zip | |
TQt4 port kdenetwork
This enables compilation under both Qt3 and Qt4
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdenetwork@1237912 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kopete/protocols/jabber/ui')
36 files changed, 424 insertions, 410 deletions
diff --git a/kopete/protocols/jabber/ui/dlgaddcontact.ui b/kopete/protocols/jabber/ui/dlgaddcontact.ui index 20a4ab98..f39e81ef 100644 --- a/kopete/protocols/jabber/ui/dlgaddcontact.ui +++ b/kopete/protocols/jabber/ui/dlgaddcontact.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>dlgAddContact</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>dlgAddContact</cstring> </property> @@ -25,22 +25,22 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout24</cstring> + <cstring>tqlayout24</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>lblID</cstring> </property> <property name="text"> <string>&Jabber ID:</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignTop</set> </property> <property name="buddy" stdset="0"> @@ -66,14 +66,14 @@ </widget> </hbox> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel1</cstring> </property> <property name="text"> <string><i>(for example: joe@jabber.org)</i></string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>WordBreak|AlignVCenter|AlignRight</set> </property> </widget> @@ -87,7 +87,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>190</height> @@ -98,7 +98,7 @@ </widget> <customwidgets> </customwidgets> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>klineedit.h</includehint> </includehints> diff --git a/kopete/protocols/jabber/ui/dlgbrowse.ui b/kopete/protocols/jabber/ui/dlgbrowse.ui index f45f224a..1b73dd95 100644 --- a/kopete/protocols/jabber/ui/dlgbrowse.ui +++ b/kopete/protocols/jabber/ui/dlgbrowse.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>dlgBrowse</class> -<widget class="QDialog"> +<widget class="TQDialog"> <property name="name"> <cstring>dlgBrowse</cstring> </property> @@ -19,14 +19,14 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QSplitter" row="0" column="0"> + <widget class="TQSplitter" row="0" column="0"> <property name="name"> <cstring>splitter1</cstring> </property> <property name="orientation"> <enum>Horizontal</enum> </property> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>dynamicForm</cstring> </property> @@ -37,7 +37,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>lblWait</cstring> </property> @@ -47,13 +47,13 @@ <property name="text"> <string>Please wait while retrieving search form...</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>WordBreak|AlignVCenter</set> </property> </widget> </vbox> </widget> - <widget class="QTable"> + <widget class="TQTable"> <column> <property name="text"> <string>JID</string> @@ -110,7 +110,7 @@ </property> </widget> </widget> - <widget class="QLayoutWidget" row="1" column="0"> + <widget class="TQLayoutWidget" row="1" column="0"> <property name="name"> <cstring>buttonsLayout</cstring> </property> @@ -128,7 +128,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>51</width> <height>21</height> @@ -193,7 +193,7 @@ <slot>close()</slot> </connection> </connections> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kpushbutton.h</includehint> <includehint>kpushbutton.h</includehint> diff --git a/kopete/protocols/jabber/ui/dlgchangepassword.ui b/kopete/protocols/jabber/ui/dlgchangepassword.ui index c3e34de6..18c0b439 100644 --- a/kopete/protocols/jabber/ui/dlgchangepassword.ui +++ b/kopete/protocols/jabber/ui/dlgchangepassword.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>DlgChangePassword</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>DlgChangePassword</cstring> </property> @@ -16,7 +16,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>textLabel1</cstring> </property> @@ -24,7 +24,7 @@ <string>Current password:</string> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>textLabel2</cstring> </property> @@ -32,7 +32,7 @@ <string>New password:</string> </property> </widget> - <widget class="QLabel" row="2" column="0"> + <widget class="TQLabel" row="2" column="0"> <property name="name"> <cstring>textLabel3</cstring> </property> @@ -55,9 +55,9 @@ <cstring>peNewPassword2</cstring> </property> </widget> - <widget class="QLabel" row="3" column="0" rowspan="1" colspan="2"> + <widget class="TQLabel" row="3" column="0" rowspan="1" colspan="2"> <property name="name"> - <cstring>lblStatus</cstring> + <cstring>lbltqStatus</cstring> </property> <property name="sizePolicy"> <sizepolicy> @@ -71,7 +71,7 @@ <string>Please enter your current password first and then your new password twice.</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignCenter</set> </property> </widget> @@ -79,7 +79,7 @@ and then your new password twice.</string> </widget> <customwidgets> </customwidgets> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kpassdlg.h</includehint> <includehint>kpassdlg.h</includehint> diff --git a/kopete/protocols/jabber/ui/dlgchatjoin.ui b/kopete/protocols/jabber/ui/dlgchatjoin.ui index 699f9ef4..db1bbfcb 100644 --- a/kopete/protocols/jabber/ui/dlgchatjoin.ui +++ b/kopete/protocols/jabber/ui/dlgchatjoin.ui @@ -16,7 +16,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="2" column="0"> + <widget class="TQLabel" row="2" column="0"> <property name="name"> <cstring>lblNick</cstring> </property> @@ -24,22 +24,22 @@ <string>Nick:</string> </property> </widget> - <widget class="QLineEdit" row="1" column="1"> + <widget class="TQLineEdit" row="1" column="1"> <property name="name"> <cstring>leServer</cstring> </property> </widget> - <widget class="QLineEdit" row="2" column="1"> + <widget class="TQLineEdit" row="2" column="1"> <property name="name"> <cstring>leNick</cstring> </property> </widget> - <widget class="QLineEdit" row="0" column="1"> + <widget class="TQLineEdit" row="0" column="1"> <property name="name"> <cstring>leRoom</cstring> </property> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>lblRoom</cstring> </property> @@ -47,7 +47,7 @@ <string>Room:</string> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>lblServer</cstring> </property> @@ -55,9 +55,9 @@ <string>Server:</string> </property> </widget> - <widget class="QLayoutWidget" row="3" column="1"> + <widget class="TQLayoutWidget" row="3" column="1"> <property name="name"> - <cstring>layout3</cstring> + <cstring>tqlayout3</cstring> </property> <hbox> <property name="name"> @@ -73,14 +73,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>41</width> <height>20</height> </size> </property> </spacer> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>pbJoin</cstring> </property> @@ -91,7 +91,7 @@ <bool>true</bool> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>pbBrowse</cstring> </property> @@ -122,9 +122,9 @@ <tabstop>leServer</tabstop> <tabstop>leNick</tabstop> </tabstops> -<slots> +<Q_SLOTS> <slot>slotBowse()</slot> <slot>slotJoin()</slot> -</slots> -<layoutdefaults spacing="6" margin="11"/> +</Q_SLOTS> +<tqlayoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kopete/protocols/jabber/ui/dlgchatroomslist.ui b/kopete/protocols/jabber/ui/dlgchatroomslist.ui index f4624de3..0c5e07be 100644 --- a/kopete/protocols/jabber/ui/dlgchatroomslist.ui +++ b/kopete/protocols/jabber/ui/dlgchatroomslist.ui @@ -19,15 +19,15 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout4</cstring> + <cstring>tqlayout4</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>lblServer</cstring> </property> @@ -35,12 +35,12 @@ <string>Server</string> </property> </widget> - <widget class="QLineEdit"> + <widget class="TQLineEdit"> <property name="name"> <cstring>leServer</cstring> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>pbQuery</cstring> </property> @@ -50,7 +50,7 @@ </widget> </hbox> </widget> - <widget class="QTable"> + <widget class="TQTable"> <column> <property name="text"> <string>Chatroom Name</string> @@ -95,9 +95,9 @@ <enum>FollowStyle</enum> </property> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout5</cstring> + <cstring>tqlayout5</cstring> </property> <hbox> <property name="name"> @@ -113,14 +113,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>121</width> <height>21</height> </size> </property> </spacer> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>pbJoin</cstring> </property> @@ -128,7 +128,7 @@ <string>&Join</string> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>pbClose</cstring> </property> @@ -172,13 +172,13 @@ <slot>slotDoubleClick(int,int,int,const QPoint&)</slot> </connection> </connections> -<slots> +<Q_SLOTS> <slot>slotQuery()</slot> <slot>slotJoin()</slot> <slot>slotClick(int row, int col, int button, const QPoint& mousePos)</slot> <slot>slotDoubleClick(int row, int col, int button, const QPoint& mousePos)</slot> -</slots> -<layoutdefaults spacing="6" margin="11"/> +</Q_SLOTS> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kdialog.h</includehint> </includehints> diff --git a/kopete/protocols/jabber/ui/dlgjabberbrowse.cpp b/kopete/protocols/jabber/ui/dlgjabberbrowse.cpp index be558388..22c228c7 100644 --- a/kopete/protocols/jabber/ui/dlgjabberbrowse.cpp +++ b/kopete/protocols/jabber/ui/dlgjabberbrowse.cpp @@ -30,7 +30,7 @@ #include "jabberformtranslator.h" #include "dlgjabberbrowse.h" -dlgJabberBrowse::dlgJabberBrowse (JabberAccount *account, const XMPP::Jid & jid, TQWidget * parent, const char *name):dlgBrowse (parent, name) +dlgJabberBrowse::dlgJabberBrowse (JabberAccount *account, const XMPP::Jid & jid, TQWidget * tqparent, const char *name):dlgBrowse (tqparent, name) { m_account = account; @@ -68,7 +68,7 @@ void dlgJabberBrowse::slotGotForm () // translate the form and create it inside the display widget translator = new JabberFormTranslator (task->form (), dynamicForm); - dynamicForm->layout()->add( translator ); + dynamicForm->tqlayout()->add( translator ); translator->show(); // enable the send button diff --git a/kopete/protocols/jabber/ui/dlgjabberbrowse.h b/kopete/protocols/jabber/ui/dlgjabberbrowse.h index 20886005..85b67fb9 100644 --- a/kopete/protocols/jabber/ui/dlgjabberbrowse.h +++ b/kopete/protocols/jabber/ui/dlgjabberbrowse.h @@ -35,9 +35,10 @@ class dlgJabberBrowse:public dlgBrowse { Q_OBJECT + TQ_OBJECT public: - dlgJabberBrowse (JabberAccount *account, const XMPP::Jid & jid, TQWidget * parent = 0, const char *name = 0); + dlgJabberBrowse (JabberAccount *account, const XMPP::Jid & jid, TQWidget * tqparent = 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 948a594e..ec7d1d10 100644 --- a/kopete/protocols/jabber/ui/dlgjabberchangepassword.cpp +++ b/kopete/protocols/jabber/ui/dlgjabberchangepassword.cpp @@ -30,8 +30,8 @@ #include "jabberaccount.h" #include "dlgchangepassword.h" -DlgJabberChangePassword::DlgJabberChangePassword ( JabberAccount *account, TQWidget *parent, const char *name ) - : KDialogBase ( parent, name, true, i18n("Change Jabber Password"), +DlgJabberChangePassword::DlgJabberChangePassword ( JabberAccount *account, TQWidget *tqparent, const char *name ) + : KDialogBase ( tqparent, name, true, i18n("Change Jabber Password"), KDialogBase::Ok | KDialogBase::Cancel, KDialogBase::Ok, true ) { @@ -116,7 +116,7 @@ void DlgJabberChangePassword::slotChangePasswordDone () if ( task->success () ) { - KMessageBox::queuedMessageBox ( dynamic_cast<TQWidget*>(parent()), KMessageBox::Information, + KMessageBox::queuedMessageBox ( dynamic_cast<TQWidget*>(tqparent()), 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<TQWidget*>(parent()), KMessageBox::Sorry, + KMessageBox::queuedMessageBox ( dynamic_cast<TQWidget*>(tqparent()), 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 023485ec..2dd8d8dd 100644 --- a/kopete/protocols/jabber/ui/dlgjabberchangepassword.h +++ b/kopete/protocols/jabber/ui/dlgjabberchangepassword.h @@ -32,9 +32,10 @@ class DlgJabberChangePassword : public KDialogBase { Q_OBJECT + TQ_OBJECT public: - DlgJabberChangePassword ( JabberAccount *account, TQWidget *parent = 0, const char *name = 0); + DlgJabberChangePassword ( JabberAccount *account, TQWidget *tqparent = 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 9d69beae..e24815d5 100644 --- a/kopete/protocols/jabber/ui/dlgjabberchatjoin.cpp +++ b/kopete/protocols/jabber/ui/dlgjabberchatjoin.cpp @@ -27,8 +27,8 @@ #include "dlgjabberchatjoin.h" -dlgJabberChatJoin::dlgJabberChatJoin(JabberAccount *account, TQWidget* parent, const char* name) : -dlgChatJoin(parent, name), +dlgJabberChatJoin::dlgJabberChatJoin(JabberAccount *account, TQWidget* tqparent, const char* name) : +dlgChatJoin(tqparent, name), m_account(account) { setCaption(i18n("Join Jabber Groupchat")); diff --git a/kopete/protocols/jabber/ui/dlgjabberchatjoin.h b/kopete/protocols/jabber/ui/dlgjabberchatjoin.h index d68ae78e..6263fd32 100644 --- a/kopete/protocols/jabber/ui/dlgjabberchatjoin.h +++ b/kopete/protocols/jabber/ui/dlgjabberchatjoin.h @@ -25,9 +25,10 @@ class dlgJabberChatJoin : public dlgChatJoin { Q_OBJECT + TQ_OBJECT public: - dlgJabberChatJoin(JabberAccount *account, TQWidget* parent = 0, const char* name = 0); + dlgJabberChatJoin(JabberAccount *account, TQWidget* tqparent = 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 1803a013..838eb84f 100644 --- a/kopete/protocols/jabber/ui/dlgjabberchatroomslist.cpp +++ b/kopete/protocols/jabber/ui/dlgjabberchatroomslist.cpp @@ -21,8 +21,8 @@ #include "dlgjabberchatroomslist.h" #include "jabberprotocol.h" -dlgJabberChatRoomsList::dlgJabberChatRoomsList(JabberAccount* account, const TQString& server, const TQString &nick, TQWidget *parent, const char *name) : -dlgChatRoomsList(parent, name), +dlgJabberChatRoomsList::dlgJabberChatRoomsList(JabberAccount* account, const TQString& server, const TQString &nick, TQWidget *tqparent, const char *name) : +dlgChatRoomsList(tqparent, name), m_account(account) , m_selectedRow(-1) , m_nick(nick) { if (!server.isNull()) diff --git a/kopete/protocols/jabber/ui/dlgjabberchatroomslist.h b/kopete/protocols/jabber/ui/dlgjabberchatroomslist.h index 6b1dce7b..5bb8b4a9 100644 --- a/kopete/protocols/jabber/ui/dlgjabberchatroomslist.h +++ b/kopete/protocols/jabber/ui/dlgjabberchatroomslist.h @@ -21,9 +21,10 @@ class dlgJabberChatRoomsList : public dlgChatRoomsList { Q_OBJECT + TQ_OBJECT public: - dlgJabberChatRoomsList(JabberAccount* account, const TQString& server = TQString::null, const TQString& nick = TQString::null, TQWidget* parent = 0, const char* name = 0); + dlgJabberChatRoomsList(JabberAccount* account, const TQString& server = TQString(), const TQString& nick = TQString(), TQWidget* tqparent = 0, const char* name = 0); ~dlgJabberChatRoomsList(); /*$PUBLIC_FUNCTIONS$*/ diff --git a/kopete/protocols/jabber/ui/dlgjabberchooseserver.ui b/kopete/protocols/jabber/ui/dlgjabberchooseserver.ui index 0a04b388..51943ee4 100644 --- a/kopete/protocols/jabber/ui/dlgjabberchooseserver.ui +++ b/kopete/protocols/jabber/ui/dlgjabberchooseserver.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.2" stdsetdef="1"> <class>DlgJabberChooseServer</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>DlgJabberChooseServer</cstring> </property> @@ -12,7 +12,7 @@ <height>343</height> </rect> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>300</width> <height>300</height> @@ -25,7 +25,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QTable" row="0" column="0"> + <widget class="TQTable" row="0" column="0"> <column> <property name="text"> <string>Server</string> @@ -85,9 +85,9 @@ <string><a href="http://www.jabber.org/network/">Details about free public Jabber servers</a></string> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> - <cstring>lblStatus</cstring> + <cstring>lbltqStatus</cstring> </property> <property name="text"> <string></string> @@ -100,7 +100,7 @@ <data format="XPM.GZ" length="2846">789c75d54953dd381007f03b9fe255fa969aea585ea59a9a039084256c0f0810a6e6204b32fbfe58a7e6bb8fddff3609c90ce6f27b6acbea764bfef07e72b0b53e79ff61ee6ee6672761128efdede47dbcbfb878fef3af3ffe9e7b67eac9f05fb849feeeb7b977d3d9244c36ae2ed300ef7b50664cac337127b626cf9db885f3a22e075325762694324edfc4de74954c4e6b705ed595dc4fe2ceb842c6fdd16093e5be6e24be1e9ce7856f647e7f227685ad647db4230e65d178194fe26eb8c43cb8903f89df1e5d4a3c1d8a7d9559acff40dccf57c1e5e0d20c97b811fb2ad928f31f8b43e59b56c6dde0aa1d2ef1ba3895b194f5901d5cd7755307b93f8add70c9f87470636a5be2fe7d71d5b416f905b1b399433db706dbcc3695d4930ab1192ef1e660d7b8429fbf216e6dd2f9b3c1a18d59443df7c4a9772dcec5dd70897707f7a355c2f33f8a8bc66678fe17b5cb50bf4f62eb7223fd430fe2d0a40cf7afc2ce1658cff9e0646c9521fe515cfad2209f457555607ee99f543bafcf3f1337aecbe4fdd005eccb4ceacd976217cacccaf8bdd8b719fa830fd57926f5e62b38984ceac12fea5ac7a5bf53eb23c689e156f3e5353834fafc67b5c3faf862b491fcf949dd66526f967aa61082ce77a04e46eac7f23e536c8b1ce3ab70e80cf291fe4ba96f70a91fefc33137c8675edcb555867807c7d220bf95d139eedf53d746fa95b3d1fafc85c15dd666b9bc0fb670b4c88fbcba3f2164fcebab518f1bb1f10eef9f23dc6abf7003c760a45f7977748efbafc579db68fc231cfb05cbf34fd429c7fb3f1d5da0decba3b15fb85677c89fe4bceb8a7e39c8bf529b1cfd78acce612e5f8d7c315eb699e697d441dfcf0e9c8c9e4f97ea02f5a4237595cbf9c84be2fe80a9b17fa3ba413da8535bac97d2abf17ee53ce9ea100af8014ed6211f1d4faec27e9c8d463d19eb69fa7a231f525b7501275fa3bfcd683d9feed46d055fa9638e7c3e8fd6f3fbf6d518bf51a702cf43beb61dfbe71c4efd8692f8157572a8dff6abd10fd7ea0ef3d1c2e806cf43bfdace75a817d6e3a2b7e8974db8df7118bf57772df617fadf875062ff213fdf7738ce8f2775897a30fab58d49e7cfe1ae6ad11ff3eadae23c5d52fb12df4fa3ee2fb91ffd1b626cb05fb6e0ae8ea8d799ba89e8d799daeaf7e159ed1accff32da62bfcbf7a08b7dc658ffa2da27d47baa6e615a56077d1fe887d4cf88f59caa6327ef87e57bd20d7fb2fee90c17137b6e3970e4c41d1f8dbf7f8fe1633ee1533ee373bee04bbee26b3e7e1bc3377ccb773ce37b7ee0477ee2677ee179be7913b3c08bfc913ff1675ee2655ee155fec26bbcfe26668337798ba7bccd3bbccb5f798ff7f980bfbd8939e48c0de75c70c915d7dcb06547fc630c11796a2950a4441d1dd1319dd0299dbd8939a70bbaecc7afe89a6ee896ee6846f774fe36777aa0c73ee2899ee985e6698116e9e1e7faf4511fe9137da6255aa6155aa52fbfd6b08f59a375daa04ddaa2296d8fbffe14b343bbf495f6689f0ee8dbffc41c524686722aa8a4ea7f626a6ac892f3ecc9fbff8e99ce7ceb838f3ef9eefb6fbfc4787fe48ffdc98fb3f431fffc3ef72fd6519eaa</data> </image> </images> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kactivelabel.h</includehint> </includehints> diff --git a/kopete/protocols/jabber/ui/dlgjabbereditaccountwidget.ui b/kopete/protocols/jabber/ui/dlgjabbereditaccountwidget.ui index 099e84a6..085f0b91 100644 --- a/kopete/protocols/jabber/ui/dlgjabbereditaccountwidget.ui +++ b/kopete/protocols/jabber/ui/dlgjabbereditaccountwidget.ui @@ -1,7 +1,7 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>DlgJabberEditAccountWidget</class> <author>Daniel Stone</author> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>DlgJabberEditAccountWidget</cstring> </property> @@ -26,14 +26,14 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QTabWidget" row="0" column="0"> + <widget class="TQTabWidget" row="0" column="0"> <property name="name"> <cstring>tabWidget10</cstring> </property> <property name="margin"> <number>0</number> </property> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>tab</cstring> </property> @@ -44,7 +44,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>groupBox65</cstring> </property> @@ -55,15 +55,15 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout61</cstring> + <cstring>tqlayout61</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>TextLabel1_3</cstring> </property> @@ -80,7 +80,7 @@ <string>The Jabber ID for the account you would like to use. Note that this must include the username and the domain (like an E-mail address), as there are many Jabber servers.</string> </property> </widget> - <widget class="QLineEdit"> + <widget class="TQLineEdit"> <property name="name"> <cstring>mID</cstring> </property> @@ -101,7 +101,7 @@ <cstring>mPass</cstring> </property> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>cbAutoConnect</cstring> </property> @@ -112,7 +112,7 @@ <string>Check to disable automatic connection. If checked, you may connect to this account manually using the icon in the bottom of the main Kopete window</string> </property> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>cbGlobalIdentity</cstring> </property> @@ -122,7 +122,7 @@ </widget> </vbox> </widget> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>groupBox5</cstring> </property> @@ -141,7 +141,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>lblRegistration</cstring> </property> @@ -153,7 +153,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>0</width> <height>0</height> @@ -162,11 +162,11 @@ <property name="text"> <string>To connect to the Jabber network, you will need an account on a Jabber server. If you do not yet have an account, please click the button to create one.</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>WordBreak|AlignVCenter</set> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>btnRegister</cstring> </property> @@ -182,7 +182,7 @@ </widget> </hbox> </widget> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>groupBox8_2</cstring> </property> @@ -201,7 +201,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QPushButton" row="0" column="1"> + <widget class="TQPushButton" row="0" column="1"> <property name="name"> <cstring>btnChangePassword</cstring> </property> @@ -209,7 +209,7 @@ <string>Change &Your Password</string> </property> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>tlChangePwSuccess</cstring> </property> @@ -227,7 +227,7 @@ <property name="text"> <string>If you have an existing Jabber account and would like to change its password, you can use this button to enter a new password.</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>WordBreak|AlignVCenter</set> </property> </widget> @@ -243,7 +243,7 @@ <property name="sizeType"> <enum>Maximum</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>16</height> @@ -252,7 +252,7 @@ </spacer> </vbox> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>TabPage</cstring> </property> @@ -263,7 +263,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>groupBox66</cstring> </property> @@ -274,7 +274,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>cbUseSSL</cstring> </property> @@ -288,7 +288,7 @@ <string>Check this box to enable SSL encrypted communication with the server. Note that this is not end-to-end encryption, but rather encrypted communication with the server.</string> </property> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>cbAllowPlainTextPassword</cstring> </property> @@ -299,7 +299,7 @@ <bool>true</bool> </property> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>cbCustomServer</cstring> </property> @@ -310,15 +310,15 @@ <bool>false</bool> </property> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout66</cstring> + <cstring>tqlayout66</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>labelServer</cstring> </property> @@ -346,7 +346,7 @@ <string>The IP address or hostname of the server you would like to connect to (for example jabber.org).</string> </property> </widget> - <widget class="QLineEdit"> + <widget class="TQLineEdit"> <property name="name"> <cstring>mServer</cstring> </property> @@ -363,7 +363,7 @@ <string>The IP address or hostname of the server you would like to connect to (for example jabber.org).</string> </property> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>labelPort</cstring> </property> @@ -391,7 +391,7 @@ <string>The port on the server that you would like to connect to (default is 5222).</string> </property> </widget> - <widget class="QSpinBox"> + <widget class="TQSpinBox"> <property name="name"> <cstring>mPort</cstring> </property> @@ -429,7 +429,7 @@ </widget> </vbox> </widget> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>groupBox8</cstring> </property> @@ -440,7 +440,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>TextLabel3_3</cstring> </property> @@ -457,7 +457,7 @@ <string>The resource name you would like to use on the Jabber network. Jabber allows you to sign on with the same account from multiple locations with different resource names, so you may wish to enter 'Home' or 'Work' here, for example.</string> </property> </widget> - <widget class="QLineEdit"> + <widget class="TQLineEdit"> <property name="name"> <cstring>mResource</cstring> </property> @@ -469,7 +469,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>100</width> <height>32767</height> @@ -495,14 +495,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>31</width> <height>20</height> </size> </property> </spacer> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>TextLabel3_3_2</cstring> </property> @@ -517,7 +517,7 @@ <property name="text"> <string>P&riority:</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter</set> </property> <property name="buddy" stdset="0"> @@ -530,7 +530,7 @@ <string>The resource name you would like to use on the Jabber network. Jabber allows you to sign on with the same account from multiple locations with different resource names, so you may wish to enter 'Home' or 'Work' here, for example.</string> </property> </widget> - <widget class="QSpinBox"> + <widget class="TQSpinBox"> <property name="name"> <cstring>mPriority</cstring> </property> @@ -542,13 +542,13 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>100</width> <height>0</height> </size> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>100</width> <height>32767</height> @@ -575,7 +575,7 @@ If two resources have the same priority, the messages will be sent to the one co <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>200</height> @@ -584,7 +584,7 @@ If two resources have the same priority, the messages will be sent to the one co </spacer> </vbox> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>TabPage</cstring> </property> @@ -595,7 +595,7 @@ If two resources have the same priority, the messages will be sent to the one co <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>groupBox4</cstring> </property> @@ -606,20 +606,20 @@ If two resources have the same priority, the messages will be sent to the one co <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout70</cstring> + <cstring>tqlayout70</cstring> </property> <grid> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLineEdit" row="1" column="1"> + <widget class="TQLineEdit" row="1" column="1"> <property name="name"> <cstring>leProxyJID</cstring> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>textLabel5</cstring> </property> @@ -630,20 +630,20 @@ If two resources have the same priority, the messages will be sent to the one co <cstring>leProxyJID</cstring> </property> </widget> - <widget class="QLayoutWidget" row="0" column="1"> + <widget class="TQLayoutWidget" row="0" column="1"> <property name="name"> - <cstring>layout68</cstring> + <cstring>tqlayout68</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLineEdit"> + <widget class="TQLineEdit"> <property name="name"> <cstring>leLocalIP</cstring> </property> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel4</cstring> </property> @@ -654,7 +654,7 @@ If two resources have the same priority, the messages will be sent to the one co <cstring>sbLocalPort</cstring> </property> </widget> - <widget class="QSpinBox"> + <widget class="TQSpinBox"> <property name="name"> <cstring>sbLocalPort</cstring> </property> @@ -667,7 +667,7 @@ If two resources have the same priority, the messages will be sent to the one co </widget> </hbox> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>textLabel2</cstring> </property> @@ -680,7 +680,7 @@ If two resources have the same priority, the messages will be sent to the one co </widget> </grid> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel3</cstring> </property> @@ -691,7 +691,7 @@ If two resources have the same priority, the messages will be sent to the one co <li>Changes to these fields will only take effect the next time you start Kopete.</li> <li>The "Proxy JID" can be configured per account.</li></ul></i></string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>WordBreak|AlignVCenter</set> </property> </widget> @@ -707,7 +707,7 @@ If two resources have the same priority, the messages will be sent to the one co <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>241</height> @@ -716,7 +716,7 @@ If two resources have the same priority, the messages will be sent to the one co </spacer> </vbox> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>TabPage</cstring> </property> @@ -727,7 +727,7 @@ If two resources have the same priority, the messages will be sent to the one co <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>groupBox7</cstring> </property> @@ -748,14 +748,14 @@ If two resources have the same priority, the messages will be sent to the one co <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>40</width> <height>20</height> </size> </property> </spacer> - <widget class="QCheckBox" row="0" column="0"> + <widget class="TQCheckBox" row="0" column="0"> <property name="name"> <cstring>cbHideSystemInfo</cstring> </property> @@ -768,7 +768,7 @@ If two resources have the same priority, the messages will be sent to the one co </widget> </grid> </widget> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>groupBox6</cstring> </property> @@ -779,7 +779,7 @@ If two resources have the same priority, the messages will be sent to the one co <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>cbSendEvents</cstring> </property> @@ -796,9 +796,9 @@ If two resources have the same priority, the messages will be sent to the one co <string>Check this box if you want to always send notifications to your contacts.</string> </property> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout10</cstring> + <cstring>tqlayout10</cstring> </property> <hbox> <property name="name"> @@ -814,22 +814,22 @@ If two resources have the same priority, the messages will be sent to the one co <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>30</width> <height>20</height> </size> </property> </spacer> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout9</cstring> + <cstring>tqlayout9</cstring> </property> <vbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>cbSendDeliveredEvent</cstring> </property> @@ -846,7 +846,7 @@ If two resources have the same priority, the messages will be sent to the one co <string><qt>Check this box to send the <b>Delivered notification</b> to your contacts : when a message is delivered to Kopete, Kopete can notify your contact that it has received the message.</qt></string> </property> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>cbSendDisplayedEvent</cstring> </property> @@ -863,7 +863,7 @@ If two resources have the same priority, the messages will be sent to the one co <string><qt>Check this box to send the <b>Displayed notification</b> to your contacts : when a message is displayed in Kopete, Kopete can notify your contact that it has displayed the message.</qt></string> </property> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>cbSendComposingEvent</cstring> </property> @@ -880,7 +880,7 @@ If two resources have the same priority, the messages will be sent to the one co <string><qt>Check this box to send the <b>Typing notification</b> to your contacts : when you are composing a message, you might want your contact to know that you are typing so that he knows you are answering.</qt></string> </property> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>cbSendGoneEvent</cstring> </property> @@ -907,7 +907,7 @@ If two resources have the same priority, the messages will be sent to the one co <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>21</width> <height>110</height> @@ -986,7 +986,7 @@ If two resources have the same priority, the messages will be sent to the one co <tabstop>cbSendDisplayedEvent</tabstop> <tabstop>cbSendComposingEvent</tabstop> </tabstops> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kopetepasswordwidget.h</includehint> </includehints> diff --git a/kopete/protocols/jabber/ui/dlgjabberregister.cpp b/kopete/protocols/jabber/ui/dlgjabberregister.cpp index ff324085..5f6b05a2 100644 --- a/kopete/protocols/jabber/ui/dlgjabberregister.cpp +++ b/kopete/protocols/jabber/ui/dlgjabberregister.cpp @@ -26,7 +26,7 @@ #include "jabberclient.h" #include "dlgjabberregister.h" -dlgJabberRegister::dlgJabberRegister (JabberAccount *account, const XMPP::Jid & jid, TQWidget * parent, const char *name):dlgRegister (parent, name) +dlgJabberRegister::dlgJabberRegister (JabberAccount *account, const XMPP::Jid & jid, TQWidget * tqparent, const char *name):dlgRegister (tqparent, name) { m_account = account; @@ -59,9 +59,9 @@ void dlgJabberRegister::slotGotForm () // translate the form and create it inside the box widget translator = new JabberFormTranslator (task->form (), grpForm); - static_cast<TQBoxLayout*>(grpForm->layout())->insertWidget(1, translator); + static_cast<TQBoxLayout*>(grpForm->tqlayout())->insertWidget(1, translator); translator->show(); - resize(sizeHint()); + resize(tqsizeHint()); // enable the send button btnRegister->setEnabled (true); diff --git a/kopete/protocols/jabber/ui/dlgjabberregister.h b/kopete/protocols/jabber/ui/dlgjabberregister.h index 5cb0af67..86100852 100644 --- a/kopete/protocols/jabber/ui/dlgjabberregister.h +++ b/kopete/protocols/jabber/ui/dlgjabberregister.h @@ -39,9 +39,10 @@ class dlgJabberRegister:public dlgRegister { Q_OBJECT + TQ_OBJECT public: - dlgJabberRegister (JabberAccount *account, const XMPP::Jid & jid, TQWidget * parent = 0, const char *name = 0); + dlgJabberRegister (JabberAccount *account, const XMPP::Jid & jid, TQWidget * tqparent = 0, const char *name = 0); ~dlgJabberRegister (); private slots: diff --git a/kopete/protocols/jabber/ui/dlgjabberregisteraccount.ui b/kopete/protocols/jabber/ui/dlgjabberregisteraccount.ui index c411bb96..96c91ec1 100644 --- a/kopete/protocols/jabber/ui/dlgjabberregisteraccount.ui +++ b/kopete/protocols/jabber/ui/dlgjabberregisteraccount.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.2" stdsetdef="1"> <class>DlgJabberRegisterAccount</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>DlgJabberRegisterAccount</cstring> </property> @@ -12,7 +12,7 @@ <height>376</height> </rect> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>300</width> <height>350</height> @@ -25,7 +25,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="1" column="1"> + <widget class="TQLabel" row="1" column="1"> <property name="name"> <cstring>lblJID</cstring> </property> @@ -36,32 +36,32 @@ <cstring>leJID</cstring> </property> </widget> - <widget class="QLabel" row="3" column="0"> + <widget class="TQLabel" row="3" column="0"> <property name="name"> <cstring>pixPasswordVerify</cstring> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>16</width> <height>16</height> </size> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>32767</width> <height>32767</height> </size> </property> </widget> - <widget class="QLayoutWidget" row="0" column="2"> + <widget class="TQLayoutWidget" row="0" column="2"> <property name="name"> - <cstring>layoutServerEntry</cstring> + <cstring>tqlayoutServerEntry</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLineEdit"> + <widget class="TQLineEdit"> <property name="name"> <cstring>leServer</cstring> </property> @@ -79,7 +79,7 @@ </widget> </hbox> </widget> - <widget class="QLabel" row="2" column="1"> + <widget class="TQLabel" row="2" column="1"> <property name="name"> <cstring>lblPassword</cstring> </property> @@ -106,7 +106,7 @@ <number>65535</number> </property> </widget> - <widget class="QCheckBox" row="5" column="1" rowspan="1" colspan="2"> + <widget class="TQCheckBox" row="5" column="1" rowspan="1" colspan="2"> <property name="name"> <cstring>cbUseSSL</cstring> </property> @@ -131,24 +131,24 @@ <string>Check this box to enable SSL encrypted communication with the server. Note that this is not end-to-end encryption, but rather encrypted communication with the server.</string> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>pixJID</cstring> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>16</width> <height>16</height> </size> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>32767</width> <height>32767</height> </size> </property> </widget> - <widget class="QLabel" row="4" column="1"> + <widget class="TQLabel" row="4" column="1"> <property name="name"> <cstring>lblPort</cstring> </property> @@ -159,7 +159,7 @@ <cstring>sbPort</cstring> </property> </widget> - <widget class="QLabel" row="3" column="1"> + <widget class="TQLabel" row="3" column="1"> <property name="name"> <cstring>lblPasswordVerify</cstring> </property> @@ -181,24 +181,24 @@ <enum>Password</enum> </property> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>pixServer</cstring> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>16</width> <height>16</height> </size> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>32767</width> <height>32767</height> </size> </property> </widget> - <widget class="QLabel" row="0" column="1"> + <widget class="TQLabel" row="0" column="1"> <property name="name"> <cstring>lblServer</cstring> </property> @@ -209,17 +209,17 @@ <cstring>leServer</cstring> </property> </widget> - <widget class="QLabel" row="2" column="0"> + <widget class="TQLabel" row="2" column="0"> <property name="name"> <cstring>pixPassword</cstring> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>16</width> <height>16</height> </size> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>32767</width> <height>32767</height> @@ -237,7 +237,7 @@ <enum>Password</enum> </property> </widget> - <widget class="QLineEdit" row="1" column="2"> + <widget class="TQLineEdit" row="1" column="2"> <property name="name"> <cstring>leJID</cstring> </property> @@ -245,19 +245,19 @@ <string></string> </property> </widget> - <widget class="QLayoutWidget" row="6" column="0" rowspan="1" colspan="3"> + <widget class="TQLayoutWidget" row="6" column="0" rowspan="1" colspan="3"> <property name="name"> - <cstring>layout3</cstring> + <cstring>tqlayout3</cstring> </property> <vbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>lblJIDInformation</cstring> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>0</width> <height>100</height> @@ -266,7 +266,7 @@ <property name="text"> <string></string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>WordBreak|AlignVCenter</set> </property> </widget> @@ -280,21 +280,21 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>16</height> </size> </property> </spacer> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>lblStatusMessage</cstring> </property> <property name="text"> <string></string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignCenter</set> </property> </widget> @@ -309,7 +309,7 @@ <tabstop>lePassword</tabstop> <tabstop>lePasswordVerify</tabstop> </tabstops> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kpushbutton.h</includehint> <includehint>knuminput.h</includehint> diff --git a/kopete/protocols/jabber/ui/dlgjabbersendraw.cpp b/kopete/protocols/jabber/ui/dlgjabbersendraw.cpp index 4b9192dc..f16d927a 100644 --- a/kopete/protocols/jabber/ui/dlgjabbersendraw.cpp +++ b/kopete/protocols/jabber/ui/dlgjabbersendraw.cpp @@ -24,8 +24,8 @@ #include <kdebug.h> #include "jabberclient.h" -dlgJabberSendRaw::dlgJabberSendRaw ( JabberClient *client, TQWidget *parent, const char *name ) - : DlgSendRaw (parent, name) +dlgJabberSendRaw::dlgJabberSendRaw ( JabberClient *client, TQWidget *tqparent, const char *name ) + : DlgSendRaw (tqparent, name) { // Connect the GUI elements to things that do stuff connect (btnSend, TQT_SIGNAL (clicked ()), this, TQT_SLOT (slotSend ())); diff --git a/kopete/protocols/jabber/ui/dlgjabbersendraw.h b/kopete/protocols/jabber/ui/dlgjabbersendraw.h index 44e1a9ad..8a16f3e7 100644 --- a/kopete/protocols/jabber/ui/dlgjabbersendraw.h +++ b/kopete/protocols/jabber/ui/dlgjabbersendraw.h @@ -28,7 +28,7 @@ class JabberClient; * A dialog to send raw strings to the jabber server. * * It comes with a TQComboBox to choose some "template" strings - * like "Availability Status", "Subscription",... + * like "Availability tqStatus", "Subscription",... * * @author Till Gerken <till@tantalo.net> * @author Chris TenHarmsel <tenharmsel@users.sf.net> @@ -36,9 +36,10 @@ class JabberClient; class dlgJabberSendRaw:public DlgSendRaw { Q_OBJECT + TQ_OBJECT public: - dlgJabberSendRaw ( JabberClient *client, TQWidget * parent = 0, const char *name = 0); + dlgJabberSendRaw ( JabberClient *client, TQWidget * tqparent = 0, const char *name = 0); virtual ~ dlgJabberSendRaw (); public slots: @@ -54,7 +55,7 @@ public slots: void slotClear (); /** - * Sets a xml message in tePacket(QTextWidget) + * Sets a xml message in tePacket(TQTextWidget) * according to the state of inputWidget. */ void slotCreateMessage (int); diff --git a/kopete/protocols/jabber/ui/dlgjabberservices.cpp b/kopete/protocols/jabber/ui/dlgjabberservices.cpp index 1bd1310c..e0e1a315 100644 --- a/kopete/protocols/jabber/ui/dlgjabberservices.cpp +++ b/kopete/protocols/jabber/ui/dlgjabberservices.cpp @@ -32,7 +32,7 @@ #include "dlgjabberservices.moc" -dlgJabberServices::dlgJabberServices (JabberAccount *account, TQWidget *parent, const char *name):dlgServices (parent, name) +dlgJabberServices::dlgJabberServices (JabberAccount *account, TQWidget *tqparent, const char *name):dlgServices (tqparent, name) { m_account = account; @@ -122,7 +122,7 @@ void dlgJabberServices::slotServiceFinished () if (!task->success ()) { TQString error = task->statusString(); - KMessageBox::queuedMessageBox (this, KMessageBox::Error, i18n ("Unable to retrieve the list of services.\nReason: %1").arg(error), i18n ("Jabber Error")); + KMessageBox::queuedMessageBox (this, KMessageBox::Error, i18n ("Unable to retrieve the list of services.\nReason: %1").tqarg(error), i18n ("Jabber Error")); return; } diff --git a/kopete/protocols/jabber/ui/dlgjabberservices.h b/kopete/protocols/jabber/ui/dlgjabberservices.h index c64fb045..9672cc55 100644 --- a/kopete/protocols/jabber/ui/dlgjabberservices.h +++ b/kopete/protocols/jabber/ui/dlgjabberservices.h @@ -34,9 +34,10 @@ class dlgJabberServices:public dlgServices { Q_OBJECT + TQ_OBJECT public: - dlgJabberServices (JabberAccount *account, TQWidget *parent = 0, const char *name = 0); + dlgJabberServices (JabberAccount *account, TQWidget *tqparent = 0, const char *name = 0); ~dlgJabberServices (); private slots: @@ -59,9 +60,10 @@ private: class dlgJabberServies_item : protected TQObject, public TQListViewItem { Q_OBJECT + TQ_OBJECT public: - dlgJabberServies_item( TQListView *parent , const TQString &s1 , const TQString &s2 ) - : TQListViewItem(parent,s1,s2), can_browse(false) , can_register(false) {} + dlgJabberServies_item( TQListView *tqparent , const TQString &s1 , const TQString &s2 ) + : TQListViewItem(tqparent,s1,s2), can_browse(false) , can_register(false) {} bool can_browse, can_register; XMPP::Jid jid; diff --git a/kopete/protocols/jabber/ui/dlgjabbervcard.cpp b/kopete/protocols/jabber/ui/dlgjabbervcard.cpp index 19070798..44278511 100644 --- a/kopete/protocols/jabber/ui/dlgjabbervcard.cpp +++ b/kopete/protocols/jabber/ui/dlgjabbervcard.cpp @@ -22,7 +22,7 @@ #include "dlgjabbervcard.h" -// Qt includes +// TQt includes #include <tqtextedit.h> #include <tqwidgetstack.h> #include <tqregexp.h> @@ -56,12 +56,12 @@ #include "dlgvcard.h" /* - * Constructs a dlgJabberVCard which is a child of 'parent', with the + * Constructs a dlgJabberVCard which is a child of 'tqparent', with the * name '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") ) +dlgJabberVCard::dlgJabberVCard (JabberAccount *account, JabberBaseContact *contact, TQWidget * tqparent, const char *name) + : KDialogBase (tqparent, name, false, i18n("Jabber vCard"), Close | User1 | User2, Close, false, i18n("&Save User Info"), i18n("&Fetch vCard") ) { m_account = account; @@ -92,7 +92,7 @@ dlgJabberVCard::dlgJabberVCard (JabberAccount *account, JabberBaseContact *conta */ dlgJabberVCard::~dlgJabberVCard () { - // no need to delete child widgets, Qt does it all for us + // no need to delete child widgets, TQt does it all for us } /* @@ -296,7 +296,7 @@ void dlgJabberVCard::setEnabled(bool state) void dlgJabberVCard::slotSaveVCard() { setEnabled(false); - m_mainWidget->lblStatus->setText( i18n("Saving vCard to server...") ); + m_mainWidget->lbltqStatus->setText( i18n("Saving vCard to server...") ); XMPP::VCard vCard; XMPP::VCard::AddressList addressList; @@ -418,12 +418,12 @@ void dlgJabberVCard::slotVCardSaved() if( vCard->success() ) { - m_mainWidget->lblStatus->setText( i18n("vCard save sucessful.") ); + m_mainWidget->lbltqStatus->setText( i18n("vCard save sucessful.") ); m_contact->setPropertiesFromVCard( vCard->vcard() ); } else { - m_mainWidget->lblStatus->setText( i18n("Error: Unable to save vCard.") ); + m_mainWidget->lbltqStatus->setText( i18n("Error: Unable to save vCard.") ); } setEnabled(true); @@ -431,7 +431,7 @@ void dlgJabberVCard::slotVCardSaved() void dlgJabberVCard::slotGetVCard() { - m_mainWidget->lblStatus->setText( i18n("Fetching contact vCard...") ); + m_mainWidget->lbltqStatus->setText( i18n("Fetching contact vCard...") ); setReadOnly(true); setEnabled(false); @@ -454,11 +454,11 @@ void dlgJabberVCard::slotGotVCard() assignContactProperties(); - m_mainWidget->lblStatus->setText( i18n("vCard fetching Done.") ); + m_mainWidget->lbltqStatus->setText( i18n("vCard fetching Done.") ); } else { - m_mainWidget->lblStatus->setText( i18n("Error: vCard could not be fetched correctly. Check connectivity with the Jabber server.") ); + m_mainWidget->lbltqStatus->setText( i18n("Error: vCard could not be fetched correctly. Check connectivity with the Jabber server.") ); //it is maybe possible to anyway edit our own vCard (if it is new if(m_account->myself() == m_contact) setEnabled( true ); @@ -469,7 +469,7 @@ void dlgJabberVCard::slotSelectPhoto() { TQString path; bool remoteFile = false; - KURL filePath = KFileDialog::getImageOpenURL( TQString::null, this, i18n( "Jabber Photo" ) ); + KURL filePath = KFileDialog::getImageOpenURL( TQString(), this, i18n( "Jabber Photo" ) ); if( filePath.isEmpty() ) return; @@ -493,7 +493,7 @@ void dlgJabberVCard::slotSelectPhoto() if(img.width() > 96 || img.height() > 96) { // Scale and crop the picture. - img = img.smoothScale( 96, 96, TQImage::ScaleMin ); + img = img.smoothScale( 96, 96, TQ_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, TQImage::ScaleMin ); + img = img.smoothScale( 32, 32, TQ_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(TQRegExp("[./~]"),"-") +".png"); + m_photoPath = locateLocal("appdata", "jabberphotos/" + m_contact->rosterItem().jid().full().lower().tqreplace(TQRegExp("[./~]"),"-") +".png"); if( img.save(m_photoPath, "PNG") ) { m_mainWidget->lblPhoto->setPixmap( TQPixmap(img) ); } else { - m_photoPath = TQString::null; + m_photoPath = TQString(); } } else @@ -542,12 +542,12 @@ void dlgJabberVCard::slotSelectPhoto() void dlgJabberVCard::slotClearPhoto() { m_mainWidget->lblPhoto->setPixmap( TQPixmap() ); - m_photoPath = TQString::null; + m_photoPath = TQString(); } void dlgJabberVCard::slotOpenURL(const TQString &url) { - if ( !url.isEmpty () || (url == TQString::fromLatin1("mailto:") ) ) + if ( !url.isEmpty () || (url == TQString::tqfromLatin1("mailto:") ) ) new KRun(KURL( url ) ); } diff --git a/kopete/protocols/jabber/ui/dlgjabbervcard.h b/kopete/protocols/jabber/ui/dlgjabbervcard.h index a3794ee4..0ab95193 100644 --- a/kopete/protocols/jabber/ui/dlgjabbervcard.h +++ b/kopete/protocols/jabber/ui/dlgjabbervcard.h @@ -45,6 +45,7 @@ class dlgVCard; class dlgJabberVCard : public KDialogBase { Q_OBJECT + TQ_OBJECT public: /** @@ -55,7 +56,7 @@ public: * @param widget Parent widget. * @param name widget name. */ - dlgJabberVCard (JabberAccount *account, JabberBaseContact *contact, TQWidget * parent = 0, const char *name = 0); + dlgJabberVCard (JabberAccount *account, JabberBaseContact *contact, TQWidget * tqparent = 0, const char *name = 0); ~dlgJabberVCard (); private slots: diff --git a/kopete/protocols/jabber/ui/dlgregister.ui b/kopete/protocols/jabber/ui/dlgregister.ui index a3930c2e..76c8cc84 100644 --- a/kopete/protocols/jabber/ui/dlgregister.ui +++ b/kopete/protocols/jabber/ui/dlgregister.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.2" stdsetdef="1"> <class>dlgRegister</class> -<widget class="QDialog"> +<widget class="TQDialog"> <property name="name"> <cstring>dlgRegister</cstring> </property> @@ -30,7 +30,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>grpForm</cstring> </property> @@ -52,7 +52,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>lblWait</cstring> </property> @@ -78,7 +78,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>0</height> @@ -87,7 +87,7 @@ </spacer> </vbox> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>Layout1</cstring> </property> @@ -111,14 +111,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> </size> </property> </spacer> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>btnRegister</cstring> </property> @@ -135,7 +135,7 @@ <bool>true</bool> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>btnCancel</cstring> </property> @@ -158,5 +158,5 @@ <slot>reject()</slot> </connection> </connections> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kopete/protocols/jabber/ui/dlgsendraw.ui b/kopete/protocols/jabber/ui/dlgsendraw.ui index 08e31f66..20c01e7c 100644 --- a/kopete/protocols/jabber/ui/dlgsendraw.ui +++ b/kopete/protocols/jabber/ui/dlgsendraw.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.1" stdsetdef="1"> <class>DlgSendRaw</class> -<widget class="QDialog"> +<widget class="TQDialog"> <property name="name"> <cstring>DlgSendRaw</cstring> </property> @@ -19,15 +19,15 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout4</cstring> + <cstring>tqlayout4</cstring> </property> <vbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>lblInfo</cstring> </property> @@ -42,15 +42,15 @@ <string>Type in the packet that should be sent to the server:</string> </property> <property name="buddy" stdset="0"> - <cstring>lblRealStatus</cstring> + <cstring>lblRealtqStatus</cstring> </property> </widget> - <widget class="QTextEdit"> + <widget class="TQTextEdit"> <property name="name"> <cstring>tePacket</cstring> </property> </widget> - <widget class="QComboBox"> + <widget class="TQComboBox"> <item> <property name="text"> <string>User Defined</string> @@ -63,7 +63,7 @@ </item> <item> <property name="text"> - <string>Availability Status</string> + <string>Availability tqStatus</string> </property> </item> <item> @@ -100,15 +100,15 @@ <cstring>inputWidget</cstring> </property> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout3</cstring> + <cstring>tqlayout3</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>btnClear</cstring> </property> @@ -116,7 +116,7 @@ <string>Clea&r</string> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>btnSend</cstring> </property> @@ -134,14 +134,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>16</width> <height>25</height> </size> </property> </spacer> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>btnClose</cstring> </property> @@ -155,5 +155,5 @@ </widget> </vbox> </widget> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kopete/protocols/jabber/ui/dlgservices.ui b/kopete/protocols/jabber/ui/dlgservices.ui index 7679309d..03022c61 100644 --- a/kopete/protocols/jabber/ui/dlgservices.ui +++ b/kopete/protocols/jabber/ui/dlgservices.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>dlgServices</class> -<widget class="QDialog"> +<widget class="TQDialog"> <property name="name"> <cstring>dlgServices</cstring> </property> @@ -22,15 +22,15 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout2</cstring> + <cstring>tqlayout2</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>lblServer</cstring> </property> @@ -46,7 +46,7 @@ <string>Server:</string> </property> </widget> - <widget class="QLineEdit"> + <widget class="TQLineEdit"> <property name="name"> <cstring>leServer</cstring> </property> @@ -59,7 +59,7 @@ </sizepolicy> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>btnQuery</cstring> </property> @@ -83,7 +83,7 @@ </widget> </hbox> </widget> - <widget class="QListView"> + <widget class="TQListView"> <column> <property name="text"> <string>Jid</string> @@ -110,9 +110,9 @@ <cstring>lvServices</cstring> </property> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout1</cstring> + <cstring>tqlayout1</cstring> </property> <hbox> <property name="name"> @@ -128,14 +128,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>111</width> <height>21</height> </size> </property> </spacer> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>btnRegister</cstring> </property> @@ -151,7 +151,7 @@ <string>&Register</string> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>btnBrowse</cstring> </property> @@ -167,7 +167,7 @@ <string>&Browse</string> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>btnClose</cstring> </property> @@ -195,5 +195,5 @@ <slot>close()</slot> </connection> </connections> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kopete/protocols/jabber/ui/dlgvcard.ui b/kopete/protocols/jabber/ui/dlgvcard.ui index efaf5519..857a2890 100644 --- a/kopete/protocols/jabber/ui/dlgvcard.ui +++ b/kopete/protocols/jabber/ui/dlgvcard.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>dlgVCard</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>dlgVCard</cstring> </property> @@ -16,11 +16,11 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QTabWidget" row="0" column="0"> + <widget class="TQTabWidget" row="0" column="0"> <property name="name"> <cstring>tabWidget3</cstring> </property> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>tab</cstring> </property> @@ -31,15 +31,15 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget" row="4" column="0" rowspan="1" colspan="2"> + <widget class="TQLayoutWidget" row="4" column="0" rowspan="1" colspan="2"> <property name="name"> - <cstring>layout13</cstring> + <cstring>tqlayout13</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>lblBirthday</cstring> </property> @@ -47,7 +47,7 @@ <string>Birthday:</string> </property> </widget> - <widget class="QLineEdit"> + <widget class="TQLineEdit"> <property name="name"> <cstring>leBirthday</cstring> </property> @@ -62,15 +62,15 @@ </widget> </hbox> </widget> - <widget class="QLayoutWidget" row="3" column="0" rowspan="1" colspan="2"> + <widget class="TQLayoutWidget" row="3" column="0" rowspan="1" colspan="2"> <property name="name"> - <cstring>layout12</cstring> + <cstring>tqlayout12</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>lblHomepage</cstring> </property> @@ -78,7 +78,7 @@ <string>Homepage:</string> </property> </widget> - <widget class="QWidgetStack"> + <widget class="TQWidgetStack"> <property name="name"> <cstring>wsHomepage</cstring> </property> @@ -90,13 +90,13 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>0</width> <height>0</height> </size> </property> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>page</cstring> </property> @@ -125,14 +125,14 @@ </property> </widget> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>page</cstring> </property> <attribute name="id"> <number>1</number> </attribute> - <widget class="QLineEdit"> + <widget class="TQLineEdit"> <property name="name"> <cstring>leHomepage</cstring> </property> @@ -157,15 +157,15 @@ </widget> </hbox> </widget> - <widget class="QLayoutWidget" row="5" column="0" rowspan="1" colspan="2"> + <widget class="TQLayoutWidget" row="5" column="0" rowspan="1" colspan="2"> <property name="name"> - <cstring>layout14</cstring> + <cstring>tqlayout14</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>lblTimezone</cstring> </property> @@ -173,7 +173,7 @@ <string>Timezone:</string> </property> </widget> - <widget class="QLineEdit"> + <widget class="TQLineEdit"> <property name="name"> <cstring>leTimezone</cstring> </property> @@ -188,15 +188,15 @@ </widget> </hbox> </widget> - <widget class="QLayoutWidget" row="2" column="0" rowspan="1" colspan="2"> + <widget class="TQLayoutWidget" row="2" column="0" rowspan="1" colspan="2"> <property name="name"> - <cstring>layout11</cstring> + <cstring>tqlayout11</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>lblJID</cstring> </property> @@ -204,7 +204,7 @@ <string>Jabber ID:</string> </property> </widget> - <widget class="QLineEdit"> + <widget class="TQLineEdit"> <property name="name"> <cstring>leJID</cstring> </property> @@ -219,15 +219,15 @@ </widget> </hbox> </widget> - <widget class="QLayoutWidget" row="1" column="0" rowspan="1" colspan="2"> + <widget class="TQLayoutWidget" row="1" column="0" rowspan="1" colspan="2"> <property name="name"> - <cstring>layout10</cstring> + <cstring>tqlayout10</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>lblName</cstring> </property> @@ -235,7 +235,7 @@ <string>Full name:</string> </property> </widget> - <widget class="QLineEdit"> + <widget class="TQLineEdit"> <property name="name"> <cstring>leName</cstring> </property> @@ -253,15 +253,15 @@ </widget> </hbox> </widget> - <widget class="QLayoutWidget" row="0" column="0" rowspan="1" colspan="2"> + <widget class="TQLayoutWidget" row="0" column="0" rowspan="1" colspan="2"> <property name="name"> - <cstring>layout9</cstring> + <cstring>tqlayout9</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>lblNick</cstring> </property> @@ -269,7 +269,7 @@ <string>Nickname:</string> </property> </widget> - <widget class="QLineEdit"> + <widget class="TQLineEdit"> <property name="name"> <cstring>leNick</cstring> </property> @@ -294,7 +294,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> @@ -311,14 +311,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> </size> </property> </spacer> - <widget class="QGroupBox" row="6" column="0" rowspan="1" colspan="2"> + <widget class="TQGroupBox" row="6" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>groupBox1</cstring> </property> @@ -329,7 +329,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QPushButton" row="1" column="0" rowspan="1" colspan="2"> + <widget class="TQPushButton" row="1" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>btnSelectPhoto</cstring> </property> @@ -337,7 +337,7 @@ <string>&Select Photo...</string> </property> </widget> - <widget class="QPushButton" row="1" column="2" rowspan="1" colspan="2"> + <widget class="TQPushButton" row="1" column="2" rowspan="1" colspan="2"> <property name="name"> <cstring>btnClearPhoto</cstring> </property> @@ -345,7 +345,7 @@ <string>Clear Pho&to</string> </property> </widget> - <widget class="QLabel" row="0" column="1" rowspan="1" colspan="2"> + <widget class="TQLabel" row="0" column="1" rowspan="1" colspan="2"> <property name="name"> <cstring>lblPhoto</cstring> </property> @@ -357,13 +357,13 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>96</width> <height>96</height> </size> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>96</width> <height>96</height> @@ -386,7 +386,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>40</width> <height>20</height> @@ -403,7 +403,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>40</width> <height>20</height> @@ -414,7 +414,7 @@ </widget> </grid> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>tab</cstring> </property> @@ -425,15 +425,15 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget" row="0" column="0"> + <widget class="TQLayoutWidget" row="0" column="0"> <property name="name"> - <cstring>layout36</cstring> + <cstring>tqlayout36</cstring> </property> <grid> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="4" column="0"> + <widget class="TQLabel" row="4" column="0"> <property name="name"> <cstring>lblState</cstring> </property> @@ -441,7 +441,7 @@ <string>Postal code:</string> </property> </widget> - <widget class="QLabel" row="2" column="0"> + <widget class="TQLabel" row="2" column="0"> <property name="name"> <cstring>lblPOBox</cstring> </property> @@ -449,12 +449,12 @@ <string>PO box:</string> </property> </widget> - <widget class="QLineEdit" row="1" column="1"> + <widget class="TQLineEdit" row="1" column="1"> <property name="name"> <cstring>leHomeExtAddr</cstring> </property> </widget> - <widget class="QLabel" row="3" column="0"> + <widget class="TQLabel" row="3" column="0"> <property name="name"> <cstring>lblCity</cstring> </property> @@ -472,14 +472,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>16</height> </size> </property> </spacer> - <widget class="QWidgetStack" row="6" column="1" rowspan="2" colspan="1"> + <widget class="TQWidgetStack" row="6" column="1" rowspan="2" colspan="1"> <property name="name"> <cstring>wsHomeEmail</cstring> </property> @@ -491,7 +491,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>page</cstring> </property> @@ -512,14 +512,14 @@ </property> </widget> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>page</cstring> </property> <attribute name="id"> <number>1</number> </attribute> - <widget class="QLineEdit"> + <widget class="TQLineEdit"> <property name="name"> <cstring>leHomeEmail</cstring> </property> @@ -534,7 +534,7 @@ </widget> </widget> </widget> - <widget class="QLabel" row="5" column="0"> + <widget class="TQLabel" row="5" column="0"> <property name="name"> <cstring>lblCountry</cstring> </property> @@ -542,7 +542,7 @@ <string>Country:</string> </property> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>lblStreet</cstring> </property> @@ -550,7 +550,7 @@ <string>Street:</string> </property> </widget> - <widget class="QLabel" row="6" column="0"> + <widget class="TQLabel" row="6" column="0"> <property name="name"> <cstring>lblEmail</cstring> </property> @@ -566,12 +566,12 @@ <string>Email:</string> </property> </widget> - <widget class="QLineEdit" row="2" column="1"> + <widget class="TQLineEdit" row="2" column="1"> <property name="name"> <cstring>leHomePOBox</cstring> </property> </widget> - <widget class="QLineEdit" row="4" column="1"> + <widget class="TQLineEdit" row="4" column="1"> <property name="name"> <cstring>leHomePostalCode</cstring> </property> @@ -586,24 +586,24 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>50</height> </size> </property> </spacer> - <widget class="QLineEdit" row="5" column="1"> + <widget class="TQLineEdit" row="5" column="1"> <property name="name"> <cstring>leHomeCountry</cstring> </property> </widget> - <widget class="QLineEdit" row="3" column="1"> + <widget class="TQLineEdit" row="3" column="1"> <property name="name"> <cstring>leHomeCity</cstring> </property> </widget> - <widget class="QLineEdit" row="0" column="1"> + <widget class="TQLineEdit" row="0" column="1"> <property name="name"> <cstring>leHomeStreet</cstring> </property> @@ -612,7 +612,7 @@ </widget> </grid> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>tab</cstring> </property> @@ -623,9 +623,9 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget" row="0" column="0"> + <widget class="TQLayoutWidget" row="0" column="0"> <property name="name"> - <cstring>layout37</cstring> + <cstring>tqlayout37</cstring> </property> <grid> <property name="name"> @@ -641,24 +641,24 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>16</height> </size> </property> </spacer> - <widget class="QLineEdit" row="2" column="1"> + <widget class="TQLineEdit" row="2" column="1"> <property name="name"> <cstring>leWorkPOBox</cstring> </property> </widget> - <widget class="QLineEdit" row="5" column="1"> + <widget class="TQLineEdit" row="5" column="1"> <property name="name"> <cstring>leWorkCountry</cstring> </property> </widget> - <widget class="QLabel" row="3" column="0"> + <widget class="TQLabel" row="3" column="0"> <property name="name"> <cstring>lblCity_2</cstring> </property> @@ -666,12 +666,12 @@ <string>City:</string> </property> </widget> - <widget class="QLineEdit" row="1" column="1"> + <widget class="TQLineEdit" row="1" column="1"> <property name="name"> <cstring>leWorkExtAddr</cstring> </property> </widget> - <widget class="QLabel" row="2" column="0"> + <widget class="TQLabel" row="2" column="0"> <property name="name"> <cstring>lblPOBox_2</cstring> </property> @@ -679,17 +679,17 @@ <string>PO box:</string> </property> </widget> - <widget class="QLineEdit" row="3" column="1"> + <widget class="TQLineEdit" row="3" column="1"> <property name="name"> <cstring>leWorkCity</cstring> </property> </widget> - <widget class="QLineEdit" row="0" column="1"> + <widget class="TQLineEdit" row="0" column="1"> <property name="name"> <cstring>leWorkStreet</cstring> </property> </widget> - <widget class="QLabel" row="6" column="0"> + <widget class="TQLabel" row="6" column="0"> <property name="name"> <cstring>lblEmail_2</cstring> </property> @@ -697,7 +697,7 @@ <string>Email:</string> </property> </widget> - <widget class="QLabel" row="5" column="0"> + <widget class="TQLabel" row="5" column="0"> <property name="name"> <cstring>lblCountry_2</cstring> </property> @@ -705,7 +705,7 @@ <string>Country:</string> </property> </widget> - <widget class="QLineEdit" row="4" column="1"> + <widget class="TQLineEdit" row="4" column="1"> <property name="name"> <cstring>leWorkPostalCode</cstring> </property> @@ -720,14 +720,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>30</height> </size> </property> </spacer> - <widget class="QLabel" row="4" column="0"> + <widget class="TQLabel" row="4" column="0"> <property name="name"> <cstring>lblState_2</cstring> </property> @@ -735,7 +735,7 @@ <string>Postal code:</string> </property> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>lblStreet_2</cstring> </property> @@ -743,7 +743,7 @@ <string>Street:</string> </property> </widget> - <widget class="QWidgetStack" row="6" column="1" rowspan="2" colspan="1"> + <widget class="TQWidgetStack" row="6" column="1" rowspan="2" colspan="1"> <property name="name"> <cstring>wsWorkEmail</cstring> </property> @@ -755,7 +755,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>page</cstring> </property> @@ -776,14 +776,14 @@ </property> </widget> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>page</cstring> </property> <attribute name="id"> <number>1</number> </attribute> - <widget class="QLineEdit"> + <widget class="TQLineEdit"> <property name="name"> <cstring>leWorkEmail</cstring> </property> @@ -810,7 +810,7 @@ </widget> </grid> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>tab</cstring> </property> @@ -821,20 +821,20 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget" row="0" column="0"> + <widget class="TQLayoutWidget" row="0" column="0"> <property name="name"> - <cstring>layout57</cstring> + <cstring>tqlayout57</cstring> </property> <grid> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLineEdit" row="1" column="1"> + <widget class="TQLineEdit" row="1" column="1"> <property name="name"> <cstring>leDepartment</cstring> </property> </widget> - <widget class="QLineEdit" row="0" column="1"> + <widget class="TQLineEdit" row="0" column="1"> <property name="name"> <cstring>leCompany</cstring> </property> @@ -849,14 +849,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> </size> </property> </spacer> - <widget class="QLabel" row="2" column="0"> + <widget class="TQLabel" row="2" column="0"> <property name="name"> <cstring>lblPosition</cstring> </property> @@ -864,17 +864,17 @@ <string>Position:</string> </property> </widget> - <widget class="QLineEdit" row="2" column="1"> + <widget class="TQLineEdit" row="2" column="1"> <property name="name"> <cstring>lePosition</cstring> </property> </widget> - <widget class="QLineEdit" row="3" column="1"> + <widget class="TQLineEdit" row="3" column="1"> <property name="name"> <cstring>leRole</cstring> </property> </widget> - <widget class="QLabel" row="3" column="0"> + <widget class="TQLabel" row="3" column="0"> <property name="name"> <cstring>lblRole</cstring> </property> @@ -882,7 +882,7 @@ <string>Role:</string> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>lblDepartment</cstring> </property> @@ -890,7 +890,7 @@ <string>Department:</string> </property> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>lblCompany</cstring> </property> @@ -902,7 +902,7 @@ </widget> </grid> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>tab</cstring> </property> @@ -913,9 +913,9 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget" row="0" column="0"> + <widget class="TQLayoutWidget" row="0" column="0"> <property name="name"> - <cstring>layout59</cstring> + <cstring>tqlayout59</cstring> </property> <grid> <property name="name"> @@ -931,24 +931,24 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> </size> </property> </spacer> - <widget class="QLineEdit" row="2" column="1"> + <widget class="TQLineEdit" row="2" column="1"> <property name="name"> <cstring>lePhoneFax</cstring> </property> </widget> - <widget class="QLineEdit" row="3" column="1"> + <widget class="TQLineEdit" row="3" column="1"> <property name="name"> <cstring>lePhoneCell</cstring> </property> </widget> - <widget class="QLabel" row="2" column="0"> + <widget class="TQLabel" row="2" column="0"> <property name="name"> <cstring>lblPhoneFax</cstring> </property> @@ -956,12 +956,12 @@ <string>Fax:</string> </property> </widget> - <widget class="QLineEdit" row="0" column="1"> + <widget class="TQLineEdit" row="0" column="1"> <property name="name"> <cstring>lePhoneHome</cstring> </property> </widget> - <widget class="QLabel" row="3" column="0"> + <widget class="TQLabel" row="3" column="0"> <property name="name"> <cstring>lblPhoneCell</cstring> </property> @@ -969,12 +969,12 @@ <string>Cell:</string> </property> </widget> - <widget class="QLineEdit" row="1" column="1"> + <widget class="TQLineEdit" row="1" column="1"> <property name="name"> <cstring>lePhoneWork</cstring> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>lblPhoneWork</cstring> </property> @@ -982,7 +982,7 @@ <string>Work:</string> </property> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>lblPhoneHome</cstring> </property> @@ -994,7 +994,7 @@ </widget> </grid> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>tab</cstring> </property> @@ -1005,7 +1005,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QTextEdit" row="0" column="0"> + <widget class="TQTextEdit" row="0" column="0"> <property name="name"> <cstring>teAbout</cstring> </property> @@ -1013,9 +1013,9 @@ </grid> </widget> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> - <cstring>lblStatus</cstring> + <cstring>lbltqStatus</cstring> </property> <property name="text"> <string></string> @@ -1055,7 +1055,7 @@ <tabstop>lePhoneCell</tabstop> <tabstop>teAbout</tabstop> </tabstops> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kurllabel.h</includehint> <includehint>kurllabel.h</includehint> diff --git a/kopete/protocols/jabber/ui/jabberaddcontactpage.cpp b/kopete/protocols/jabber/ui/jabberaddcontactpage.cpp index 076b92b8..90f4f1e0 100644 --- a/kopete/protocols/jabber/ui/jabberaddcontactpage.cpp +++ b/kopete/protocols/jabber/ui/jabberaddcontactpage.cpp @@ -35,7 +35,7 @@ #include "jabberclient.h" #include "xmpp_tasks.h" -JabberAddContactPage::JabberAddContactPage (Kopete::Account * owner, TQWidget * parent, const char *name):AddContactPage (parent, name) +JabberAddContactPage::JabberAddContactPage (Kopete::Account * owner, TQWidget * tqparent, const char *name):AddContactPage (tqparent, name) { (new TQVBoxLayout (this))->setAutoAdd (true); @@ -76,7 +76,7 @@ bool JabberAddContactPage::validateData () } -bool JabberAddContactPage::apply ( Kopete::Account *account, Kopete::MetaContact *parentContact ) +bool JabberAddContactPage::apply ( Kopete::Account *account, Kopete::MetaContact *tqparentContact ) { if( canadd && validateData () ) @@ -90,25 +90,25 @@ bool JabberAddContactPage::apply ( Kopete::Account *account, Kopete::MetaContact { 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 ); + new JabberAddContactPage_there_is_no_possibility_to_add_assync_WORKAROUND( transport , tqparentContact , gatewayTask ); TQObject::connect (gatewayTask, TQT_SIGNAL (finished ()), workaround, TQT_SLOT (slotJidReceived())); gatewayTask->set ( transport->myself()->contactId() , contactId ); gatewayTask->go ( true ); return true; } - TQString displayName = parentContact->displayName (); + TQString displayName = tqparentContact->displayName (); /* if ( displayName.isEmpty () ) displayName = contactId; */ // collect all group names TQStringList groupNames; - Kopete::GroupList groupList = parentContact->groups(); + Kopete::GroupList groupList = tqparentContact->groups(); for(Kopete::Group *group = groupList.first(); group; group = groupList.next()) groupNames += group->displayName(); - if ( jaccount->addContact ( contactId, parentContact, Kopete::Account::ChangeKABC ) ) + if ( jaccount->addContact ( contactId, tqparentContact, Kopete::Account::ChangeKABC ) ) { XMPP::RosterItem item; XMPP::Jid jid ( contactId ); @@ -167,25 +167,25 @@ void JabberAddContactPage_there_is_no_possibility_to_add_assync_WORKAROUND::slot TQString contactId=task->prompt(); - Kopete::MetaContact* parentContact=metacontact; + Kopete::MetaContact* tqparentContact=metacontact; JabberAccount *jaccount=transport->account();; /*\ * this is a copy of the end of JabberAddContactPage::apply \*/ - TQString displayName = parentContact->displayName (); + TQString displayName = tqparentContact->displayName (); /* if ( displayName.isEmpty () ) displayName = contactId; */ // collect all group names TQStringList groupNames; - Kopete::GroupList groupList = parentContact->groups(); + Kopete::GroupList groupList = tqparentContact->groups(); for(Kopete::Group *group = groupList.first(); group; group = groupList.next()) groupNames += group->displayName(); - if ( jaccount->addContact ( contactId, parentContact, Kopete::Account::ChangeKABC ) ) + if ( jaccount->addContact ( contactId, tqparentContact, Kopete::Account::ChangeKABC ) ) { XMPP::RosterItem item; XMPP::Jid jid ( contactId ); diff --git a/kopete/protocols/jabber/ui/jabberaddcontactpage.h b/kopete/protocols/jabber/ui/jabberaddcontactpage.h index 09cdaae1..bb4e0271 100644 --- a/kopete/protocols/jabber/ui/jabberaddcontactpage.h +++ b/kopete/protocols/jabber/ui/jabberaddcontactpage.h @@ -32,9 +32,10 @@ class TQLabel; class JabberAddContactPage:public AddContactPage { Q_OBJECT + TQ_OBJECT public: - JabberAddContactPage (Kopete::Account * owner, TQWidget * parent = 0, const char *name = 0); + JabberAddContactPage (Kopete::Account * owner, TQWidget * tqparent = 0, const char *name = 0); ~JabberAddContactPage (); virtual bool validateData (); virtual bool apply (Kopete::Account *, Kopete::MetaContact *); @@ -52,10 +53,11 @@ class JabberTransport; * @author Olivier Goffart * this class is just there to workaround the fact that it's not possible to add contact assync with Kopete::AddContactPage::apply */ -class JabberAddContactPage_there_is_no_possibility_to_add_assync_WORKAROUND : public QObject +class JabberAddContactPage_there_is_no_possibility_to_add_assync_WORKAROUND : public TQObject { Q_OBJECT + TQ_OBJECT public: - JabberAddContactPage_there_is_no_possibility_to_add_assync_WORKAROUND( JabberTransport * , Kopete::MetaContact *mc, TQObject *parent); + JabberAddContactPage_there_is_no_possibility_to_add_assync_WORKAROUND( JabberTransport * , Kopete::MetaContact *mc, TQObject *tqparent); Kopete::MetaContact *metacontact; JabberTransport *transport; public slots: diff --git a/kopete/protocols/jabber/ui/jabberchooseserver.cpp b/kopete/protocols/jabber/ui/jabberchooseserver.cpp index 63339158..b5fef8f3 100644 --- a/kopete/protocols/jabber/ui/jabberchooseserver.cpp +++ b/kopete/protocols/jabber/ui/jabberchooseserver.cpp @@ -30,18 +30,18 @@ #include "dlgjabberchooseserver.h" #include "jabberregisteraccount.h" -JabberChooseServer::JabberChooseServer ( JabberRegisterAccount *parent, const char *name ) - : KDialogBase ( parent, name, true, i18n("Choose Jabber Server"), +JabberChooseServer::JabberChooseServer ( JabberRegisterAccount *tqparent, const char *name ) + : KDialogBase ( tqparent, name, true, i18n("Choose Jabber Server"), KDialogBase::Ok | KDialogBase::Cancel ) { - mParentWidget = parent; + mParentWidget = tqparent; mSelectedRow = -1; mMainWidget = new DlgJabberChooseServer ( this ); setMainWidget ( mMainWidget ); - mMainWidget->lblStatus->setText ( i18n ( "Retrieving server list...") ); + mMainWidget->lbltqStatus->setText ( i18n ( "Retrieving server list...") ); mMainWidget->listServers->setLeftMargin ( 0 ); @@ -108,7 +108,7 @@ void JabberChooseServer::slotTransferResult ( KIO::Job *job ) if ( job->error () || mTransferJob->isErrorPage () ) { - mMainWidget->lblStatus->setText ( i18n ( "Could not retrieve server list." ) ); + mMainWidget->lbltqStatus->setText ( i18n ( "Could not retrieve server list." ) ); return; } else @@ -116,14 +116,14 @@ void JabberChooseServer::slotTransferResult ( KIO::Job *job ) kdDebug ( JABBER_DEBUG_GLOBAL ) << k_funcinfo << "Received server list ok!" << endl; // clear status message - mMainWidget->lblStatus->setText ( "" ); + mMainWidget->lbltqStatus->setText ( "" ); // parse XML list TQDomDocument doc; if ( !doc.setContent ( xmlServerList ) ) { - mMainWidget->lblStatus->setText ( i18n ( "Could not parse the server list.") ); + mMainWidget->lbltqStatus->setText ( i18n ( "Could not parse the server list.") ); return; } diff --git a/kopete/protocols/jabber/ui/jabberchooseserver.h b/kopete/protocols/jabber/ui/jabberchooseserver.h index cc64040b..bd74575d 100644 --- a/kopete/protocols/jabber/ui/jabberchooseserver.h +++ b/kopete/protocols/jabber/ui/jabberchooseserver.h @@ -39,9 +39,10 @@ class JabberChooseServer : public KDialogBase { Q_OBJECT + TQ_OBJECT public: - JabberChooseServer ( JabberRegisterAccount *parent = 0, const char *name = 0); + JabberChooseServer ( JabberRegisterAccount *tqparent = 0, const char *name = 0); ~JabberChooseServer(); diff --git a/kopete/protocols/jabber/ui/jabbereditaccountwidget.cpp b/kopete/protocols/jabber/ui/jabbereditaccountwidget.cpp index 6c928ad6..9a769122 100644 --- a/kopete/protocols/jabber/ui/jabbereditaccountwidget.cpp +++ b/kopete/protocols/jabber/ui/jabbereditaccountwidget.cpp @@ -40,8 +40,8 @@ #include "jabberregisteraccount.h" #include "dlgjabberchangepassword.h" -JabberEditAccountWidget::JabberEditAccountWidget (JabberProtocol * proto, JabberAccount * ident, TQWidget * parent, const char *name) - : DlgJabberEditAccountWidget (parent, name), KopeteEditAccountWidget (ident) +JabberEditAccountWidget::JabberEditAccountWidget (JabberProtocol * proto, JabberAccount * ident, TQWidget * tqparent, const char *name) + : DlgJabberEditAccountWidget (tqparent, name), KopeteEditAccountWidget (ident) { m_protocol = proto; @@ -88,15 +88,15 @@ void JabberEditAccountWidget::reopen () mPass->load (&account()->password ()); cbAutoConnect->setChecked (account()->excludeConnect()); - mResource->setText (account()->configGroup()->readEntry ("Resource", TQString::fromLatin1("Kopete"))); + mResource->setText (account()->configGroup()->readEntry ("Resource", TQString::tqfromLatin1("Kopete"))); mPriority->setValue (account()->configGroup()->readNumEntry ("Priority", 5)); - mServer->setText (account()->configGroup()->readEntry ("Server", TQString::null)); + mServer->setText (account()->configGroup()->readEntry ("Server", TQString())); cbUseSSL->setChecked (account()->configGroup()->readBoolEntry( "UseSSL", false)); mPort->setValue (account()->configGroup()->readNumEntry("Port", 5222)); - TQString auth = account()->configGroup()->readEntry("AuthType", TQString::null); + TQString auth = account()->configGroup()->readEntry("AuthType", TQString()); 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", TQString::null)); + leProxyJID->setText (account()->configGroup()->readEntry("ProxyJID", TQString())); // Privacy cbSendEvents->setChecked( account()->configGroup()->readBoolEntry("SendEvents", true) ); @@ -200,7 +200,7 @@ void JabberEditAccountWidget::writeConfig () bool JabberEditAccountWidget::validateData () { - if(!mID->text().contains('@')) + if(!mID->text().tqcontains('@')) { KMessageBox::sorry(this, i18n("The Jabber ID you have chosen is invalid. " "Please make sure it is in the form user@server.com, like an email address."), diff --git a/kopete/protocols/jabber/ui/jabbereditaccountwidget.h b/kopete/protocols/jabber/ui/jabbereditaccountwidget.h index e56dcbd2..e1ce2d30 100644 --- a/kopete/protocols/jabber/ui/jabbereditaccountwidget.h +++ b/kopete/protocols/jabber/ui/jabbereditaccountwidget.h @@ -35,9 +35,10 @@ class JabberEditAccountWidget:public DlgJabberEditAccountWidget, public KopeteEd { Q_OBJECT + TQ_OBJECT public: - JabberEditAccountWidget (JabberProtocol * proto, JabberAccount *, TQWidget * parent = 0, const char *name = 0); + JabberEditAccountWidget (JabberProtocol * proto, JabberAccount *, TQWidget * tqparent = 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 bb20611b..dee7534a 100644 --- a/kopete/protocols/jabber/ui/jabberregisteraccount.cpp +++ b/kopete/protocols/jabber/ui/jabberregisteraccount.cpp @@ -47,18 +47,18 @@ #include "jabberchooseserver.h" #include "dlgjabberregisteraccount.h" -JabberRegisterAccount::JabberRegisterAccount ( JabberEditAccountWidget *parent, const char *name ) - : KDialogBase ( parent, name, true, i18n("Register New Jabber Account"), +JabberRegisterAccount::JabberRegisterAccount ( JabberEditAccountWidget *tqparent, const char *name ) + : KDialogBase ( tqparent, name, true, i18n("Register New Jabber Account"), KDialogBase::Ok | KDialogBase::Cancel ) { - mParentWidget = parent; + mParentWidget = tqparent; // setup main dialog mMainWidget = new DlgJabberRegisterAccount ( this ); setMainWidget ( mMainWidget ); - // replace "Ok" button with a "Register" button + // tqreplace "Ok" button with a "Register" button KGuiItem registerButton = KStdGuiItem::ok(); registerButton.setText ( i18n ( "Register" ) ); setButtonOK ( registerButton ); @@ -78,12 +78,12 @@ JabberRegisterAccount::JabberRegisterAccount ( JabberEditAccountWidget *parent, mSuccess = false; // get all settings from the main dialog - mMainWidget->leServer->setText ( parent->mServer->text () ); - mMainWidget->leJID->setText ( parent->mID->text () ); - mMainWidget->lePassword->setText ( parent->mPass->password () ); - // mMainWidget->lePasswordVerify->setText ( parent->mPass->password () ); //BUG 114631 - mMainWidget->sbPort->setValue ( parent->mPort->value () ); - mMainWidget->cbUseSSL->setChecked ( parent->cbUseSSL->isChecked () ); + mMainWidget->leServer->setText ( tqparent->mServer->text () ); + mMainWidget->leJID->setText ( tqparent->mID->text () ); + mMainWidget->lePassword->setText ( tqparent->mPass->password () ); + // mMainWidget->lePasswordVerify->setText ( tqparent->mPass->password () ); //BUG 114631 + mMainWidget->sbPort->setValue ( tqparent->mPort->value () ); + mMainWidget->cbUseSSL->setChecked ( tqparent->cbUseSSL->isChecked () ); // connect buttons to slots, ok is already connected by default connect ( this, TQT_SIGNAL ( cancelClicked () ), this, TQT_SLOT ( slotDeleteDialog () ) ); @@ -146,8 +146,8 @@ void JabberRegisterAccount::validateData () } if ( valid && - ( TQString::fromLatin1 ( mMainWidget->lePassword->password () ).isEmpty () || - TQString::fromLatin1 ( mMainWidget->lePasswordVerify->password () ).isEmpty () ) ) + ( TQString::tqfromLatin1 ( mMainWidget->lePassword->password () ).isEmpty () || + TQString::tqfromLatin1 ( 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 && - ( TQString::fromLatin1 ( mMainWidget->lePassword->password () ) != - TQString::fromLatin1 ( mMainWidget->lePasswordVerify->password () ) ) ) + ( TQString::tqfromLatin1 ( mMainWidget->lePassword->password () ) != + TQString::tqfromLatin1 ( mMainWidget->lePasswordVerify->password () ) ) ) { mMainWidget->lblStatusMessage->setText ( i18n ( "Password entries do not match." ) ); valid = false; @@ -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 () ), TQString::null, false ) ) + switch ( jabberClient->connect ( XMPP::Jid ( mMainWidget->leJID->text () ), TQString(), false ) ) { case JabberClient::NoTLS: // no SSL support, at the connecting stage this means the problem is client-side @@ -341,7 +341,7 @@ void JabberRegisterAccount::slotRegisterUserDone () { mMainWidget->lblStatusMessage->setText ( i18n ( "Registration successful." ) ); - // save settings to parent + // save settings to tqparent mParentWidget->mServer->setText ( mMainWidget->leServer->text () ); mParentWidget->mID->setText ( mMainWidget->leJID->text () ); mParentWidget->mPass->setPassword ( mMainWidget->lePassword->password () ); diff --git a/kopete/protocols/jabber/ui/jabberregisteraccount.h b/kopete/protocols/jabber/ui/jabberregisteraccount.h index 727d61fb..5d8b9b5f 100644 --- a/kopete/protocols/jabber/ui/jabberregisteraccount.h +++ b/kopete/protocols/jabber/ui/jabberregisteraccount.h @@ -36,9 +36,10 @@ class JabberRegisterAccount : public KDialogBase { Q_OBJECT + TQ_OBJECT public: - JabberRegisterAccount ( JabberEditAccountWidget *parent = 0, const char *name = 0 ); + JabberRegisterAccount ( JabberEditAccountWidget *tqparent = 0, const char *name = 0 ); ~JabberRegisterAccount (); |