6 files changed, 10 insertions, 10 deletions
diff --git a/kopete/protocols/oscar/aim/aimaccount.cpp b/kopete/protocols/oscar/aim/aimaccount.cpp
index 1f0269c8..201d7d01 100644
--- a/kopete/protocols/oscar/aim/aimaccount.cpp
+++ b/kopete/protocols/oscar/aim/aimaccount.cpp
@@ -235,9 +235,9 @@ AIMAccount::~AIMAccount()
 {
 }
 
-OscarContact *AIMAccount::createNewContact( const TQString &contactId, Kopete::MetaContact *tqparentContact, const SSI& ssiItem )
+OscarContact *AIMAccount::createNewContact( const TQString &contactId, Kopete::MetaContact *parentContact, const SSI& ssiItem )
 {
-	AIMContact* contact = new AIMContact( this, contactId, tqparentContact, TQString(), ssiItem );
+	AIMContact* contact = new AIMContact( this, contactId, parentContact, TQString(), ssiItem );
 	if ( !ssiItem.alias().isEmpty() )
 		contact->setProperty( Kopete::Global::Properties::self()->nickName(), ssiItem.alias() );
 
diff --git a/kopete/protocols/oscar/aim/aimaccount.h b/kopete/protocols/oscar/aim/aimaccount.h
index 35c7adb5..fc3d57ff 100644
--- a/kopete/protocols/oscar/aim/aimaccount.h
+++ b/kopete/protocols/oscar/aim/aimaccount.h
@@ -133,7 +133,7 @@ protected:
 	* Implement virtual method from OscarAccount
 	* This allows OscarAccount to take care of adding new contacts
 	*/
-	OscarContact *createNewContact( const TQString &contactId, Kopete::MetaContact *tqparentContact, const SSI& ssiItem );
+	OscarContact *createNewContact( const TQString &contactId, Kopete::MetaContact *parentContact, const SSI& ssiItem );
 
 	TQString sanitizedMessage( const TQString& message );
 
diff --git a/kopete/protocols/oscar/aim/ui/aimaddcontactui.ui b/kopete/protocols/oscar/aim/ui/aimaddcontactui.ui
index 97484a6d..663d2fc5 100644
--- a/kopete/protocols/oscar/aim/ui/aimaddcontactui.ui
+++ b/kopete/protocols/oscar/aim/ui/aimaddcontactui.ui
@@ -26,9 +26,9 @@
             <property name="title">
                 <string>Contact Information</string>
             </property>
-            <property name="tqlayoutMargin" stdset="0">
+            <property name="layoutMargin" stdset="0">
             </property>
-            <property name="tqlayoutSpacing" stdset="0">
+            <property name="layoutSpacing" stdset="0">
             </property>
             <grid>
                 <property name="name">
@@ -60,5 +60,5 @@
 <tabstops>
     <tabstop>addSN</tabstop>
 </tabstops>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/kopete/protocols/oscar/aim/ui/aimeditaccountui.ui b/kopete/protocols/oscar/aim/ui/aimeditaccountui.ui
index a1b8dbfd..5221130e 100644
--- a/kopete/protocols/oscar/aim/ui/aimeditaccountui.ui
+++ b/kopete/protocols/oscar/aim/ui/aimeditaccountui.ui
@@ -533,7 +533,7 @@
     <tabstop>rbBlockAIM</tabstop>
     <tabstop>rbBlockDenyList</tabstop>
 </tabstops>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>kopetepasswordwidget.h</includehint>
 </includehints>
diff --git a/kopete/protocols/oscar/aim/ui/aiminfobase.ui b/kopete/protocols/oscar/aim/ui/aiminfobase.ui
index 5743d7e7..9457068e 100644
--- a/kopete/protocols/oscar/aim/ui/aiminfobase.ui
+++ b/kopete/protocols/oscar/aim/ui/aiminfobase.ui
@@ -18,7 +18,7 @@
             <height>400</height>
         </size>
     </property>
-    <property name="tqlayoutMargin" stdset="0">
+    <property name="layoutMargin" stdset="0">
     </property>
     <vbox>
         <property name="name">
@@ -239,7 +239,7 @@
     <tabstop>txtOnlineSince</tabstop>
     <tabstop>txtAwayMessage</tabstop>
 </tabstops>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>ktextbrowser.h</includehint>
 </includehints>
diff --git a/kopete/protocols/oscar/aim/ui/aimjoinchatbase.ui b/kopete/protocols/oscar/aim/ui/aimjoinchatbase.ui
index 4b3b12aa..fdfe2a53 100644
--- a/kopete/protocols/oscar/aim/ui/aimjoinchatbase.ui
+++ b/kopete/protocols/oscar/aim/ui/aimjoinchatbase.ui
@@ -120,5 +120,5 @@
         </spacer>
     </grid>
 </widget>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>