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

21 files changed, 103 insertions, 103 deletions

diff --git a/kopete/kopete/config/accounts/kopeteaccountconfig.cpp b/kopete/kopete/config/accounts/kopeteaccountconfig.cpp
index 147c6f17..21cf6e86 100644
--- a/kopete/kopete/config/accounts/kopeteaccountconfig.cpp
+++ b/kopete/kopete/config/accounts/kopeteaccountconfig.cpp
@@ -19,7 +19,7 @@
 #include "kopeteaccountconfig.h"
 
 #include <tqcheckbox.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqguardedptr.h>
 
 #include <kcolorbutton.h>
@@ -231,7 +231,7 @@ void KopeteAccountConfig::slotRemoveAccount()
 		return;
 
 	Kopete::Account *i = lvi->account();
-	if ( KMessageBox::warningContinueCancel( this, i18n( "Are you sure you want to remove the account \"%1\"?" ).tqarg( i->accountLabel() ),
+	if ( KMessageBox::warningContinueCancel( this, i18n( "Are you sure you want to remove the account \"%1\"?" ).arg( i->accountLabel() ),
 		i18n( "Remove Account" ), KGuiItem(i18n( "Remove Account" ), "editdelete"),
 		 "askRemoveAccount", KMessageBox::Notify | KMessageBox::Dangerous ) == KMessageBox::Continue )
 	{
diff --git a/kopete/kopete/config/accounts/kopeteaccountconfigbase.ui b/kopete/kopete/config/accounts/kopeteaccountconfigbase.ui
index 112d01f5..321adac8 100644
--- a/kopete/kopete/config/accounts/kopeteaccountconfigbase.ui
+++ b/kopete/kopete/config/accounts/kopeteaccountconfigbase.ui
@@ -131,7 +131,7 @@ The icon of every contact of this account will be coloured with this color. Usef
             <property name="sizeType">
                 <enum>Minimum</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>16</width>
                     <height>16</height>
@@ -140,7 +140,7 @@ The icon of every contact of this account will be coloured with this color. Usef
         </spacer>
         <widget class="TQLayoutWidget" row="7" column="1" rowspan="1" colspan="2">
             <property name="name">
-                <cstring>tqlayout27</cstring>
+                <cstring>layout27</cstring>
             </property>
             <grid>
                 <property name="name">
@@ -150,7 +150,7 @@ The icon of every contact of this account will be coloured with this color. Usef
                     <property name="name">
                         <cstring>mButtonUp</cstring>
                     </property>
-                    <property name="tqminimumSize">
+                    <property name="minimumSize">
                         <size>
                             <width>60</width>
                             <height>10</height>
@@ -177,7 +177,7 @@ The priority is used to determine which contact to use when you click on a metac
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>20</width>
                             <height>40</height>
@@ -188,7 +188,7 @@ The priority is used to determine which contact to use when you click on a metac
                     <property name="name">
                         <cstring>mButtonDown</cstring>
                     </property>
-                    <property name="tqminimumSize">
+                    <property name="minimumSize">
                         <size>
                             <width>60</width>
                             <height>10</height>
@@ -217,7 +217,7 @@ The priority is used to determine which contact to use when you click on a metac
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>70</width>
                     <height>50</height>
@@ -234,7 +234,7 @@ The priority is used to determine which contact to use when you click on a metac
             <property name="sizeType">
                 <enum>Fixed</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>70</width>
                     <height>20</height>
diff --git a/kopete/kopete/config/appearance/appearanceconfig.cpp b/kopete/kopete/config/appearance/appearanceconfig.cpp
index ac6c4a27..d4b57b05 100644
--- a/kopete/kopete/config/appearance/appearanceconfig.cpp
+++ b/kopete/kopete/config/appearance/appearanceconfig.cpp
@@ -31,7 +31,7 @@
 
 #include <tqcheckbox.h>
 #include <tqdir.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqhbuttongroup.h>
 #include <tqspinbox.h>
 #include <tqslider.h>
@@ -242,7 +242,7 @@ AppearanceConfig::AppearanceConfig(TQWidget *parent, const char* /*name*/, const
 	htmlWidget->setMarginWidth(4);
 	htmlWidget->setMarginHeight(4);
 	htmlWidget->setFocusPolicy(TQ_NoFocus);
-	htmlWidget->tqsetSizePolicy(
+	htmlWidget->setSizePolicy(
 		TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding));
 	l->addWidget(htmlWidget);
 	// Add the preview message to the ChatMessagePart
@@ -548,9 +548,9 @@ void AppearanceConfig::slotSelectedEmoticonsThemeChanged()
 	TQString newContentText = "<qt>";
 
 	for(TQStringList::Iterator it = smileys.begin(); it != smileys.end(); ++it )
-		newContentText += TQString::tqfromLatin1("<img src=\"%1\"> ").tqarg(*it);
+		newContentText += TQString::fromLatin1("<img src=\"%1\"> ").arg(*it);
 
-	newContentText += TQString::tqfromLatin1("</qt>");
+	newContentText += TQString::fromLatin1("</qt>");
 	d->mPrfsEmoticons->icon_theme_preview->setText(newContentText);
 	emitChanged();
 }
@@ -673,7 +673,7 @@ void AppearanceConfig::slotDeleteChatStyle()
 	TQString stylePathToDelete = d->styleItemMap[d->mPrfsChatWindow->styleList->selectedItem()];
 	if( ChatWindowStyleManager::self()->removeStyle(stylePathToDelete) )
 	{
-		KMessageBox::queuedMessageBox(this, KMessageBox::Information, i18n("It's the deleted style name", "The style %1 was successfully deleted.").tqarg(styleName));
+		KMessageBox::queuedMessageBox(this, KMessageBox::Information, i18n("It's the deleted style name", "The style %1 was successfully deleted.").arg(styleName));
 
 		// Get the first item in the stye List.
 		TQString stylePath = (*d->styleItemMap.begin());
@@ -682,7 +682,7 @@ void AppearanceConfig::slotDeleteChatStyle()
 	}
 	else
 	{
-		KMessageBox::queuedMessageBox(this, KMessageBox::Information, i18n("It's the deleted style name", "An error occured while trying to delete %1 style.").tqarg(styleName));
+		KMessageBox::queuedMessageBox(this, KMessageBox::Information, i18n("It's the deleted style name", "An error occured while trying to delete %1 style.").arg(styleName));
 	}
 }
 
@@ -728,7 +728,7 @@ FakeAccount(Kopete::Protocol *parent, const TQString &accountID, const char *nam
 ~FakeAccount()
 {}
 bool createContact( const TQString &/*contactId*/, Kopete::MetaContact */*parentContact*/ ){return true;}
-void connect( const Kopete::OnlineStatus& /*initialtqStatus*/){}
+void connect( const Kopete::OnlineStatus& /*initialStatus*/){}
 void disconnect(){}
 void setOnlineStatus( const Kopete::OnlineStatus& /*status*/ , const TQString &/*reason*/){}
 };
diff --git a/kopete/kopete/config/appearance/appearanceconfig_chatwindow.ui b/kopete/kopete/config/appearance/appearanceconfig_chatwindow.ui
index 35fa6489..67dbaa07 100644
--- a/kopete/kopete/config/appearance/appearanceconfig_chatwindow.ui
+++ b/kopete/kopete/config/appearance/appearanceconfig_chatwindow.ui
@@ -96,7 +96,7 @@
                 </widget>
                 <widget class="TQLayoutWidget" row="2" column="0" rowspan="1" colspan="2">
                     <property name="name">
-                        <cstring>tqlayout10</cstring>
+                        <cstring>layout10</cstring>
                     </property>
                     <hbox>
                         <property name="name">
diff --git a/kopete/kopete/config/appearance/appearanceconfig_colors.ui b/kopete/kopete/config/appearance/appearanceconfig_colors.ui
index 880f2a38..8943bc6c 100644
--- a/kopete/kopete/config/appearance/appearanceconfig_colors.ui
+++ b/kopete/kopete/config/appearance/appearanceconfig_colors.ui
@@ -203,7 +203,7 @@
                 </widget>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>tqlayout9</cstring>
+                        <cstring>layout9</cstring>
                     </property>
                     <hbox>
                         <property name="name">
@@ -219,7 +219,7 @@
                             <property name="sizeType">
                                 <enum>Fixed</enum>
                             </property>
-                            <property name="tqsizeHint">
+                            <property name="sizeHint">
                                 <size>
                                     <width>20</width>
                                     <height>16</height>
@@ -228,7 +228,7 @@
                         </spacer>
                         <widget class="TQLayoutWidget">
                             <property name="name">
-                                <cstring>tqlayout8</cstring>
+                                <cstring>layout8</cstring>
                             </property>
                             <vbox>
                                 <property name="name">
@@ -236,7 +236,7 @@
                                 </property>
                                 <widget class="TQLayoutWidget">
                                     <property name="name">
-                                        <cstring>tqlayout5</cstring>
+                                        <cstring>layout5</cstring>
                                     </property>
                                     <hbox>
                                         <property name="name">
@@ -265,7 +265,7 @@
                                 </widget>
                                 <widget class="TQLayoutWidget">
                                     <property name="name">
-                                        <cstring>tqlayout6</cstring>
+                                        <cstring>layout6</cstring>
                                     </property>
                                     <hbox>
                                         <property name="name">
@@ -294,7 +294,7 @@
                                 </widget>
                                 <widget class="TQLayoutWidget">
                                     <property name="name">
-                                        <cstring>tqlayout7</cstring>
+                                        <cstring>layout7</cstring>
                                     </property>
                                     <hbox>
                                         <property name="name">
@@ -327,7 +327,7 @@
                 </widget>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>tqlayout6</cstring>
+                        <cstring>layout6</cstring>
                     </property>
                     <grid>
                         <property name="name">
@@ -382,7 +382,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>20</width>
                     <height>80</height>
diff --git a/kopete/kopete/config/appearance/appearanceconfig_contactlist.ui b/kopete/kopete/config/appearance/appearanceconfig_contactlist.ui
index d15d2d71..d92f9467 100644
--- a/kopete/kopete/config/appearance/appearanceconfig_contactlist.ui
+++ b/kopete/kopete/config/appearance/appearanceconfig_contactlist.ui
@@ -21,7 +21,7 @@
         </property>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>tqlayout4</cstring>
+                <cstring>layout4</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -56,7 +56,7 @@
                 </widget>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>tqlayout3</cstring>
+                        <cstring>layout3</cstring>
                     </property>
                     <hbox>
                         <property name="name">
@@ -72,7 +72,7 @@
                             <property name="sizeType">
                                 <enum>Fixed</enum>
                             </property>
-                            <property name="tqsizeHint">
+                            <property name="sizeHint">
                                 <size>
                                     <width>16</width>
                                     <height>16</height>
@@ -248,7 +248,7 @@
                 </widget>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>tqlayout2</cstring>
+                        <cstring>layout2</cstring>
                     </property>
                     <hbox>
                         <property name="name">
@@ -264,7 +264,7 @@
                             <property name="sizeType">
                                 <enum>Fixed</enum>
                             </property>
-                            <property name="tqsizeHint">
+                            <property name="sizeHint">
                                 <size>
                                     <width>16</width>
                                     <height>16</height>
@@ -315,7 +315,7 @@
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="tqsizeHint">
+                            <property name="sizeHint">
                                 <size>
                                     <width>81</width>
                                     <height>20</height>
@@ -328,7 +328,7 @@
         </widget>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>tqlayout8</cstring>
+                <cstring>layout8</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -352,7 +352,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>16</width>
                             <height>16</height>
@@ -371,7 +371,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>20</width>
                     <height>16</height>
diff --git a/kopete/kopete/config/appearance/appearanceconfig_emoticons.ui b/kopete/kopete/config/appearance/appearanceconfig_emoticons.ui
index 49c4cd47..6af82e16 100644
--- a/kopete/kopete/config/appearance/appearanceconfig_emoticons.ui
+++ b/kopete/kopete/config/appearance/appearanceconfig_emoticons.ui
@@ -80,7 +80,7 @@
                     <verstretch>0</verstretch>
                 </sizepolicy>
             </property>
-            <property name="tqmaximumSize">
+            <property name="maximumSize">
                 <size>
                     <width>32767</width>
                     <height>64</height>
@@ -92,7 +92,7 @@
         </widget>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>tqlayout2</cstring>
+                <cstring>layout2</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -165,7 +165,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>31</width>
                             <height>20</height>
diff --git a/kopete/kopete/config/appearance/emoticonseditdialog.cpp b/kopete/kopete/config/appearance/emoticonseditdialog.cpp
index d14e94f5..e6e8d524 100644
--- a/kopete/kopete/config/appearance/emoticonseditdialog.cpp
+++ b/kopete/kopete/config/appearance/emoticonseditdialog.cpp
@@ -27,7 +27,7 @@
 #include <kio/job.h>
 #include <tqpixmap.h>
 #include <tqheader.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqlabel.h>
 
 
@@ -197,14 +197,14 @@ void EmoticonsEditDialog::slotEditClicked()
         TQString f = mMainWidget->klvEmoticons->selectedItem()->text(2);
 
         KStandardDirs *dir = KGlobal::dirs();
-        emo = dir->findResource( "emoticons", themeName + TQString::tqfromLatin1( "/" ) + f );
+        emo = dir->findResource( "emoticons", themeName + TQString::fromLatin1( "/" ) + f );
 
         if( emo.isNull() )
-            emo = dir->findResource( "emoticons", themeName + TQString::tqfromLatin1( "/" ) + f + TQString::tqfromLatin1( ".mng" ) );
+            emo = dir->findResource( "emoticons", themeName + TQString::fromLatin1( "/" ) + f + TQString::fromLatin1( ".mng" ) );
         if ( emo.isNull() )
-            emo = dir->findResource( "emoticons", themeName + TQString::tqfromLatin1( "/" ) + f + TQString::tqfromLatin1( ".png" ) );
+            emo = dir->findResource( "emoticons", themeName + TQString::fromLatin1( "/" ) + f + TQString::fromLatin1( ".png" ) );
         if ( emo.isNull() )
-            emo = dir->findResource( "emoticons", themeName + TQString::tqfromLatin1( "/" ) + f + TQString::tqfromLatin1( ".gif" ) );
+            emo = dir->findResource( "emoticons", themeName + TQString::fromLatin1( "/" ) + f + TQString::fromLatin1( ".gif" ) );
         if ( emo.isNull() )
             return;
     }
diff --git a/kopete/kopete/config/appearance/emoticonseditwidget.ui b/kopete/kopete/config/appearance/emoticonseditwidget.ui
index 0babcc4e..e5a23692 100644
--- a/kopete/kopete/config/appearance/emoticonseditwidget.ui
+++ b/kopete/kopete/config/appearance/emoticonseditwidget.ui
@@ -21,7 +21,7 @@
         </property>
         <widget class="TQLayoutWidget" row="0" column="1">
             <property name="name">
-                <cstring>tqlayout5</cstring>
+                <cstring>layout5</cstring>
             </property>
             <vbox>
                 <property name="name">
@@ -61,7 +61,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>20</width>
                             <height>40</height>
diff --git a/kopete/kopete/config/appearance/tooltipeditwidget.ui b/kopete/kopete/config/appearance/tooltipeditwidget.ui
index c08cfc2c..8a2021fd 100644
--- a/kopete/kopete/config/appearance/tooltipeditwidget.ui
+++ b/kopete/kopete/config/appearance/tooltipeditwidget.ui
@@ -45,7 +45,7 @@
             <property name="text">
                 <string>Using the arrow buttons, put on the right the items you want to see in the contact tooltips. You can then sort them.</string>
             </property>
-            <property name="tqalignment">
+            <property name="alignment">
                 <set>WordBreak|AlignVCenter</set>
             </property>
         </widget>
@@ -59,7 +59,7 @@
         </widget>
         <widget class="TQLayoutWidget" row="3" column="0">
             <property name="name">
-                <cstring>tqlayout5</cstring>
+                <cstring>layout5</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -89,7 +89,7 @@
                 </widget>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>tqlayout4</cstring>
+                        <cstring>layout4</cstring>
                     </property>
                     <vbox>
                         <property name="name">
@@ -105,7 +105,7 @@
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="tqsizeHint">
+                            <property name="sizeHint">
                                 <size>
                                     <width>20</width>
                                     <height>60</height>
@@ -114,7 +114,7 @@
                         </spacer>
                         <widget class="TQLayoutWidget">
                             <property name="name">
-                                <cstring>tqlayout1</cstring>
+                                <cstring>layout1</cstring>
                             </property>
                             <grid>
                                 <property name="name">
@@ -170,7 +170,7 @@
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="tqsizeHint">
+                            <property name="sizeHint">
                                 <size>
                                     <width>20</width>
                                     <height>30</height>
diff --git a/kopete/kopete/config/avdevice/avdeviceconfig.cpp b/kopete/kopete/config/avdevice/avdeviceconfig.cpp
index 4f8bafc0..cc82696e 100644
--- a/kopete/kopete/config/avdevice/avdeviceconfig.cpp
+++ b/kopete/kopete/config/avdevice/avdeviceconfig.cpp
@@ -20,7 +20,7 @@
 #include "videodevice.h"
 
 #include <tqcheckbox.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqlabel.h>
 #include <tqhbuttongroup.h>
 #include <tqspinbox.h>
diff --git a/kopete/kopete/config/avdevice/avdeviceconfig_videoconfig.ui b/kopete/kopete/config/avdevice/avdeviceconfig_videoconfig.ui
index 5e4a7b1f..d9fa4e4f 100644
--- a/kopete/kopete/config/avdevice/avdeviceconfig_videoconfig.ui
+++ b/kopete/kopete/config/avdevice/avdeviceconfig_videoconfig.ui
@@ -198,7 +198,7 @@
                             </property>
                             <widget class="TQLayoutWidget" row="0" column="0">
                                 <property name="name">
-                                    <cstring>tqlayout11</cstring>
+                                    <cstring>layout11</cstring>
                                 </property>
                                 <hbox>
                                     <property name="name">
@@ -206,7 +206,7 @@
                                     </property>
                                     <widget class="TQLayoutWidget">
                                         <property name="name">
-                                            <cstring>tqlayout9</cstring>
+                                            <cstring>layout9</cstring>
                                         </property>
                                         <vbox>
                                             <property name="name">
@@ -296,7 +296,7 @@
                                     </widget>
                                     <widget class="TQLayoutWidget">
                                         <property name="name">
-                                            <cstring>tqlayout10</cstring>
+                                            <cstring>layout10</cstring>
                                         </property>
                                         <vbox>
                                             <property name="name">
@@ -448,7 +448,7 @@
                     </property>
                     <widget class="TQLayoutWidget" row="0" column="0">
                         <property name="name">
-                            <cstring>tqlayout8</cstring>
+                            <cstring>layout8</cstring>
                         </property>
                         <vbox>
                             <property name="name">
@@ -536,7 +536,7 @@
         </widget>
         <widget class="TQLayoutWidget" row="0" column="0">
             <property name="name">
-                <cstring>tqlayout19</cstring>
+                <cstring>layout19</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -552,7 +552,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>40</width>
                             <height>20</height>
@@ -571,7 +571,7 @@
                             <verstretch>0</verstretch>
                         </sizepolicy>
                     </property>
-                    <property name="tqminimumSize">
+                    <property name="minimumSize">
                         <size>
                             <width>320</width>
                             <height>240</height>
@@ -594,7 +594,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>40</width>
                             <height>20</height>
diff --git a/kopete/kopete/config/behavior/behaviorconfig.cpp b/kopete/kopete/config/behavior/behaviorconfig.cpp
index b133a64b..e7f053e8 100644
--- a/kopete/kopete/config/behavior/behaviorconfig.cpp
+++ b/kopete/kopete/config/behavior/behaviorconfig.cpp
@@ -20,7 +20,7 @@
 
 #include <tqcheckbox.h>
 #include <tqradiobutton.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqlabel.h>
 #include <tqhbuttongroup.h>
 #include <tqspinbox.h>
diff --git a/kopete/kopete/config/behavior/behaviorconfig_chat.ui b/kopete/kopete/config/behavior/behaviorconfig_chat.ui
index f5601731..a2a40598 100644
--- a/kopete/kopete/config/behavior/behaviorconfig_chat.ui
+++ b/kopete/kopete/config/behavior/behaviorconfig_chat.ui
@@ -56,7 +56,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>40</width>
                             <height>20</height>
@@ -75,7 +75,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>20</width>
                     <height>240</height>
@@ -182,7 +182,7 @@
         </widget>
         <widget class="TQLayoutWidget" row="6" column="0">
             <property name="name">
-                <cstring>tqlayout3</cstring>
+                <cstring>layout3</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -206,7 +206,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>120</width>
                             <height>20</height>
@@ -231,7 +231,7 @@
         </widget>
         <widget class="TQLayoutWidget" row="7" column="0">
             <property name="name">
-                <cstring>tqlayout4</cstring>
+                <cstring>layout4</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -261,7 +261,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>212</width>
                             <height>20</height>
diff --git a/kopete/kopete/config/behavior/behaviorconfig_events.ui b/kopete/kopete/config/behavior/behaviorconfig_events.ui
index 3d1c8926..9a3fe302 100644
--- a/kopete/kopete/config/behavior/behaviorconfig_events.ui
+++ b/kopete/kopete/config/behavior/behaviorconfig_events.ui
@@ -46,7 +46,7 @@
                 </widget>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>tqlayout11_2</cstring>
+                        <cstring>layout11_2</cstring>
                     </property>
                     <hbox>
                         <property name="name">
@@ -62,7 +62,7 @@
                             <property name="sizeType">
                                 <enum>Fixed</enum>
                             </property>
-                            <property name="tqsizeHint">
+                            <property name="sizeHint">
                                 <size>
                                     <width>16</width>
                                     <height>16</height>
@@ -104,7 +104,7 @@
                 </widget>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>tqlayout11</cstring>
+                        <cstring>layout11</cstring>
                     </property>
                     <hbox>
                         <property name="name">
@@ -120,7 +120,7 @@
                             <property name="sizeType">
                                 <enum>Fixed</enum>
                             </property>
-                            <property name="tqsizeHint">
+                            <property name="sizeHint">
                                 <size>
                                     <width>16</width>
                                     <height>16</height>
@@ -148,7 +148,7 @@
                 </widget>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>tqlayout7</cstring>
+                        <cstring>layout7</cstring>
                     </property>
                     <hbox>
                         <property name="name">
@@ -164,7 +164,7 @@
                             <property name="sizeType">
                                 <enum>Fixed</enum>
                             </property>
-                            <property name="tqsizeHint">
+                            <property name="sizeHint">
                                 <size>
                                     <width>16</width>
                                     <height>16</height>
@@ -221,7 +221,7 @@
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="tqsizeHint">
+                            <property name="sizeHint">
                                 <size>
                                     <width>70</width>
                                     <height>20</height>
@@ -339,7 +339,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>20</width>
                     <height>16</height>
diff --git a/kopete/kopete/config/behavior/behaviorconfig_general.ui b/kopete/kopete/config/behavior/behaviorconfig_general.ui
index 13e7cc5d..d22eb069 100644
--- a/kopete/kopete/config/behavior/behaviorconfig_general.ui
+++ b/kopete/kopete/config/behavior/behaviorconfig_general.ui
@@ -172,7 +172,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>20</width>
                     <height>16</height>
diff --git a/kopete/kopete/config/behavior/kopeteawayconfigbase.ui b/kopete/kopete/config/behavior/kopeteawayconfigbase.ui
index d2a1860a..c35aa4d5 100644
--- a/kopete/kopete/config/behavior/kopeteawayconfigbase.ui
+++ b/kopete/kopete/config/behavior/kopeteawayconfigbase.ui
@@ -77,7 +77,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>61</width>
                             <height>20</height>
@@ -111,7 +111,7 @@
                 </widget>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>tqlayout3</cstring>
+                        <cstring>layout3</cstring>
                     </property>
                     <hbox>
                         <property name="name">
@@ -163,7 +163,7 @@
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="tqsizeHint">
+                            <property name="sizeHint">
                                 <size>
                                     <width>81</width>
                                     <height>20</height>
@@ -226,7 +226,7 @@
                 </widget>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>tqlayout3</cstring>
+                        <cstring>layout3</cstring>
                     </property>
                     <hbox>
                         <property name="name">
@@ -242,7 +242,7 @@
                             <property name="sizeType">
                                 <enum>Fixed</enum>
                             </property>
-                            <property name="tqsizeHint">
+                            <property name="sizeHint">
                                 <size>
                                     <width>16</width>
                                     <height>16</height>
@@ -264,7 +264,7 @@
                                     <verstretch>0</verstretch>
                                 </sizepolicy>
                             </property>
-                            <property name="tqminimumSize">
+                            <property name="minimumSize">
                                 <size>
                                     <width>300</width>
                                     <height>0</height>
@@ -285,7 +285,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>20</width>
                     <height>30</height>
diff --git a/kopete/kopete/config/identity/globalidentitiesmanager.cpp b/kopete/kopete/config/identity/globalidentitiesmanager.cpp
index 41fbb3b6..7c1ebd56 100644
--- a/kopete/kopete/config/identity/globalidentitiesmanager.cpp
+++ b/kopete/kopete/config/identity/globalidentitiesmanager.cpp
@@ -19,7 +19,7 @@
 // TQt includes
 #include <tqdom.h>
 #include <tqfile.h>
-#include <tqtextstream.h>
+#include <textstream.h>
 
 // KDE includes
 #include <kdebug.h>
diff --git a/kopete/kopete/config/identity/kopeteidentityconfig.cpp b/kopete/kopete/config/identity/kopeteidentityconfig.cpp
index 97bc2bcc..cfe61002 100644
--- a/kopete/kopete/config/identity/kopeteidentityconfig.cpp
+++ b/kopete/kopete/config/identity/kopeteidentityconfig.cpp
@@ -18,7 +18,7 @@
 #include "kopeteidentityconfig.h"
 
 // TQt includes
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqimage.h>
 #include <tqlabel.h>
 #include <tqlineedit.h>
@@ -564,12 +564,12 @@ void KopeteIdentityConfig::slotChangePhoto(const TQString &photoUrl)
 		KMD5 context(tempArray);
 		// Save the image to a file.
 		saveLocation = context.hexDigest() + ".png";
-		saveLocation = locateLocal( "appdata", TQString::fromUtf8("globalidentitiespictures/%1").tqarg( saveLocation ) );
+		saveLocation = locateLocal( "appdata", TQString::fromUtf8("globalidentitiespictures/%1").arg( saveLocation ) );
 
 		if(!photo.save(saveLocation, "PNG"))
 		{
 			KMessageBox::sorry(this, 
-					i18n("An error occurred when trying to save the custom photo for %1 identity.").tqarg(d->selectedIdentity),
+					i18n("An error occurred when trying to save the custom photo for %1 identity.").arg(d->selectedIdentity),
 					i18n("Identity Configuration"));
 		}
 		d->m_view->comboPhotoURL->setURL(saveLocation);
@@ -578,7 +578,7 @@ void KopeteIdentityConfig::slotChangePhoto(const TQString &photoUrl)
 	else
 	{
 		KMessageBox::sorry(this, 
-					i18n("An error occurred when trying to save the custom photo for %1 identity.").tqarg(d->selectedIdentity),
+					i18n("An error occurred when trying to save the custom photo for %1 identity.").arg(d->selectedIdentity),
 					i18n("Identity Configuration"));
 	}
 }
