9 files changed, 12 insertions, 12 deletions
diff --git a/kopete/protocols/gadu/gaduaccount.cpp b/kopete/protocols/gadu/gaduaccount.cpp
index 985111a4..767c7b1a 100644
--- a/kopete/protocols/gadu/gaduaccount.cpp
+++ b/kopete/protocols/gadu/gaduaccount.cpp
@@ -375,12 +375,12 @@ GaduAccount::userlistChanged()
 }
 
 bool
-GaduAccount::createContact( const TQString& contactId, Kopete::MetaContact* tqparentContact )
+GaduAccount::createContact( const TQString& contactId, Kopete::MetaContact* parentContact )
 {
 	kdDebug(14100) << "createContact " << contactId << endl;
 
 	uin_t uinNumber = contactId.toUInt();
-	GaduContact* newContact = new GaduContact( uinNumber, tqparentContact->displayName(),this, tqparentContact );
+	GaduContact* newContact = new GaduContact( uinNumber, parentContact->displayName(),this, parentContact );
 	newContact->setParentIdentity( accountId() );
 	addNotify( uinNumber );
 
diff --git a/kopete/protocols/gadu/gaduaccount.h b/kopete/protocols/gadu/gaduaccount.h
index ad7b4edf..0363d181 100644
--- a/kopete/protocols/gadu/gaduaccount.h
+++ b/kopete/protocols/gadu/gaduaccount.h
@@ -128,7 +128,7 @@ signals:
 protected:
 	//{
 	bool createContact( const TQString& contactId,
-			Kopete::MetaContact* tqparentContact );
+			Kopete::MetaContact* parentContact );
 	//}
 
 private slots:
diff --git a/kopete/protocols/gadu/gaducontact.cpp b/kopete/protocols/gadu/gaducontact.cpp
index 2ee61e97..0b581a42 100644
--- a/kopete/protocols/gadu/gaducontact.cpp
+++ b/kopete/protocols/gadu/gaducontact.cpp
@@ -74,13 +74,13 @@ GaduContact::GaduContact( uin_t uin, const TQString& name, Kopete::Account* acco
 TQString
 GaduContact::identityId() const
 {
-	return tqparentIdentity_;
+	return parentIdentity_;
 }
 
 void
 GaduContact::setParentIdentity( const TQString& id)
 {
-	tqparentIdentity_ = id;
+	parentIdentity_ = id;
 }
 
 uin_t
diff --git a/kopete/protocols/gadu/gaducontact.h b/kopete/protocols/gadu/gaducontact.h
index ee244a96..15eaf288 100644
--- a/kopete/protocols/gadu/gaducontact.h
+++ b/kopete/protocols/gadu/gaducontact.h
@@ -96,7 +96,7 @@ private:
 
 	Kopete::ChatSession*	msgManager_;
 	TQString			description_;
-	TQString			tqparentIdentity_;
+	TQString			parentIdentity_;
 	GaduAccount*		account_;
 
 	KAction*		actionSendMessage_;
diff --git a/kopete/protocols/gadu/ui/gaduadd.ui b/kopete/protocols/gadu/ui/gaduadd.ui
index afc259b1..7fa193d6 100644
--- a/kopete/protocols/gadu/ui/gaduadd.ui
+++ b/kopete/protocols/gadu/ui/gaduadd.ui
@@ -353,7 +353,7 @@
 </widget>
 <customwidgets>
 </customwidgets>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>krestrictedline.h</includehint>
 </includehints>
diff --git a/kopete/protocols/gadu/ui/gaduawayui.ui b/kopete/protocols/gadu/ui/gaduawayui.ui
index fbc9411c..de6b1b81 100644
--- a/kopete/protocols/gadu/ui/gaduawayui.ui
+++ b/kopete/protocols/gadu/ui/gaduawayui.ui
@@ -190,5 +190,5 @@ Choosing Offline status will disconnect you, with given description.</string>
     <tabstop>invisibleButton_</tabstop>
     <tabstop>offlineButton_</tabstop>
 </tabstops>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/kopete/protocols/gadu/ui/gadueditaccountui.ui b/kopete/protocols/gadu/ui/gadueditaccountui.ui
index 1542a76f..ff165d35 100644
--- a/kopete/protocols/gadu/ui/gadueditaccountui.ui
+++ b/kopete/protocols/gadu/ui/gadueditaccountui.ui
@@ -865,7 +865,7 @@ If you do not currently have an account, please click the button to create one.<
     <tabstop>ipAddress</tabstop>
     <tabstop>dccPort</tabstop>
 </tabstops>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>klineedit.h</includehint>
     <includehint>krestrictedline.h</includehint>
diff --git a/kopete/protocols/gadu/ui/gaduregisteraccountui.ui b/kopete/protocols/gadu/ui/gaduregisteraccountui.ui
index 9490ffb6..9397854c 100644
--- a/kopete/protocols/gadu/ui/gaduregisteraccountui.ui
+++ b/kopete/protocols/gadu/ui/gaduregisteraccountui.ui
@@ -267,7 +267,7 @@
         </widget>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>tqlayoutImageCenter</cstring>
+                <cstring>layoutImageCenter</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -414,7 +414,7 @@
     <tabstop>valuePasswordVerify</tabstop>
     <tabstop>valueVerificationSequence</tabstop>
 </tabstops>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>klineedit.h</includehint>
     <includehint>klineedit.h</includehint>
diff --git a/kopete/protocols/gadu/ui/gadusearch.ui b/kopete/protocols/gadu/ui/gadusearch.ui
index 2aef2334..d9c39029 100644
--- a/kopete/protocols/gadu/ui/gadusearch.ui
+++ b/kopete/protocols/gadu/ui/gadusearch.ui
@@ -684,7 +684,7 @@
     <tabstop>onlyOnline</tabstop>
     <tabstop>listFound</tabstop>
 </tabstops>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>krestrictedline.h</includehint>
     <includehint>klistview.h</includehint>