diff options
Diffstat (limited to 'kopete/protocols/jabber/ui')
-rw-r--r-- | kopete/protocols/jabber/ui/dlgaddcontact.ui | 2 | ||||
-rw-r--r-- | kopete/protocols/jabber/ui/dlgbrowse.ui | 2 | ||||
-rw-r--r-- | kopete/protocols/jabber/ui/dlgchangepassword.ui | 2 | ||||
-rw-r--r-- | kopete/protocols/jabber/ui/dlgchatjoin.ui | 2 | ||||
-rw-r--r-- | kopete/protocols/jabber/ui/dlgchatroomslist.ui | 2 | ||||
-rw-r--r-- | kopete/protocols/jabber/ui/dlgjabberchooseserver.ui | 2 | ||||
-rw-r--r-- | kopete/protocols/jabber/ui/dlgjabbereditaccountwidget.ui | 2 | ||||
-rw-r--r-- | kopete/protocols/jabber/ui/dlgjabberregisteraccount.ui | 4 | ||||
-rw-r--r-- | kopete/protocols/jabber/ui/dlgregister.ui | 2 | ||||
-rw-r--r-- | kopete/protocols/jabber/ui/dlgsendraw.ui | 2 | ||||
-rw-r--r-- | kopete/protocols/jabber/ui/dlgservices.ui | 2 | ||||
-rw-r--r-- | kopete/protocols/jabber/ui/dlgvcard.ui | 2 | ||||
-rw-r--r-- | kopete/protocols/jabber/ui/jabberaddcontactpage.cpp | 18 |
13 files changed, 22 insertions, 22 deletions
diff --git a/kopete/protocols/jabber/ui/dlgaddcontact.ui b/kopete/protocols/jabber/ui/dlgaddcontact.ui index f39e81ef..c0b3d1cc 100644 --- a/kopete/protocols/jabber/ui/dlgaddcontact.ui +++ b/kopete/protocols/jabber/ui/dlgaddcontact.ui @@ -98,7 +98,7 @@ </widget> <customwidgets> </customwidgets> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults 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 1b73dd95..cb0f1cc2 100644 --- a/kopete/protocols/jabber/ui/dlgbrowse.ui +++ b/kopete/protocols/jabber/ui/dlgbrowse.ui @@ -193,7 +193,7 @@ <slot>close()</slot> </connection> </connections> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults 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 18c0b439..29ae6d33 100644 --- a/kopete/protocols/jabber/ui/dlgchangepassword.ui +++ b/kopete/protocols/jabber/ui/dlgchangepassword.ui @@ -79,7 +79,7 @@ and then your new password twice.</string> </widget> <customwidgets> </customwidgets> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults 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 db1bbfcb..aa124cc2 100644 --- a/kopete/protocols/jabber/ui/dlgchatjoin.ui +++ b/kopete/protocols/jabber/ui/dlgchatjoin.ui @@ -126,5 +126,5 @@ <slot>slotBowse()</slot> <slot>slotJoin()</slot> </Q_SLOTS> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kopete/protocols/jabber/ui/dlgchatroomslist.ui b/kopete/protocols/jabber/ui/dlgchatroomslist.ui index 0c5e07be..5feefbb7 100644 --- a/kopete/protocols/jabber/ui/dlgchatroomslist.ui +++ b/kopete/protocols/jabber/ui/dlgchatroomslist.ui @@ -178,7 +178,7 @@ <slot>slotClick(int row, int col, int button, const QPoint& mousePos)</slot> <slot>slotDoubleClick(int row, int col, int button, const QPoint& mousePos)</slot> </Q_SLOTS> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kdialog.h</includehint> </includehints> diff --git a/kopete/protocols/jabber/ui/dlgjabberchooseserver.ui b/kopete/protocols/jabber/ui/dlgjabberchooseserver.ui index 51943ee4..a1b732db 100644 --- a/kopete/protocols/jabber/ui/dlgjabberchooseserver.ui +++ b/kopete/protocols/jabber/ui/dlgjabberchooseserver.ui @@ -100,7 +100,7 @@ <data format="XPM.GZ" length="2846">789c75d54953dd381007f03b9fe255fa969aea585ea59a9a039084256c0f0810a6e6204b32fbfe58a7e6bb8fddff3609c90ce6f27b6acbea764bfef07e72b0b53e79ff61ee6ee6672761128efdede47dbcbfb878fef3af3ffe9e7b67eac9f05fb849feeeb7b977d3d9244c36ae2ed300ef7b50664cac337127b626cf9db885f3a22e075325762694324edfc4de74954c4e6b705ed595dc4fe2ceb842c6fdd16093e5be6e24be1e9ce7856f647e7f227685ad647db4230e65d178194fe26eb8c43cb8903f89df1e5d4a3c1d8a7d9559acff40dccf57c1e5e0d20c97b811fb2ad928f31f8b43e59b56c6dde0aa1d2ef1ba3895b194f5901d5cd7755307b93f8add70c9f87470636a5be2fe7d71d5b416f905b1b399433db706dbcc3695d4930ab1192ef1e660d7b8429fbf216e6dd2f9b3c1a18d59443df7c4a9772dcec5dd70897707f7a355c2f33f8a8bc66678fe17b5cb50bf4f62eb7223fd430fe2d0a40cf7afc2ce1658cff9e0646c9521fe515cfad2209f457555607ee99f543bafcf3f1337aecbe4fdd005eccb4ceacd976217cacccaf8bdd8b719fa830fd57926f5e62b38984ceac12fea5ac7a5bf53eb23c689e156f3e5353834fafc67b5c3faf862b491fcf949dd66526f967aa61082ce77a04e46eac7f23e536c8b1ce3ab70e80cf291fe4ba96f70a91fefc33137c8675edcb555867807c7d220bf95d139eedf53d746fa95b3d1fafc85c15dd666b9bc0fb670b4c88fbcba3f2164fcebab518f1bb1f10eef9f23dc6abf7003c760a45f7977748efbafc579db68fc231cfb05cbf34fd429c7fb3f1d5da0decba3b15fb85677c89fe4bceb8a7e39c8bf529b1cfd78acce612e5f8d7c315eb699e697d441dfcf0e9c8c9e4f97ea02f5a4237595cbf9c84be2fe80a9b17fa3ba413da8535bac97d2abf17ee53ce9ea100af8014ed6211f1d4faec27e9c8d463d19eb69fa7a231f525b7501275fa3bfcd683d9feed46d055fa9638e7c3e8fd6f3fbf6d518bf51a702cf43beb61dfbe71c4efd8692f8157572a8dff6abd10fd7ea0ef3d1c2e806cf43bfdace75a817d6e3a2b7e8974db8df7118bf57772df617fadf875062ff213fdf7738ce8f2775897a30fab58d49e7cfe1ae6ad11ff3eadae23c5d52fb12df4fa3ee2fb91ffd1b626cb05fb6e0ae8ea8d799ba89e8d799daeaf7e159ed1accff32da62bfcbf7a08b7dc658ffa2da27d47baa6e615a56077d1fe887d4cf88f59caa6327ef87e57bd20d7fb2fee90c17137b6e3970e4c41d1f8dbf7f8fe1633ee1533ee373bee04bbee26b3e7e1bc3377ccb773ce37b7ee0477ee2677ee179be7913b3c08bfc913ff1675ee2655ee155fec26bbcfe26668337798ba7bccd3bbccb5f798ff7f980bfbd8939e48c0de75c70c915d7dcb06547fc630c11796a2950a4441d1dd1319dd0299dbd8939a70bbaecc7afe89a6ee896ee6846f774fe36777aa0c73ee2899ee985e6698116e9e1e7faf4511fe9137da6255aa6155aa52fbfd6b08f59a375daa04ddaa2296d8fbffe14b343bbf495f6689f0ee8dbffc41c524686722aa8a4ea7f626a6ac892f3ecc9fbff8e99ce7ceb838f3ef9eefb6fbfc4787fe48ffdc98fb3f431fffc3ef72fd6519eaa</data> </image> </images> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults 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 085f0b91..e3599536 100644 --- a/kopete/protocols/jabber/ui/dlgjabbereditaccountwidget.ui +++ b/kopete/protocols/jabber/ui/dlgjabbereditaccountwidget.ui @@ -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> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kopetepasswordwidget.h</includehint> </includehints> diff --git a/kopete/protocols/jabber/ui/dlgjabberregisteraccount.ui b/kopete/protocols/jabber/ui/dlgjabberregisteraccount.ui index 96c91ec1..32749c18 100644 --- a/kopete/protocols/jabber/ui/dlgjabberregisteraccount.ui +++ b/kopete/protocols/jabber/ui/dlgjabberregisteraccount.ui @@ -55,7 +55,7 @@ </widget> <widget class="TQLayoutWidget" row="0" column="2"> <property name="name"> - <cstring>tqlayoutServerEntry</cstring> + <cstring>layoutServerEntry</cstring> </property> <hbox> <property name="name"> @@ -309,7 +309,7 @@ <tabstop>lePassword</tabstop> <tabstop>lePasswordVerify</tabstop> </tabstops> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kpushbutton.h</includehint> <includehint>knuminput.h</includehint> diff --git a/kopete/protocols/jabber/ui/dlgregister.ui b/kopete/protocols/jabber/ui/dlgregister.ui index 76c8cc84..8a883b65 100644 --- a/kopete/protocols/jabber/ui/dlgregister.ui +++ b/kopete/protocols/jabber/ui/dlgregister.ui @@ -158,5 +158,5 @@ <slot>reject()</slot> </connection> </connections> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kopete/protocols/jabber/ui/dlgsendraw.ui b/kopete/protocols/jabber/ui/dlgsendraw.ui index 20c01e7c..9d56f7bc 100644 --- a/kopete/protocols/jabber/ui/dlgsendraw.ui +++ b/kopete/protocols/jabber/ui/dlgsendraw.ui @@ -155,5 +155,5 @@ </widget> </vbox> </widget> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kopete/protocols/jabber/ui/dlgservices.ui b/kopete/protocols/jabber/ui/dlgservices.ui index 03022c61..fda7bf4a 100644 --- a/kopete/protocols/jabber/ui/dlgservices.ui +++ b/kopete/protocols/jabber/ui/dlgservices.ui @@ -195,5 +195,5 @@ <slot>close()</slot> </connection> </connections> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kopete/protocols/jabber/ui/dlgvcard.ui b/kopete/protocols/jabber/ui/dlgvcard.ui index 857a2890..8a4aa790 100644 --- a/kopete/protocols/jabber/ui/dlgvcard.ui +++ b/kopete/protocols/jabber/ui/dlgvcard.ui @@ -1055,7 +1055,7 @@ <tabstop>lePhoneCell</tabstop> <tabstop>teAbout</tabstop> </tabstops> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults 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 90f4f1e0..0f86a79b 100644 --- a/kopete/protocols/jabber/ui/jabberaddcontactpage.cpp +++ b/kopete/protocols/jabber/ui/jabberaddcontactpage.cpp @@ -76,7 +76,7 @@ bool JabberAddContactPage::validateData () } -bool JabberAddContactPage::apply ( Kopete::Account *account, Kopete::MetaContact *tqparentContact ) +bool JabberAddContactPage::apply ( Kopete::Account *account, Kopete::MetaContact *parentContact ) { 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 , tqparentContact , gatewayTask ); + new JabberAddContactPage_there_is_no_possibility_to_add_assync_WORKAROUND( transport , parentContact , gatewayTask ); TQObject::connect (gatewayTask, TQT_SIGNAL (finished ()), workaround, TQT_SLOT (slotJidReceived())); gatewayTask->set ( transport->myself()->contactId() , contactId ); gatewayTask->go ( true ); return true; } - TQString displayName = tqparentContact->displayName (); + TQString displayName = parentContact->displayName (); /* if ( displayName.isEmpty () ) displayName = contactId; */ // collect all group names TQStringList groupNames; - Kopete::GroupList groupList = tqparentContact->groups(); + Kopete::GroupList groupList = parentContact->groups(); for(Kopete::Group *group = groupList.first(); group; group = groupList.next()) groupNames += group->displayName(); - if ( jaccount->addContact ( contactId, tqparentContact, Kopete::Account::ChangeKABC ) ) + if ( jaccount->addContact ( contactId, parentContact, 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* tqparentContact=metacontact; + Kopete::MetaContact* parentContact=metacontact; JabberAccount *jaccount=transport->account();; /*\ * this is a copy of the end of JabberAddContactPage::apply \*/ - TQString displayName = tqparentContact->displayName (); + TQString displayName = parentContact->displayName (); /* if ( displayName.isEmpty () ) displayName = contactId; */ // collect all group names TQStringList groupNames; - Kopete::GroupList groupList = tqparentContact->groups(); + Kopete::GroupList groupList = parentContact->groups(); for(Kopete::Group *group = groupList.first(); group; group = groupList.next()) groupNames += group->displayName(); - if ( jaccount->addContact ( contactId, tqparentContact, Kopete::Account::ChangeKABC ) ) + if ( jaccount->addContact ( contactId, parentContact, Kopete::Account::ChangeKABC ) ) { XMPP::RosterItem item; XMPP::Jid jid ( contactId ); |