From 808e453c56036211f57482ed847d54aca01bba68 Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Thu, 15 Dec 2011 15:49:40 -0600
Subject: Rename a number of old tq methods that are no longer tq specific

---
 kopete/protocols/msn/ui/msnadd.ui                |  8 +--
 kopete/protocols/msn/ui/msneditaccountui.ui      | 76 ++++++++++++------------
 kopete/protocols/msn/ui/msneditaccountwidget.cpp |  2 +-
 kopete/protocols/msn/ui/msninfo.ui               |  4 +-
 4 files changed, 45 insertions(+), 45 deletions(-)

(limited to 'kopete/protocols/msn/ui')

diff --git a/kopete/protocols/msn/ui/msnadd.ui b/kopete/protocols/msn/ui/msnadd.ui
index 283ea56f..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">
@@ -37,7 +37,7 @@
                     <property name="text">
                         <string>&amp;MSN Passport ID:</string>
                     </property>
-                    <property name="tqalignment">
+                    <property name="alignment">
                         <set>AlignTop</set>
                     </property>
                     <property name="buddy" stdset="0">
@@ -70,7 +70,7 @@
             <property name="text">
                 <string>&lt;i&gt;(for example: joe@hotmail.com)&lt;/i&gt;</string>
             </property>
-            <property name="tqalignment">
+            <property name="alignment">
                 <set>AlignVCenter|AlignRight</set>
             </property>
         </widget>
@@ -84,7 +84,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>20</width>
                     <height>160</height>
diff --git a/kopete/protocols/msn/ui/msneditaccountui.ui b/kopete/protocols/msn/ui/msneditaccountui.ui
index 674248a1..0a764c57 100644
--- a/kopete/protocols/msn/ui/msneditaccountui.ui
+++ b/kopete/protocols/msn/ui/msneditaccountui.ui
@@ -54,7 +54,7 @@
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="tqsizeHint">
+                        <property name="sizeHint">
                             <size>
                                 <width>20</width>
                                 <height>146</height>
@@ -92,7 +92,7 @@
                                         <verstretch>0</verstretch>
                                     </sizepolicy>
                                 </property>
-                                <property name="tqminimumSize">
+                                <property name="minimumSize">
                                     <size>
                                         <width>0</width>
                                         <height>0</height>
@@ -101,7 +101,7 @@
                                 <property name="text">
                                     <string>To connect to the Microsoft network, you will need a Microsoft Passport.&lt;br&gt;&lt;br&gt;If you do not currently have a Passport, please click the button to create one.</string>
                                 </property>
-                                <property name="tqalignment">
+                                <property name="alignment">
                                     <set>WordBreak|AlignVCenter</set>
                                 </property>
                             </widget>
@@ -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">
@@ -229,7 +229,7 @@
                         <property name="text">
                             <string>&lt;qt&gt;&lt;b&gt;Note:&lt;/b&gt; These settings are applicable to all MSN accounts</string>
                         </property>
-                        <property name="tqalignment">
+                        <property name="alignment">
                             <set>WordBreak|AlignCenter</set>
                         </property>
                     </widget>
@@ -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">
@@ -449,7 +449,7 @@ Only works for emoticons in the PNG format.</string>
                                         <property name="sizeType">
                                             <enum>Expanding</enum>
                                         </property>
-                                        <property name="tqsizeHint">
+                                        <property name="sizeHint">
                                             <size>
                                                 <width>61</width>
                                                 <height>21</height>
@@ -468,7 +468,7 @@ Only works for emoticons in the PNG format.</string>
                                 <property name="sizeType">
                                     <enum>Minimum</enum>
                                 </property>
-                                <property name="tqsizeHint">
+                                <property name="sizeHint">
                                     <size>
                                         <width>20</width>
                                         <height>21</height>
@@ -482,7 +482,7 @@ Only works for emoticons in the PNG format.</string>
                                 <property name="text">
                                     <string>There are also privacy options in the "Contacts" tab</string>
                                 </property>
-                                <property name="tqalignment">
+                                <property name="alignment">
                                     <set>WordBreak|AlignCenter</set>
                                 </property>
                             </widget>
@@ -498,7 +498,7 @@ Only works for emoticons in the PNG format.</string>
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="tqsizeHint">
+                        <property name="sizeHint">
                             <size>
                                 <width>31</width>
                                 <height>40</height>
@@ -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">
@@ -673,13 +673,13 @@ Only works for emoticons in the PNG format.</string>
                                         <property name="text">
                                             <string>Please select a square image. The image will be scaled to 96x96.</string>
                                         </property>
-                                        <property name="tqalignment">
+                                        <property name="alignment">
                                             <set>WordBreak|AlignVCenter</set>
                                         </property>
                                     </widget>
                                     <widget class="TQLayoutWidget">
                                         <property name="name">
-                                            <cstring>tqlayout13</cstring>
+                                            <cstring>layout13</cstring>
                                         </property>
                                         <hbox>
                                             <property name="name">
@@ -706,7 +706,7 @@ Only works for emoticons in the PNG format.</string>
                                                 <property name="sizeType">
                                                     <enum>Expanding</enum>
                                                 </property>
-                                                <property name="tqsizeHint">
+                                                <property name="sizeHint">
                                                     <size>
                                                         <width>61</width>
                                                         <height>21</height>
