From 81d696e1ee26cfc46fb4c97989575a7376b2d246 Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Wed, 21 Dec 2011 14:23:09 -0600
Subject: Rename obsolete tq methods to standard names (cherry picked from
 commit 8a143ab9f846e910c583ea8e770cd05495e0c58d)

---
 kopete/protocols/msn/config/msnprefs.ui     |  2 +-
 kopete/protocols/msn/msnsocket.cpp          |  2 +-
 kopete/protocols/msn/ui/msnadd.ui           |  2 +-
 kopete/protocols/msn/ui/msneditaccountui.ui | 26 +++++++++++++-------------
 kopete/protocols/msn/ui/msninfo.ui          |  2 +-
 5 files changed, 17 insertions(+), 17 deletions(-)

(limited to 'kopete/protocols/msn')

diff --git a/kopete/protocols/msn/config/msnprefs.ui b/kopete/protocols/msn/config/msnprefs.ui
index a0c37920..13817584 100644
--- a/kopete/protocols/msn/config/msnprefs.ui
+++ b/kopete/protocols/msn/config/msnprefs.ui
@@ -137,7 +137,7 @@
         </widget>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>tqlayout18</cstring>
+                <cstring>layout18</cstring>
             </property>
             <hbox>
                 <property name="name">
diff --git a/kopete/protocols/msn/msnsocket.cpp b/kopete/protocols/msn/msnsocket.cpp
index b8f852e3..e098e27b 100644
--- a/kopete/protocols/msn/msnsocket.cpp
+++ b/kopete/protocols/msn/msnsocket.cpp
@@ -762,7 +762,7 @@ TQString MSNSocket::escape( const TQString &str )
 
 	for	( int i = 0; i < old_length; i++ )
 	{
-		unsigned short character = str[i].tqunicode();
+		unsigned short character = str[i].unicode();
 
 		if( character <= 32 || character == '%' )
 		{
diff --git a/kopete/protocols/msn/ui/msnadd.ui b/kopete/protocols/msn/ui/msnadd.ui
index 3bf74195..fab496d3 100644
--- a/kopete/protocols/msn/ui/msnadd.ui
+++ b/kopete/protocols/msn/ui/msnadd.ui
@@ -24,7 +24,7 @@
         </property>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>tqlayout21</cstring>
+                <cstring>layout21</cstring>
             </property>
             <hbox>
                 <property name="name">
diff --git a/kopete/protocols/msn/ui/msneditaccountui.ui b/kopete/protocols/msn/ui/msneditaccountui.ui
index 9c453e7c..0a764c57 100644
--- a/kopete/protocols/msn/ui/msneditaccountui.ui
+++ b/kopete/protocols/msn/ui/msneditaccountui.ui
@@ -128,7 +128,7 @@
                             </property>
                             <widget class="TQLayoutWidget" row="0" column="0">
                                 <property name="name">
-                                    <cstring>tqlayout14</cstring>
+                                    <cstring>layout14</cstring>
                                 </property>
                                 <hbox>
                                     <property name="name">
@@ -265,7 +265,7 @@
                             </widget>
                             <widget class="TQLayoutWidget">
                                 <property name="name">
-                                    <cstring>tqlayout13_2</cstring>
+                                    <cstring>layout13_2</cstring>
                                 </property>
                                 <hbox>
                                     <property name="name">
@@ -408,7 +408,7 @@ Only works for emoticons in the PNG format.</string>
                             </widget>
                             <widget class="TQLayoutWidget">
                                 <property name="name">
-                                    <cstring>tqlayout28</cstring>
+                                    <cstring>layout28</cstring>
                                 </property>
                                 <hbox>
                                     <property name="name">
@@ -641,7 +641,7 @@ Only works for emoticons in the PNG format.</string>
                             </property>
                             <widget class="TQLayoutWidget">
                                 <property name="name">
-                                    <cstring>tqlayout17</cstring>
+                                    <cstring>layout17</cstring>
                                 </property>
                                 <vbox>
                                     <property name="name">
@@ -679,7 +679,7 @@ Only works for emoticons in the PNG format.</string>
                                     </widget>
                                     <widget class="TQLayoutWidget">
                                         <property name="name">
-                                            <cstring>tqlayout13</cstring>
+                                            <cstring>layout13</cstring>
                                         </property>
                                         <hbox>
                                             <property name="name">
@@ -736,7 +736,7 @@ Only works for emoticons in the PNG format.</string>
                             </widget>
                             <widget class="TQLayoutWidget">
                                 <property name="name">
-                                    <cstring>tqlayout16</cstring>
+                                    <cstring>layout16</cstring>
                                 </property>
                                 <vbox>
                                     <property name="name">
@@ -865,7 +865,7 @@ Only works for emoticons in the PNG format.</string>
                     </widget>
                     <widget class="TQLayoutWidget">
                         <property name="name">
-                            <cstring>tqlayout6</cstring>
+                            <cstring>layout6</cstring>
                         </property>
                         <grid>
                             <property name="name">
@@ -889,7 +889,7 @@ Only works for emoticons in the PNG format.</string>
                             </widget>
                             <widget class="TQLayoutWidget" row="1" column="1">
                                 <property name="name">
-                                    <cstring>tqlayout4</cstring>
+                                    <cstring>layout4</cstring>
                                 </property>
                                 <vbox>
                                     <property name="name">
@@ -950,7 +950,7 @@ Only works for emoticons in the PNG format.</string>
                     </widget>
                     <widget class="TQLayoutWidget">
                         <property name="name">
-                            <cstring>tqlayout58</cstring>
+                            <cstring>layout58</cstring>
                         </property>
                         <hbox>
                             <property name="name">
@@ -1005,7 +1005,7 @@ Only works for emoticons in the PNG format.</string>
                     </widget>
                     <widget class="TQLayoutWidget">
                         <property name="name">
-                            <cstring>tqlayout59</cstring>
+                            <cstring>layout59</cstring>
                         </property>
                         <hbox>
                             <property name="name">
@@ -1124,7 +1124,7 @@ Only works for emoticons in the PNG format.</string>
                             </widget>
                             <widget class="TQLayoutWidget">
                                 <property name="name">
-                                    <cstring>tqlayout20</cstring>
+                                    <cstring>layout20</cstring>
                                 </property>
                                 <hbox>
                                     <property name="name">
@@ -1132,7 +1132,7 @@ Only works for emoticons in the PNG format.</string>
                                     </property>
                                     <widget class="TQLayoutWidget">
                                         <property name="name">
-                                            <cstring>tqlayout19</cstring>
+                                            <cstring>layout19</cstring>
                                         </property>
                                         <hbox>
                                             <property name="name">
@@ -1236,7 +1236,7 @@ Only check this option if the normal connection doesn't work.</string>
                             </widget>
                             <widget class="TQLayoutWidget">
                                 <property name="name">
-                                    <cstring>tqlayout22</cstring>
+                                    <cstring>layout22</cstring>
                                 </property>
                                 <hbox>
                                     <property name="name">
diff --git a/kopete/protocols/msn/ui/msninfo.ui b/kopete/protocols/msn/ui/msninfo.ui
index fde773a2..59d50be6 100644
--- a/kopete/protocols/msn/ui/msninfo.ui
+++ b/kopete/protocols/msn/ui/msninfo.ui
@@ -98,7 +98,7 @@
         </widget>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>tqlayout3</cstring>
+                <cstring>layout3</cstring>
             </property>
             <hbox>
                 <property name="name">
-- 
cgit v1.2.1