Rename a number of old tq methods that are no longer tq specific

14 files changed, 39 insertions, 39 deletions

diff --git a/kopete/protocols/groupwise/ui/gwaccountpreferences.ui b/kopete/protocols/groupwise/ui/gwaccountpreferences.ui
index 21f774b5..40917ccf 100644
--- a/kopete/protocols/groupwise/ui/gwaccountpreferences.ui
+++ b/kopete/protocols/groupwise/ui/gwaccountpreferences.ui
@@ -53,7 +53,7 @@
                             </property>
                             <widget class="TQLayoutWidget">
                                 <property name="name">
-                                    <cstring>tqlayout1</cstring>
+                                    <cstring>layout1</cstring>
                                 </property>
                                 <hbox>
                                     <property name="name">
@@ -121,7 +121,7 @@
                             </widget>
                             <widget class="TQLayoutWidget">
                                 <property name="name">
-                                    <cstring>tqlayout66</cstring>
+                                    <cstring>layout66</cstring>
                                 </property>
                                 <hbox>
                                     <property name="name">
@@ -269,7 +269,7 @@
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="tqsizeHint">
+                        <property name="sizeHint">
                             <size>
                                 <width>20</width>
                                 <height>91</height>
@@ -286,7 +286,7 @@
             <property name="text">
                 <string></string>
             </property>
-            <property name="tqalignment">
+            <property name="alignment">
                 <set>AlignCenter</set>
             </property>
         </widget>
diff --git a/kopete/protocols/groupwise/ui/gwaddcontactpage.cpp b/kopete/protocols/groupwise/ui/gwaddcontactpage.cpp
index 5ece3882..a10bcc16 100644
--- a/kopete/protocols/groupwise/ui/gwaddcontactpage.cpp
+++ b/kopete/protocols/groupwise/ui/gwaddcontactpage.cpp
@@ -23,7 +23,7 @@
 
 //#include <tqcombobox.h>
 #include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqlineedit.h>
 #include <tqlistview.h>
 #include <tqpushbutton.h>
diff --git a/kopete/protocols/groupwise/ui/gwchatpropswidget.ui b/kopete/protocols/groupwise/ui/gwchatpropswidget.ui
index 726376a5..c4f9a9c6 100644
--- a/kopete/protocols/groupwise/ui/gwchatpropswidget.ui
+++ b/kopete/protocols/groupwise/ui/gwchatpropswidget.ui
@@ -29,7 +29,7 @@
         </widget>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>tqlayout16</cstring>
+                <cstring>layout16</cstring>
             </property>
             <grid>
                 <property name="name">
@@ -341,7 +341,7 @@
         </widget>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>tqlayout15</cstring>
+                <cstring>layout15</cstring>
             </property>
             <hbox>
                 <property name="name">
diff --git a/kopete/protocols/groupwise/ui/gwchatsearchwidget.ui b/kopete/protocols/groupwise/ui/gwchatsearchwidget.ui
index 63ffca38..1899a525 100644
--- a/kopete/protocols/groupwise/ui/gwchatsearchwidget.ui
+++ b/kopete/protocols/groupwise/ui/gwchatsearchwidget.ui
@@ -65,7 +65,7 @@
         </widget>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>tqlayout2</cstring>
+                <cstring>layout2</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -89,7 +89,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>340</width>
                             <height>20</height>
diff --git a/kopete/protocols/groupwise/ui/gwcontactproperties.cpp b/kopete/protocols/groupwise/ui/gwcontactproperties.cpp
index e7b6ecb2..5a991a42 100644
--- a/kopete/protocols/groupwise/ui/gwcontactproperties.cpp
+++ b/kopete/protocols/groupwise/ui/gwcontactproperties.cpp
@@ -16,7 +16,7 @@
     *************************************************************************
 */
 
-#include <tqclipboard.h>
+#include <clipboard.h>
 #include <tqheader.h>
 #include <tqlabel.h>
 #include <tqlineedit.h>
@@ -47,7 +47,7 @@ GroupWiseContactProperties::GroupWiseContactProperties( GroupWiseContact * conta
 	init();
 	// set up the contents of the props widget
 	m_propsWidget->m_userId->setText( contact->contactId() );
-	m_propsWidget->m_status->setText( contact->onlinetqStatus().description() );
+	m_propsWidget->m_status->setText( contact->onlineStatus().description() );
 	m_propsWidget->m_displayName->setText( contact->metaContact()->displayName() );
 	m_propsWidget->m_firstName->setText( contact->property( Kopete::Global::Properties::self()->firstName() ).value().toString() );
 	m_propsWidget->m_lastName->setText( contact->property( Kopete::Global::Properties::self()->lastName() ).value().toString() );
@@ -137,7 +137,7 @@ void GroupWiseContactProperties::slotCopy()
 	kdDebug( GROUPWISE_DEBUG_GLOBAL ) << k_funcinfo << endl;
 	if ( m_propsWidget->m_propsView->currentItem() )
 	{
-		TQClipboard *cb = kapp->tqclipboard();
+		TQClipboard *cb = kapp->clipboard();
 		cb->setText( m_propsWidget->m_propsView->currentItem()->text( 1 ) );
 	}
 }