@@ -725,7 +725,7 @@ Only works for emoticons in the PNG format.</string>
                                         <property name="sizeType">
                                             <enum>Minimum</enum>
                                         </property>
-                                        <property name="tqsizeHint">
+                                        <property name="sizeHint">
                                             <size>
                                                 <width>20</width>
                                                 <height>1</height>
@@ -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">
@@ -760,13 +760,13 @@ Only works for emoticons in the PNG format.</string>
                                                 <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>
@@ -789,7 +789,7 @@ Only works for emoticons in the PNG format.</string>
                                         <property name="sizeType">
                                             <enum>Minimum</enum>
                                         </property>
-                                        <property name="tqsizeHint">
+                                        <property name="sizeHint">
                                             <size>
                                                 <width>20</width>
                                                 <height>1</height>
@@ -810,7 +810,7 @@ Only works for emoticons in the PNG format.</string>
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="tqsizeHint">
+                        <property name="sizeHint">
                             <size>
                                 <width>20</width>
                                 <height>21</height>
@@ -836,7 +836,7 @@ Only works for emoticons in the PNG format.</string>
                         <property name="text">
                             <string>WARNING: You need to be connected to modify this page.</string>
                         </property>
-                        <property name="tqalignment">
+                        <property name="alignment">
                             <set>WordBreak|AlignVCenter</set>
                         </property>
                     </widget>
@@ -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">
@@ -921,7 +921,7 @@ Only works for emoticons in the PNG format.</string>
                                         <property name="sizeType">
                                             <enum>Expanding</enum>
                                         </property>
-                                        <property name="tqsizeHint">
+                                        <property name="sizeHint">
                                             <size>
                                                 <width>20</width>
                                                 <height>20</height>
@@ -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">
@@ -966,7 +966,7 @@ Only works for emoticons in the PNG format.</string>
                                 <property name="sizeType">
                                     <enum>Expanding</enum>
                                 </property>
-                                <property name="tqsizeHint">
+                                <property name="sizeHint">
                                     <size>
                                         <width>41</width>
                                         <height>20</height>
@@ -994,7 +994,7 @@ Only works for emoticons in the PNG format.</string>
                                 <property name="sizeType">
                                     <enum>Expanding</enum>
                                 </property>
-                                <property name="tqsizeHint">
+                                <property name="sizeHint">
                                     <size>
                                         <width>41</width>
                                         <height>20</height>
@@ -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">
@@ -1021,7 +1021,7 @@ Only works for emoticons in the PNG format.</string>
                                 <property name="sizeType">
                                     <enum>Expanding</enum>
                                 </property>
-                                <property name="tqsizeHint">
+                                <property name="sizeHint">
                                     <size>
                                         <width>81</width>
                                         <height>20</height>
@@ -1032,7 +1032,7 @@ Only works for emoticons in the PNG format.</string>
                                 <property name="name">
                                     <cstring>m_RLButton</cstring>
                                 </property>
-                                <property name="tqmaximumSize">
+                                <property name="maximumSize">
                                     <size>
                                         <width>200</width>
                                         <height>32767</height>
@@ -1058,7 +1058,7 @@ Only works for emoticons in the PNG format.</string>
                                 <property name="sizeType">
                                     <enum>Expanding</enum>
                                 </property>
-                                <property name="tqsizeHint">
+                                <property name="sizeHint">
                                     <size>
                                         <width>111</width>
                                         <height>20</height>
@@ -1086,7 +1086,7 @@ Only works for emoticons in the PNG format.</string>
                         <property name="text">
                             <string>WARNING: You need to be connected to modify this page</string>
                         </property>
-                        <property name="tqalignment">
+                        <property name="alignment">
                             <set>WordBreak|AlignVCenter</set>
                         </property>
                     </widget>
@@ -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">
@@ -1287,7 +1287,7 @@ Only check this option if the normal connection doesn't work.</string>
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="tqsizeHint">
+                        <property name="sizeHint">
                             <size>
                                 <width>21</width>
                                 <height>70</height>
@@ -1304,7 +1304,7 @@ Only check this option if the normal connection doesn't work.</string>
             <property name="text">
                 <string></string>
             </property>
-            <property name="tqalignment">
+            <property name="alignment">
                 <set>AlignCenter</set>
             </property>
         </widget>
diff --git a/kopete/protocols/msn/ui/msneditaccountwidget.cpp b/kopete/protocols/msn/ui/msneditaccountwidget.cpp
index 4bb246a2..a3ac755a 100644
--- a/kopete/protocols/msn/ui/msneditaccountwidget.cpp
+++ b/kopete/protocols/msn/ui/msneditaccountwidget.cpp
@@ -22,7 +22,7 @@
 #include <tqgroupbox.h>
 #include <tqimage.h>
 #include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqlineedit.h>
 #include <tqlistbox.h>
 #include <tqpushbutton.h>
diff --git a/kopete/protocols/msn/ui/msninfo.ui b/kopete/protocols/msn/ui/msninfo.ui
index 42a0f0b6..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">
@@ -208,7 +208,7 @@ If not, the user has not added you to their list, or has removed you.</string>
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>20</width>
                     <height>40</height>
-- 
cgit v1.2.1