Rename obsolete tq methods to standard names

25 files changed, 63 insertions, 63 deletions

diff --git a/kopete/kopete/addaccountwizard/addaccountwizardpage1.ui b/kopete/kopete/addaccountwizard/addaccountwizardpage1.ui
index 19e1f6e8..04ab9f9a 100644
--- a/kopete/kopete/addaccountwizard/addaccountwizardpage1.ui
+++ b/kopete/kopete/addaccountwizard/addaccountwizardpage1.ui
@@ -30,7 +30,7 @@
         </property>
         <widget class="TQLayoutWidget" row="0" column="0" rowspan="2" colspan="1">
             <property name="name">
-                <cstring>tqlayout8</cstring>
+                <cstring>layout8</cstring>
             </property>
             <vbox>
                 <property name="name">
diff --git a/kopete/kopete/addaccountwizard/addaccountwizardpage2.ui b/kopete/kopete/addaccountwizard/addaccountwizardpage2.ui
index 860e0e8e..f652cb2e 100644
--- a/kopete/kopete/addaccountwizard/addaccountwizardpage2.ui
+++ b/kopete/kopete/addaccountwizard/addaccountwizardpage2.ui
@@ -44,7 +44,7 @@
         </widget>
         <widget class="TQLayoutWidget" row="1" column="1">
             <property name="name">
-                <cstring>tqlayout3</cstring>
+                <cstring>layout3</cstring>
             </property>
             <hbox>
                 <property name="name">
diff --git a/kopete/kopete/addaccountwizard/addaccountwizardpage3.ui b/kopete/kopete/addaccountwizard/addaccountwizardpage3.ui
index f0b20fb4..4cd6e1ef 100644
--- a/kopete/kopete/addaccountwizard/addaccountwizardpage3.ui
+++ b/kopete/kopete/addaccountwizard/addaccountwizardpage3.ui
@@ -46,7 +46,7 @@
         </widget>
         <widget class="TQLayoutWidget" row="1" column="1">
             <property name="name">
-                <cstring>tqlayout3</cstring>
+                <cstring>layout3</cstring>
             </property>
             <hbox>
                 <property name="name">
diff --git a/kopete/kopete/addcontactwizard/fastaddcontactwizard_base.ui b/kopete/kopete/addcontactwizard/fastaddcontactwizard_base.ui
index 951bdbff..cc8d9ce0 100644
--- a/kopete/kopete/addcontactwizard/fastaddcontactwizard_base.ui
+++ b/kopete/kopete/addcontactwizard/fastaddcontactwizard_base.ui
@@ -28,7 +28,7 @@
             </property>
             <widget class="TQLayoutWidget">
                 <property name="name">
-                    <cstring>tqlayout21</cstring>
+                    <cstring>layout21</cstring>
                 </property>
                 <vbox>
                     <property name="name">
@@ -66,7 +66,7 @@
             </widget>
             <widget class="TQLayoutWidget">
                 <property name="name">
-                    <cstring>tqlayout19</cstring>
+                    <cstring>layout19</cstring>
                 </property>
                 <vbox>
                     <property name="name">
@@ -130,7 +130,7 @@
             </property>
             <widget class="TQLayoutWidget">
                 <property name="name">
-                    <cstring>tqlayout21_2</cstring>
+                    <cstring>layout21_2</cstring>
                 </property>
                 <vbox>
                     <property name="name">
@@ -168,7 +168,7 @@
             </widget>
             <widget class="TQLayoutWidget">
                 <property name="name">
-                    <cstring>tqlayout25</cstring>
+                    <cstring>layout25</cstring>
                 </property>
                 <vbox>
                     <property name="name">
diff --git a/kopete/kopete/chatwindow/chatmessagepart.cpp b/kopete/kopete/chatwindow/chatmessagepart.cpp
index 4e29627c..e7421438 100644
--- a/kopete/kopete/chatwindow/chatmessagepart.cpp
+++ b/kopete/kopete/chatwindow/chatmessagepart.cpp
@@ -955,13 +955,13 @@ void ChatMessagePart::copy(bool justselection /* default false */)
     		htmltextdrag->setSubtype("html");
             drag->addDragObject( htmltextdrag );
     	}
-    	TQApplication::tqclipboard()->setData( drag, TQClipboard::Clipboard );
+    	TQApplication::clipboard()->setData( drag, TQClipboard::Clipboard );
 	}
-    TQApplication::tqclipboard()->setText( text, TQClipboard::Selection );
+    TQApplication::clipboard()->setText( text, TQClipboard::Selection );
 #else
 	if(!justselection)
