diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-12-15 15:49:40 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-12-15 15:49:40 -0600 |
| commit | 808e453c56036211f57482ed847d54aca01bba68 (patch) | |
| tree | 75515d5768dea10d4fbe4cd772e0a89c1c4b3aa9 /kopete/protocols/jabber/ui | |
| parent | cd9b9ed7fd0ac8a75106148254aa58e2e5c04863 (diff) | |
| download | tdenetwork-808e453c56036211f57482ed847d54aca01bba68.tar.gz tdenetwork-808e453c56036211f57482ed847d54aca01bba68.zip | |
Rename a number of old tq methods that are no longer tq specific
Diffstat (limited to 'kopete/protocols/jabber/ui')
22 files changed, 108 insertions, 108 deletions
diff --git a/kopete/protocols/jabber/ui/dlgaddcontact.ui b/kopete/protocols/jabber/ui/dlgaddcontact.ui index c0b3d1cc..30a609a0 100644 --- a/kopete/protocols/jabber/ui/dlgaddcontact.ui +++ b/kopete/protocols/jabber/ui/dlgaddcontact.ui @@ -27,7 +27,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout24</cstring> + <cstring>layout24</cstring> </property> <hbox> <property name="name"> @@ -40,7 +40,7 @@ <property name="text"> <string>&Jabber ID:</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignTop</set> </property> <property name="buddy" stdset="0"> @@ -73,7 +73,7 @@ <property name="text"> <string><i>(for example: joe@jabber.org)</i></string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignVCenter|AlignRight</set> </property> </widget> @@ -87,7 +87,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>190</height> diff --git a/kopete/protocols/jabber/ui/dlgbrowse.ui b/kopete/protocols/jabber/ui/dlgbrowse.ui index cb0f1cc2..66cfcfc5 100644 --- a/kopete/protocols/jabber/ui/dlgbrowse.ui +++ b/kopete/protocols/jabber/ui/dlgbrowse.ui @@ -47,7 +47,7 @@ <property name="text"> <string>Please wait while retrieving search form...</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignVCenter</set> </property> </widget> @@ -128,7 +128,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>51</width> <height>21</height> diff --git a/kopete/protocols/jabber/ui/dlgchangepassword.ui b/kopete/protocols/jabber/ui/dlgchangepassword.ui index 29ae6d33..bed6e8d4 100644 --- a/kopete/protocols/jabber/ui/dlgchangepassword.ui +++ b/kopete/protocols/jabber/ui/dlgchangepassword.ui @@ -57,7 +57,7 @@ </widget> <widget class="TQLabel" row="3" column="0" rowspan="1" colspan="2"> <property name="name"> - <cstring>lbltqStatus</cstring> + <cstring>lblStatus</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="tqalignment"> + <property name="alignment"> <set>AlignCenter</set> </property> </widget> diff --git a/kopete/protocols/jabber/ui/dlgchatjoin.ui b/kopete/protocols/jabber/ui/dlgchatjoin.ui index aa124cc2..f5f40392 100644 --- a/kopete/protocols/jabber/ui/dlgchatjoin.ui +++ b/kopete/protocols/jabber/ui/dlgchatjoin.ui @@ -57,7 +57,7 @@ </widget> <widget class="TQLayoutWidget" row="3" column="1"> <property name="name"> - <cstring>tqlayout3</cstring> + <cstring>layout3</cstring> </property> <hbox> <property name="name"> @@ -73,7 +73,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>41</width> <height>20</height> diff --git a/kopete/protocols/jabber/ui/dlgchatroomslist.ui b/kopete/protocols/jabber/ui/dlgchatroomslist.ui index 31f5b201..b158db62 100644 --- a/kopete/protocols/jabber/ui/dlgchatroomslist.ui +++ b/kopete/protocols/jabber/ui/dlgchatroomslist.ui @@ -21,7 +21,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout4</cstring> + <cstring>layout4</cstring> </property> <hbox> <property name="name"> @@ -97,7 +97,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout5</cstring> + <cstring>layout5</cstring> </property> <hbox> <property name="name"> @@ -113,7 +113,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>121</width> <height>21</height> diff --git a/kopete/protocols/jabber/ui/dlgjabberbrowse.cpp b/kopete/protocols/jabber/ui/dlgjabberbrowse.cpp index d130fa97..be558388 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->tqlayout()->add( translator ); + dynamicForm->layout()->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 a1b732db..ad52240e 100644 --- a/kopete/protocols/jabber/ui/dlgjabberchooseserver.ui +++ b/kopete/protocols/jabber/ui/dlgjabberchooseserver.ui @@ -12,7 +12,7 @@ <height>343</height> </rect> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>300</width> <height>300</height> @@ -87,7 +87,7 @@ </widget> <widget class="TQLabel" row="1" column="0"> <property name="name"> - <cstring>lbltqStatus</cstring> + <cstring>lblStatus</cstring> </property> <property name="text"> <string></string> diff --git a/kopete/protocols/jabber/ui/dlgjabbereditaccountwidget.ui b/kopete/protocols/jabber/ui/dlgjabbereditaccountwidget.ui index e3599536..e0a14f1c 100644 --- a/kopete/protocols/jabber/ui/dlgjabbereditaccountwidget.ui +++ b/kopete/protocols/jabber/ui/dlgjabbereditaccountwidget.ui @@ -57,7 +57,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout61</cstring> + <cstring>layout61</cstring> </property> <hbox> <property name="name"> @@ -153,7 +153,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>0</width> <height>0</height> @@ -162,7 +162,7 @@ <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="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignVCenter</set> </property> </widget> @@ -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="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignVCenter</set> </property> </widget> @@ -243,7 +243,7 @@ <property name="sizeType"> <enum>Maximum</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>16</height> @@ -312,7 +312,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout66</cstring> + <cstring>layout66</cstring> </property> <hbox> <property name="name"> @@ -469,7 +469,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>100</width> <height>32767</height> @@ -495,7 +495,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>31</width> <height>20</height> @@ -517,7 +517,7 @@ <property name="text"> <string>P&riority:</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignVCenter</set> </property> <property name="buddy" stdset="0"> @@ -542,13 +542,13 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>100</width> <height>0</height> </size> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <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="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>200</height> @@ -608,7 +608,7 @@ If two resources have the same priority, the messages will be sent to the one co </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout70</cstring> + <cstring>layout70</cstring> </property> <grid> <property name="name"> @@ -632,7 +632,7 @@ If two resources have the same priority, the messages will be sent to the one co </widget> <widget class="TQLayoutWidget" row="0" column="1"> <property name="name"> - <cstring>tqlayout68</cstring> + <cstring>layout68</cstring> </property> <hbox> <property name="name"> @@ -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="tqalignment"> + <property name="alignment"> <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="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>241</height> @@ -748,7 +748,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="tqsizeHint"> + <property name="sizeHint"> <size> <width>40</width> <height>20</height> @@ -798,7 +798,7 @@ If two resources have the same priority, the messages will be sent to the one co </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout10</cstring> + <cstring>layout10</cstring> </property> <hbox> <property name="name"> @@ -814,7 +814,7 @@ 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="tqsizeHint"> + <property name="sizeHint"> <size> <width>30</width> <height>20</height> @@ -823,7 +823,7 @@ If two resources have the same priority, the messages will be sent to the one co </spacer> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout9</cstring> + <cstring>layout9</cstring> </property> <vbox> <property name="name"> @@ -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="tqsizeHint"> + <property name="sizeHint"> <size> <width>21</width> <height>110</height> diff --git a/kopete/protocols/jabber/ui/dlgjabberregister.cpp b/kopete/protocols/jabber/ui/dlgjabberregister.cpp index 8d1324ca..ff324085 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<TQBoxLayout*>(grpForm->tqlayout())->insertWidget(1, translator); + static_cast<TQBoxLayout*>(grpForm->layout())->insertWidget(1, translator); translator->show(); - resize(tqsizeHint()); + resize(sizeHint()); // enable the send button btnRegister->setEnabled (true); diff --git a/kopete/protocols/jabber/ui/dlgjabberregister.h b/kopete/protocols/jabber/ui/dlgjabberregister.h index bc0bfe44..8fe905ce 100644 --- a/kopete/protocols/jabber/ui/dlgjabberregister.h +++ b/kopete/protocols/jabber/ui/dlgjabberregister.h @@ -20,7 +20,7 @@ #define DLGJABBERREGISTER_H #include <tqwidget.h> -#include <tqlayout.h> +#include <layout.h> #include <tqgroupbox.h> #include <tqlabel.h> diff --git a/kopete/protocols/jabber/ui/dlgjabberregisteraccount.ui b/kopete/protocols/jabber/ui/dlgjabberregisteraccount.ui index 32749c18..ea3d51c0 100644 --- a/kopete/protocols/jabber/ui/dlgjabberregisteraccount.ui +++ b/kopete/protocols/jabber/ui/dlgjabberregisteraccount.ui @@ -12,7 +12,7 @@ <height>376</height> </rect> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>300</width> <height>350</height> @@ -40,13 +40,13 @@ <property name="name"> <cstring>pixPasswordVerify</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>16</width> <height>16</height> </size> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>32767</width> <height>32767</height> @@ -135,13 +135,13 @@ <property name="name"> <cstring>pixJID</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>16</width> <height>16</height> </size> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>32767</width> <height>32767</height> @@ -185,13 +185,13 @@ <property name="name"> <cstring>pixServer</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>16</width> <height>16</height> </size> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>32767</width> <height>32767</height> @@ -213,13 +213,13 @@ <property name="name"> <cstring>pixPassword</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>16</width> <height>16</height> </size> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>32767</width> <height>32767</height> @@ -247,7 +247,7 @@ </widget> <widget class="TQLayoutWidget" row="6" column="0" rowspan="1" colspan="3"> <property name="name"> - <cstring>tqlayout3</cstring> + <cstring>layout3</cstring> </property> <vbox> <property name="name"> @@ -257,7 +257,7 @@ <property name="name"> <cstring>lblJIDInformation</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>0</width> <height>100</height> @@ -266,7 +266,7 @@ <property name="text"> <string></string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignVCenter</set> </property> </widget> @@ -280,7 +280,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>16</height> @@ -294,7 +294,7 @@ <property name="text"> <string></string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignCenter</set> </property> </widget> diff --git a/kopete/protocols/jabber/ui/dlgjabbersendraw.cpp b/kopete/protocols/jabber/ui/dlgjabbersendraw.cpp index 4b9192dc..97753bb2 100644 --- a/kopete/protocols/jabber/ui/dlgjabbersendraw.cpp +++ b/kopete/protocols/jabber/ui/dlgjabbersendraw.cpp @@ -20,7 +20,7 @@ #include <tqcombobox.h> #include <tqpushbutton.h> -#include <tqtextedit.h> +#include <textedit.h> #include <kdebug.h> #include "jabberclient.h" diff --git a/kopete/protocols/jabber/ui/dlgjabberservices.cpp b/kopete/protocols/jabber/ui/dlgjabberservices.cpp index 29b2b617..1bd1310c 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").tqarg(error), i18n ("Jabber Error")); + KMessageBox::queuedMessageBox (this, KMessageBox::Error, i18n ("Unable to retrieve the list of services.\nReason: %1").arg(error), i18n ("Jabber Error")); return; } diff --git a/kopete/protocols/jabber/ui/dlgjabbervcard.cpp b/kopete/protocols/jabber/ui/dlgjabbervcard.cpp index 2e81801d..425890af 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 <tqtextedit.h> +#include <textedit.h> #include <tqwidgetstack.h> #include <tqregexp.h> #include <tqbuffer.h> @@ -296,7 +296,7 @@ void dlgJabberVCard::setEnabled(bool state) void dlgJabberVCard::slotSaveVCard() { setEnabled(false); - m_mainWidget->lbltqStatus->setText( i18n("Saving vCard to server...") ); + m_mainWidget->lblStatus->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->lbltqStatus->setText( i18n("vCard save sucessful.") ); + m_mainWidget->lblStatus->setText( i18n("vCard save sucessful.") ); m_contact->setPropertiesFromVCard( vCard->vcard() ); } else { - m_mainWidget->lbltqStatus->setText( i18n("Error: Unable to save vCard.") ); + m_mainWidget->lblStatus->setText( i18n("Error: Unable to save vCard.") ); } setEnabled(true); @@ -431,7 +431,7 @@ void dlgJabberVCard::slotVCardSaved() void dlgJabberVCard::slotGetVCard() { - m_mainWidget->lbltqStatus->setText( i18n("Fetching contact vCard...") ); + m_mainWidget->lblStatus->setText( i18n("Fetching contact vCard...") ); setReadOnly(true); setEnabled(false); @@ -454,11 +454,11 @@ void dlgJabberVCard::slotGotVCard() assignContactProperties(); - m_mainWidget->lbltqStatus->setText( i18n("vCard fetching Done.") ); + m_mainWidget->lblStatus->setText( i18n("vCard fetching Done.") ); } else { - m_mainWidget->lbltqStatus->setText( i18n("Error: vCard could not be fetched correctly. Check connectivity with the Jabber server.") ); + m_mainWidget->lblStatus->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::tqfromLatin1("mailto:") ) ) + if ( !url.isEmpty () || (url == TQString::fromLatin1("mailto:") ) ) new KRun(KURL( url ) ); } diff --git a/kopete/protocols/jabber/ui/dlgregister.ui b/kopete/protocols/jabber/ui/dlgregister.ui index 8a883b65..8ea5d423 100644 --- a/kopete/protocols/jabber/ui/dlgregister.ui +++ b/kopete/protocols/jabber/ui/dlgregister.ui @@ -78,7 +78,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>0</height> @@ -111,7 +111,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> diff --git a/kopete/protocols/jabber/ui/dlgsendraw.ui b/kopete/protocols/jabber/ui/dlgsendraw.ui index 9d56f7bc..eaaf5aa6 100644 --- a/kopete/protocols/jabber/ui/dlgsendraw.ui +++ b/kopete/protocols/jabber/ui/dlgsendraw.ui @@ -21,7 +21,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout4</cstring> + <cstring>layout4</cstring> </property> <vbox> <property name="name"> @@ -42,7 +42,7 @@ <string>Type in the packet that should be sent to the server:</string> </property> <property name="buddy" stdset="0"> - <cstring>lblRealtqStatus</cstring> + <cstring>lblRealStatus</cstring> </property> </widget> <widget class="TQTextEdit"> @@ -63,7 +63,7 @@ </item> <item> <property name="text"> - <string>Availability tqStatus</string> + <string>Availability Status</string> </property> </item> <item> @@ -102,7 +102,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout3</cstring> + <cstring>layout3</cstring> </property> <hbox> <property name="name"> @@ -134,7 +134,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>16</width> <height>25</height> diff --git a/kopete/protocols/jabber/ui/dlgservices.ui b/kopete/protocols/jabber/ui/dlgservices.ui index fda7bf4a..da690a97 100644 --- a/kopete/protocols/jabber/ui/dlgservices.ui +++ b/kopete/protocols/jabber/ui/dlgservices.ui @@ -24,7 +24,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout2</cstring> + <cstring>layout2</cstring> </property> <hbox> <property name="name"> @@ -112,7 +112,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout1</cstring> + <cstring>layout1</cstring> </property> <hbox> <property name="name"> @@ -128,7 +128,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>111</width> <height>21</height> diff --git a/kopete/protocols/jabber/ui/dlgvcard.ui b/kopete/protocols/jabber/ui/dlgvcard.ui index 8a4aa790..6daa3a4e 100644 --- a/kopete/protocols/jabber/ui/dlgvcard.ui +++ b/kopete/protocols/jabber/ui/dlgvcard.ui @@ -33,7 +33,7 @@ </property> <widget class="TQLayoutWidget" row="4" column="0" rowspan="1" colspan="2"> <property name="name"> - <cstring>tqlayout13</cstring> + <cstring>layout13</cstring> </property> <hbox> <property name="name"> @@ -64,7 +64,7 @@ </widget> <widget class="TQLayoutWidget" row="3" column="0" rowspan="1" colspan="2"> <property name="name"> - <cstring>tqlayout12</cstring> + <cstring>layout12</cstring> </property> <hbox> <property name="name"> @@ -90,7 +90,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>0</width> <height>0</height> @@ -159,7 +159,7 @@ </widget> <widget class="TQLayoutWidget" row="5" column="0" rowspan="1" colspan="2"> <property name="name"> - <cstring>tqlayout14</cstring> + <cstring>layout14</cstring> </property> <hbox> <property name="name"> @@ -190,7 +190,7 @@ </widget> <widget class="TQLayoutWidget" row="2" column="0" rowspan="1" colspan="2"> <property name="name"> - <cstring>tqlayout11</cstring> + <cstring>layout11</cstring> </property> <hbox> <property name="name"> @@ -221,7 +221,7 @@ </widget> <widget class="TQLayoutWidget" row="1" column="0" rowspan="1" colspan="2"> <property name="name"> - <cstring>tqlayout10</cstring> + <cstring>layout10</cstring> </property> <hbox> <property name="name"> @@ -255,7 +255,7 @@ </widget> <widget class="TQLayoutWidget" row="0" column="0" rowspan="1" colspan="2"> <property name="name"> - <cstring>tqlayout9</cstring> + <cstring>layout9</cstring> </property> <hbox> <property name="name"> @@ -294,7 +294,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -311,7 +311,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -357,13 +357,13 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>96</width> <height>96</height> </size> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>96</width> <height>96</height> @@ -386,7 +386,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>40</width> <height>20</height> @@ -403,7 +403,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>40</width> <height>20</height> @@ -427,7 +427,7 @@ </property> <widget class="TQLayoutWidget" row="0" column="0"> <property name="name"> - <cstring>tqlayout36</cstring> + <cstring>layout36</cstring> </property> <grid> <property name="name"> @@ -472,7 +472,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>16</height> @@ -586,7 +586,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>50</height> @@ -625,7 +625,7 @@ </property> <widget class="TQLayoutWidget" row="0" column="0"> <property name="name"> - <cstring>tqlayout37</cstring> + <cstring>layout37</cstring> </property> <grid> <property name="name"> @@ -641,7 +641,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>16</height> @@ -720,7 +720,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>30</height> @@ -823,7 +823,7 @@ </property> <widget class="TQLayoutWidget" row="0" column="0"> <property name="name"> - <cstring>tqlayout57</cstring> + <cstring>layout57</cstring> </property> <grid> <property name="name"> @@ -849,7 +849,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -915,7 +915,7 @@ </property> <widget class="TQLayoutWidget" row="0" column="0"> <property name="name"> - <cstring>tqlayout59</cstring> + <cstring>layout59</cstring> </property> <grid> <property name="name"> @@ -931,7 +931,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -1015,7 +1015,7 @@ </widget> <widget class="TQLabel" row="1" column="0"> <property name="name"> - <cstring>lbltqStatus</cstring> + <cstring>lblStatus</cstring> </property> <property name="text"> <string></string> diff --git a/kopete/protocols/jabber/ui/jabberaddcontactpage.cpp b/kopete/protocols/jabber/ui/jabberaddcontactpage.cpp index 076b92b8..fea94d86 100644 --- a/kopete/protocols/jabber/ui/jabberaddcontactpage.cpp +++ b/kopete/protocols/jabber/ui/jabberaddcontactpage.cpp @@ -20,7 +20,7 @@ #include "jabberaddcontactpage.h" -#include <tqlayout.h> +#include <layout.h> #include <klineedit.h> #include <klocale.h> #include <kopeteaccount.h> diff --git a/kopete/protocols/jabber/ui/jabberchooseserver.cpp b/kopete/protocols/jabber/ui/jabberchooseserver.cpp index 95272833..63339158 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->lbltqStatus->setText ( i18n ( "Retrieving server list...") ); + mMainWidget->lblStatus->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->lbltqStatus->setText ( i18n ( "Could not retrieve server list." ) ); + mMainWidget->lblStatus->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->lbltqStatus->setText ( "" ); + mMainWidget->lblStatus->setText ( "" ); // parse XML list TQDomDocument doc; if ( !doc.setContent ( xmlServerList ) ) { - mMainWidget->lbltqStatus->setText ( i18n ( "Could not parse the server list.") ); + mMainWidget->lblStatus->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 758322cf..b8a9c080 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::tqfromLatin1("Kopete"))); + mResource->setText (account()->configGroup()->readEntry ("Resource", TQString::fromLatin1("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 2641ed41..631ec3f4 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::tqfromLatin1 ( mMainWidget->lePassword->password () ).isEmpty () || - TQString::tqfromLatin1 ( mMainWidget->lePasswordVerify->password () ).isEmpty () ) ) + ( TQString::fromLatin1 ( mMainWidget->lePassword->password () ).isEmpty () || + TQString::fromLatin1 ( mMainWidget->lePasswordVerify->password () ).isEmpty () ) ) { mMainWidget->lblStatusMessage->setText ( i18n ( "Please enter the same password twice." ) ); valid = false; @@ -155,8 +155,8 @@ void JabberRegisterAccount::validateData () } if ( valid && - ( TQString::tqfromLatin1 ( mMainWidget->lePassword->password () ) != - TQString::tqfromLatin1 ( mMainWidget->lePasswordVerify->password () ) ) ) + ( TQString::fromLatin1 ( mMainWidget->lePassword->password () ) != + TQString::fromLatin1 ( mMainWidget->lePasswordVerify->password () ) ) ) { mMainWidget->lblStatusMessage->setText ( i18n ( "Password entries do not match." ) ); valid = false; |