diff --git a/kopete/kopete/config/identity/kopeteidentityconfigbase.ui b/kopete/kopete/config/identity/kopeteidentityconfigbase.ui
index cebc838c..08272e07 100644
--- a/kopete/kopete/config/identity/kopeteidentityconfigbase.ui
+++ b/kopete/kopete/config/identity/kopeteidentityconfigbase.ui
@@ -27,7 +27,7 @@
         </widget>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>tqlayout6</cstring>
+                <cstring>layout6</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -61,7 +61,7 @@
         </widget>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>tqlayout7</cstring>
+                <cstring>layout7</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -138,7 +138,7 @@
                             </property>
                             <widget class="TQLayoutWidget" row="0" column="0">
                                 <property name="name">
-                                    <cstring>tqlayout12</cstring>
+                                    <cstring>layout12</cstring>
                                 </property>
                                 <vbox>
                                     <property name="name">
@@ -203,7 +203,7 @@
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="tqsizeHint">
+                        <property name="sizeHint">
                             <size>
                                 <width>20</width>
                                 <height>16</height>
@@ -242,7 +242,7 @@
                             </property>
                             <widget class="TQLayoutWidget">
                                 <property name="name">
-                                    <cstring>tqlayout7</cstring>
+                                    <cstring>layout7</cstring>
                                 </property>
                                 <grid>
                                     <property name="name">