-    	TQApplication::tqclipboard()->setText( text, TQClipboard::Clipboard );
-	TQApplication::tqclipboard()->setText( text, TQClipboard::Selection );
+    	TQApplication::clipboard()->setText( text, TQClipboard::Clipboard );
+	TQApplication::clipboard()->setText( text, TQClipboard::Selection );
 #endif
 	connect( kapp->clipboard(), TQT_SIGNAL( selectionChanged()), TQT_SLOT( slotClearSelection()));
 
@@ -1130,7 +1130,7 @@ TQString ChatMessagePart::formatStyleKeywords( const TQString &sourceHTML, const
 	// hash contactId to deterministically pick a color for the contact
 	int hash = 0;
 	for( uint f = 0; f < contactId.length(); ++f )
-		hash += contactId[f].tqunicode() * f;
+		hash += contactId[f].unicode() * f;
 	const TQString colorName = nameColors[ hash % nameColorsLen ];
 	TQString lightColorName;	// Do not initialize, TQColor::name() is expensive!
 	kdDebug(14000) << k_funcinfo << "Hash " << hash << " has color " << colorName << endl;
diff --git a/kopete/kopete/chatwindow/chatview.cpp b/kopete/kopete/chatwindow/chatview.cpp
index efb2a668..4f356690 100644
--- a/kopete/kopete/chatwindow/chatview.cpp
+++ b/kopete/kopete/chatwindow/chatview.cpp
@@ -317,7 +317,7 @@ void ChatView::makeVisible()
 	if ( !m_mainWindow->isVisible() )
 	{
 		m_mainWindow->show();
-		// scroll down post show and tqlayout, otherwise the geometry is wrong to scroll to the bottom.
+		// scroll down post show and layout, otherwise the geometry is wrong to scroll to the bottom.
 		m_messagePart->keepScrolledDown();
 	}
 
diff --git a/kopete/kopete/config/accounts/kopeteaccountconfigbase.ui b/kopete/kopete/config/accounts/kopeteaccountconfigbase.ui
index 16faf54f..321adac8 100644
--- a/kopete/kopete/config/accounts/kopeteaccountconfigbase.ui
+++ b/kopete/kopete/config/accounts/kopeteaccountconfigbase.ui
@@ -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">
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 12afec52..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">
@@ -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">
diff --git a/kopete/kopete/config/appearance/appearanceconfig_contactlist.ui b/kopete/kopete/config/appearance/appearanceconfig_contactlist.ui
index da705359..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">
@@ -248,7 +248,7 @@
                 </widget>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>tqlayout2</cstring>
+                        <cstring>layout2</cstring>
                     </property>
                     <hbox>
                         <property name="name">
@@ -328,7 +328,7 @@
         </widget>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>tqlayout8</cstring>
+                <cstring>layout8</cstring>
             </property>
             <hbox>
                 <property name="name">
diff --git a/kopete/kopete/config/appearance/appearanceconfig_emoticons.ui b/kopete/kopete/config/appearance/appearanceconfig_emoticons.ui
index 20ad8628..6af82e16 100644
--- a/kopete/kopete/config/appearance/appearanceconfig_emoticons.ui
+++ b/kopete/kopete/config/appearance/appearanceconfig_emoticons.ui
@@ -92,7 +92,7 @@
         </widget>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>tqlayout2</cstring>
+                <cstring>layout2</cstring>
             </property>
             <hbox>
                 <property name="name">
diff --git a/kopete/kopete/config/appearance/emoticonseditwidget.ui b/kopete/kopete/config/appearance/emoticonseditwidget.ui
index c40df6e2..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">
diff --git a/kopete/kopete/config/appearance/tooltipeditwidget.ui b/kopete/kopete/config/appearance/tooltipeditwidget.ui
index 16026c84..8a2021fd 100644
--- a/kopete/kopete/config/appearance/tooltipeditwidget.ui
+++ b/kopete/kopete/config/appearance/tooltipeditwidget.ui
@@ -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">
@@ -114,7 +114,7 @@
                         </spacer>
                         <widget class="TQLayoutWidget">
                             <property name="name">
-                                <cstring>tqlayout1</cstring>
+                                <cstring>layout1</cstring>
                             </property>
                             <grid>
                                 <property name="name">
diff --git a/kopete/kopete/config/avdevice/avdeviceconfig_videoconfig.ui b/kopete/kopete/config/avdevice/avdeviceconfig_videoconfig.ui
index f8a26c86..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">
diff --git a/kopete/kopete/config/behavior/behaviorconfig_chat.ui b/kopete/kopete/config/behavior/behaviorconfig_chat.ui
index f2394f16..a2a40598 100644
--- a/kopete/kopete/config/behavior/behaviorconfig_chat.ui
+++ b/kopete/kopete/config/behavior/behaviorconfig_chat.ui
@@ -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">
@@ -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">
diff --git a/kopete/kopete/config/behavior/behaviorconfig_events.ui b/kopete/kopete/config/behavior/behaviorconfig_events.ui
index 748d519f..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">
@@ -104,7 +104,7 @@
                 </widget>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>tqlayout11</cstring>
+                        <cstring>layout11</cstring>
                     </property>
                     <hbox>
                         <property name="name">
@@ -148,7 +148,7 @@
                 </widget>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>tqlayout7</cstring>
+                        <cstring>layout7</cstring>
                     </property>
                     <hbox>
                         <property name="name">
diff --git a/kopete/kopete/config/behavior/kopeteawayconfigbase.ui b/kopete/kopete/config/behavior/kopeteawayconfigbase.ui
index 48680e64..c35aa4d5 100644
--- a/kopete/kopete/config/behavior/kopeteawayconfigbase.ui
+++ b/kopete/kopete/config/behavior/kopeteawayconfigbase.ui
@@ -111,7 +111,7 @@
                 </widget>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>tqlayout3</cstring>
+                        <cstring>layout3</cstring>
                     </property>
                     <hbox>
                         <property name="name">
@@ -226,7 +226,7 @@
                 </widget>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>tqlayout3</cstring>
+                        <cstring>layout3</cstring>
                     </property>
                     <hbox>
                         <property name="name">
diff --git a/kopete/kopete/config/identity/kopeteidentityconfigbase.ui b/kopete/kopete/config/identity/kopeteidentityconfigbase.ui
index a216ec68..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">
@@ -242,7 +242,7 @@
                             </property>
                             <widget class="TQLayoutWidget">
                                 <property name="name">
-                                    <cstring>tqlayout7</cstring>
+                                    <cstring>layout7</cstring>
                                 </property>
                                 <grid>
                                     <property name="name">
@@ -316,7 +316,7 @@
                             </widget>
                             <widget class="TQLayoutWidget">
                                 <property name="name">
-                                    <cstring>tqlayout11</cstring>
+                                    <cstring>layout11</cstring>
                                 </property>
                                 <vbox>
                                     <property name="name">
@@ -424,7 +424,7 @@
                     </property>
                     <widget class="TQLayoutWidget">
                         <property name="name">
-                            <cstring>tqlayout7</cstring>
+                            <cstring>layout7</cstring>
                         </property>
                         <hbox>
                             <property name="name">
diff --git a/kopete/kopete/contactlist/customnotifications.ui b/kopete/kopete/contactlist/customnotifications.ui
index afd59013..45f15dad 100644
--- a/kopete/kopete/contactlist/customnotifications.ui
+++ b/kopete/kopete/contactlist/customnotifications.ui
@@ -18,7 +18,7 @@
         </property>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>tqlayout13</cstring>
+                <cstring>layout13</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -47,7 +47,7 @@
         </widget>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>tqlayout12</cstring>
+                <cstring>layout12</cstring>
             </property>
             <grid>
                 <property name="name">
diff --git a/kopete/kopete/contactlist/kabcexport_base.ui b/kopete/kopete/contactlist/kabcexport_base.ui
index bc8c78f1..fa147a52 100644
--- a/kopete/kopete/contactlist/kabcexport_base.ui
+++ b/kopete/kopete/contactlist/kabcexport_base.ui
@@ -135,7 +135,7 @@
             </widget>
             <widget class="TQLayoutWidget">
                 <property name="name">
-                    <cstring>tqlayout3</cstring>
+                    <cstring>layout3</cstring>
                 </property>
                 <hbox>
                     <property name="name">
diff --git a/kopete/kopete/contactlist/kopetegvipropswidget.ui b/kopete/kopete/contactlist/kopetegvipropswidget.ui
index 515ac5ab..6e13abba 100644
--- a/kopete/kopete/contactlist/kopetegvipropswidget.ui
+++ b/kopete/kopete/contactlist/kopetegvipropswidget.ui
@@ -36,7 +36,7 @@
                     </property>
                     <widget class="TQLayoutWidget">
                         <property name="name">
-                            <cstring>tqlayout7</cstring>
+                            <cstring>layout7</cstring>
                         </property>
                         <hbox>
                             <property name="name">
diff --git a/kopete/kopete/contactlist/kopetelviprops.cpp b/kopete/kopete/contactlist/kopetelviprops.cpp
index b86ba2ba..0c66892c 100644
--- a/kopete/kopete/contactlist/kopetelviprops.cpp
+++ b/kopete/kopete/contactlist/kopetelviprops.cpp
@@ -157,10 +157,10 @@ KopeteMetaLVIProps::KopeteMetaLVIProps(KopeteMetaContactLVI *lvi, TQWidget *pare
 
 	mNotificationProps = new CustomNotificationProps( this, lvi->metaContact() );
 	// add a button to the notification props to get the sound from KABC
-	// the widget's vert box tqlayout, horiz box tqlayout containing button, spacer, followed by a spacer
-	TQBoxLayout * vb = static_cast<TQVBoxLayout*>( mNotificationProps->widget()->tqlayout() );
+	// the widget's vert box layout, horiz box layout containing button, spacer, followed by a spacer
+	TQBoxLayout * vb = static_cast<TQVBoxLayout*>( mNotificationProps->widget()->layout() );
 
-	TQHBoxLayout* hb = new TQHBoxLayout( vb, -1, "soundFromKABCtqlayout" );
+	TQHBoxLayout* hb = new TQHBoxLayout( vb, -1, "soundFromKABClayout" );
 	mFromKABC = new TQPushButton( i18n( "Sync KABC..." ), mNotificationProps->widget(), "getSoundFromKABC" );
 	hb->addWidget( mFromKABC ); // [ [Button] <-xxxxx-> ]
 	hb->addStretch();
diff --git a/kopete/kopete/contactlist/kopetemetalvipropswidget.ui b/kopete/kopete/contactlist/kopetemetalvipropswidget.ui
index 831365b7..718a3ae9 100644
--- a/kopete/kopete/contactlist/kopetemetalvipropswidget.ui
+++ b/kopete/kopete/contactlist/kopetemetalvipropswidget.ui
@@ -60,7 +60,7 @@
                             </widget>
                             <widget class="TQLayoutWidget">
                                 <property name="name">
-                                    <cstring>tqlayout8</cstring>
+                                    <cstring>layout8</cstring>
                                 </property>
                                 <hbox>
                                     <property name="name">
@@ -136,7 +136,7 @@
                             </widget>
                             <widget class="TQLayoutWidget">
                                 <property name="name">
-                                    <cstring>tqlayout11</cstring>
+                                    <cstring>layout11</cstring>
                                 </property>
                                 <hbox>
                                     <property name="name">
@@ -187,7 +187,7 @@
                             </widget>
                             <widget class="TQLayoutWidget">
                                 <property name="name">
-                                    <cstring>tqlayout12</cstring>
+                                    <cstring>layout12</cstring>
                                 </property>
                                 <hbox>
                                     <property name="name">
@@ -277,7 +277,7 @@
                             </widget>
                             <widget class="TQLayoutWidget" row="1" column="0">
                                 <property name="name">
-                                    <cstring>tqlayout13</cstring>
+                                    <cstring>layout13</cstring>
                                 </property>
                                 <hbox>
                                     <property name="name">
@@ -328,7 +328,7 @@
                             </widget>
                             <widget class="TQLayoutWidget" row="2" column="0">
                                 <property name="name">
-                                    <cstring>tqlayout7</cstring>
+                                    <cstring>layout7</cstring>
                                 </property>
                                 <hbox>
                                     <property name="name">
diff --git a/kopete/kopete/groupkabcselectorwidget.ui b/kopete/kopete/groupkabcselectorwidget.ui
index 46d6c5e3..d4d6d5cf 100644
--- a/kopete/kopete/groupkabcselectorwidget.ui
+++ b/kopete/kopete/groupkabcselectorwidget.ui
@@ -35,7 +35,7 @@
         </widget>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>tqlayout13</cstring>
+                <cstring>layout13</cstring>
             </property>
             <grid>
                 <property name="name">
diff --git a/kopete/kopete/kconf_update/kopete-account-kconf_update.cpp b/kopete/kopete/kconf_update/kopete-account-kconf_update.cpp
index ae50ae98..4e0daa55 100644
--- a/kopete/kopete/kconf_update/kopete-account-kconf_update.cpp
+++ b/kopete/kopete/kconf_update/kopete-account-kconf_update.cpp
@@ -46,8 +46,8 @@ TQString cryptStr(const TQString &aStr)
 {
 	TQString result;
 	for (unsigned int i = 0; i < aStr.length(); i++)
-		result += (aStr[i].tqunicode() < 0x20) ? aStr[i] :
-			TQChar(0x1001F - aStr[i].tqunicode());
+		result += (aStr[i].unicode() < 0x20) ? aStr[i] :
+			TQChar(0x1001F - aStr[i].unicode());
 	return result;
 }