diff --git a/kopete/protocols/groupwise/ui/gwcontactpropswidget.ui b/kopete/protocols/groupwise/ui/gwcontactpropswidget.ui
index b403abec..95481add 100644
--- a/kopete/protocols/groupwise/ui/gwcontactpropswidget.ui
+++ b/kopete/protocols/groupwise/ui/gwcontactpropswidget.ui
@@ -48,7 +48,7 @@
         </widget>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>tqlayout15</cstring>
+                <cstring>layout15</cstring>
             </property>
             <grid>
                 <property name="name">
@@ -73,7 +73,7 @@
                         <cstring>textLabel14</cstring>
                     </property>
                     <property name="text">
-                        <string>tqStatus:</string>
+                        <string>Status:</string>
                     </property>
                 </widget>
                 <widget class="TQLineEdit" row="2" column="1">
diff --git a/kopete/protocols/groupwise/ui/gwcontactsearch.ui b/kopete/protocols/groupwise/ui/gwcontactsearch.ui
index e6c6a2f6..3713e31b 100644
--- a/kopete/protocols/groupwise/ui/gwcontactsearch.ui
+++ b/kopete/protocols/groupwise/ui/gwcontactsearch.ui
@@ -21,7 +21,7 @@
         </property>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>tqlayout13</cstring>
+                <cstring>layout13</cstring>
             </property>
             <grid>
                 <property name="name">
@@ -255,7 +255,7 @@
         </widget>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>tqlayout12</cstring>
+                <cstring>layout12</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -264,7 +264,7 @@
                 <widget class="TQListView">
                     <column>
                         <property name="text">
-                            <string>tqStatus</string>
+                            <string>Status</string>
                         </property>
                         <property name="clickable">
                             <bool>true</bool>
@@ -318,7 +318,7 @@
                 </widget>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>tqlayout8</cstring>
+                        <cstring>layout8</cstring>
                     </property>
                     <vbox>
                         <property name="name">
@@ -345,7 +345,7 @@
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="tqsizeHint">
+                            <property name="sizeHint">
                                 <size>
                                     <width>20</width>
                                     <height>141</height>
diff --git a/kopete/protocols/groupwise/ui/gwcustomstatusedit.ui b/kopete/protocols/groupwise/ui/gwcustomstatusedit.ui
index 9ef4caad..0e81a783 100644
--- a/kopete/protocols/groupwise/ui/gwcustomstatusedit.ui
+++ b/kopete/protocols/groupwise/ui/gwcustomstatusedit.ui
@@ -21,7 +21,7 @@
         </property>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>tqlayout3</cstring>
+                <cstring>layout3</cstring>
             </property>
             <grid>
                 <property name="name">
@@ -43,7 +43,7 @@
                 </widget>
                 <widget class="TQComboBox" row="0" column="1">
                     <property name="name">
-                        <cstring>m_cmbtqStatus</cstring>
+                        <cstring>m_cmbStatus</cstring>
                     </property>
                 </widget>
                 <widget class="TQLabel" row="0" column="0">
@@ -51,7 +51,7 @@
                         <cstring>textLabel3</cstring>
                     </property>
                     <property name="text">
-                        <string>&amp;tqStatus:</string>
+                        <string>&amp;Status:</string>
                     </property>
                     <property name="buddy" stdset="0">
                         <cstring>comboBox1</cstring>
diff --git a/kopete/protocols/groupwise/ui/gwcustomstatuswidget.ui b/kopete/protocols/groupwise/ui/gwcustomstatuswidget.ui
index 821c6030..0c3efcac 100644
--- a/kopete/protocols/groupwise/ui/gwcustomstatuswidget.ui
+++ b/kopete/protocols/groupwise/ui/gwcustomstatuswidget.ui
@@ -54,7 +54,7 @@
         </widget>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>tqlayout2</cstring>
+                <cstring>layout2</cstring>
             </property>
             <vbox>
                 <property name="name">
@@ -94,7 +94,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>20</width>
                             <height>41</height>
diff --git a/kopete/protocols/groupwise/ui/gweditaccountwidget.cpp b/kopete/protocols/groupwise/ui/gweditaccountwidget.cpp
index 7f049d7c..87296ab2 100644
--- a/kopete/protocols/groupwise/ui/gweditaccountwidget.cpp
+++ b/kopete/protocols/groupwise/ui/gweditaccountwidget.cpp
@@ -20,7 +20,7 @@
 */
 
 #include <tqcheckbox.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqlineedit.h>
 #include <tqspinbox.h>
 
diff --git a/kopete/protocols/groupwise/ui/gwprivacy.ui b/kopete/protocols/groupwise/ui/gwprivacy.ui
index 1f4b6bcb..60fb63db 100644
--- a/kopete/protocols/groupwise/ui/gwprivacy.ui
+++ b/kopete/protocols/groupwise/ui/gwprivacy.ui
@@ -26,7 +26,7 @@
         </widget>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>tqlayout11</cstring>