@@ -257,7 +257,7 @@
                                         <property name="name">
                                             <cstring>buttonClearPhoto</cstring>
                                         </property>
-                                        <property name="tqmaximumSize">
+                                        <property name="maximumSize">
                                             <size>
                                                 <width>32</width>
                                                 <height>3232</height>
@@ -316,7 +316,7 @@
                             </widget>
                             <widget class="TQLayoutWidget">
                                 <property name="name">
-                                    <cstring>tqlayout11</cstring>
+                                    <cstring>layout11</cstring>
                                 </property>
                                 <vbox>
                                     <property name="name">
@@ -332,7 +332,7 @@
                                         <property name="sizeType">
                                             <enum>Expanding</enum>
                                         </property>
-                                        <property name="tqsizeHint">
+                                        <property name="sizeHint">
                                             <size>
                                                 <width>20</width>
                                                 <height>36</height>
@@ -343,13 +343,13 @@
                                         <property name="name">
                                             <cstring>labelPhoto</cstring>
                                         </property>
-                                        <property name="tqminimumSize">
+                                        <property name="minimumSize">
                                             <size>
                                                 <width>64</width>
                                                 <height>92</height>
                                             </size>
                                         </property>
-                                        <property name="tqmaximumSize">
+                                        <property name="maximumSize">
                                             <size>
                                                 <width>64</width>
                                                 <height>32767</height>
