Rename obsolete tq methods to standard names

13 files changed, 35 insertions, 35 deletions

diff --git a/kopete/plugins/autoreplace/autoreplaceprefs.ui b/kopete/plugins/autoreplace/autoreplaceprefs.ui
index e31ef3e4..3694784a 100644
--- a/kopete/plugins/autoreplace/autoreplaceprefs.ui
+++ b/kopete/plugins/autoreplace/autoreplaceprefs.ui
@@ -91,7 +91,7 @@
                 </property>
                 <widget class="TQLayoutWidget" row="1" column="1" rowspan="2" colspan="1">
                     <property name="name">
-                        <cstring>tqlayout5</cstring>
+                        <cstring>layout5</cstring>
                     </property>
                     <vbox>
                         <property name="name">
@@ -157,7 +157,7 @@
                 </widget>
                 <widget class="TQLayoutWidget" row="0" column="0" rowspan="1" colspan="2">
                     <property name="name">
-                        <cstring>tqlayout1</cstring>
+                        <cstring>layout1</cstring>
                     </property>
                     <hbox>
                         <property name="name">
diff --git a/kopete/plugins/highlight/highlightprefsbase.ui b/kopete/plugins/highlight/highlightprefsbase.ui
index 7138396c..4d39a0ca 100644
--- a/kopete/plugins/highlight/highlightprefsbase.ui
+++ b/kopete/plugins/highlight/highlightprefsbase.ui
@@ -137,7 +137,7 @@
                 </widget>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>tqlayout3</cstring>
+                        <cstring>layout3</cstring>
                     </property>
                     <hbox>
                         <property name="name">
@@ -217,7 +217,7 @@
                 </property>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>tqlayout4</cstring>
+                        <cstring>layout4</cstring>
                     </property>
                     <hbox>
                         <property name="name">
@@ -288,7 +288,7 @@
                 </widget>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>tqlayout5</cstring>
+                        <cstring>layout5</cstring>
                     </property>
                     <hbox>
                         <property name="name">
@@ -339,7 +339,7 @@
                 </widget>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>tqlayout6</cstring>
+                        <cstring>layout6</cstring>
                     </property>
                     <hbox>
                         <property name="name">
@@ -390,7 +390,7 @@
                 </widget>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>tqlayout7</cstring>
+                        <cstring>layout7</cstring>
                     </property>
                     <hbox>
                         <property name="name">
@@ -413,7 +413,7 @@
                 </widget>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>tqlayout8</cstring>
+                        <cstring>layout8</cstring>
                     </property>
                     <hbox>
                         <property name="name">
diff --git a/kopete/plugins/history/historydialog.cpp b/kopete/plugins/history/historydialog.cpp
index b31118ec..09c349f1 100644
--- a/kopete/plugins/history/historydialog.cpp
+++ b/kopete/plugins/history/historydialog.cpp
@@ -597,16 +597,16 @@ void HistoryDialog::slotCopy()
 	if ( qsSelection.isEmpty() ) return;
 	
 	disconnect( kapp->clipboard(), TQT_SIGNAL( selectionChanged()), mHtmlPart, TQT_SLOT(slotClearSelection()));
-	TQApplication::tqclipboard()->setText(qsSelection, TQClipboard::Clipboard);
-	TQApplication::tqclipboard()->setText(qsSelection, TQClipboard::Selection);
+	TQApplication::clipboard()->setText(qsSelection, TQClipboard::Clipboard);
+	TQApplication::clipboard()->setText(qsSelection, TQClipboard::Selection);
 	connect( kapp->clipboard(), TQT_SIGNAL( selectionChanged()), mHtmlPart, TQT_SLOT(slotClearSelection()));
 }
 
 void HistoryDialog::slotCopyURL()
 {
 	disconnect( kapp->clipboard(), TQT_SIGNAL( selectionChanged()), mHtmlPart, TQT_SLOT(slotClearSelection()));
-	TQApplication::tqclipboard()->setText( mURL, TQClipboard::Clipboard);
-	TQApplication::tqclipboard()->setText( mURL, TQClipboard::Selection);
+	TQApplication::clipboard()->setText( mURL, TQClipboard::Clipboard);
+	TQApplication::clipboard()->setText( mURL, TQClipboard::Selection);
 	connect( kapp->clipboard(), TQT_SIGNAL( selectionChanged()), mHtmlPart, TQT_SLOT(slotClearSelection()));
 }
 