+                <cstring>layout11</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -34,7 +34,7 @@
                 </property>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>tqlayout9</cstring>
+                        <cstring>layout9</cstring>
                     </property>
                     <vbox>
                         <property name="name">
@@ -60,7 +60,7 @@
                 </widget>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>tqlayout8</cstring>
+                        <cstring>layout8</cstring>
                     </property>
                     <vbox>
                         <property name="name">
@@ -76,7 +76,7 @@
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="tqsizeHint">
+                            <property name="sizeHint">
                                 <size>
                                     <width>20</width>
                                     <height>21</height>
@@ -109,7 +109,7 @@
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="tqsizeHint">
+                            <property name="sizeHint">
                                 <size>
                                     <width>20</width>
                                     <height>53</height>
@@ -142,7 +142,7 @@
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="tqsizeHint">
+                            <property name="sizeHint">
                                 <size>
                                     <width>20</width>
                                     <height>52</height>
@@ -153,7 +153,7 @@
                 </widget>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>tqlayout10</cstring>
+                        <cstring>layout10</cstring>
                     </property>
                     <vbox>
                         <property name="name">
diff --git a/kopete/protocols/groupwise/ui/gwprivacydialog.cpp b/kopete/protocols/groupwise/ui/gwprivacydialog.cpp
index e6179882..80daff71 100644
--- a/kopete/protocols/groupwise/ui/gwprivacydialog.cpp
+++ b/kopete/protocols/groupwise/ui/gwprivacydialog.cpp
@@ -49,7 +49,7 @@ private:
 };
 
 GroupWisePrivacyDialog::GroupWisePrivacyDialog( GroupWiseAccount * account, TQWidget *parent, const char *name )
- : KDialogBase(  parent, name, false, i18n( "Account specific privacy settings", "Manage Privacy for %1" ).tqarg( account->accountId() ),
+ : KDialogBase(  parent, name, false, i18n( "Account specific privacy settings", "Manage Privacy for %1" ).arg( account->accountId() ),
  KDialogBase::Ok|KDialogBase::Apply|KDialogBase::Cancel, Ok, true ), m_account( account ), m_dirty( false ), m_searchDlg(0)
 {
 	m_privacy = new GroupWisePrivacyWidget( this );
@@ -343,7 +343,7 @@ void GroupWisePrivacyDialog::commitChanges()
 void GroupWisePrivacyDialog::errorNotConnected()
 {
 	KMessageBox::queuedMessageBox( this, KMessageBox::Information,
-			i18n( "You can only change privacy settings while you are logged in to the GroupWise Messenger server." ) , i18n("'%1' Not Logged In").tqarg( m_account->accountId() ) );
+			i18n( "You can only change privacy settings while you are logged in to the GroupWise Messenger server." ) , i18n("'%1' Not Logged In").arg( m_account->accountId() ) );
 }
 
 #include "gwprivacydialog.moc"
diff --git a/kopete/protocols/groupwise/ui/gwreceiveinvitationdialog.cpp b/kopete/protocols/groupwise/ui/gwreceiveinvitationdialog.cpp
index 547de1b5..6005f61a 100644
--- a/kopete/protocols/groupwise/ui/gwreceiveinvitationdialog.cpp
+++ b/kopete/protocols/groupwise/ui/gwreceiveinvitationdialog.cpp
@@ -50,7 +50,7 @@ ReceiveInvitationDialog::ReceiveInvitationDialog( GroupWiseAccount * account, co
 		m_wid->m_contactName->setText( event.user );
 		
 	m_wid->m_dateTime->setText( KGlobal::locale()->formatDateTime( event.timeStamp ) );
-	m_wid->m_message->setText( TQString("<b>%1</b>").tqarg( event.message ) );
+	m_wid->m_message->setText( TQString("<b>%1</b>").arg( event.message ) );
 	
 	setMainWidget( m_wid );
 }
diff --git a/kopete/protocols/groupwise/ui/gwshowinvitation.ui b/kopete/protocols/groupwise/ui/gwshowinvitation.ui
index 48c061a9..2027c579 100644
--- a/kopete/protocols/groupwise/ui/gwshowinvitation.ui
+++ b/kopete/protocols/groupwise/ui/gwshowinvitation.ui
@@ -21,7 +21,7 @@
         </property>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>tqlayout13</cstring>
+                <cstring>layout13</cstring>
             </property>
             <grid>
                 <property name="name">
@@ -82,13 +82,13 @@
             <property name="text">
                 <string>INVITE_MESSAGE</string>
             </property>
-            <property name="tqalignment">
+            <property name="alignment">
                 <set>WordBreak|AlignVCenter</set>
             </property>
         </widget>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>tqlayout14</cstring>
+                <cstring>layout14</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -112,7 +112,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>20</width>
                             <height>31</height>