@@ -381,7 +381,7 @@
                                         <property name="sizeType">
                                             <enum>Expanding</enum>
                                         </property>
-                                        <property name="tqsizeHint">
+                                        <property name="sizeHint">
                                             <size>
                                                 <width>20</width>
                                                 <height>40</height>
@@ -402,7 +402,7 @@
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="tqsizeHint">
+                        <property name="sizeHint">
                             <size>
                                 <width>20</width>
                                 <height>40</height>
@@ -424,7 +424,7 @@
                     </property>
                     <widget class="TQLayoutWidget">
                         <property name="name">
-                            <cstring>tqlayout7</cstring>
+                            <cstring>layout7</cstring>
                         </property>
                         <hbox>
                             <property name="name">
@@ -470,7 +470,7 @@ current user contact.</string>
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="tqsizeHint">
+                        <property name="sizeHint">
                             <size>
                                 <width>20</width>
                                 <height>100</height>
@@ -490,7 +490,7 @@ current user contact.</string>
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>20</width>
                     <height>16</height>
diff --git a/kopete/kopete/config/plugins/kopetepluginconfig.cpp b/kopete/kopete/config/plugins/kopetepluginconfig.cpp
index 7f790a0b..e3235d0c 100644
--- a/kopete/kopete/config/plugins/kopetepluginconfig.cpp
+++ b/kopete/kopete/config/plugins/kopetepluginconfig.cpp
@@ -17,7 +17,7 @@
 
 #include "kopetepluginconfig.h"
 
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqtimer.h>
 
 #include <kdebug.h>