diff --git a/kopete/plugins/history/historyviewer.ui b/kopete/plugins/history/historyviewer.ui
index 35891bf9..8d7ca4b2 100644
--- a/kopete/plugins/history/historyviewer.ui
+++ b/kopete/plugins/history/historyviewer.ui
@@ -35,7 +35,7 @@
         </property>
         <widget class="TQLayoutWidget" row="3" column="0">
             <property name="name">
-                <cstring>tqlayout3</cstring>
+                <cstring>layout3</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -64,7 +64,7 @@
         </widget>
         <widget class="TQLayoutWidget" row="2" column="0">
             <property name="name">
-                <cstring>tqlayout8</cstring>
+                <cstring>layout8</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -136,7 +136,7 @@
             </property>
             <widget class="TQLayoutWidget">
                 <property name="name">
-                    <cstring>tqlayout5</cstring>
+                    <cstring>layout5</cstring>
                 </property>
                 <vbox>
                     <property name="name">
@@ -253,7 +253,7 @@
         </widget>
         <widget class="TQLayoutWidget" row="0" column="0">
             <property name="name">
-                <cstring>tqlayout11</cstring>
+                <cstring>layout11</cstring>
             </property>
             <hbox>
                 <property name="name">
diff --git a/kopete/plugins/latex/latexprefsbase.ui b/kopete/plugins/latex/latexprefsbase.ui
index 365e159b..2d036a3c 100644
--- a/kopete/plugins/latex/latexprefsbase.ui
+++ b/kopete/plugins/latex/latexprefsbase.ui
@@ -59,7 +59,7 @@
                 </spacer>
                 <widget class="TQLayoutWidget" row="0" column="0">
                     <property name="name">
-                        <cstring>tqlayout1</cstring>
+                        <cstring>layout1</cstring>
                     </property>
                     <hbox>
                         <property name="name">
@@ -94,7 +94,7 @@
                 </widget>
                 <widget class="TQLayoutWidget" row="1" column="0">
                     <property name="name">
-                        <cstring>tqlayout2</cstring>
+                        <cstring>layout2</cstring>
                     </property>
                     <hbox>
                         <property name="name">
diff --git a/kopete/plugins/motionautoaway/motionawayprefs.ui b/kopete/plugins/motionautoaway/motionawayprefs.ui
index f673ccb7..f8fd22c7 100644
--- a/kopete/plugins/motionautoaway/motionawayprefs.ui
+++ b/kopete/plugins/motionautoaway/motionawayprefs.ui
@@ -60,7 +60,7 @@
                 </property>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>tqlayout21</cstring>
+                        <cstring>layout21</cstring>
                     </property>
                     <hbox>
                         <property name="name">
@@ -136,7 +136,7 @@
                 </property>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>tqlayout5</cstring>
+                        <cstring>layout5</cstring>
                     </property>
                     <hbox>
                         <property name="name">
@@ -174,7 +174,7 @@
                 </widget>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>tqlayout6</cstring>
+                        <cstring>layout6</cstring>
                     </property>
                     <hbox>
                         <property name="name">
@@ -212,7 +212,7 @@
                 </widget>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>tqlayout16</cstring>
+                        <cstring>layout16</cstring>
                     </property>
                     <hbox>
                         <property name="name">
diff --git a/kopete/plugins/netmeeting/netmeetingprefs_ui.ui b/kopete/plugins/netmeeting/netmeetingprefs_ui.ui
index 57c5943b..0c0838fb 100644
--- a/kopete/plugins/netmeeting/netmeetingprefs_ui.ui
+++ b/kopete/plugins/netmeeting/netmeetingprefs_ui.ui
@@ -46,7 +46,7 @@ This is not the same as webcam chat you can find in the newer Windows MessengerÂ
         </widget>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>tqlayout1</cstring>
+                <cstring>layout1</cstring>
             </property>
             <hbox>
                 <property name="name">
diff --git a/kopete/plugins/nowlistening/nowlisteningprefs.ui b/kopete/plugins/nowlistening/nowlisteningprefs.ui
index 474c448a..125ff80b 100644
--- a/kopete/plugins/nowlistening/nowlisteningprefs.ui
+++ b/kopete/plugins/nowlistening/nowlisteningprefs.ui
@@ -64,7 +64,7 @@
                     </property>
                     <widget class="TQLayoutWidget">
                         <property name="name">
-                            <cstring>tqlayout4</cstring>
+                            <cstring>layout4</cstring>
                         </property>
                         <vbox>
                             <property name="name">
@@ -92,7 +92,7 @@ Expressions in brackets depend on a substitution being made.</string>
                             </widget>
                             <widget class="TQLayoutWidget">
                                 <property name="name">
