From 83677e35509b4dafac63b76995652bdf3b49f209 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 16 Dec 2011 09:59:34 -0600 Subject: Revert "Rename a number of old tq methods that are no longer tq specific" This reverts commit 808e453c56036211f57482ed847d54aca01bba68. --- kopete/protocols/jabber/ui/dlgaddcontact.ui | 8 ++-- kopete/protocols/jabber/ui/dlgbrowse.ui | 4 +- kopete/protocols/jabber/ui/dlgchangepassword.ui | 4 +- kopete/protocols/jabber/ui/dlgchatjoin.ui | 4 +- kopete/protocols/jabber/ui/dlgchatroomslist.ui | 6 +-- kopete/protocols/jabber/ui/dlgjabberbrowse.cpp | 2 +- .../protocols/jabber/ui/dlgjabberchooseserver.ui | 4 +- .../jabber/ui/dlgjabbereditaccountwidget.ui | 42 +++++++++---------- kopete/protocols/jabber/ui/dlgjabberregister.cpp | 4 +- kopete/protocols/jabber/ui/dlgjabberregister.h | 2 +- .../jabber/ui/dlgjabberregisteraccount.ui | 28 ++++++------- kopete/protocols/jabber/ui/dlgjabbersendraw.cpp | 2 +- kopete/protocols/jabber/ui/dlgjabberservices.cpp | 2 +- kopete/protocols/jabber/ui/dlgjabbervcard.cpp | 16 ++++---- kopete/protocols/jabber/ui/dlgregister.ui | 4 +- kopete/protocols/jabber/ui/dlgsendraw.ui | 10 ++--- kopete/protocols/jabber/ui/dlgservices.ui | 6 +-- kopete/protocols/jabber/ui/dlgvcard.ui | 48 +++++++++++----------- .../protocols/jabber/ui/jabberaddcontactpage.cpp | 2 +- kopete/protocols/jabber/ui/jabberchooseserver.cpp | 8 ++-- .../jabber/ui/jabbereditaccountwidget.cpp | 2 +- .../protocols/jabber/ui/jabberregisteraccount.cpp | 8 ++-- 22 files changed, 108 insertions(+), 108 deletions(-) (limited to 'kopete/protocols/jabber/ui') diff --git a/kopete/protocols/jabber/ui/dlgaddcontact.ui b/kopete/protocols/jabber/ui/dlgaddcontact.ui index 30a609a0..c0b3d1cc 100644 --- a/kopete/protocols/jabber/ui/dlgaddcontact.ui +++ b/kopete/protocols/jabber/ui/dlgaddcontact.ui @@ -27,7 +27,7 @@ - layout24 + tqlayout24 @@ -40,7 +40,7 @@ &Jabber ID: - + AlignTop @@ -73,7 +73,7 @@ <i>(for example: joe@jabber.org)</i> - + WordBreak|AlignVCenter|AlignRight @@ -87,7 +87,7 @@ Expanding - + 20 190 diff --git a/kopete/protocols/jabber/ui/dlgbrowse.ui b/kopete/protocols/jabber/ui/dlgbrowse.ui index 66cfcfc5..cb0f1cc2 100644 --- a/kopete/protocols/jabber/ui/dlgbrowse.ui +++ b/kopete/protocols/jabber/ui/dlgbrowse.ui @@ -47,7 +47,7 @@ Please wait while retrieving search form... - + WordBreak|AlignVCenter @@ -128,7 +128,7 @@ Expanding - + 51 21 diff --git a/kopete/protocols/jabber/ui/dlgchangepassword.ui b/kopete/protocols/jabber/ui/dlgchangepassword.ui index bed6e8d4..29ae6d33 100644 --- a/kopete/protocols/jabber/ui/dlgchangepassword.ui +++ b/kopete/protocols/jabber/ui/dlgchangepassword.ui @@ -57,7 +57,7 @@ - lblStatus + lbltqStatus @@ -71,7 +71,7 @@ Please enter your current password first and then your new password twice. - + AlignCenter diff --git a/kopete/protocols/jabber/ui/dlgchatjoin.ui b/kopete/protocols/jabber/ui/dlgchatjoin.ui index f5f40392..aa124cc2 100644 --- a/kopete/protocols/jabber/ui/dlgchatjoin.ui +++ b/kopete/protocols/jabber/ui/dlgchatjoin.ui @@ -57,7 +57,7 @@ - layout3 + tqlayout3 @@ -73,7 +73,7 @@ Expanding - + 41 20 diff --git a/kopete/protocols/jabber/ui/dlgchatroomslist.ui b/kopete/protocols/jabber/ui/dlgchatroomslist.ui index b158db62..31f5b201 100644 --- a/kopete/protocols/jabber/ui/dlgchatroomslist.ui +++ b/kopete/protocols/jabber/ui/dlgchatroomslist.ui @@ -21,7 +21,7 @@ - layout4 + tqlayout4 @@ -97,7 +97,7 @@ - layout5 + tqlayout5 @@ -113,7 +113,7 @@ Expanding - + 121 21 diff --git a/kopete/protocols/jabber/ui/dlgjabberbrowse.cpp b/kopete/protocols/jabber/ui/dlgjabberbrowse.cpp index be558388..d130fa97 100644 --- a/kopete/protocols/jabber/ui/dlgjabberbrowse.cpp +++ b/kopete/protocols/jabber/ui/dlgjabberbrowse.cpp @@ -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/dlgjabberchooseserver.ui b/kopete/protocols/jabber/ui/dlgjabberchooseserver.ui index ad52240e..a1b732db 100644 --- a/kopete/protocols/jabber/ui/dlgjabberchooseserver.ui +++ b/kopete/protocols/jabber/ui/dlgjabberchooseserver.ui @@ -12,7 +12,7 @@ 343 - + 300 300 @@ -87,7 +87,7 @@ - lblStatus + lbltqStatus diff --git a/kopete/protocols/jabber/ui/dlgjabbereditaccountwidget.ui b/kopete/protocols/jabber/ui/dlgjabbereditaccountwidget.ui index e0a14f1c..e3599536 100644 --- a/kopete/protocols/jabber/ui/dlgjabbereditaccountwidget.ui +++ b/kopete/protocols/jabber/ui/dlgjabbereditaccountwidget.ui @@ -57,7 +57,7 @@ - layout61 + tqlayout61 @@ -153,7 +153,7 @@ 0 - + 0 0 @@ -162,7 +162,7 @@ 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. - + WordBreak|AlignVCenter @@ -227,7 +227,7 @@ If you have an existing Jabber account and would like to change its password, you can use this button to enter a new password. - + WordBreak|AlignVCenter @@ -243,7 +243,7 @@ Maximum - + 20 16 @@ -312,7 +312,7 @@ - layout66 + tqlayout66 @@ -469,7 +469,7 @@ 0 - + 100 32767 @@ -495,7 +495,7 @@ Expanding - + 31 20 @@ -517,7 +517,7 @@ P&riority: - + AlignVCenter @@ -542,13 +542,13 @@ 0 - + 100 0 - + 100 32767 @@ -575,7 +575,7 @@ If two resources have the same priority, the messages will be sent to the one co Expanding - + 20 200 @@ -608,7 +608,7 @@ If two resources have the same priority, the messages will be sent to the one co - layout70 + tqlayout70 @@ -632,7 +632,7 @@ If two resources have the same priority, the messages will be sent to the one co - layout68 + tqlayout68 @@ -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> - + WordBreak|AlignVCenter @@ -707,7 +707,7 @@ If two resources have the same priority, the messages will be sent to the one co Expanding - + 20 241 @@ -748,7 +748,7 @@ If two resources have the same priority, the messages will be sent to the one co Expanding - + 40 20 @@ -798,7 +798,7 @@ If two resources have the same priority, the messages will be sent to the one co - layout10 + tqlayout10 @@ -814,7 +814,7 @@ If two resources have the same priority, the messages will be sent to the one co Fixed - + 30 20 @@ -823,7 +823,7 @@ If two resources have the same priority, the messages will be sent to the one co - layout9 + tqlayout9 @@ -907,7 +907,7 @@ If two resources have the same priority, the messages will be sent to the one co Expanding - + 21 110 diff --git a/kopete/protocols/jabber/ui/dlgjabberregister.cpp b/kopete/protocols/jabber/ui/dlgjabberregister.cpp index ff324085..8d1324ca 100644 --- a/kopete/protocols/jabber/ui/dlgjabberregister.cpp +++ b/kopete/protocols/jabber/ui/dlgjabberregister.cpp @@ -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(grpForm->layout())->insertWidget(1, translator); + static_cast(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 8fe905ce..bc0bfe44 100644 --- a/kopete/protocols/jabber/ui/dlgjabberregister.h +++ b/kopete/protocols/jabber/ui/dlgjabberregister.h @@ -20,7 +20,7 @@ #define DLGJABBERREGISTER_H #include -#include +#include #include #include diff --git a/kopete/protocols/jabber/ui/dlgjabberregisteraccount.ui b/kopete/protocols/jabber/ui/dlgjabberregisteraccount.ui index ea3d51c0..32749c18 100644 --- a/kopete/protocols/jabber/ui/dlgjabberregisteraccount.ui +++ b/kopete/protocols/jabber/ui/dlgjabberregisteraccount.ui @@ -12,7 +12,7 @@ 376 - + 300 350 @@ -40,13 +40,13 @@ pixPasswordVerify - + 16 16 - + 32767 32767 @@ -135,13 +135,13 @@ pixJID - + 16 16 - + 32767 32767 @@ -185,13 +185,13 @@ pixServer - + 16 16 - + 32767 32767 @@ -213,13 +213,13 @@ pixPassword - + 16 16 - + 32767 32767 @@ -247,7 +247,7 @@ - layout3 + tqlayout3 @@ -257,7 +257,7 @@ lblJIDInformation - + 0 100 @@ -266,7 +266,7 @@ - + WordBreak|AlignVCenter @@ -280,7 +280,7 @@ Expanding - + 20 16 @@ -294,7 +294,7 @@ - + AlignCenter diff --git a/kopete/protocols/jabber/ui/dlgjabbersendraw.cpp b/kopete/protocols/jabber/ui/dlgjabbersendraw.cpp index 97753bb2..4b9192dc 100644 --- a/kopete/protocols/jabber/ui/dlgjabbersendraw.cpp +++ b/kopete/protocols/jabber/ui/dlgjabbersendraw.cpp @@ -20,7 +20,7 @@ #include #include -#include +#include #include #include "jabberclient.h" diff --git a/kopete/protocols/jabber/ui/dlgjabberservices.cpp b/kopete/protocols/jabber/ui/dlgjabberservices.cpp index 1bd1310c..29b2b617 100644 --- a/kopete/protocols/jabber/ui/dlgjabberservices.cpp +++ b/kopete/protocols/jabber/ui/dlgjabberservices.cpp @@ -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/dlgjabbervcard.cpp b/kopete/protocols/jabber/ui/dlgjabbervcard.cpp index 425890af..2e81801d 100644 --- a/kopete/protocols/jabber/ui/dlgjabbervcard.cpp +++ b/kopete/protocols/jabber/ui/dlgjabbervcard.cpp @@ -23,7 +23,7 @@ #include "dlgjabbervcard.h" // TQt includes -#include +#include #include #include #include @@ -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 ); @@ -547,7 +547,7 @@ void dlgJabberVCard::slotClearPhoto() 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/dlgregister.ui b/kopete/protocols/jabber/ui/dlgregister.ui index 8ea5d423..8a883b65 100644 --- a/kopete/protocols/jabber/ui/dlgregister.ui +++ b/kopete/protocols/jabber/ui/dlgregister.ui @@ -78,7 +78,7 @@ Expanding - + 20 0 @@ -111,7 +111,7 @@ Expanding - + 20 20 diff --git a/kopete/protocols/jabber/ui/dlgsendraw.ui b/kopete/protocols/jabber/ui/dlgsendraw.ui index eaaf5aa6..9d56f7bc 100644 --- a/kopete/protocols/jabber/ui/dlgsendraw.ui +++ b/kopete/protocols/jabber/ui/dlgsendraw.ui @@ -21,7 +21,7 @@ - layout4 + tqlayout4 @@ -42,7 +42,7 @@ Type in the packet that should be sent to the server: - lblRealStatus + lblRealtqStatus @@ -63,7 +63,7 @@ - Availability Status + Availability tqStatus @@ -102,7 +102,7 @@ - layout3 + tqlayout3 @@ -134,7 +134,7 @@ Expanding - + 16 25 diff --git a/kopete/protocols/jabber/ui/dlgservices.ui b/kopete/protocols/jabber/ui/dlgservices.ui index da690a97..fda7bf4a 100644 --- a/kopete/protocols/jabber/ui/dlgservices.ui +++ b/kopete/protocols/jabber/ui/dlgservices.ui @@ -24,7 +24,7 @@ - layout2 + tqlayout2 @@ -112,7 +112,7 @@ - layout1 + tqlayout1 @@ -128,7 +128,7 @@ Expanding - + 111 21 diff --git a/kopete/protocols/jabber/ui/dlgvcard.ui b/kopete/protocols/jabber/ui/dlgvcard.ui index 6daa3a4e..8a4aa790 100644 --- a/kopete/protocols/jabber/ui/dlgvcard.ui +++ b/kopete/protocols/jabber/ui/dlgvcard.ui @@ -33,7 +33,7 @@ - layout13 + tqlayout13 @@ -64,7 +64,7 @@ - layout12 + tqlayout12 @@ -90,7 +90,7 @@ 0 - + 0 0 @@ -159,7 +159,7 @@ - layout14 + tqlayout14 @@ -190,7 +190,7 @@ - layout11 + tqlayout11 @@ -221,7 +221,7 @@ - layout10 + tqlayout10 @@ -255,7 +255,7 @@ - layout9 + tqlayout9 @@ -294,7 +294,7 @@ Expanding - + 20 20 @@ -311,7 +311,7 @@ Expanding - + 20 20 @@ -357,13 +357,13 @@ 0 - + 96 96 - + 96 96 @@ -386,7 +386,7 @@ Expanding - + 40 20 @@ -403,7 +403,7 @@ Expanding - + 40 20 @@ -427,7 +427,7 @@ - layout36 + tqlayout36 @@ -472,7 +472,7 @@ Expanding - + 20 16 @@ -586,7 +586,7 @@ Expanding - + 20 50 @@ -625,7 +625,7 @@ - layout37 + tqlayout37 @@ -641,7 +641,7 @@ Expanding - + 20 16 @@ -720,7 +720,7 @@ Expanding - + 20 30 @@ -823,7 +823,7 @@ - layout57 + tqlayout57 @@ -849,7 +849,7 @@ Expanding - + 20 20 @@ -915,7 +915,7 @@ - layout59 + tqlayout59 @@ -931,7 +931,7 @@ Expanding - + 20 20 @@ -1015,7 +1015,7 @@ - lblStatus + lbltqStatus diff --git a/kopete/protocols/jabber/ui/jabberaddcontactpage.cpp b/kopete/protocols/jabber/ui/jabberaddcontactpage.cpp index fea94d86..076b92b8 100644 --- a/kopete/protocols/jabber/ui/jabberaddcontactpage.cpp +++ b/kopete/protocols/jabber/ui/jabberaddcontactpage.cpp @@ -20,7 +20,7 @@ #include "jabberaddcontactpage.h" -#include +#include #include #include #include diff --git a/kopete/protocols/jabber/ui/jabberchooseserver.cpp b/kopete/protocols/jabber/ui/jabberchooseserver.cpp index 63339158..95272833 100644 --- a/kopete/protocols/jabber/ui/jabberchooseserver.cpp +++ b/kopete/protocols/jabber/ui/jabberchooseserver.cpp @@ -41,7 +41,7 @@ JabberChooseServer::JabberChooseServer ( JabberRegisterAccount *parent, const ch 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/jabbereditaccountwidget.cpp b/kopete/protocols/jabber/ui/jabbereditaccountwidget.cpp index b8a9c080..758322cf 100644 --- a/kopete/protocols/jabber/ui/jabbereditaccountwidget.cpp +++ b/kopete/protocols/jabber/ui/jabbereditaccountwidget.cpp @@ -88,7 +88,7 @@ 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())); diff --git a/kopete/protocols/jabber/ui/jabberregisteraccount.cpp b/kopete/protocols/jabber/ui/jabberregisteraccount.cpp index 631ec3f4..2641ed41 100644 --- a/kopete/protocols/jabber/ui/jabberregisteraccount.cpp +++ b/kopete/protocols/jabber/ui/jabberregisteraccount.cpp @@ -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; -- cgit v1.2.1