-                                    <cstring>tqlayout2</cstring>
+                                    <cstring>layout2</cstring>
                                 </property>
                                 <vbox>
                                     <property name="name">
@@ -281,7 +281,7 @@ in place of your status message.</string>
                     </property>
                     <widget class="TQLayoutWidget">
                         <property name="name">
-                            <cstring>tqlayout2_2</cstring>
+                            <cstring>layout2_2</cstring>
                         </property>
                         <vbox>
                             <property name="name">
diff --git a/kopete/plugins/smpppdcs/smpppdcsprefs.ui b/kopete/plugins/smpppdcs/smpppdcsprefs.ui
index f8be184a..efe7ede5 100644
--- a/kopete/plugins/smpppdcs/smpppdcsprefs.ui
+++ b/kopete/plugins/smpppdcs/smpppdcsprefs.ui
@@ -37,7 +37,7 @@
                     </property>
                     <widget class="TQLayoutWidget">
                         <property name="name">
-                            <cstring>tqlayout4</cstring>
+                            <cstring>layout4</cstring>
                         </property>
                         <vbox>
                             <property name="name">
diff --git a/kopete/plugins/smpppdcs/smpppdlocationui.ui b/kopete/plugins/smpppdcs/smpppdlocationui.ui
index 7c88f07f..e10c3c3a 100644
--- a/kopete/plugins/smpppdcs/smpppdlocationui.ui
+++ b/kopete/plugins/smpppdcs/smpppdlocationui.ui
@@ -60,7 +60,7 @@
         </widget>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>tqlayout14</cstring>
+                <cstring>layout14</cstring>
             </property>
             <hbox>
                 <property name="name">
diff --git a/kopete/plugins/statistics/statisticswidget.ui b/kopete/plugins/statistics/statisticswidget.ui
index b0f6ea27..4c53d8e2 100644
--- a/kopete/plugins/statistics/statisticswidget.ui
+++ b/kopete/plugins/statistics/statisticswidget.ui
@@ -52,7 +52,7 @@
                             </property>
                             <widget class="TQLayoutWidget" row="0" column="0">
                                 <property name="name">
-                                    <cstring>tqlayout11</cstring>
+                                    <cstring>layout11</cstring>
                                 </property>
                                 <hbox>
                                     <property name="name">
@@ -77,7 +77,7 @@
                                     </spacer>
                                     <widget class="TQLayoutWidget">
                                         <property name="name">
-                                            <cstring>tqlayout9</cstring>
+                                            <cstring>layout9</cstring>
                                         </property>
                                         <vbox>
                                             <property name="name">
@@ -98,7 +98,7 @@
                                             </widget>
                                             <widget class="TQLayoutWidget">
                                                 <property name="name">
-                                                    <cstring>tqlayout7</cstring>
+                                                    <cstring>layout7</cstring>
                                                 </property>
                                                 <hbox>
                                                     <property name="name">
@@ -172,7 +172,7 @@
                             </property>
                             <widget class="TQLayoutWidget" row="0" column="0">
                                 <property name="name">
-                                    <cstring>tqlayout5</cstring>
+                                    <cstring>layout5</cstring>
                                 </property>
                                 <hbox>
                                     <property name="name">
diff --git a/kopete/plugins/translator/translatorplugin.cpp b/kopete/plugins/translator/translatorplugin.cpp
index 20f3ed03..64febcaa 100644
--- a/kopete/plugins/translator/translatorplugin.cpp
+++ b/kopete/plugins/translator/translatorplugin.cpp
@@ -17,7 +17,7 @@
     *                                                                       *
     *************************************************************************
     Patched by Francesco Rossi <redsh@email.it> in order to support new 
-    google translation page tqlayout (13-sept-2007)
+    google translation page layout (13-sept-2007)
 */
 
 #include <tqapplication.h>
diff --git a/kopete/plugins/webpresence/webpresenceprefs.ui b/kopete/plugins/webpresence/webpresenceprefs.ui
index 5c6632d8..0a676973 100644
--- a/kopete/plugins/webpresence/webpresenceprefs.ui
+++ b/kopete/plugins/webpresence/webpresenceprefs.ui
@@ -159,7 +159,7 @@ Note that some web browsers do not support XHTML. You should also make sure your
                 </widget>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>tqlayout1</cstring>
+                        <cstring>layout1</cstring>
                     </property>
                     <hbox>
                         <property name="name">
@@ -260,7 +260,7 @@ images/winpopup_protocol.png</string>
                 </widget>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>tqlayout2</cstring>
+                        <cstring>layout2</cstring>
                     </property>
                     <hbox>
                         <property name="name">