Remove the tq in front of these incorrectly TQt4-converted methods/data members:

tqrepaint[...]
tqinvalidate[...]
tqparent[...]
tqmask[...]
tqlayout[...]
tqalignment[...]


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdenetwork@1240522 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

177 files changed, 298 insertions, 298 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>
diff --git a/kopete/protocols/groupwise/gwaccount.cpp b/kopete/protocols/groupwise/gwaccount.cpp
index ff5b53b4..ddcf1918 100644
--- a/kopete/protocols/groupwise/gwaccount.cpp
+++ b/kopete/protocols/groupwise/gwaccount.cpp
@@ -855,11 +855,11 @@ void GroupWiseAccount::receiveFolder( const FolderItem & folder )
 	kdDebug( GROUPWISE_DEBUG_GLOBAL ) << k_funcinfo
 			<< " objectId: " << folder.id
 			<< " sequence: " << folder.sequence
-			<< " tqparentId: " << folder.tqparentId
+			<< " parentId: " << folder.parentId
 			<< " displayName: " << folder.name << endl;
-	if ( folder.tqparentId != 0 )
+	if ( folder.parentId != 0 )
 	{
-		kdWarning( GROUPWISE_DEBUG_GLOBAL ) << " - received a nested folder.  These were not supported in GroupWise or Kopete as of Sept 2004, aborting! (tqparentId = " << folder.tqparentId << ")" << endl;
+		kdWarning( GROUPWISE_DEBUG_GLOBAL ) << " - received a nested folder.  These were not supported in GroupWise or Kopete as of Sept 2004, aborting! (parentId = " << folder.parentId << ")" << endl;
 		return;
 	}
 
@@ -910,13 +910,13 @@ void GroupWiseAccount::receiveContact( const ContactItem & contact )
 	kdDebug( GROUPWISE_DEBUG_GLOBAL ) << k_funcinfo
 			<< " objectId: " << contact.id
 			<< ", sequence: " << contact.sequence
-			<< ", tqparentId: " << contact.tqparentId
+			<< ", parentId: " << contact.parentId
 			<< ", dn: " << contact.dn
 			<< ", displayName: " << contact.displayName << endl;
 	//kdDebug( GROUPWISE_DEBUG_GLOBAL ) << "\n dotted notation is '" << protocol()->dnToDotted( contact.dn ) << "'\n" <<endl;
 
 	// add to new style contact list
-	GWContactInstance * gwInst = m_serverListModel->addContactInstance( contact.id, contact.tqparentId, contact.sequence, contact.displayName, contact.dn );
+	GWContactInstance * gwInst = m_serverListModel->addContactInstance( contact.id, contact.parentId, contact.sequence, contact.displayName, contact.dn );
 	Q_ASSERT( gwInst );
 
 	GroupWiseContact * c = contactForDN( contact.dn );
@@ -925,21 +925,21 @@ void GroupWiseAccount::receiveContact( const ContactItem & contact )
 	{
 		Kopete::MetaContact *metaContact = new Kopete::MetaContact();
 		metaContact->setDisplayName( contact.displayName );
-		c = new GroupWiseContact( this, contact.dn, metaContact, contact.id, contact.tqparentId, contact.sequence );
+		c = new GroupWiseContact( this, contact.dn, metaContact, contact.id, contact.parentId, contact.sequence );
 		Kopete::ContactList::self()->addMetaContact( metaContact );
 	}
 	// add the metacontact to the ContactItem's group, if not there aleady
-	if ( contact.tqparentId == 0 )
+	if ( contact.parentId == 0 )
 		c->metaContact()->addToGroup( Kopete::Group::topLevel() );
 	else
 	{
 		// check the metacontact is in the group this listing-of-the-contact is in...
-		GWFolder * folder = m_serverListModel->findFolderById( contact.tqparentId );
+		GWFolder * folder = m_serverListModel->findFolderById( contact.parentId );
 		if ( !folder ) // inconsistent
 		{
 			kdDebug( GROUPWISE_DEBUG_GLOBAL ) << " - ERROR - contact's folder doesn't exist on server" << endl;
 			DeleteItemTask * dit = new DeleteItemTask( client()->rootTask() );
-			dit->item( contact.tqparentId, contact.id );
+			dit->item( contact.parentId, contact.id );
 //			TQObject::connect( dit, TQT_SIGNAL( gotContactDeleted( const ContactItem & ) ), TQT_SLOT( receiveContactDeleted( const ContactItem & ) ) );
 			dit->go( true );
 			return;
@@ -1092,7 +1092,7 @@ void GroupWiseAccount::sendMessage( const GroupWise::ConferenceGuid &guid, const
 	}
 }
 
-bool GroupWiseAccount::createContact( const TQString& contactId, Kopete::MetaContact* tqparentContact )
+bool GroupWiseAccount::createContact( const TQString& contactId, Kopete::MetaContact* parentContact )
 {
 	kdDebug ( GROUPWISE_DEBUG_GLOBAL ) << k_funcinfo << "contactId: " << contactId << endl;
 
@@ -1101,7 +1101,7 @@ bool GroupWiseAccount::createContact( const TQString& contactId, Kopete::MetaCon
 	// Set object id to 0 if not found - they do not exist on the server
 	bool topLevel = false;
 	TQValueList< FolderItem > folders;
-	Kopete::GroupList groupList = tqparentContact->groups();
+	Kopete::GroupList groupList = parentContact->groups();
 	for ( Kopete::Group *group = groupList.first(); group; group = groupList.next() )
 	{
 		if ( group->type() == Kopete::Group::TopLevel ) // no need to create it on the server
@@ -1117,7 +1117,7 @@ bool GroupWiseAccount::createContact( const TQString& contactId, Kopete::MetaCon
 		{
 			kdDebug( GROUPWISE_DEBUG_GLOBAL ) << fld->displayName << endl;
 			//FIXME - get rid of FolderItem & co
-			fi.tqparentId = ::tqqt_cast<GWFolder*>( fld->tqparent() )->id;
+			fi.parentId = ::tqqt_cast<GWFolder*>( fld->tqparent() )->id;
 			fi.id = fld->id;
 			fi.name = fld->displayName;
 		}
@@ -1125,7 +1125,7 @@ bool GroupWiseAccount::createContact( const TQString& contactId, Kopete::MetaCon
 		{
 			kdDebug( GROUPWISE_DEBUG_GLOBAL ) << "folder: " << group->displayName() << 
 				"not found in server list model." << endl;
-			fi.tqparentId = 0;
+			fi.parentId = 0;
 			fi.id = 0;
 			fi.name = group->displayName();
 		}
@@ -1144,7 +1144,7 @@ bool GroupWiseAccount::createContact( const TQString& contactId, Kopete::MetaCon
 	//
 	// Since ToMetaContact expects synchronous contact creation
 	// we have to create the contact optimistically.
-	GroupWiseContact * gc = new GroupWiseContact( this, contactId, tqparentContact, 0, 0, 0 );
+	GroupWiseContact * gc = new GroupWiseContact( this, contactId, parentContact, 0, 0, 0 );
 	ContactDetails dt = client()->userDetailsManager()->details( contactId );
 	TQString displayAs;
 	if ( dt.fullName.isEmpty() )
@@ -1164,7 +1164,7 @@ bool GroupWiseAccount::createContact( const TQString& contactId, Kopete::MetaCon
 	
 	// get the contact's full name to use as the display name of the created contact
 	CreateContactTask * cct = new CreateContactTask( client()->rootTask() );
-	cct->contactFromUserId( contactId, tqparentContact->displayName(), highestFreeSequence, folders, topLevel );
+	cct->contactFromUserId( contactId, parentContact->displayName(), highestFreeSequence, folders, topLevel );
 	TQObject::connect( cct, TQT_SIGNAL( finished() ), TQT_SLOT( receiveContactCreated() ) );
 	cct->go( true );
 	return true;
@@ -1470,7 +1470,7 @@ void GroupWiseAccount::syncContact( GroupWiseContact * contact )
 		kdDebug( GROUPWISE_DEBUG_GLOBAL ) << " = CONTACT '" << contact->nickName() << "' IS IN " << contact->metaContact()->groups().count() << " MC GROUPS, AND HAS " << m_serverListModel->instancesWithDn( contact->dn() ).count() << " CONTACT LIST INSTANCES." << endl;
 
 		kdDebug( GROUPWISE_DEBUG_GLOBAL ) << " = LOOKING FOR NOOP GROUP MEMBERSHIPS" << endl;
-		// 1) Seek matches between CLIs and MCGs and remove from the lists without taking any action. match on objectid, tqparentid
+		// 1) Seek matches between CLIs and MCGs and remove from the lists without taking any action. match on objectid, parentid
 		// 2) Each remaining unmatched pair is a move, initiate and remove - need to take care to always use greatest unused sequence number - if we have to set the sequence number to the following sequence number within the folder, we may have a problem where after the first move, we have to wait for the state of the CLIs to be updated pending the completion of the first move - this would be difficult to cope with, because our current lists would be out of date, or we'd have to restart the sync - assuming the first move created a new matched CLI-MCG pair, we could do that with little cost.
 		// 3) Any remaining entries in MCG list are adds, carry out
 		// 4) Any remaining entries in CLI list are removes, carry out
@@ -1531,7 +1531,7 @@ void GroupWiseAccount::syncContact( GroupWiseContact * contact )
 			// create contactItem parameter
 			ContactItem instance;
 			instance.id = ( *instIt )->id;
-			instance.tqparentId = sourceFolder->id;
+			instance.parentId = sourceFolder->id;
 			instance.sequence = ( *instIt )->sequence;
 			instance.dn = ( *instIt )->dn;
 			instance.displayName = contact->nickName();
@@ -1579,8 +1579,8 @@ void GroupWiseAccount::syncContact( GroupWiseContact * contact )
 			// does this group exist on the server?  Create the contact appropriately
 			if ( destinationFolder )
 			{
-				int tqparentId = destinationFolder->id;
-				ccit->contactFromUserId( contact->dn(), contact->metaContact()->displayName(), tqparentId );
+				int parentId = destinationFolder->id;
+				ccit->contactFromUserId( contact->dn(), contact->metaContact()->displayName(), parentId );
 			}
 			else
 			{
@@ -1628,7 +1628,7 @@ void GroupWiseAccount::syncContact( GroupWiseContact * contact )
 				TQValueList< ContactItem > instancesToChange;
 				ContactItem instance;
 				instance.id = (*it)->id;
-				instance.tqparentId = ::tqqt_cast<GWFolder *>( (*it)->tqparent() )->id;
+				instance.parentId = ::tqqt_cast<GWFolder *>( (*it)->tqparent() )->id;
 				instance.sequence = (*it)->sequence;
 				instance.dn = contact->dn();
 				instance.displayName = contact->nickName();
diff --git a/kopete/protocols/groupwise/gwaccount.h b/kopete/protocols/groupwise/gwaccount.h
index 314769f0..fbb66697 100644
--- a/kopete/protocols/groupwise/gwaccount.h
+++ b/kopete/protocols/groupwise/gwaccount.h
@@ -74,7 +74,7 @@ public:
 	 * Creates a protocol specific Kopete::Contact subclass and adds it to the supplied
 	 * Kopete::MetaContact
 	 */
-	virtual bool createContact(const TQString& contactId, Kopete::MetaContact* tqparentContact);
+	virtual bool createContact(const TQString& contactId, Kopete::MetaContact* parentContact);
 	/**
 	 * Delete a contact on the server
 	 */
diff --git a/kopete/protocols/groupwise/gwaddui.ui b/kopete/protocols/groupwise/gwaddui.ui
index 4de7649d..6302f869 100644
--- a/kopete/protocols/groupwise/gwaddui.ui
+++ b/kopete/protocols/groupwise/gwaddui.ui
@@ -109,5 +109,5 @@
         </spacer>
     </vbox>
 </widget>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/kopete/protocols/groupwise/gwcontact.cpp b/kopete/protocols/groupwise/gwcontact.cpp
index dd74fc67..0dd78a71 100644
--- a/kopete/protocols/groupwise/gwcontact.cpp
+++ b/kopete/protocols/groupwise/gwcontact.cpp
@@ -48,8 +48,8 @@ using namespace GroupWise;
 
 GroupWiseContact::GroupWiseContact( Kopete::Account* account, const TQString &dn, 
 			Kopete::MetaContact *tqparent, 
-			const int objectId, const int tqparentId, const int sequence )
-: Kopete::Contact( account, GroupWiseProtocol::dnToDotted( dn ), tqparent ), m_objectId( objectId ), m_parentId( tqparentId ),
+			const int objectId, const int parentId, const int sequence )
+: Kopete::Contact( account, GroupWiseProtocol::dnToDotted( dn ), tqparent ), m_objectId( objectId ), m_parentId( parentId ),
   m_sequence( sequence ), m_actionBlock( 0 ), m_archiving( false ), m_deleting( false ), m_messageReceivedOffline( false )
 {
 	if ( dn.tqfind( '=' ) != -1 )
diff --git a/kopete/protocols/groupwise/gwcontact.h b/kopete/protocols/groupwise/gwcontact.h
index 183df1a4..d3c98a6b 100644
--- a/kopete/protocols/groupwise/gwcontact.h
+++ b/kopete/protocols/groupwise/gwcontact.h
@@ -61,12 +61,12 @@ public:
 	 * @param uniqueName The userId for this contact.  May be a DN, in which case it will be converted to dotted format for the contactId and stored.
 	 * @param tqparent The Kopete::MetaContact this contact is part of.
 	 * @param objectId The contact's numeric object ID.
-	 * @param tqparentId The ID of this contact's tqparent (folder).
+	 * @param parentId The ID of this contact's tqparent (folder).
 	 * @param sequence This contact's sequence number (The position it appears in within its tqparent).
 	 */
 	GroupWiseContact( Kopete::Account* account, const TQString &uniqueName, 
 			Kopete::MetaContact *tqparent, 
-			const int objectId, const int tqparentId, const int sequence );
+			const int objectId, const int parentId, const int sequence );
 
     ~GroupWiseContact();
 
@@ -132,11 +132,11 @@ public:
 	 */
 	void setDeleting( bool deleting );
 	/**
-	 * Marks this contact as having sent a message whilst aptqparently offline
+	 * Marks this contact as having sent a message whilst apparently offline
 	 */
 	void setMessageReceivedOffline( bool on );
 	/**
-	 * Has this contact sent a message whilst aptqparently offline?
+	 * Has this contact sent a message whilst apparently offline?
 	 */
 	bool messageReceivedOffline() const;
 
diff --git a/kopete/protocols/groupwise/gwprotocol.cpp b/kopete/protocols/groupwise/gwprotocol.cpp
index 176a4b92..4abdab9f 100644
--- a/kopete/protocols/groupwise/gwprotocol.cpp
+++ b/kopete/protocols/groupwise/gwprotocol.cpp
@@ -94,7 +94,7 @@ Kopete::Contact *GroupWiseProtocol::deserializeContact(
 	TQString accountId = serializedData[ "accountId" ];
 	TQString displayName = serializedData[ "displayName" ];
 	int objectId = serializedData[ "objectId" ].toInt();
-	int tqparentId = serializedData[ "tqparentId" ].toInt();
+	int parentId = serializedData[ "parentId" ].toInt();
 	int sequence = serializedData[ "sequenceNumber" ].toInt();
 	
 	TQDict<Kopete::Account> accounts = Kopete::AccountManager::self()->accounts( this );
@@ -107,7 +107,7 @@ Kopete::Contact *GroupWiseProtocol::deserializeContact(
 	}
 
 	// FIXME: creating a contact with a userId here
-	return new GroupWiseContact(account, dn, metaContact, objectId, tqparentId, sequence );
+	return new GroupWiseContact(account, dn, metaContact, objectId, parentId, sequence );
 }
 
 AddContactPage * GroupWiseProtocol::createAddContactWidget( TQWidget *tqparent, Kopete::Account *  account )
diff --git a/kopete/protocols/groupwise/libgroupwise/coreprotocol.cpp b/kopete/protocols/groupwise/libgroupwise/coreprotocol.cpp
index e48bf368..7b071f35 100644
--- a/kopete/protocols/groupwise/libgroupwise/coreprotocol.cpp
+++ b/kopete/protocols/groupwise/libgroupwise/coreprotocol.cpp
@@ -278,7 +278,7 @@ void CoreProtocol::fieldsToWire( Field::FieldList fields, int depth )
 			continue;
 			
 		// GAIM writes these tags to the secure socket separately - if we can't connect, check here
-		// NM Protocol 1 writes them in an aptqparently arbitrary order
+		// NM Protocol 1 writes them in an apparently arbitrary order
 		// tag
 		//dout.writeRawBytes( GW_URLVAR_TAG, sizeof( GW_URLVAR_TAG ) );
 		//dout <<  field->tag();
diff --git a/kopete/protocols/groupwise/libgroupwise/coreprotocol.h b/kopete/protocols/groupwise/libgroupwise/coreprotocol.h
index 50ac0f65..ea3a2626 100644
--- a/kopete/protocols/groupwise/libgroupwise/coreprotocol.h
+++ b/kopete/protocols/groupwise/libgroupwise/coreprotocol.h
@@ -109,7 +109,7 @@ class Transfer;
  *      ascii text,
  *      latin1 as hexadecimal,
  *      escaped tqunicode code points (encoded/escaped as \uUNICODEVALUE?, with or without a space between the end of the tqunicode value and the ? )
- * Outgoing messages may contain rich text, and additionally the plain text encoded as UTF8, but this plain payload is aptqparently ignored by the server
+ * Outgoing messages may contain rich text, and additionally the plain text encoded as UTF8, but this plain payload is apparently ignored by the server
  *
  */
 class CoreProtocol : public TQObject
diff --git a/kopete/protocols/groupwise/libgroupwise/gwerror.h b/kopete/protocols/groupwise/libgroupwise/gwerror.h
index a6afa5c8..f5de53ce 100644
--- a/kopete/protocols/groupwise/libgroupwise/gwerror.h
+++ b/kopete/protocols/groupwise/libgroupwise/gwerror.h
@@ -123,14 +123,14 @@ namespace GroupWise
 	{
 		uint id; 
 		uint sequence;
-		uint tqparentId;
+		uint parentId;
 		TQString name;
 	};
 	
 	struct ContactItem
 	{
 		uint id;
-		uint tqparentId;
+		uint parentId;
 		uint sequence;
 		TQString dn;
 		TQString displayName;
diff --git a/kopete/protocols/groupwise/libgroupwise/gwfield.h b/kopete/protocols/groupwise/libgroupwise/gwfield.h
index 1f8deea2..6d3cb5a9 100644
--- a/kopete/protocols/groupwise/libgroupwise/gwfield.h
+++ b/kopete/protocols/groupwise/libgroupwise/gwfield.h
@@ -22,7 +22,7 @@
 #define GWFIELD_H
 
 /* Field types */
-/* Comments: ^1 not used ^2 ignored ^3 aptqparently only used in _field_to_string for debug */
+/* Comments: ^1 not used ^2 ignored ^3 apparently only used in _field_to_string for debug */
 /* Otherwise: widely used */
 #define	NMFIELD_TYPE_INVALID				0
 /* ^1 */
diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/createcontactinstancetask.cpp b/kopete/protocols/groupwise/libgroupwise/tasks/createcontactinstancetask.cpp
index ae1a6984..6f410dcb 100644
--- a/kopete/protocols/groupwise/libgroupwise/tasks/createcontactinstancetask.cpp
+++ b/kopete/protocols/groupwise/libgroupwise/tasks/createcontactinstancetask.cpp
@@ -31,9 +31,9 @@ CreateContactInstanceTask::~CreateContactInstanceTask()
 {
 }
 
-void CreateContactInstanceTask::contactFromUserId( const TQString & userId, const TQString & displayName, const int tqparentFolder )
+void CreateContactInstanceTask::contactFromUserId( const TQString & userId, const TQString & displayName, const int parentFolder )
 {
-	contact( new Field::SingleField( NM_A_SZ_USERID, 0, NMFIELD_TYPE_UTF8, userId ), displayName, tqparentFolder );
+	contact( new Field::SingleField( NM_A_SZ_USERID, 0, NMFIELD_TYPE_UTF8, userId ), displayName, parentFolder );
 }
 
 void CreateContactInstanceTask::contactFromUserIdAndFolder( const TQString & userId, const TQString & displayName, const int folderSequence, const TQString & folderDisplayName )
@@ -46,9 +46,9 @@ void CreateContactInstanceTask::contactFromUserIdAndFolder( const TQString & use
 	m_folderDisplayName = folderDisplayName;
 }
 
-void CreateContactInstanceTask::contactFromDN( const TQString & dn, const TQString & displayName, const int tqparentFolder )
+void CreateContactInstanceTask::contactFromDN( const TQString & dn, const TQString & displayName, const int parentFolder )
 {
-	contact( new Field::SingleField( NM_A_SZ_DN, 0, NMFIELD_TYPE_UTF8, dn ), displayName, tqparentFolder );
+	contact( new Field::SingleField( NM_A_SZ_DN, 0, NMFIELD_TYPE_UTF8, dn ), displayName, parentFolder );
 }
 
 void CreateContactInstanceTask::contactFromDNAndFolder( const TQString & dn, const TQString & displayName, const int folderSequence, const TQString & folderDisplayName )
@@ -61,10 +61,10 @@ void CreateContactInstanceTask::contactFromDNAndFolder( const TQString & dn, con
 	m_folderDisplayName = folderDisplayName;
 }
 
-void CreateContactInstanceTask::contact( Field::SingleField * id, const TQString & displayName, const int tqparentFolder )
+void CreateContactInstanceTask::contact( Field::SingleField * id, const TQString & displayName, const int parentFolder )
 {
 	Field::FieldList lst;
-	lst.append( new Field::SingleField( NM_A_SZ_PARENT_ID, 0, NMFIELD_TYPE_UTF8, TQString::number( tqparentFolder ) ) );
+	lst.append( new Field::SingleField( NM_A_SZ_PARENT_ID, 0, NMFIELD_TYPE_UTF8, TQString::number( parentFolder ) ) );
 	// this is either a user Id or a DN
 	lst.append( id );
 	if ( displayName.isEmpty() ) // fallback so that the contact is created
diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/createcontactinstancetask.h b/kopete/protocols/groupwise/libgroupwise/tasks/createcontactinstancetask.h
index 84347964..19e41f2e 100644
--- a/kopete/protocols/groupwise/libgroupwise/tasks/createcontactinstancetask.h
+++ b/kopete/protocols/groupwise/libgroupwise/tasks/createcontactinstancetask.h
@@ -38,13 +38,13 @@ public:
 	/** 
 	 * Sets up the request message.  
 	 */
-	void contactFromUserId( const TQString & userId, const TQString & displayName, const int tqparentFolder );
-	void contactFromDN( const TQString & dn, const TQString & displayName, const int tqparentFolder );
+	void contactFromUserId( const TQString & userId, const TQString & displayName, const int parentFolder );
+	void contactFromDN( const TQString & dn, const TQString & displayName, const int parentFolder );
 	void contactFromUserIdAndFolder( const TQString & userId, const TQString & displayName, const int folderSequence, const TQString & folderDisplayName );
 	void contactFromDNAndFolder( const TQString & dn, const TQString & displayName, const int folderSequence, const TQString & folderDisplayName );
 	void onGo();
 protected:
-	void contact( Field::SingleField * id, const TQString & displayName, const int tqparentFolder );
+	void contact( Field::SingleField * id, const TQString & displayName, const int parentFolder );
 	void onFolderCreated();
 private:
 	TQString m_userId;
diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/createcontacttask.cpp b/kopete/protocols/groupwise/libgroupwise/tasks/createcontacttask.cpp
index 4e9d3e8a..bf0873ab 100644
--- a/kopete/protocols/groupwise/libgroupwise/tasks/createcontacttask.cpp
+++ b/kopete/protocols/groupwise/libgroupwise/tasks/createcontacttask.cpp
@@ -113,7 +113,7 @@ void CreateContactTask::slotContactAdded( const ContactItem & addedContact )
 		return;
 	}
 	client()->debug( TQString( "CreateContactTask::slotContactAdded() - Contact Instance %1 was created on the server, with objectId %2 in folder %3" ).tqarg
-			( addedContact.displayName ).tqarg( addedContact.id ).tqarg( addedContact.tqparentId ) );
+			( addedContact.displayName ).tqarg( addedContact.id ).tqarg( addedContact.parentId ) );
 			
 	if ( m_dn.isEmpty() )
 		m_dn = addedContact.dn;
@@ -123,7 +123,7 @@ void CreateContactTask::slotContactAdded( const ContactItem & addedContact )
 		m_folders.pop_back();
 
 	// clear the topLevel flag once the corresponding server side entry has been successfully created
-	if ( addedContact.tqparentId == 0 )
+	if ( addedContact.parentId == 0 )
 		m_topLevel = false;
 	
 	if ( m_folders.isEmpty() && !m_topLevel )
diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/createcontacttask.h b/kopete/protocols/groupwise/libgroupwise/tasks/createcontacttask.h
index 8b973361..1ca6f141 100644
--- a/kopete/protocols/groupwise/libgroupwise/tasks/createcontacttask.h
+++ b/kopete/protocols/groupwise/libgroupwise/tasks/createcontacttask.h
@@ -65,7 +65,7 @@ public:
 	 * @param topLevel is the folder also in the top level folder?
 	 */
 	void contactFromUserId( const TQString & userId, const TQString & displayName, const int firstSeqNo, const TQValueList< FolderItem > folders, bool topLevel );
-	//void contactFromDN( const TQString & dn, const TQString & displayName, const int tqparentFolder );
+	//void contactFromDN( const TQString & dn, const TQString & displayName, const int parentFolder );
 	/** 
 	 * This task doesn't do any I/O itself, so this take prints an error and returns false;
 	 */
diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/createfoldertask.cpp b/kopete/protocols/groupwise/libgroupwise/tasks/createfoldertask.cpp
index 363882d8..a165cdc2 100644
--- a/kopete/protocols/groupwise/libgroupwise/tasks/createfoldertask.cpp
+++ b/kopete/protocols/groupwise/libgroupwise/tasks/createfoldertask.cpp
@@ -29,10 +29,10 @@ CreateFolderTask::~CreateFolderTask()
 {
 }
 
-void CreateFolderTask::folder( const int tqparentId, const int sequence, const TQString & displayName )
+void CreateFolderTask::folder( const int parentId, const int sequence, const TQString & displayName )
 {
 	Field::FieldList lst;
-	lst.append( new Field::SingleField( NM_A_SZ_PARENT_ID, 0, NMFIELD_TYPE_UTF8, TQString::number( tqparentId ) ) );
+	lst.append( new Field::SingleField( NM_A_SZ_PARENT_ID, 0, NMFIELD_TYPE_UTF8, TQString::number( parentId ) ) );
 	lst.append( new Field::SingleField( NM_A_SZ_DISPLAY_NAME, 0, NMFIELD_TYPE_UTF8, displayName ) );
 	lst.append( new Field::SingleField( NM_A_SZ_SEQUENCE_NUMBER, 0, NMFIELD_TYPE_UTF8, TQString::number( sequence ) ) );
 	createTransfer( "createfolder", lst );
diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/createfoldertask.h b/kopete/protocols/groupwise/libgroupwise/tasks/createfoldertask.h
index 4befdf40..448e17a2 100644
--- a/kopete/protocols/groupwise/libgroupwise/tasks/createfoldertask.h
+++ b/kopete/protocols/groupwise/libgroupwise/tasks/createfoldertask.h
@@ -35,7 +35,7 @@ Q_OBJECT
 public:
 	CreateFolderTask(Task* tqparent);
 	~CreateFolderTask();
-	void folder( const int tqparentId, const int sequence, const TQString & displayName );
+	void folder( const int parentId, const int sequence, const TQString & displayName );
 };
 
 #endif
diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/deleteitemtask.cpp b/kopete/protocols/groupwise/libgroupwise/tasks/deleteitemtask.cpp
index 4559c1f7..ad67cb4c 100644
--- a/kopete/protocols/groupwise/libgroupwise/tasks/deleteitemtask.cpp
+++ b/kopete/protocols/groupwise/libgroupwise/tasks/deleteitemtask.cpp
@@ -29,7 +29,7 @@ DeleteItemTask::~DeleteItemTask()
 {
 }
 
-void DeleteItemTask::item( const int tqparentFolder, const int objectId )
+void DeleteItemTask::item( const int parentFolder, const int objectId )
 {
 	if ( objectId == 0 )
 	{
@@ -37,7 +37,7 @@ void DeleteItemTask::item( const int tqparentFolder, const int objectId )
 		return;
 	}
 	Field::FieldList lst;
-	lst.append( new Field::SingleField( NM_A_SZ_PARENT_ID, 0, NMFIELD_TYPE_UTF8, TQString::number( tqparentFolder ) ) );
+	lst.append( new Field::SingleField( NM_A_SZ_PARENT_ID, 0, NMFIELD_TYPE_UTF8, TQString::number( parentFolder ) ) );
 	// this is either a user Id or a DN
 	lst.append( new Field::SingleField( NM_A_SZ_OBJECT_ID, 0, NMFIELD_TYPE_UTF8, TQString::number( objectId ) ) );
 	createTransfer( "deletecontact", lst );
diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/deleteitemtask.h b/kopete/protocols/groupwise/libgroupwise/tasks/deleteitemtask.h
index 15ea9702..2e2ed64c 100644
--- a/kopete/protocols/groupwise/libgroupwise/tasks/deleteitemtask.h
+++ b/kopete/protocols/groupwise/libgroupwise/tasks/deleteitemtask.h
@@ -33,7 +33,7 @@ Q_OBJECT
 public:
 	DeleteItemTask(Task* tqparent);
 	~DeleteItemTask();
-	void item( const int tqparentFolder, const int objectId );
+	void item( const int parentFolder, const int objectId );
 };
 
 #endif
diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/logintask.cpp b/kopete/protocols/groupwise/libgroupwise/tasks/logintask.cpp
index a09af45a..2474aaaa 100644
--- a/kopete/protocols/groupwise/libgroupwise/tasks/logintask.cpp
+++ b/kopete/protocols/groupwise/libgroupwise/tasks/logintask.cpp
@@ -121,9 +121,9 @@ void LoginTask::extractFolder( Field::MultiField * folderContainer )
 	folder.name = current->value().toString();
 	// tqparent
 	current = fl.findSingleField( NM_A_SZ_PARENT_ID );
-	folder.tqparentId = current->value().toInt();
+	folder.parentId = current->value().toInt();
 	
-	client()->debug( TQString( "Got folder: %1, obj: %2, tqparent: %3, seq: %3." ).tqarg( folder.name ).tqarg(  folder.id ).tqarg( folder.tqparentId ).tqarg( folder.sequence ) );
+	client()->debug( TQString( "Got folder: %1, obj: %2, tqparent: %3, seq: %3." ).tqarg( folder.name ).tqarg(  folder.id ).tqarg( folder.parentId ).tqarg( folder.sequence ) );
 	// tell the world about it
 	emit gotFolder( folder );
 }
@@ -139,7 +139,7 @@ void LoginTask::extractContact( Field::MultiField * contactContainer )
 	current = fl.findSingleField( NM_A_SZ_OBJECT_ID );
 	contact.id = current->value().toInt();
 	current = fl.findSingleField( NM_A_SZ_PARENT_ID );
-	contact.tqparentId = current->value().toInt();
+	contact.parentId = current->value().toInt();
 	current = fl.findSingleField( NM_A_SZ_SEQUENCE_NUMBER );
 	contact.sequence = current->value().toInt();
 	current = fl.findSingleField( NM_A_SZ_DISPLAY_NAME );
@@ -206,13 +206,13 @@ ContactDetails LoginTask::extractUserDetails( Field::FieldList & fields )
 				if ( propList )
 				{
 					// Hello A Nagappan. GW gave us a multiple field where we previously got a single field
-					TQString tqparentName = propList->tag();
+					TQString parentName = propList->tag();
 					Field::FieldList propFields = propList->fields();
 					const Field::FieldListIterator end = propFields.end();
 					for ( Field::FieldListIterator it = propFields.begin(); it != end; ++it )
 					{
 						propField = dynamic_cast<Field::SingleField *>( *it );
-						if ( propField /*&& propField->tag() == tqparentName */)
+						if ( propField /*&& propField->tag() == parentName */)
 						{
 							TQString propValue = propField->value().toString();
 							TQString contents = propMap[ propField->tag() ];
diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/modifycontactlisttask.cpp b/kopete/protocols/groupwise/libgroupwise/tasks/modifycontactlisttask.cpp
index 703c0582..be04efad 100644
--- a/kopete/protocols/groupwise/libgroupwise/tasks/modifycontactlisttask.cpp
+++ b/kopete/protocols/groupwise/libgroupwise/tasks/modifycontactlisttask.cpp
@@ -92,7 +92,7 @@ void ModifyContactListTask::processContactChange( Field::MultiField * container
 	current = fl.findSingleField( NM_A_SZ_OBJECT_ID );
 	contact.id = current->value().toInt();
 	current = fl.findSingleField( NM_A_SZ_PARENT_ID );
-	contact.tqparentId = current->value().toInt();
+	contact.parentId = current->value().toInt();
 	current = fl.findSingleField( NM_A_SZ_SEQUENCE_NUMBER );
 	contact.sequence = current->value().toInt();
 	current = fl.findSingleField( NM_A_SZ_DISPLAY_NAME );
@@ -127,7 +127,7 @@ void ModifyContactListTask::processFolderChange( Field::MultiField * container )
 	folder.name = current->value().toString();
 	// tqparent
 	current = fl.findSingleField( NM_A_SZ_PARENT_ID );
-	folder.tqparentId = current->value().toInt();
+	folder.parentId = current->value().toInt();
 	if ( container->method() == NMFIELD_METHOD_ADD )
 		emit gotFolderAdded( folder );
 	else if ( container->method() == NMFIELD_METHOD_DELETE )
diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/movecontacttask.cpp b/kopete/protocols/groupwise/libgroupwise/tasks/movecontacttask.cpp
index 044a4e24..c9d6aac9 100644
--- a/kopete/protocols/groupwise/libgroupwise/tasks/movecontacttask.cpp
+++ b/kopete/protocols/groupwise/libgroupwise/tasks/movecontacttask.cpp
@@ -39,7 +39,7 @@ void MoveContactTask::moveContact( const ContactItem & contact, const int newPar
 	// TODO: - write a contact_item_to_fields method and factor duplicate code like this out
 	Field::FieldList contactFields;
 	contactFields.append( new Field::SingleField( NM_A_SZ_OBJECT_ID, 0, NMFIELD_TYPE_UTF8, contact.id ) );
-	contactFields.append( new Field::SingleField( NM_A_SZ_PARENT_ID, 0, NMFIELD_TYPE_UTF8, contact.tqparentId ) );
+	contactFields.append( new Field::SingleField( NM_A_SZ_PARENT_ID, 0, NMFIELD_TYPE_UTF8, contact.parentId ) );
 	contactFields.append( new Field::SingleField( NM_A_SZ_SEQUENCE_NUMBER, 0, NMFIELD_TYPE_UTF8, contact.sequence ) );
 	if ( !contact.dn.isNull() )
 		contactFields.append( new Field::SingleField( NM_A_SZ_DN, 0, NMFIELD_TYPE_UTF8, contact.dn ) );
diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/pollsearchresultstask.cpp b/kopete/protocols/groupwise/libgroupwise/tasks/pollsearchresultstask.cpp
index ae0f9456..1cc33e75 100644
--- a/kopete/protocols/groupwise/libgroupwise/tasks/pollsearchresultstask.cpp
+++ b/kopete/protocols/groupwise/libgroupwise/tasks/pollsearchresultstask.cpp
@@ -155,7 +155,7 @@ GroupWise::ContactDetails PollSearchResultsTask::extractUserDetails( Field::Fiel
 				Field::MultiField * propList = dynamic_cast<Field::MultiField*>( *it );
 				if ( propList )
 				{
-					TQString tqparentName = propList->tag();
+					TQString parentName = propList->tag();
 					Field::FieldList propFields = propList->fields();
 					const Field::FieldListIterator end = propFields.end();
 					for ( Field::FieldListIterator it = propFields.begin(); it != end; ++it )
diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/updatecontacttask.cpp b/kopete/protocols/groupwise/libgroupwise/tasks/updatecontacttask.cpp
index e1a863a7..a1e539d9 100644
--- a/kopete/protocols/groupwise/libgroupwise/tasks/updatecontacttask.cpp
+++ b/kopete/protocols/groupwise/libgroupwise/tasks/updatecontacttask.cpp
@@ -48,7 +48,7 @@ void UpdateContactTask::renameContact( const TQString & newName, const TQValueLi
 	{
 		Field::FieldList contactFields;
 		contactFields.append( new Field::SingleField( NM_A_SZ_OBJECT_ID, 0, NMFIELD_TYPE_UTF8, (*it).id ) );
-		contactFields.append( new Field::SingleField( NM_A_SZ_PARENT_ID, 0, NMFIELD_TYPE_UTF8, (*it).tqparentId ) );
+		contactFields.append( new Field::SingleField( NM_A_SZ_PARENT_ID, 0, NMFIELD_TYPE_UTF8, (*it).parentId ) );
 		contactFields.append( new Field::SingleField( NM_A_SZ_SEQUENCE_NUMBER, 0, NMFIELD_TYPE_UTF8, (*it).sequence ) );
 		if ( !(*it).dn.isNull() )
 			contactFields.append( new Field::SingleField( NM_A_SZ_DN, 0, NMFIELD_TYPE_UTF8, (*it).dn ) );
@@ -61,7 +61,7 @@ void UpdateContactTask::renameContact( const TQString & newName, const TQValueLi
 	{
 		Field::FieldList contactFields;
 		contactFields.append( new Field::SingleField( NM_A_SZ_OBJECT_ID, 0, NMFIELD_TYPE_UTF8, (*it).id ) );
-		contactFields.append( new Field::SingleField( NM_A_SZ_PARENT_ID, 0, NMFIELD_TYPE_UTF8, (*it).tqparentId ) );
+		contactFields.append( new Field::SingleField( NM_A_SZ_PARENT_ID, 0, NMFIELD_TYPE_UTF8, (*it).parentId ) );
 		contactFields.append( new Field::SingleField( NM_A_SZ_SEQUENCE_NUMBER, 0, NMFIELD_TYPE_UTF8, (*it).sequence ) );
 		if ( !(*it).dn.isNull() )
 			contactFields.append( new Field::SingleField( NM_A_SZ_DN, 0, NMFIELD_TYPE_UTF8, (*it).dn ) );
diff --git a/kopete/protocols/groupwise/ui/gwaccountpreferences.ui b/kopete/protocols/groupwise/ui/gwaccountpreferences.ui
index 6b3d89f7..21f774b5 100644
--- a/kopete/protocols/groupwise/ui/gwaccountpreferences.ui
+++ b/kopete/protocols/groupwise/ui/gwaccountpreferences.ui
@@ -316,5 +316,5 @@
         <data format="PNG" length="866">89504e470d0a1a0a0000000d4948445200000016000000160806000000c4b46c3b0000032949444154388db59531681b6714c77f32373c8186ef0305eea005093258900eca26d30e3174a8a807d1c9ee940e5d4a276f09a414e22974ee609a4c75a0857a70a20c199ce93424e43414aee0c26910dc8105f7410df706413a7c915551db049a3e38b87bf7bedffddfc7ff7d578be398456c6c6cbce13d441cc7b5da02fcf4e8e99bde7a8f899b501515d959f64e10e71cd949c6e8d508e6cb7cb050fae49727444d87ed08a566dc0cea545a621b96725e62c522f312c4929ff9e7725e6203439282ec0bc72f74150c30c927d89690163f539619a044564973a1980ae54c01c136a1db518a0024808942780dead16a27e7e0ca55949a81668023b242fcd2901c394663072cd408ad75e18b6d43a7076143710aa1b9049ccd326e064a5979e8f0191cfc5878544368af1b24807caa4cfe507ef8aea0bf6dd8b92de7f00bc1562c95e64416e297f216aadcfa3ca43f10da1f8243112286871507fb05c3c7059d568bde96c5885b01af2d6e4a2db10dc8ff128e0fdd39f4cbaf8576dbe170702afcf6b86467bbce57df8680f0d3230767e0e62bdc55c5e53c476742fabbc318437f209886c3cd41d4b0f74049c78ef21476ef5846cf7ded2831848d55f0aa62816caade11adb7ed2fa0f71ce9d8619ac2e627824a45a72b00e413c5a95c0cf63e052bbe2014bfa738c3de3d251dfb0f8a80fda04e6480600113cc558a11a0e10b93a9225886cff04a8d10868662eab87f37271e59f2136f85a855bfda15f9594eb7a3b4ae0b933f95e161c5ceed88f254e97f2ad49b75eedf8562e2d8fb264355314da1dbada866abe47fedb106d01f78b71fec170c8f7276ef58da3de8f64a76bf6f634283730e9d2b9b8390ce0dae565c6a8e04b0710b746678f8a8e0e18382d173a1d7151c909fe4e84ccf57be3e76245b115143584ee73f27afc8e80b4c667e4c37b7054c8be1afde0de978a9c63485fea0457cec70aa089015ab9297e0938c240573cdb7651a4a7f20f43feb304a72aac2e73bd723da1fe5746ec0682bc26070f38c345905d7e238f6077c00dd8f85280211fcd91af84b02ef94a50c004502c1394813252f14575ca09839242f9484cb42df31e763edd237ff31d6c0ffa3fe17f0fb86c7715cfb1ba8bd86cc8d2decd30000000049454e44ae426082</data>
     </image>
 </images>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/kopete/protocols/groupwise/ui/gwaddcontactpage.cpp b/kopete/protocols/groupwise/ui/gwaddcontactpage.cpp
index 5f48d727..ad0c75be 100644
--- a/kopete/protocols/groupwise/ui/gwaddcontactpage.cpp
+++ b/kopete/protocols/groupwise/ui/gwaddcontactpage.cpp
@@ -73,7 +73,7 @@ GroupWiseAddContactPage::~GroupWiseAddContactPage()
 // i18n( "There was an error while carrying out your search.  Please change your search terms or try again later." )
 }
 
-bool GroupWiseAddContactPage::apply( Kopete::Account* account, Kopete::MetaContact* tqparentContact )
+bool GroupWiseAddContactPage::apply( Kopete::Account* account, Kopete::MetaContact* parentContact )
 {
 	if ( validateData() )
 	{
@@ -91,7 +91,7 @@ bool GroupWiseAddContactPage::apply( Kopete::Account* account, Kopete::MetaConta
 		else
 			return false;
 
-		return ( account->addContact ( contactId, tqparentContact, Kopete::Account::ChangeKABC ) );
+		return ( account->addContact ( contactId, parentContact, Kopete::Account::ChangeKABC ) );
 	}
 	else
 		return false;
diff --git a/kopete/protocols/groupwise/ui/gwaddui.ui b/kopete/protocols/groupwise/ui/gwaddui.ui
index 6c360392..4f036f8b 100644
--- a/kopete/protocols/groupwise/ui/gwaddui.ui
+++ b/kopete/protocols/groupwise/ui/gwaddui.ui
@@ -133,5 +133,5 @@
         <slot>setEnabled(bool)</slot>
     </connection>
 </connections>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/kopete/protocols/groupwise/ui/gwchatpropswidget.ui b/kopete/protocols/groupwise/ui/gwchatpropswidget.ui
index 651a3b17..726376a5 100644
--- a/kopete/protocols/groupwise/ui/gwchatpropswidget.ui
+++ b/kopete/protocols/groupwise/ui/gwchatpropswidget.ui
@@ -384,7 +384,7 @@
         </widget>
     </vbox>
 </widget>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>klistbox.h</includehint>
     <includehint>kpushbutton.h</includehint>
diff --git a/kopete/protocols/groupwise/ui/gwchatsearchwidget.ui b/kopete/protocols/groupwise/ui/gwchatsearchwidget.ui
index c239ce86..63ffca38 100644
--- a/kopete/protocols/groupwise/ui/gwchatsearchwidget.ui
+++ b/kopete/protocols/groupwise/ui/gwchatsearchwidget.ui
@@ -108,7 +108,7 @@
         </widget>
     </vbox>
 </widget>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>klistview.h</includehint>
     <includehint>kpushbutton.h</includehint>
diff --git a/kopete/protocols/groupwise/ui/gwcontactpropswidget.ui b/kopete/protocols/groupwise/ui/gwcontactpropswidget.ui
index 12e0deb2..b403abec 100644
--- a/kopete/protocols/groupwise/ui/gwcontactpropswidget.ui
+++ b/kopete/protocols/groupwise/ui/gwcontactpropswidget.ui
@@ -204,7 +204,7 @@
         </widget>
     </vbox>
 </widget>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>klistview.h</includehint>
 </includehints>
diff --git a/kopete/protocols/groupwise/ui/gwcontactsearch.ui b/kopete/protocols/groupwise/ui/gwcontactsearch.ui
index 8c215959..508f4015 100644
--- a/kopete/protocols/groupwise/ui/gwcontactsearch.ui
+++ b/kopete/protocols/groupwise/ui/gwcontactsearch.ui
@@ -382,5 +382,5 @@
     <tabstop>m_details</tabstop>
     <tabstop>m_firstNameOperation</tabstop>
 </tabstops>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/kopete/protocols/groupwise/ui/gwcustomstatusedit.ui b/kopete/protocols/groupwise/ui/gwcustomstatusedit.ui
index 366cb717..9ef4caad 100644
--- a/kopete/protocols/groupwise/ui/gwcustomstatusedit.ui
+++ b/kopete/protocols/groupwise/ui/gwcustomstatusedit.ui
@@ -88,5 +88,5 @@
         </widget>
     </vbox>
 </widget>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/kopete/protocols/groupwise/ui/gwcustomstatuswidget.ui b/kopete/protocols/groupwise/ui/gwcustomstatuswidget.ui
index df25aaef..821c6030 100644
--- a/kopete/protocols/groupwise/ui/gwcustomstatuswidget.ui
+++ b/kopete/protocols/groupwise/ui/gwcustomstatuswidget.ui
@@ -105,7 +105,7 @@
         </widget>
     </hbox>
 </widget>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>klistview.h</includehint>
 </includehints>
diff --git a/kopete/protocols/groupwise/ui/gwprivacy.ui b/kopete/protocols/groupwise/ui/gwprivacy.ui
index 13070437..1f4b6bcb 100644
--- a/kopete/protocols/groupwise/ui/gwprivacy.ui
+++ b/kopete/protocols/groupwise/ui/gwprivacy.ui
@@ -189,5 +189,5 @@
         </widget>
     </vbox>
 </widget>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/kopete/protocols/groupwise/ui/gwshowinvitation.ui b/kopete/protocols/groupwise/ui/gwshowinvitation.ui
index 08253705..48c061a9 100644
--- a/kopete/protocols/groupwise/ui/gwshowinvitation.ui
+++ b/kopete/protocols/groupwise/ui/gwshowinvitation.ui
@@ -131,5 +131,5 @@
         </widget>
     </vbox>
 </widget>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/kopete/protocols/irc/ircaccount.h b/kopete/protocols/irc/ircaccount.h
index a20ccc93..3e5bf304 100644
--- a/kopete/protocols/irc/ircaccount.h
+++ b/kopete/protocols/irc/ircaccount.h
@@ -191,7 +191,7 @@ public slots:
 	void appendMessage( const TQString &message, MessageType type = Default );
 
 protected:
-	virtual bool createContact( const TQString &contactId, Kopete::MetaContact *tqparentContact ) ;
+	virtual bool createContact( const TQString &contactId, Kopete::MetaContact *parentContact ) ;
 
 private slots:
 	void engineStatusChanged(KIRC::Engine::tqStatus newtqStatus);
diff --git a/kopete/protocols/irc/ui/channellist.cpp b/kopete/protocols/irc/ui/channellist.cpp
index 67916d4d..e4e574bc 100644
--- a/kopete/protocols/irc/ui/channellist.cpp
+++ b/kopete/protocols/irc/ui/channellist.cpp
@@ -46,11 +46,11 @@ class ChannelListItem : public KListViewItem
 		virtual void paintCell( TQPainter *p, const TQColorGroup &cg, int column, int width, int align );
 
 	private:
-		KListView *tqparentList;
+		KListView *parentList;
 };
 
 ChannelListItem::ChannelListItem( KListView *tqparent, TQString arg1, TQString arg2, TQString arg3 ) :
-	KListViewItem( tqparent, tqparent->lastItem() ), tqparentList( tqparent )
+	KListViewItem( tqparent, tqparent->lastItem() ), parentList( tqparent )
 {
 	setText(0, arg1);
 	setText(1, arg2);
diff --git a/kopete/protocols/irc/ui/ircadd.ui b/kopete/protocols/irc/ui/ircadd.ui
index ae2c0740..c899eca8 100644
--- a/kopete/protocols/irc/ui/ircadd.ui
+++ b/kopete/protocols/irc/ui/ircadd.ui
@@ -159,5 +159,5 @@
     <tabstop>addID</tabstop>
     <tabstop>tabWidget3</tabstop>
 </tabstops>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/kopete/protocols/irc/ui/irceditaccount.ui b/kopete/protocols/irc/ui/irceditaccount.ui
index c5827342..e2e33f69 100644
--- a/kopete/protocols/irc/ui/irceditaccount.ui
+++ b/kopete/protocols/irc/ui/irceditaccount.ui
@@ -1015,7 +1015,7 @@
     <tabstop>commandEdit</tabstop>
     <tabstop>addButton</tabstop>
 </tabstops>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>klistview.h</includehint>
 </includehints>
diff --git a/kopete/protocols/irc/ui/networkconfig.ui b/kopete/protocols/irc/ui/networkconfig.ui
index 2a00f1bb..0f15dee5 100644
--- a/kopete/protocols/irc/ui/networkconfig.ui
+++ b/kopete/protocols/irc/ui/networkconfig.ui
@@ -378,5 +378,5 @@
     <slot access="protected">accept()</slot>
     <slot access="protected">reject()</slot>
 </Q_SLOTS>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/kopete/protocols/jabber/jabberaccount.cpp b/kopete/protocols/jabber/jabberaccount.cpp
index f3583f0e..4f22a622 100644
--- a/kopete/protocols/jabber/jabberaccount.cpp
+++ b/kopete/protocols/jabber/jabberaccount.cpp
@@ -1184,11 +1184,11 @@ void JabberAccount::slotContactAddedNotifyDialogClosed( const TQString & contact
 
 	if(dialog->added())
 	{
-		Kopete::MetaContact *tqparentContact=dialog->addContact();
-		if(tqparentContact)
+		Kopete::MetaContact *parentContact=dialog->addContact();
+		if(parentContact)
 		{
 			TQStringList groupNames;
-			Kopete::GroupList groupList = tqparentContact->groups();
+			Kopete::GroupList groupList = parentContact->groups();
 			for(Kopete::Group *group = groupList.first(); group; group = groupList.next())
 				groupNames += group->displayName();
 
@@ -1196,7 +1196,7 @@ void JabberAccount::slotContactAddedNotifyDialogClosed( const TQString & contact
 //			XMPP::Jid jid ( contactId );
 
 			item.setJid ( jid );
-			item.setName ( tqparentContact->displayName() );
+			item.setName ( parentContact->displayName() );
 			item.setGroups ( groupNames );
 
 			// add the new contact to our roster.
diff --git a/kopete/protocols/jabber/jabberaccount.h b/kopete/protocols/jabber/jabberaccount.h
index 3d174639..04b79770 100644
--- a/kopete/protocols/jabber/jabberaccount.h
+++ b/kopete/protocols/jabber/jabberaccount.h
@@ -168,12 +168,12 @@ protected:
 	 * method should have the "dirty" flag set.
 	 *
 	 * This method should simply be used to intantiate the new contact, everything else
-	 * (updating the GUI, tqparenting to meta contact, etc.) is being taken care of.
+	 * (updating the GUI, parenting to meta contact, etc.) is being taken care of.
 	 *
 	 * @param contactId The unique ID for this protocol
-	 * @param tqparentContact The metacontact to add this contact to
+	 * @param parentContact The metacontact to add this contact to
 	 */
-	virtual bool createContact (const TQString & contactID, Kopete::MetaContact * tqparentContact);
+	virtual bool createContact (const TQString & contactID, Kopete::MetaContact * parentContact);
 	
 	
 
diff --git a/kopete/protocols/jabber/jabberchatsession.cpp b/kopete/protocols/jabber/jabberchatsession.cpp
index 38ea726f..60c109ae 100644
--- a/kopete/protocols/jabber/jabberchatsession.cpp
+++ b/kopete/protocols/jabber/jabberchatsession.cpp
@@ -117,7 +117,7 @@ void JabberChatSession::slotUpdateDisplayName ()
 	if ( !mResource.isEmpty () )
 		jid.setResource ( mResource );
 
-	TQString statusText = i18n("a contact's online status in tqparenthesis.", " (%1)")
+	TQString statusText = i18n("a contact's online status in parenthesis.", " (%1)")
 							.tqarg( chatMembers.first()->onlinetqStatus().description() );
 	if ( jid.resource().isEmpty () )
 		setDisplayName ( chatMembers.first()->metaContact()->displayName () + statusText );
diff --git a/kopete/protocols/jabber/jabbercontact.cpp b/kopete/protocols/jabber/jabbercontact.cpp
index 119a6f6e..f873387f 100644
--- a/kopete/protocols/jabber/jabbercontact.cpp
+++ b/kopete/protocols/jabber/jabbercontact.cpp
@@ -1298,7 +1298,7 @@ void JabberContact::slotDiscoFinished( )
 		
 		XMPP::RosterItem ri = rosterItem();
 		Kopete::MetaContact *mc=metaContact();
-		JabberAccount *tqparentAccount=account();
+		JabberAccount *parentAccount=account();
 		Kopete::OnlineStatus status=onlinetqStatus();
 		
 		kdDebug(JABBER_DEBUG_GLOBAL) << k_funcinfo << ri.jid().full() << " is not a contact but a gateway   - " << this << endl;
@@ -1315,7 +1315,7 @@ void JabberContact::slotDiscoFinished( )
 			Kopete::ContactList::self()->removeMetaContact( mc );
 		
 		//we need to create the transport when 'this' is already deleted, so transport->myself() will not conflict with it
-		JabberTransport *transport = new JabberTransport( tqparentAccount , ri , tr_type );
+		JabberTransport *transport = new JabberTransport( parentAccount , ri , tr_type );
 		if(!Kopete::AccountManager::self()->registerAccount( transport ))
 			return;
 		transport->myself()->setOnlineStatus( status ); //push back the online status
diff --git a/kopete/protocols/jabber/jabbertransport.cpp b/kopete/protocols/jabber/jabbertransport.cpp
index a081a8db..8bd9a915 100644
--- a/kopete/protocols/jabber/jabbertransport.cpp
+++ b/kopete/protocols/jabber/jabbertransport.cpp
@@ -38,11 +38,11 @@
 
 #include "xmpp_tasks.h"
 
-JabberTransport::JabberTransport (JabberAccount * tqparentAccount, const XMPP::RosterItem & item, const TQString& gateway_type)
-	: Kopete::Account ( tqparentAccount->protocol(), tqparentAccount->accountId()+"/"+ item.jid().bare() )
+JabberTransport::JabberTransport (JabberAccount * parentAccount, const XMPP::RosterItem & item, const TQString& gateway_type)
+	: Kopete::Account ( parentAccount->protocol(), parentAccount->accountId()+"/"+ item.jid().bare() )
 {
 	m_status=Creating;
-	m_account = tqparentAccount;
+	m_account = parentAccount;
 	m_account->addTransport( this,item.jid().bare() );
 	
 	JabberContact *myContact = m_account->contactPool()->addContact ( item , Kopete::ContactList::self()->myself(), false );
@@ -88,11 +88,11 @@ JabberTransport::JabberTransport (JabberAccount * tqparentAccount, const XMPP::R
 	m_status=Normal;
 }
 
-JabberTransport::JabberTransport( JabberAccount * tqparentAccount, const TQString & _accountId )
-	: Kopete::Account ( tqparentAccount->protocol(), _accountId )
+JabberTransport::JabberTransport( JabberAccount * parentAccount, const TQString & _accountId )
+	: Kopete::Account ( parentAccount->protocol(), _accountId )
 {
 	m_status=Creating;
-	m_account = tqparentAccount;
+	m_account = parentAccount;
 	
 	const TQString contactJID_s = configGroup()->readEntry("GatewayJID");
 	
diff --git a/kopete/protocols/jabber/jabbertransport.h b/kopete/protocols/jabber/jabbertransport.h
index e03be173..3f14fcc5 100644
--- a/kopete/protocols/jabber/jabbertransport.h
+++ b/kopete/protocols/jabber/jabbertransport.h
@@ -45,18 +45,18 @@ class JabberTransport : public Kopete::Account
 public:
 	/**
 	 * constructor called when the transport is created by info from server  (i.e not when loading kopete)
-	 * @param tqparentAccount is the tqparent jabber account.
+	 * @param parentAccount is the tqparent jabber account.
 	 * @param item is the roster item of the gateway
 	 * @param gateway_type eg: "msn" or "icq"  only used when the account is not loaded from config file for determining the icon
 	 */
-	JabberTransport (JabberAccount * tqparentAccount, const XMPP::RosterItem &item, const TQString& gateway_type=TQString());
+	JabberTransport (JabberAccount * parentAccount, const XMPP::RosterItem &item, const TQString& gateway_type=TQString());
 	
 	/**
 	 * constructor called when the transport is loaded from config
-	 * @param tqparentAccount is the tqparent jabber account.
+	 * @param parentAccount is the tqparent jabber account.
 	 * @param accountId is the accountId
 	 */
-	JabberTransport (JabberAccount * tqparentAccount, const TQString &accountId );
+	JabberTransport (JabberAccount * parentAccount, const TQString &accountId );
 
 	~JabberTransport ();
 
@@ -123,12 +123,12 @@ protected:
 	 * method should have the "dirty" flag set.
 	 *
 	 * This method should simply be used to intantiate the new contact, everything else
-	 * (updating the GUI, tqparenting to meta contact, etc.) is being taken care of.
+	 * (updating the GUI, parenting to meta contact, etc.) is being taken care of.
 	 *
 	 * @param contactId The unique ID for this protocol
-	 * @param tqparentContact The metacontact to add this contact to
+	 * @param parentContact The metacontact to add this contact to
 	 */
-	virtual bool createContact (const TQString & contactID, Kopete::MetaContact * tqparentContact);
+	virtual bool createContact (const TQString & contactID, Kopete::MetaContact * parentContact);
 
 private:
 	JabberAccount *m_account;
diff --git a/kopete/protocols/jabber/jingle/jinglevoicesessiondialogbase.ui b/kopete/protocols/jabber/jingle/jinglevoicesessiondialogbase.ui
index c6349007..72e3827c 100644
--- a/kopete/protocols/jabber/jingle/jinglevoicesessiondialogbase.ui
+++ b/kopete/protocols/jabber/jingle/jinglevoicesessiondialogbase.ui
@@ -360,7 +360,7 @@
         </spacer>
     </vbox>
 </widget>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>kpushbutton.h</includehint>
     <includehint>kpushbutton.h</includehint>
diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/base/task.cc b/kopete/protocols/jabber/jingle/libjingle/talk/base/task.cc
index 41ae9068..09655472 100644
--- a/kopete/protocols/jabber/jingle/libjingle/talk/base/task.cc
+++ b/kopete/protocols/jabber/jingle/libjingle/talk/base/task.cc
@@ -34,7 +34,7 @@ namespace buzz {
 
 Task::Task(Task * tqparent) :
     state_(STATE_INIT),
-    tqparent_(tqparent),
+    parent_(tqparent),
     blocked_(false),
     done_(false),
     aborted_(false),
@@ -43,8 +43,8 @@ Task::Task(Task * tqparent) :
     child_error_(false),
     start_time_(0) {
   runner_ = ((tqparent == NULL) ? (TaskRunner *)this : tqparent->GetRunner());
-  if (tqparent_ != NULL) {
-    tqparent_->AddChild(this);
+  if (parent_ != NULL) {
+    parent_->AddChild(this);
   }
 }
 
@@ -224,7 +224,7 @@ Task::AbortAllChildren() {
 void
 Task::Stop() {
   AbortAllChildren(); // No need to wake because we're either awake or in abort
-  tqparent_->OnChildStopped(this);
+  parent_->OnChildStopped(this);
 }
 
 void
diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/base/task.h b/kopete/protocols/jabber/jingle/libjingle/talk/base/task.h
index 553d04fb..c583bda8 100644
--- a/kopete/protocols/jabber/jingle/libjingle/talk/base/task.h
+++ b/kopete/protocols/jabber/jingle/libjingle/talk/base/task.h
@@ -115,9 +115,9 @@ public:
   unsigned long long ElapsedTime();
   virtual void Poll() {}
 
-  Task * GetParent() { return tqparent_; }
+  Task * GetParent() { return parent_; }
   TaskRunner * GetRunner() { return runner_; }
-  virtual Task * GetParent(int code) { return tqparent_->GetParent(code); }
+  virtual Task * GetParent(int code) { return parent_->GetParent(code); }
 
   // Called from outside to stop task without any more callbacks
   void Abort(bool nowake = false);
@@ -162,7 +162,7 @@ private:
   void OnChildStopped(Task * child);
   
   int state_;
-  Task * tqparent_;
+  Task * parent_;
   TaskRunner * runner_;
   bool blocked_;
   bool done_;
diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msAlawdec.h b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msAlawdec.h
index 9e13459e..c10d76fd 100644
--- a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msAlawdec.h
+++ b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msAlawdec.h
@@ -42,7 +42,7 @@ typedef struct _MSALAWDecoderClass
 {
 	/* the MSALAWDecoder derivates from MSFilter, so the MSFilter class MUST be the first of the MSALAWDecoder class
        in order to the class mechanism to work*/
-	MSFilterClass tqparent_class;
+	MSFilterClass parent_class;
 } MSALAWDecoderClass;
 
 /* PUBLIC */
diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msAlawenc.h b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msAlawenc.h
index d76f2f62..66e9fa63 100644
--- a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msAlawenc.h
+++ b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msAlawenc.h
@@ -42,7 +42,7 @@ typedef struct _MSALAWEncoderClass
 {
 	/* the MSALAWEncoder derivates from MSFilter, so the MSFilter class MUST be the first of the MSALAWEncoder class
        in order to the class mechanism to work*/
-	MSFilterClass tqparent_class;
+	MSFilterClass parent_class;
 } MSALAWEncoderClass;
 
 /* PUBLIC */
diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msGSMdecoder.h b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msGSMdecoder.h
index dd8d330c..8fbce4a0 100644
--- a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msGSMdecoder.h
+++ b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msGSMdecoder.h
@@ -45,7 +45,7 @@ typedef struct _MSGSMDecoderClass
 {
 	/* the MSGSMDecoder derivates from MSFilter, so the MSFilter class MUST be the first of the MSGSMDecoder class
        in order to the class mechanism to work*/
-	MSFilterClass tqparent_class;
+	MSFilterClass parent_class;
 } MSGSMDecoderClass;
 
 /* PUBLIC */
diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msGSMencoder.h b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msGSMencoder.h
index 3fad63e3..e2130625 100644
--- a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msGSMencoder.h
+++ b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msGSMencoder.h
@@ -44,7 +44,7 @@ typedef struct _MSGSMEncoderClass
 {
 	/* the MSGSMEncoder derivates from MSFilter, so the MSFilter class MUST be the first of the MSGSMEncoder class
        in order to the class mechanism to work*/
-	MSFilterClass tqparent_class;
+	MSFilterClass parent_class;
 } MSGSMEncoderClass;
 
 /* PUBLIC */
diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msLPC10decoder.h b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msLPC10decoder.h
index af1ecc7c..8f61778b 100644
--- a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msLPC10decoder.h
+++ b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msLPC10decoder.h
@@ -45,7 +45,7 @@ typedef struct _MSLPC10DecoderClass
 {
 	/* the MSLPC10Decoder derivates from MSFilter, so the MSFilter class MUST be the first of the MSLPC10Decoder class
        in order to the class mechanism to work*/
-	MSFilterClass tqparent_class;
+	MSFilterClass parent_class;
 } MSLPC10DecoderClass;
 
 /* PUBLIC */
diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msLPC10encoder.h b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msLPC10encoder.h
index af900445..e72539ec 100644
--- a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msLPC10encoder.h
+++ b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msLPC10encoder.h
@@ -57,7 +57,7 @@ typedef struct _MSLPC10EncoderClass
 {
 	/* the MSLPC10Encoder derivates from MSFilter, so the MSFilter class MUST be the first of the MSLPC10Encoder class
        in order to the class mechanism to work*/
-	MSFilterClass tqparent_class;
+	MSFilterClass parent_class;
 } MSLPC10EncoderClass;
 
 /* PUBLIC */
diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msMUlawdec.h b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msMUlawdec.h
index 6e516db5..6e038368 100644
--- a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msMUlawdec.h
+++ b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msMUlawdec.h
@@ -42,7 +42,7 @@ typedef struct _MSMULAWDecoderClass
 {
 	/* the MSMULAWDecoder derivates from MSFilter, so the MSFilter class MUST be the first of the MSMULAWDecoder class
        in order to the class mechanism to work*/
-	MSFilterClass tqparent_class;
+	MSFilterClass parent_class;
 } MSMULAWDecoderClass;
 
 /* PUBLIC */
diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msMUlawenc.h b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msMUlawenc.h
index 0192984e..b302b339 100644
--- a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msMUlawenc.h
+++ b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msMUlawenc.h
@@ -42,7 +42,7 @@ typedef struct _MSMULAWEncoderClass
 {
 	/* the MSMULAWEncoder derivates from MSFilter, so the MSFilter class MUST be the first of the MSMULAWEncoder class
        in order to the class mechanism to work*/
-	MSFilterClass tqparent_class;
+	MSFilterClass parent_class;
 } MSMULAWEncoderClass;
 
 /* PUBLIC */
diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msavdecoder.h b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msavdecoder.h
index 71a04d3a..55008939 100644
--- a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msavdecoder.h
+++ b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msavdecoder.h
@@ -57,7 +57,7 @@ struct _MSAVDecoderClass
 {
 	/* the MSAVDecoder derivates from MSFilter, so the MSFilter class MUST be the first of the MSAVDecoder class
        in order to the class mechanism to work*/
-	MSFilterClass tqparent_class;
+	MSFilterClass parent_class;
 };
 
 typedef struct _MSAVDecoderClass MSAVDecoderClass;
diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msavencoder.h b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msavencoder.h
index 23da59f6..b703a396 100644
--- a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msavencoder.h
+++ b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msavencoder.h
@@ -58,7 +58,7 @@ struct _MSAVEncoderClass
 {
 	/* the MSAVEncoder derivates from MSFilter, so the MSFilter class MUST be the first of the MSAVEncoder class
        in order to the class mechanism to work*/
-	MSFilterClass tqparent_class;
+	MSFilterClass parent_class;
 };
 
 typedef struct _MSAVEncoderClass MSAVEncoderClass;
diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/mscopy.h b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/mscopy.h
index 2e03e525..9b7c438b 100644
--- a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/mscopy.h
+++ b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/mscopy.h
@@ -44,7 +44,7 @@ typedef struct _MSCopyClass
 {
 	/* the MSCopy derivates from MSFilter, so the MSFilter class MUST be the first of the MSCopy class
        in order to the class mechanism to work*/
-	MSFilterClass tqparent_class;
+	MSFilterClass parent_class;
 } MSCopyClass;
 
 /* PUBLIC */
diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msfdispatcher.c b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msfdispatcher.c
index 84859fda..623a3682 100644
--- a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msfdispatcher.c
+++ b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msfdispatcher.c
@@ -51,15 +51,15 @@ void ms_fdispatcher_init(MSFdispatcher *obj)
 
 void ms_fdispatcher_class_init(MSFdispatcherClass *klass)
 {
-	MSFilterClass *tqparent_class=MS_FILTER_CLASS(klass);
-	ms_filter_class_init(tqparent_class);
-	ms_filter_class_set_name(tqparent_class,"fdispatcher");
-	tqparent_class->max_finputs=MS_FDISPATCHER_MAX_INPUTS;
-	tqparent_class->max_foutputs=MS_FDISPATCHER_MAX_OUTPUTS;
-	tqparent_class->r_maxgran=MS_FDISPATCHER_DEF_GRAN;
-	tqparent_class->w_maxgran=MS_FDISPATCHER_DEF_GRAN;
-	tqparent_class->destroy=(MSFilterDestroyFunc)ms_fdispatcher_destroy;
-	tqparent_class->process=(MSFilterProcessFunc)ms_fdispatcher_process;
+	MSFilterClass *parent_class=MS_FILTER_CLASS(klass);
+	ms_filter_class_init(parent_class);
+	ms_filter_class_set_name(parent_class,"fdispatcher");
+	parent_class->max_finputs=MS_FDISPATCHER_MAX_INPUTS;
+	parent_class->max_foutputs=MS_FDISPATCHER_MAX_OUTPUTS;
+	parent_class->r_maxgran=MS_FDISPATCHER_DEF_GRAN;
+	parent_class->w_maxgran=MS_FDISPATCHER_DEF_GRAN;
+	parent_class->destroy=(MSFilterDestroyFunc)ms_fdispatcher_destroy;
+	parent_class->process=(MSFilterProcessFunc)ms_fdispatcher_process;
 }
 
 
diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msfdispatcher.h b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msfdispatcher.h
index a50c5637..4aea7e95 100644
--- a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msfdispatcher.h
+++ b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msfdispatcher.h
@@ -44,7 +44,7 @@ typedef struct _MSFdispatcherClass
 {
 	/* the MSFdispatcher derivates from MSFilter, so the MSFilter class MUST be the first of the MSFdispatcher class
        in order to the class mechanism to work*/
-	MSFilterClass tqparent_class;
+	MSFilterClass parent_class;
 } MSFdispatcherClass;
 
 /* PUBLIC */
diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msilbcdec.h b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msilbcdec.h
index 035a80fd..a3d0a326 100644
--- a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msilbcdec.h
+++ b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msilbcdec.h
@@ -49,7 +49,7 @@ typedef struct _MSILBCDecoderClass
 {
 	/* the MSILBCDecoder derivates from MSFilter, so the MSFilter class MUST be the first of the MSILBCDecoder class
        in order to the class mechanism to work*/
-	MSFilterClass tqparent_class;
+	MSFilterClass parent_class;
 } MSILBCDecoderClass;
 
 /* PUBLIC */
diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msilbcenc.h b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msilbcenc.h
index 6995022c..b072e430 100644
--- a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msilbcenc.h
+++ b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msilbcenc.h
@@ -64,7 +64,7 @@ typedef struct _MSILBCEncoderClass
 {
 	/* the MSILBCEncoder derivates from MSFilter, so the MSFilter class MUST be the first of the MSILBCEncoder class
        in order to the class mechanism to work*/
-	MSFilterClass tqparent_class;
+	MSFilterClass parent_class;
 } MSILBCEncoderClass;
 
 /* PUBLIC */
diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msnosync.h b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msnosync.h
index 7af095f8..a6c9e9e8 100644
--- a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msnosync.h
+++ b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msnosync.h
@@ -38,7 +38,7 @@ typedef struct _MSNoSync
 typedef struct _MSNoSyncClass
 {
 	/* the MSSyncClass must be the first field of the class in order to the class mechanism to work*/
-	MSSyncClass tqparent_class;
+	MSSyncClass parent_class;
 } MSNoSyncClass;
 
 
diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msossread.h b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msossread.h
index 78fa91ad..e359f271 100644
--- a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msossread.h
+++ b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msossread.h
@@ -53,7 +53,7 @@ struct _MSOssReadClass
 {
 	/* the MSOssRead derivates from MSSoundRead, so the MSSoundRead class MUST be the first of the MSOssRead class
        in order to the class mechanism to work*/
-	MSSoundReadClass tqparent_class;
+	MSSoundReadClass parent_class;
 };
 
 typedef struct _MSOssReadClass MSOssReadClass;
diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msosswrite.h b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msosswrite.h
index 21abb2a1..024eebb4 100644
--- a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msosswrite.h
+++ b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msosswrite.h
@@ -52,7 +52,7 @@ struct _MSOssWriteClass
 {
 	/* the MSOssWrite derivates from MSSoundWrite, so the MSSoundWrite class MUST be the first of the MSOssWrite class
        in order to the class mechanism to work*/
-	MSSoundWriteClass tqparent_class;
+	MSSoundWriteClass parent_class;
 };
 
 typedef struct _MSOssWriteClass MSOssWriteClass;
diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msqdispatcher.c b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msqdispatcher.c
index 20051b62..568411c6 100644
--- a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msqdispatcher.c
+++ b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msqdispatcher.c
@@ -51,14 +51,14 @@ void ms_qdispatcher_init(MSQdispatcher *obj)
 
 void ms_qdispatcher_class_init(MSQdispatcherClass *klass)
 {
-	MSFilterClass *tqparent_class=MS_FILTER_CLASS(klass);
-	ms_filter_class_init(tqparent_class);
-	ms_filter_class_set_name(tqparent_class,"qdispatcher");
-	tqparent_class->max_qinputs=MS_TQDISPATCHER_MAX_INPUTS;
-	tqparent_class->max_qoutputs=MS_TQDISPATCHER_MAX_OUTPUTS;
+	MSFilterClass *parent_class=MS_FILTER_CLASS(klass);
+	ms_filter_class_init(parent_class);
+	ms_filter_class_set_name(parent_class,"qdispatcher");
+	parent_class->max_qinputs=MS_TQDISPATCHER_MAX_INPUTS;
+	parent_class->max_qoutputs=MS_TQDISPATCHER_MAX_OUTPUTS;
 	
-	tqparent_class->destroy=(MSFilterDestroyFunc)ms_qdispatcher_destroy;
-	tqparent_class->process=(MSFilterProcessFunc)ms_qdispatcher_process;
+	parent_class->destroy=(MSFilterDestroyFunc)ms_qdispatcher_destroy;
+	parent_class->process=(MSFilterProcessFunc)ms_qdispatcher_process;
 }
 
 
diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msqdispatcher.h b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msqdispatcher.h
index 66e80902..6f28abf9 100644
--- a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msqdispatcher.h
+++ b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msqdispatcher.h
@@ -43,7 +43,7 @@ typedef struct _MSQdispatcherClass
 {
 	/* the MSQdispatcher derivates from MSFilter, so the MSFilter class MUST be the first of the MSQdispatcher class
        in order to the class mechanism to work*/
-	MSFilterClass tqparent_class;
+	MSFilterClass parent_class;
 } MSQdispatcherClass;
 
 /* PUBLIC */
diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msread.h b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msread.h
index a40f4fa0..b695f7da 100644
--- a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msread.h
+++ b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msread.h
@@ -55,7 +55,7 @@ typedef struct _MSReadClass
 {
 	/* the MSRead derivates from MSFilter, so the MSFilter class MUST be the first of the MSRead class
        in order to the class mechanism to work*/
-	MSFilterClass tqparent_class;
+	MSFilterClass parent_class;
 } MSReadClass;
 
 /* PUBLIC */
diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msringplayer.h b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msringplayer.h
index 715cdf3c..a090afbf 100644
--- a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msringplayer.h
+++ b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msringplayer.h
@@ -59,7 +59,7 @@ struct _MSRingPlayerClass
 {
 	/* the MSRingPlayer derivates from MSFilter, so the MSFilter class MUST be the first of the MSRingPlayer class
        in order to the class mechanism to work*/
-	MSFilterClass tqparent_class;
+	MSFilterClass parent_class;
 };
 
 typedef struct _MSRingPlayerClass MSRingPlayerClass;
diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msrtprecv.h b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msrtprecv.h
index e9fd7937..0f36c379 100644
--- a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msrtprecv.h
+++ b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msrtprecv.h
@@ -55,7 +55,7 @@ struct _MSRtpRecvClass
 {
 	/* the MSCopy derivates from MSFilter, so the MSFilter class MUST be the first of the MSCopy class
        in order to the class mechanism to work*/
-	MSFilterClass tqparent_class;
+	MSFilterClass parent_class;
 };
 
 typedef struct _MSRtpRecvClass MSRtpRecvClass;
diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msrtpsend.h b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msrtpsend.h
index 56728f16..96889964 100644
--- a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msrtpsend.h
+++ b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msrtpsend.h
@@ -59,7 +59,7 @@ struct _MSRtpSendClass
 {
 	/* the MSRtpSend derivates from MSFilter, so the MSFilter class MUST be the first of the MSCopy class
        in order to the class mechanism to work*/
-	MSFilterClass tqparent_class;
+	MSFilterClass parent_class;
 };
 
 typedef struct _MSRtpSendClass MSRtpSendClass;
diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/mssdlout.h b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/mssdlout.h
index b19c7e74..9c7d5ab3 100644
--- a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/mssdlout.h
+++ b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/mssdlout.h
@@ -51,7 +51,7 @@ typedef struct _MSSdlOut MSSdlOut;
 	
 struct _MSSdlOutClass
 {
-	MSFilterClass tqparent_class;
+	MSFilterClass parent_class;
 };
 
 typedef struct _MSSdlOutClass MSSdlOutClass;
diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/mssoundread.h b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/mssoundread.h
index 31349250..9c5512b0 100644
--- a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/mssoundread.h
+++ b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/mssoundread.h
@@ -38,7 +38,7 @@ struct _MSSoundReadClass
 {
 	/* the MSOssRead derivates from MSFilter, so the MSFilter class MUST be the first of the MSOssRead class
        in order to the class mechanism to work*/
-	MSFilterClass tqparent_class;
+	MSFilterClass parent_class;
 	gint (*set_device)(MSSoundRead *, gint devid);
 	void (*start)(MSSoundRead *);
 	void (*stop)(MSSoundRead*);
diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/mssoundwrite.h b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/mssoundwrite.h
index e8fae0d8..8c1bab2d 100644
--- a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/mssoundwrite.h
+++ b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/mssoundwrite.h
@@ -38,7 +38,7 @@ struct _MSSoundWriteClass
 {
 	/* the MSOssWrite derivates from MSFilter, so the MSFilter class MUST be the first of the MSOssWrite class
        in order to the class mechanism to work*/
-	MSFilterClass tqparent_class;
+	MSFilterClass parent_class;
 	gint (*set_device)(MSSoundWrite *, gint devid);
 	void (*start)(MSSoundWrite *);
 	void (*stop)(MSSoundWrite*);
diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/mstimer.h b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/mstimer.h
index b245ab86..3fe11350 100644
--- a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/mstimer.h
+++ b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/mstimer.h
@@ -42,7 +42,7 @@ typedef struct _MSTimer
 typedef struct _MSTimerClass
 {
 	/* the MSSyncClass must be the first field of the class in order to the class mechanism to work*/
-	MSSyncClass tqparent_class;
+	MSSyncClass parent_class;
 } MSTimerClass;
 
 
diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/mstruespeechdecoder.h b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/mstruespeechdecoder.h
index 105e2603..a61719ea 100644
--- a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/mstruespeechdecoder.h
+++ b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/mstruespeechdecoder.h
@@ -42,7 +42,7 @@ typedef struct _MSTrueSpeechDecoderClass
            so the MSFilter class MUST be the first of the MSTrueSpechDecoder
            class
            in order for the class mechanism to work*/
-  MSFilterClass tqparent_class;
+  MSFilterClass parent_class;
   Win32CodecDriver* driver;
 } MSTrueSpeechDecoderClass;
 
diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/mstruespeechencoder.h b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/mstruespeechencoder.h
index 2637d3ac..78024946 100644
--- a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/mstruespeechencoder.h
+++ b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/mstruespeechencoder.h
@@ -46,7 +46,7 @@ typedef struct _MSTrueSpeechEncoderClass
            so the MSFilter class MUST be the first of the MSTrueSpechEncoder
            class
            in order for the class mechanism to work*/
-  MSFilterClass tqparent_class;
+  MSFilterClass parent_class;
   Win32CodecDriver* driver;
 } MSTrueSpeechEncoderClass;
 
diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msv4l.h b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msv4l.h
index e289ccc8..950187b8 100644
--- a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msv4l.h
+++ b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msv4l.h
@@ -61,7 +61,7 @@ typedef struct _MSV4l MSV4l;
 
 struct _MSV4lClass
 {
-	MSVideoSourceClass tqparent_class;
+	MSVideoSourceClass parent_class;
 	
 };
 
diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msvideosource.h b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msvideosource.h
index 2189a6df..897b239e 100644
--- a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msvideosource.h
+++ b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msvideosource.h
@@ -45,7 +45,7 @@ typedef struct _MSVideoSourceClass
 {
 	/* the MSVideoSource derivates from MSFilter, so the MSFilter class MUST be the first of the MSVideoSource class
        in order to the class mechanism to work*/
-	MSFilterClass tqparent_class;
+	MSFilterClass parent_class;
 	gint (*set_device)(MSVideoSource *s, const gchar *name);
 	void (*start)(MSVideoSource *s);
 	void (*stop)(MSVideoSource *s);
diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/mswrite.h b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/mswrite.h
index 55081793..8492a09d 100644
--- a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/mswrite.h
+++ b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/mswrite.h
@@ -45,7 +45,7 @@ typedef struct _MSWriteClass
 {
 	/* the MSWrite derivates from MSFilter, so the MSFilter class MUST be the first of the MSWrite class
        in order to the class mechanism to work*/
-	MSFilterClass tqparent_class;
+	MSFilterClass parent_class;
 } MSWriteClass;
 
 /* PUBLIC */
diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/ortp/rtpsession.h b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/ortp/rtpsession.h
index 81554a06..7518e075 100644
--- a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/ortp/rtpsession.h
+++ b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/ortp/rtpsession.h
@@ -177,7 +177,7 @@ struct _RtpSession
 	RtpSessionMode mode;
 	struct _RtpScheduler *sched;
 	guint32 flags;
-	gint tqmask_pos;	/* the position in the scheduler tqmask of RtpSession */
+	gint mask_pos;	/* the position in the scheduler tqmask of RtpSession */
 	gpointer user_data;
 	
 	/* telephony events extension */
diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/ortp/scheduler.c b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/ortp/scheduler.c
index 2ea733ac..bee787a2 100644
--- a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/ortp/scheduler.c
+++ b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/ortp/scheduler.c
@@ -177,7 +177,7 @@ void rtp_scheduler_add_session(RtpScheduler *sched, RtpSession *session)
 	/* find a free pos in the session tqmask*/
 	for (i=0;i<sched->max_sessions;i++){
 		if (!ORTP_FD_ISSET(i,&sched->all_sessions.rtpset)){
-			session->tqmask_pos=i;
+			session->mask_pos=i;
 			session_set_set(&sched->all_sessions,session);
 			/* make a new session scheduled not blockable if it has not started*/
 			if (session->flags & RTP_SESSION_RECV_NOT_STARTED) 
diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/ortp/scheduler.h b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/ortp/scheduler.h
index 106f1fcd..4dcd9afb 100644
--- a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/ortp/scheduler.h
+++ b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/ortp/scheduler.h
@@ -37,7 +37,7 @@ struct _RtpScheduler {
 	gint 		w_max;
 	SessionSet	e_sessions;	/* tqmask of session that have error event */
 	gint		e_max;
-	gint max_sessions;		/* the number of position in the tqmasks */
+	gint max_sessions;		/* the number of position in the masks */
   /* GMutex  *unblock_select_mutex; */
 	GCond   *unblock_select_cond;
 	GMutex	*lock;
diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/ortp/sessionset.c b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/ortp/sessionset.c
index bea1a7c9..36856a99 100644
--- a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/ortp/sessionset.c
+++ b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/ortp/sessionset.c
@@ -67,7 +67,7 @@ gint session_set_and(SessionSet *sched_set, gint maxs, SessionSet *user_set, Ses
 	tqmask2=(guint32*)&user_set->rtpset;
 	tqmask3=(guint32*)&result_set->rtpset;
 	while(i<maxs+1){
-		*tqmask3=(*tqmask1) & (*tqmask2);	/* computes the AND between the two tqmasks*/
+		*tqmask3=(*tqmask1) & (*tqmask2);	/* computes the AND between the two masks*/
 		/* and unset the sessions that have been found from the sched_set */
 		*tqmask1=(*tqmask1) & (~(*tqmask3));
 		if ((*tqmask3)!=0){
@@ -116,12 +116,12 @@ int session_set_select(SessionSet *recvs, SessionSet *sends, SessionSet *errors)
 	SessionSet temp;
 	RtpScheduler *sched=ortp_get_scheduler();
 	
-	/*lock the scheduler to not read the tqmasks while they are being modified by the scheduler*/
+	/*lock the scheduler to not read the masks while they are being modified by the scheduler*/
 	rtp_scheduler_lock(sched);
 	
 	while(1){
 		/* computes the SessionSet intersection (in the other words tqmask intersection) between
-		the tqmask given by the user and scheduler tqmasks */
+		the tqmask given by the user and scheduler masks */
 		if (recvs!=NULL){
 			bits=session_set_and(&sched->r_sessions,sched->all_max,recvs,&temp);
 			if (bits>0){
diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/ortp/sessionset.h b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/ortp/sessionset.h
index b4a0b904..8d166222 100644
--- a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/ortp/sessionset.h
+++ b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/ortp/sessionset.h
@@ -87,9 +87,9 @@ typedef struct _SessionSet SessionSet;
 
 SessionSet * session_set_new();
 #define session_set_init(ss)		ORTP_FD_ZERO(&(ss)->rtpset)
-#define session_set_set(ss,rtpsession)		ORTP_FD_SET((rtpsession)->tqmask_pos,&(ss)->rtpset)
-#define session_set_is_set(ss,rtpsession)	ORTP_FD_ISSET((rtpsession)->tqmask_pos,&(ss)->rtpset)
-#define session_set_clr(ss,rtpsession)		ORTP_FD_CLR((rtpsession)->tqmask_pos,&(ss)->rtpset)
+#define session_set_set(ss,rtpsession)		ORTP_FD_SET((rtpsession)->mask_pos,&(ss)->rtpset)
+#define session_set_is_set(ss,rtpsession)	ORTP_FD_ISSET((rtpsession)->mask_pos,&(ss)->rtpset)
+#define session_set_clr(ss,rtpsession)		ORTP_FD_CLR((rtpsession)->mask_pos,&(ss)->rtpset)
 
 #define session_set_copy(dest,src)		memcpy(&(dest)->rtpset,&(src)->rtpset,sizeof(ortp_fd_set))
 
diff --git a/kopete/protocols/jabber/libiris/cutestuff/network/srvresolver.cpp b/kopete/protocols/jabber/libiris/cutestuff/network/srvresolver.cpp
index 0bd0ca45..68f260ca 100644
--- a/kopete/protocols/jabber/libiris/cutestuff/network/srvresolver.cpp
+++ b/kopete/protocols/jabber/libiris/cutestuff/network/srvresolver.cpp
@@ -205,7 +205,7 @@ void SrvResolver::qdns_done()
 	if(!d->qdns)
 		return;
 
-	// aptqparently we sometimes get this signal even though the results aren't ready
+	// apparently we sometimes get this signal even though the results aren't ready
 	if(d->qdns->isWorking())
 		return;
 	d->t.stop();
@@ -266,7 +266,7 @@ void SrvResolver::ndns_done()
 	if(!d->qdns)
 		return;
 
-	// aptqparently we sometimes get this signal even though the results aren't ready
+	// apparently we sometimes get this signal even though the results aren't ready
 	if(d->qdns->isWorking())
 		return;
 
diff --git a/kopete/protocols/jabber/libiris/iris/xmpp-core/connector.cpp b/kopete/protocols/jabber/libiris/iris/xmpp-core/connector.cpp
index a8ad7bd9..ab2a5d5c 100644
--- a/kopete/protocols/jabber/libiris/iris/xmpp-core/connector.cpp
+++ b/kopete/protocols/jabber/libiris/iris/xmpp-core/connector.cpp
@@ -409,7 +409,7 @@ void AdvancedConnector::dns_done()
 	//if(!d->qdns)
 	//	return;
 
-	// aptqparently we sometimes get this signal even though the results aren' t ready
+	// apparently we sometimes get this signal even though the results aren' t ready
 	//if(d->qdns->isWorking())
 	//	return;
 
diff --git a/kopete/protocols/jabber/libiris/iris/xmpp-core/parser.cpp b/kopete/protocols/jabber/libiris/iris/xmpp-core/parser.cpp
index ba14f404..80ce5366 100644
--- a/kopete/protocols/jabber/libiris/iris/xmpp-core/parser.cpp
+++ b/kopete/protocols/jabber/libiris/iris/xmpp-core/parser.cpp
@@ -465,7 +465,7 @@ namespace XMPP
 					current = TQDomElement();
 				}
 				else
-					current = current.tqparentNode().toElement();
+					current = current.parentNode().toElement();
 			}
 
 			if(in->lastRead() == '/')
diff --git a/kopete/protocols/jabber/libiris/iris/xmpp-core/xmlprotocol.cpp b/kopete/protocols/jabber/libiris/iris/xmpp-core/xmlprotocol.cpp
index 0f8b17a7..5f682371 100644
--- a/kopete/protocols/jabber/libiris/iris/xmpp-core/xmlprotocol.cpp
+++ b/kopete/protocols/jabber/libiris/iris/xmpp-core/xmlprotocol.cpp
@@ -33,9 +33,9 @@ using namespace XMPP;
 static TQDomElement stripExtraNS(const TQDomElement &e)
 {
 	// find closest tqparent with a namespace
-	TQDomNode par = e.tqparentNode();
+	TQDomNode par = e.parentNode();
 	while(!par.isNull() && par.namespaceURI().isNull())
-		par = par.tqparentNode();
+		par = par.parentNode();
 	bool noShowNS = false;
 	if(!par.isNull() && par.namespaceURI() == e.namespaceURI())
 		noShowNS = true;
diff --git a/kopete/protocols/jabber/libiris/iris/xmpp-im/client.cpp b/kopete/protocols/jabber/libiris/iris/xmpp-im/client.cpp
index 9d56467c..86a01e60 100644
--- a/kopete/protocols/jabber/libiris/iris/xmpp-im/client.cpp
+++ b/kopete/protocols/jabber/libiris/iris/xmpp-im/client.cpp
@@ -470,9 +470,9 @@ void Client::streamCloseFinished()
 static TQDomElement oldStyleNS(const TQDomElement &e)
 {
 	// find closest tqparent with a namespace
-	TQDomNode par = e.tqparentNode();
+	TQDomNode par = e.parentNode();
 	while(!par.isNull() && par.namespaceURI().isNull())
-		par = par.tqparentNode();
+		par = par.parentNode();
 	bool noShowNS = false;
 	if(!par.isNull() && par.namespaceURI() == e.namespaceURI())
 		noShowNS = true;
@@ -588,7 +588,7 @@ static TQDomElement addCorrectNS(const TQDomElement &e)
 	// find closest xmlns
 	TQDomNode n = e;
 	while(!n.isNull() && !n.toElement().hasAttribute("xmlns"))
-		n = n.tqparentNode();
+		n = n.parentNode();
 	TQString ns;
 	if(n.isNull() || !n.toElement().hasAttribute("xmlns"))
 		ns = "jabber:client";
diff --git a/kopete/protocols/jabber/libiris/iris/xmpp-im/xmpp_tasks.cpp b/kopete/protocols/jabber/libiris/iris/xmpp-im/xmpp_tasks.cpp
index 2d13db79..bab5665b 100644
--- a/kopete/protocols/jabber/libiris/iris/xmpp-im/xmpp_tasks.cpp
+++ b/kopete/protocols/jabber/libiris/iris/xmpp-im/xmpp_tasks.cpp
@@ -654,9 +654,9 @@ bool JT_PushPresence::take(const TQDomElement &e)
 static TQDomElement oldStyleNS(const TQDomElement &e)
 {
 	// find closest tqparent with a namespace
-	TQDomNode par = e.tqparentNode();
+	TQDomNode par = e.parentNode();
 	while(!par.isNull() && par.namespaceURI().isNull())
-		par = par.tqparentNode();
+		par = par.parentNode();
 	bool noShowNS = false;
 	if(!par.isNull() && par.namespaceURI() == e.namespaceURI())
 		noShowNS = true;
@@ -724,7 +724,7 @@ static TQDomElement addCorrectNS(const TQDomElement &e)
 	// find closest xmlns
 	TQDomNode n = e;
 	while(!n.isNull() && !n.toElement().hasAttribute("xmlns"))
-		n = n.tqparentNode();
+		n = n.parentNode();
 	TQString ns;
 	if(n.isNull() || !n.toElement().hasAttribute("xmlns"))
 		ns = "jabber:client";
diff --git a/kopete/protocols/jabber/ui/dlgaddcontact.ui b/kopete/protocols/jabber/ui/dlgaddcontact.ui
index f39e81ef..c0b3d1cc 100644
--- a/kopete/protocols/jabber/ui/dlgaddcontact.ui
+++ b/kopete/protocols/jabber/ui/dlgaddcontact.ui
@@ -98,7 +98,7 @@
 </widget>
 <customwidgets>
 </customwidgets>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>klineedit.h</includehint>
 </includehints>
diff --git a/kopete/protocols/jabber/ui/dlgbrowse.ui b/kopete/protocols/jabber/ui/dlgbrowse.ui
index 1b73dd95..cb0f1cc2 100644
--- a/kopete/protocols/jabber/ui/dlgbrowse.ui
+++ b/kopete/protocols/jabber/ui/dlgbrowse.ui
@@ -193,7 +193,7 @@
         <slot>close()</slot>
     </connection>
 </connections>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>kpushbutton.h</includehint>
     <includehint>kpushbutton.h</includehint>
diff --git a/kopete/protocols/jabber/ui/dlgchangepassword.ui b/kopete/protocols/jabber/ui/dlgchangepassword.ui
index 18c0b439..29ae6d33 100644
--- a/kopete/protocols/jabber/ui/dlgchangepassword.ui
+++ b/kopete/protocols/jabber/ui/dlgchangepassword.ui
@@ -79,7 +79,7 @@ and then your new password twice.</string>
 </widget>
 <customwidgets>
 </customwidgets>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>kpassdlg.h</includehint>
     <includehint>kpassdlg.h</includehint>
diff --git a/kopete/protocols/jabber/ui/dlgchatjoin.ui b/kopete/protocols/jabber/ui/dlgchatjoin.ui
index db1bbfcb..aa124cc2 100644
--- a/kopete/protocols/jabber/ui/dlgchatjoin.ui
+++ b/kopete/protocols/jabber/ui/dlgchatjoin.ui
@@ -126,5 +126,5 @@
     <slot>slotBowse()</slot>
     <slot>slotJoin()</slot>
 </Q_SLOTS>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/kopete/protocols/jabber/ui/dlgchatroomslist.ui b/kopete/protocols/jabber/ui/dlgchatroomslist.ui
index 0c5e07be..5feefbb7 100644
--- a/kopete/protocols/jabber/ui/dlgchatroomslist.ui
+++ b/kopete/protocols/jabber/ui/dlgchatroomslist.ui
@@ -178,7 +178,7 @@
     <slot>slotClick(int row, int col, int button, const QPoint&amp; mousePos)</slot>
     <slot>slotDoubleClick(int row, int col, int button, const QPoint&amp; mousePos)</slot>
 </Q_SLOTS>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>kdialog.h</includehint>
 </includehints>
diff --git a/kopete/protocols/jabber/ui/dlgjabberchooseserver.ui b/kopete/protocols/jabber/ui/dlgjabberchooseserver.ui
index 51943ee4..a1b732db 100644
--- a/kopete/protocols/jabber/ui/dlgjabberchooseserver.ui
+++ b/kopete/protocols/jabber/ui/dlgjabberchooseserver.ui
@@ -100,7 +100,7 @@
         <data format="XPM.GZ" length="2846">789c75d54953dd381007f03b9fe255fa969aea585ea59a9a039084256c0f0810a6e6204b32fbfe58a7e6bb8fddff3609c90ce6f27b6acbea764bfef07e72b0b53e79ff61ee6ee6672761128efdede47dbcbfb878fef3af3ffe9e7b67eac9f05fb849feeeb7b977d3d9244c36ae2ed300ef7b50664cac337127b626cf9db885f3a22e075325762694324edfc4de74954c4e6b705ed595dc4fe2ceb842c6fdd16093e5be6e24be1e9ce7856f647e7f227685ad647db4230e65d178194fe26eb8c43cb8903f89df1e5d4a3c1d8a7d9559acff40dccf57c1e5e0d20c97b811fb2ad928f31f8b43e59b56c6dde0aa1d2ef1ba3895b194f5901d5cd7755307b93f8add70c9f87470636a5be2fe7d71d5b416f905b1b399433db706dbcc3695d4930ab1192ef1e660d7b8429fbf216e6dd2f9b3c1a18d59443df7c4a9772dcec5dd70897707f7a355c2f33f8a8bc66678fe17b5cb50bf4f62eb7223fd430fe2d0a40cf7afc2ce1658cff9e0646c9521fe515cfad2209f457555607ee99f543bafcf3f1337aecbe4fdd005eccb4ceacd976217cacccaf8bdd8b719fa830fd57926f5e62b38984ceac12fea5ac7a5bf53eb23c689e156f3e5353834fafc67b5c3faf862b491fcf949dd66526f967aa61082ce77a04e46eac7f23e536c8b1ce3ab70e80cf291fe4ba96f70a91fefc33137c8675edcb555867807c7d220bf95d139eedf53d746fa95b3d1fafc85c15dd666b9bc0fb670b4c88fbcba3f2164fcebab518f1bb1f10eef9f23dc6abf7003c760a45f7977748efbafc579db68fc231cfb05cbf34fd429c7fb3f1d5da0decba3b15fb85677c89fe4bceb8a7e39c8bf529b1cfd78acce612e5f8d7c315eb699e697d441dfcf0e9c8c9e4f97ea02f5a4237595cbf9c84be2fe80a9b17fa3ba413da8535bac97d2abf17ee53ce9ea100af8014ed6211f1d4faec27e9c8d463d19eb69fa7a231f525b7501275fa3bfcd683d9feed46d055fa9638e7c3e8fd6f3fbf6d518bf51a702cf43beb61dfbe71c4efd8692f8157572a8dff6abd10fd7ea0ef3d1c2e806cf43bfdace75a817d6e3a2b7e8974db8df7118bf57772df617fadf875062ff213fdf7738ce8f2775897a30fab58d49e7cfe1ae6ad11ff3eadae23c5d52fb12df4fa3ee2fb91ffd1b626cb05fb6e0ae8ea8d799ba89e8d799daeaf7e159ed1accff32da62bfcbf7a08b7dc658ffa2da27d47baa6e615a56077d1fe887d4cf88f59caa6327ef87e57bd20d7fb2fee90c17137b6e3970e4c41d1f8dbf7f8fe1633ee1533ee373bee04bbee26b3e7e1bc3377ccb773ce37b7ee0477ee2677ee179be7913b3c08bfc913ff1675ee2655ee155fec26bbcfe26668337798ba7bccd3bbccb5f798ff7f980bfbd8939e48c0de75c70c915d7dcb06547fc630c11796a2950a4441d1dd1319dd0299dbd8939a70bbaecc7afe89a6ee896ee6846f774fe36777aa0c73ee2899ee985e6698116e9e1e7faf4511fe9137da6255aa6155aa52fbfd6b08f59a375daa04ddaa2296d8fbffe14b343bbf495f6689f0ee8dbffc41c524686722aa8a4ea7f626a6ac892f3ecc9fbff8e99ce7ceb838f3ef9eefb6fbfc4787fe48ffdc98fb3f431fffc3ef72fd6519eaa</data>
     </image>
 </images>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>kactivelabel.h</includehint>
 </includehints>
diff --git a/kopete/protocols/jabber/ui/dlgjabbereditaccountwidget.ui b/kopete/protocols/jabber/ui/dlgjabbereditaccountwidget.ui
index 085f0b91..e3599536 100644
--- a/kopete/protocols/jabber/ui/dlgjabbereditaccountwidget.ui
+++ b/kopete/protocols/jabber/ui/dlgjabbereditaccountwidget.ui
@@ -986,7 +986,7 @@ If two resources have the same priority, the messages will be sent to the one co
     <tabstop>cbSendDisplayedEvent</tabstop>
     <tabstop>cbSendComposingEvent</tabstop>
 </tabstops>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>kopetepasswordwidget.h</includehint>
 </includehints>
diff --git a/kopete/protocols/jabber/ui/dlgjabberregisteraccount.ui b/kopete/protocols/jabber/ui/dlgjabberregisteraccount.ui
index 96c91ec1..32749c18 100644
--- a/kopete/protocols/jabber/ui/dlgjabberregisteraccount.ui
+++ b/kopete/protocols/jabber/ui/dlgjabberregisteraccount.ui
@@ -55,7 +55,7 @@
         </widget>
         <widget class="TQLayoutWidget" row="0" column="2">
             <property name="name">
-                <cstring>tqlayoutServerEntry</cstring>
+                <cstring>layoutServerEntry</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -309,7 +309,7 @@
     <tabstop>lePassword</tabstop>
     <tabstop>lePasswordVerify</tabstop>
 </tabstops>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>kpushbutton.h</includehint>
     <includehint>knuminput.h</includehint>
diff --git a/kopete/protocols/jabber/ui/dlgregister.ui b/kopete/protocols/jabber/ui/dlgregister.ui
index 76c8cc84..8a883b65 100644
--- a/kopete/protocols/jabber/ui/dlgregister.ui
+++ b/kopete/protocols/jabber/ui/dlgregister.ui
@@ -158,5 +158,5 @@
         <slot>reject()</slot>
     </connection>
 </connections>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/kopete/protocols/jabber/ui/dlgsendraw.ui b/kopete/protocols/jabber/ui/dlgsendraw.ui
index 20c01e7c..9d56f7bc 100644
--- a/kopete/protocols/jabber/ui/dlgsendraw.ui
+++ b/kopete/protocols/jabber/ui/dlgsendraw.ui
@@ -155,5 +155,5 @@
         </widget>
     </vbox>
 </widget>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/kopete/protocols/jabber/ui/dlgservices.ui b/kopete/protocols/jabber/ui/dlgservices.ui
index 03022c61..fda7bf4a 100644
--- a/kopete/protocols/jabber/ui/dlgservices.ui
+++ b/kopete/protocols/jabber/ui/dlgservices.ui
@@ -195,5 +195,5 @@
         <slot>close()</slot>
     </connection>
 </connections>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/kopete/protocols/jabber/ui/dlgvcard.ui b/kopete/protocols/jabber/ui/dlgvcard.ui
index 857a2890..8a4aa790 100644
--- a/kopete/protocols/jabber/ui/dlgvcard.ui
+++ b/kopete/protocols/jabber/ui/dlgvcard.ui
@@ -1055,7 +1055,7 @@
     <tabstop>lePhoneCell</tabstop>
     <tabstop>teAbout</tabstop>
 </tabstops>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>kurllabel.h</includehint>
     <includehint>kurllabel.h</includehint>
diff --git a/kopete/protocols/jabber/ui/jabberaddcontactpage.cpp b/kopete/protocols/jabber/ui/jabberaddcontactpage.cpp
index 90f4f1e0..0f86a79b 100644
--- a/kopete/protocols/jabber/ui/jabberaddcontactpage.cpp
+++ b/kopete/protocols/jabber/ui/jabberaddcontactpage.cpp
@@ -76,7 +76,7 @@ bool JabberAddContactPage::validateData ()
 }
 
 
-bool JabberAddContactPage::apply ( Kopete::Account *account, Kopete::MetaContact *tqparentContact )
+bool JabberAddContactPage::apply ( Kopete::Account *account, Kopete::MetaContact *parentContact )
 {
 
 	if( canadd && validateData () )
@@ -90,25 +90,25 @@ bool JabberAddContactPage::apply ( Kopete::Account *account, Kopete::MetaContact
 		{
 			XMPP::JT_Gateway * gatewayTask = new XMPP::JT_Gateway ( jaccount->client()->rootTask () );
 			JabberAddContactPage_there_is_no_possibility_to_add_assync_WORKAROUND *workaround = 
-					new JabberAddContactPage_there_is_no_possibility_to_add_assync_WORKAROUND( transport , tqparentContact , gatewayTask );
+					new JabberAddContactPage_there_is_no_possibility_to_add_assync_WORKAROUND( transport , parentContact , gatewayTask );
 			TQObject::connect (gatewayTask, TQT_SIGNAL (finished ()), workaround, TQT_SLOT (slotJidReceived()));
 			gatewayTask->set ( transport->myself()->contactId() , contactId );
 			gatewayTask->go ( true );
 			return true;
 		}
 		
-		TQString displayName = tqparentContact->displayName ();
+		TQString displayName = parentContact->displayName ();
 		/*		
 		if ( displayName.isEmpty () )
 			displayName = contactId;
 		*/
 		// collect all group names
 		TQStringList groupNames;
-		Kopete::GroupList groupList = tqparentContact->groups();
+		Kopete::GroupList groupList = parentContact->groups();
 		for(Kopete::Group *group = groupList.first(); group; group = groupList.next())
 			groupNames += group->displayName();
 
-		if ( jaccount->addContact ( contactId, tqparentContact, Kopete::Account::ChangeKABC ) )
+		if ( jaccount->addContact ( contactId, parentContact, Kopete::Account::ChangeKABC ) )
 		{
 			XMPP::RosterItem item;
 			XMPP::Jid jid ( contactId );
@@ -167,25 +167,25 @@ void JabberAddContactPage_there_is_no_possibility_to_add_assync_WORKAROUND::slot
 
 	TQString contactId=task->prompt();
 	
-	Kopete::MetaContact* tqparentContact=metacontact;
+	Kopete::MetaContact* parentContact=metacontact;
 	JabberAccount *jaccount=transport->account();;
 	
 	/*\
 	 *   this is a copy of the end of JabberAddContactPage::apply
 	\*/
 	
-	TQString displayName = tqparentContact->displayName ();
+	TQString displayName = parentContact->displayName ();
 		/*		
 	if ( displayName.isEmpty () )
 	displayName = contactId;
 		*/
 		// collect all group names
 	TQStringList groupNames;
-	Kopete::GroupList groupList = tqparentContact->groups();
+	Kopete::GroupList groupList = parentContact->groups();
 	for(Kopete::Group *group = groupList.first(); group; group = groupList.next())
 		groupNames += group->displayName();
 
-	if ( jaccount->addContact ( contactId, tqparentContact, Kopete::Account::ChangeKABC ) )
+	if ( jaccount->addContact ( contactId, parentContact, Kopete::Account::ChangeKABC ) )
 	{
 		XMPP::RosterItem item;
 		XMPP::Jid jid ( contactId );
diff --git a/kopete/protocols/meanwhile/meanwhileaccount.cpp b/kopete/protocols/meanwhile/meanwhileaccount.cpp
index 91ad1a0f..f96b10f8 100644
--- a/kopete/protocols/meanwhile/meanwhileaccount.cpp
+++ b/kopete/protocols/meanwhile/meanwhileaccount.cpp
@@ -63,10 +63,10 @@ void MeanwhileAccount::setPlugin(MeanwhilePlugin *plugin)
 
 bool MeanwhileAccount::createContact(
                         const TQString & contactId ,
-                        Kopete::MetaContact * tqparentContact)
+                        Kopete::MetaContact * parentContact)
 {
     MeanwhileContact* newContact = new MeanwhileContact(contactId,
-            tqparentContact->displayName(), this, tqparentContact);
+            parentContact->displayName(), this, parentContact);
 
     MeanwhileProtocol *p = static_cast<MeanwhileProtocol *>(protocol());
 
diff --git a/kopete/protocols/meanwhile/meanwhileaccount.h b/kopete/protocols/meanwhile/meanwhileaccount.h
index daa5ca0c..2b59e1ca 100644
--- a/kopete/protocols/meanwhile/meanwhileaccount.h
+++ b/kopete/protocols/meanwhile/meanwhileaccount.h
@@ -44,7 +44,7 @@ public:
     ~MeanwhileAccount();
 
     virtual bool createContact(const TQString &contactId,
-                        Kopete::MetaContact *tqparentContact);
+                        Kopete::MetaContact *parentContact);
 
     virtual void connectWithPassword(const TQString &password);
 
diff --git a/kopete/protocols/meanwhile/ui/meanwhileaddcontactbase.ui b/kopete/protocols/meanwhile/ui/meanwhileaddcontactbase.ui
index d323bbe9..6920d7e3 100644
--- a/kopete/protocols/meanwhile/ui/meanwhileaddcontactbase.ui
+++ b/kopete/protocols/meanwhile/ui/meanwhileaddcontactbase.ui
@@ -107,5 +107,5 @@
         </spacer>
     </vbox>
 </widget>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/kopete/protocols/meanwhile/ui/meanwhileeditaccountbase.ui b/kopete/protocols/meanwhile/ui/meanwhileeditaccountbase.ui
index 39bde950..5f85cac2 100644
--- a/kopete/protocols/meanwhile/ui/meanwhileeditaccountbase.ui
+++ b/kopete/protocols/meanwhile/ui/meanwhileeditaccountbase.ui
@@ -430,7 +430,7 @@
 <tabstops>
     <tabstop>mScreenName</tabstop>
 </tabstops>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>kopetepasswordwidget.h</includehint>
 </includehints>
diff --git a/kopete/protocols/msn/config/msnprefs.ui b/kopete/protocols/msn/config/msnprefs.ui
index e6d95217..701d564d 100644
--- a/kopete/protocols/msn/config/msnprefs.ui
+++ b/kopete/protocols/msn/config/msnprefs.ui
@@ -209,7 +209,7 @@
 <includes>
     <include location="global" impldecl="in implementation">knuminput.h</include>
 </includes>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>knuminput.h</includehint>
     <includehint>knuminput.h</includehint>
diff --git a/kopete/protocols/msn/msnaccount.h b/kopete/protocols/msn/msnaccount.h
index d62998cf..f7c9b4e3 100644
--- a/kopete/protocols/msn/msnaccount.h
+++ b/kopete/protocols/msn/msnaccount.h
@@ -126,7 +126,7 @@ public slots:
 	void slotErrorMessageReceived( int type, const TQString &msg );
 
 protected:
-	virtual bool createContact( const TQString &contactId, Kopete::MetaContact *tqparentContact );
+	virtual bool createContact( const TQString &contactId, Kopete::MetaContact *parentContact );
 
 
 private slots:
diff --git a/kopete/protocols/msn/ui/msnadd.ui b/kopete/protocols/msn/ui/msnadd.ui
index 6373ccf3..283ea56f 100644
--- a/kopete/protocols/msn/ui/msnadd.ui
+++ b/kopete/protocols/msn/ui/msnadd.ui
@@ -93,5 +93,5 @@
         </spacer>
     </vbox>
 </widget>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/kopete/protocols/msn/ui/msndebugrawcommand_base.ui b/kopete/protocols/msn/ui/msndebugrawcommand_base.ui
index 27c1050f..b5699dd0 100644
--- a/kopete/protocols/msn/ui/msndebugrawcommand_base.ui
+++ b/kopete/protocols/msn/ui/msndebugrawcommand_base.ui
@@ -100,7 +100,7 @@
     <tabstop>m_addId</tabstop>
     <tabstop>m_addNewline</tabstop>
 </tabstops>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>ktextedit.h</includehint>
 </includehints>
diff --git a/kopete/protocols/msn/ui/msneditaccountui.ui b/kopete/protocols/msn/ui/msneditaccountui.ui
index b4bfe186..674248a1 100644
--- a/kopete/protocols/msn/ui/msneditaccountui.ui
+++ b/kopete/protocols/msn/ui/msneditaccountui.ui
@@ -1412,7 +1412,7 @@ Only check this option if the normal connection doesn't work.</string>
     <tabstop>m_blp</tabstop>
     <tabstop>m_RLButton</tabstop>
 </tabstops>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>kopetepasswordwidget.h</includehint>
     <includehint>kcombobox.h</includehint>
diff --git a/kopete/protocols/msn/ui/msninfo.ui b/kopete/protocols/msn/ui/msninfo.ui
index f983af30..42a0f0b6 100644
--- a/kopete/protocols/msn/ui/msninfo.ui
+++ b/kopete/protocols/msn/ui/msninfo.ui
@@ -217,5 +217,5 @@ If not, the user has not added you to their list, or has removed you.</string>
         </spacer>
     </vbox>
 </widget>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>
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>
diff --git a/kopete/protocols/oscar/icq/icqaccount.cpp b/kopete/protocols/oscar/icq/icqaccount.cpp
index e9772233..b65f7e4e 100644
--- a/kopete/protocols/oscar/icq/icqaccount.cpp
+++ b/kopete/protocols/oscar/icq/icqaccount.cpp
@@ -375,9 +375,9 @@ void ICQAccount::setOnlineStatus( const Kopete::OnlineStatus& status, const TQSt
 }
 
 
-OscarContact *ICQAccount::createNewContact( const TQString &contactId, Kopete::MetaContact *tqparentContact, const SSI& ssiItem )
+OscarContact *ICQAccount::createNewContact( const TQString &contactId, Kopete::MetaContact *parentContact, const SSI& ssiItem )
 {
-	ICQContact* contact = new ICQContact( this, contactId, tqparentContact, TQString(), ssiItem );
+	ICQContact* contact = new ICQContact( this, contactId, parentContact, TQString(), ssiItem );
 	if ( !ssiItem.alias().isEmpty() )
 		contact->setProperty( Kopete::Global::Properties::self()->nickName(), ssiItem.alias() );
 
diff --git a/kopete/protocols/oscar/icq/icqaccount.h b/kopete/protocols/oscar/icq/icqaccount.h
index 256c54dd..e6a86819 100644
--- a/kopete/protocols/oscar/icq/icqaccount.h
+++ b/kopete/protocols/oscar/icq/icqaccount.h
@@ -69,7 +69,7 @@ public:
 	void setUserProfile( const TQString &profile );
 
 protected:
-	virtual OscarContact *createNewContact( const TQString &contactId, Kopete::MetaContact *tqparentContact, const SSI& ssiItem );
+	virtual OscarContact *createNewContact( const TQString &contactId, Kopete::MetaContact *parentContact, const SSI& ssiItem );
 
 	virtual TQString sanitizedMessage( const TQString& message );
 
diff --git a/kopete/protocols/oscar/icq/ui/icqadd.ui b/kopete/protocols/oscar/icq/ui/icqadd.ui
index c42adfe2..5ac8d973 100644
--- a/kopete/protocols/oscar/icq/ui/icqadd.ui
+++ b/kopete/protocols/oscar/icq/ui/icqadd.ui
@@ -115,7 +115,7 @@
         <data format="PNG" length="736">89504e470d0a1a0a0000000d49484452000000100000001008060000001ff3ff61000002a749444154388d7d91cd4b945114c69f73ef3b33ea7ca838a6a32681501194d2975050b4c82f92dc042e5a550b5bf60744bb16b58a8268218144d026da64da228a0a2b52d1c8c8c48f2c54669c19df79df793fefbd2d662469860e1cb870cef3e339cf2500989b5b88e56cb78b0857f2b6d3e67b0e0b0503baf4e57bdbb21eb8b6fadedf7fda4599a2e999f9bdb66b5fb75db79b3164b8c6b3504af8426852885adff3272dc31cb14c313e38d827fe0568593d77225811b8d8d810475555a89e88e0791e0c330f2515cc7c9e6ccb822f8d6f00964a009e6b5f8ed554211a0d235c5501ce1874c30411414a89582cdc0625c3e964e64c3900b35de768301000e70c1ae7608c81738e80a6a1b2b202b16814cd4d8946ced550b90c98e33a158c113ccf47ceccc3cc5b080534282591d94c637d6d1d5bd92c2ccb3af2f0d1e8bd92135cd7370184018088c0350ec639a291086291083ccf432e6740d3822c994cc54a1c5886f5d1755d48a920a584520a4a291000251508844c3a83baf82e1051e90996e5dc5959fe0d21fd4270424208015184e9ba8e0f139350d050460fd6de7ec80e5786313b3307c33021a484effb104222994c61ecc52b380ec1cbfcc281fcd33dd3379af7ec04d0f497c5ae8977afc77b7acf6262620a7a2e0d2505a0181a1a1388d735209f5a41647504bb833fdcad8de4e896c9864edd5edb00006d9bd49468c4c0406f318b420b2121a440eaf324226d3588b79c0f6a536303d6fc2a9e5d4d5c1bb8bfb6cc769829f7cd2010aaf77741f7dbb095d1517bb81b0dadf57dd1907bf3f1a5448b5656b52d2ea6c62b6bf076ad09355f17cc939d84face736185d10bd9d9541dfbbb5c1010018c1158f14d44205600ad878ebdf9f47cfceec6a6e5b0d6e39a1139d8a5b1e2707878e47f660a15aaddfcb9a4df4a3f79d921abf7f52cda1d737f0030624881b39160420000000049454e44ae426082</data>
     </image>
 </images>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>kpushbutton.h</includehint>
 </includehints>
diff --git a/kopete/protocols/oscar/icq/ui/icqaddcontactpage.cpp b/kopete/protocols/oscar/icq/ui/icqaddcontactpage.cpp
index 6280644b..05d9eb70 100644
--- a/kopete/protocols/oscar/icq/ui/icqaddcontactpage.cpp
+++ b/kopete/protocols/oscar/icq/ui/icqaddcontactpage.cpp
@@ -66,13 +66,13 @@ void ICQAddContactPage::showEvent(TQShowEvent *e)
 	AddContactPage::showEvent(e);
 }
 
-bool ICQAddContactPage::apply(Kopete::Account* , Kopete::MetaContact *tqparentContact  )
+bool ICQAddContactPage::apply(Kopete::Account* , Kopete::MetaContact *parentContact  )
 {
 	kdDebug(14153) << k_funcinfo << "called; adding contact..." << endl;
 
 	TQString contactId = addUI->uinEdit->text();
 	kdDebug(14153) << k_funcinfo << "uin=" << contactId << endl;
-	return mAccount->addContact(contactId, tqparentContact, Kopete::Account::ChangeKABC );
+	return mAccount->addContact(contactId, parentContact, Kopete::Account::ChangeKABC );
 
 }
 
diff --git a/kopete/protocols/oscar/icq/ui/icqaddcontactpage.h b/kopete/protocols/oscar/icq/ui/icqaddcontactpage.h
index 23c514f6..ba658f94 100644
--- a/kopete/protocols/oscar/icq/ui/icqaddcontactpage.h
+++ b/kopete/protocols/oscar/icq/ui/icqaddcontactpage.h
@@ -39,7 +39,7 @@ public:
 	~ICQAddContactPage();
 	
 	virtual bool validateData();
-	virtual bool apply(Kopete::Account* , Kopete::MetaContact *tqparentContact);
+	virtual bool apply(Kopete::Account* , Kopete::MetaContact *parentContact);
 	
 	void setUINFromSearch( const TQString& );
 	
diff --git a/kopete/protocols/oscar/icq/ui/icqauthreplyui.ui b/kopete/protocols/oscar/icq/ui/icqauthreplyui.ui
index a73b95a2..61fc84cb 100644
--- a/kopete/protocols/oscar/icq/ui/icqauthreplyui.ui
+++ b/kopete/protocols/oscar/icq/ui/icqauthreplyui.ui
@@ -192,5 +192,5 @@
         </widget>
     </grid>
 </widget>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/kopete/protocols/oscar/icq/ui/icqeditaccountui.ui b/kopete/protocols/oscar/icq/ui/icqeditaccountui.ui
index 074e4424..8c8776e0 100644
--- a/kopete/protocols/oscar/icq/ui/icqeditaccountui.ui
+++ b/kopete/protocols/oscar/icq/ui/icqeditaccountui.ui
@@ -479,7 +479,7 @@ If you do not currently have an ICQ account, please click the button to create o
     <tabstop>chkHideIP</tabstop>
     <tabstop>chkWebAware</tabstop>
 </tabstops>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>kopetepasswordwidget.h</includehint>
 </includehints>
diff --git a/kopete/protocols/oscar/icq/ui/icqgeneralinfo.ui b/kopete/protocols/oscar/icq/ui/icqgeneralinfo.ui
index 52288b38..c48e8ff9 100644
--- a/kopete/protocols/oscar/icq/ui/icqgeneralinfo.ui
+++ b/kopete/protocols/oscar/icq/ui/icqgeneralinfo.ui
@@ -607,5 +607,5 @@
     <tabstop>emailEdit</tabstop>
     <tabstop>homepageEdit</tabstop>
 </tabstops>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/kopete/protocols/oscar/icq/ui/icqinterestinfowidget.ui b/kopete/protocols/oscar/icq/ui/icqinterestinfowidget.ui
index a8107e44..009780f0 100644
--- a/kopete/protocols/oscar/icq/ui/icqinterestinfowidget.ui
+++ b/kopete/protocols/oscar/icq/ui/icqinterestinfowidget.ui
@@ -112,5 +112,5 @@
         </spacer>
     </grid>
 </widget>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/kopete/protocols/oscar/icq/ui/icqotherinfowidget.ui b/kopete/protocols/oscar/icq/ui/icqotherinfowidget.ui
index 2e1079a2..d5d77c09 100644
--- a/kopete/protocols/oscar/icq/ui/icqotherinfowidget.ui
+++ b/kopete/protocols/oscar/icq/ui/icqotherinfowidget.ui
@@ -64,5 +64,5 @@
         </widget>
     </grid>
 </widget>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/kopete/protocols/oscar/icq/ui/icqsearchbase.ui b/kopete/protocols/oscar/icq/ui/icqsearchbase.ui
index 5e2b3bf6..140f17fa 100644
--- a/kopete/protocols/oscar/icq/ui/icqsearchbase.ui
+++ b/kopete/protocols/oscar/icq/ui/icqsearchbase.ui
@@ -479,7 +479,7 @@
     <tabstop>closeButton</tabstop>
     <tabstop>searchResults</tabstop>
 </tabstops>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>kpushbutton.h</includehint>
     <includehint>kpushbutton.h</includehint>
diff --git a/kopete/protocols/oscar/icq/ui/icqworkinfowidget.ui b/kopete/protocols/oscar/icq/ui/icqworkinfowidget.ui
index bd6b714a..4707dbe8 100644
--- a/kopete/protocols/oscar/icq/ui/icqworkinfowidget.ui
+++ b/kopete/protocols/oscar/icq/ui/icqworkinfowidget.ui
@@ -245,5 +245,5 @@
         </spacer>
     </vbox>
 </widget>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/kopete/protocols/oscar/liboscar/HACKING b/kopete/protocols/oscar/liboscar/HACKING
index 36a6edf5..0259505d 100644
--- a/kopete/protocols/oscar/liboscar/HACKING
+++ b/kopete/protocols/oscar/liboscar/HACKING
@@ -101,7 +101,7 @@ Spaces
 ================================================================================
 
 Spaces should be used between the conditional / loop type and the
-conditional statement.  They should also not be used after tqparenthesis.  However
+conditional statement.  They should also not be used after parenthesis.  However
 the should be to mark of mathematical or comparative operators.
 
 if ( foo == bar )
@@ -188,7 +188,7 @@ written in this document. Those files that don't match will be corrected eventua
 To make things easier on you, kate modelines are provided at the end of certain files
 to help enforce the coding style. If you're using the new C S&S Indenter that will be in
 KDE 3.4, I can provide a patch that will automatically implement the space padding around
-tqparenthesis. Please mail me so I can send it to you.
+parenthesis. Please mail me so I can send it to you.
 
 Matt Rogers <mattr@kde.org>
 
diff --git a/kopete/protocols/oscar/liboscar/aimlogintask.cpp b/kopete/protocols/oscar/liboscar/aimlogintask.cpp
index 05a63198..56fa497f 100644
--- a/kopete/protocols/oscar/liboscar/aimlogintask.cpp
+++ b/kopete/protocols/oscar/liboscar/aimlogintask.cpp
@@ -158,7 +158,7 @@ void AimLoginTask::sendLoginRequest()
 	
 	outbuf->addTLV(0x0001, client()->userId().length(), client()->userId().latin1());
 
-	TQByteArray digest( 17 ); //aptqparently MD5 digests are 16 bytes long
+	TQByteArray digest( 17 ); //apparently MD5 digests are 16 bytes long
 	encodePassword( digest );
 	digest[16] = '\0';  //do this so that addTLV sees a NULL-terminator
 
diff --git a/kopete/protocols/oscar/oscaraccount.cpp b/kopete/protocols/oscar/oscaraccount.cpp
index 4ff71b1c..38d01121 100644
--- a/kopete/protocols/oscar/oscaraccount.cpp
+++ b/kopete/protocols/oscar/oscaraccount.cpp
@@ -555,7 +555,7 @@ Connection* OscarAccount::setupConnection( const TQString& server, uint port )
 
 
 bool OscarAccount::createContact(const TQString &contactId,
-	Kopete::MetaContact *tqparentContact)
+	Kopete::MetaContact *parentContact)
 {
 	/* We're not even online or connecting
 	 * (when getting server contacts), so don't bother
@@ -577,10 +577,10 @@ bool OscarAccount::createContact(const TQString &contactId,
 	 */
 
 	TQValueList<TLV> dummyList;
-	if ( tqparentContact->isTemporary() )
+	if ( parentContact->isTemporary() )
 	{
 		SSI tempItem( contactId, 0, 0, 0xFFFF, dummyList, 0 );
-		return createNewContact( contactId, tqparentContact, tempItem );
+		return createNewContact( contactId, parentContact, tempItem );
 	}
 
 	SSI ssiItem = d->engine->ssiManager()->findContact( contactId );
@@ -597,7 +597,7 @@ bool OscarAccount::createContact(const TQString &contactId,
 		else
 		{
 			kdDebug(OSCAR_GEN_DEBUG) << k_funcinfo << "Didn't find contact in list, creating new contact" << endl;
-			return createNewContact( contactId, tqparentContact, ssiItem );
+			return createNewContact( contactId, parentContact, ssiItem );
 		}
 	}
 	else
@@ -608,7 +608,7 @@ bool OscarAccount::createContact(const TQString &contactId,
 		kdDebug(OSCAR_GEN_DEBUG) << k_funcinfo << "Adding " << contactId << " to server side list" << endl;
 
 		TQString groupName;
-		Kopete::GroupList kopeteGroups = tqparentContact->groups(); //get the group list
+		Kopete::GroupList kopeteGroups = parentContact->groups(); //get the group list
 
 		if ( kopeteGroups.isEmpty() || kopeteGroups.first() == Kopete::Group::topLevel() )
 		{
@@ -617,7 +617,7 @@ bool OscarAccount::createContact(const TQString &contactId,
 		}
 		else
 		{
-				//aptqparently kopeteGroups.first() can be invalid. Attempt to prevent
+				//apparently kopeteGroups.first() can be invalid. Attempt to prevent
 				//crashes in SSIData::findGroup(const TQString& name)
 			groupName = kopeteGroups.first() ? kopeteGroups.first()->displayName() : i18n("Buddies");
 
@@ -631,7 +631,7 @@ bool OscarAccount::createContact(const TQString &contactId,
 			return false;
 		}
 
-		d->addContactMap[Oscar::normalize( contactId )] = tqparentContact;
+		d->addContactMap[Oscar::normalize( contactId )] = parentContact;
 		addContactToSSI( Oscar::normalize( contactId ), groupName, true );
 		return true;
 	}
diff --git a/kopete/protocols/oscar/oscaraccount.h b/kopete/protocols/oscar/oscaraccount.h
index bccaa9a1..2371a640 100644
--- a/kopete/protocols/oscar/oscaraccount.h
+++ b/kopete/protocols/oscar/oscaraccount.h
@@ -134,16 +134,16 @@ protected:
 	 * Adds a contact to a meta contact
 	 */
 	virtual bool createContact(const TQString &contactId,
-		 Kopete::MetaContact *tqparentContact );
+		 Kopete::MetaContact *parentContact );
 
 	/**
 	 * Protocols using Oscar must implement this to perform the instantiation
 	 * of their contact for Kopete.  Called by @ref createContact().
 	 * @param contactId theprotocol unique id of the contact
-	 * @param tqparentContact the tqparent metacontact
+	 * @param parentContact the tqparent metacontact
 	 * @return whether the creation succeeded or not
 	 */
-	virtual OscarContact *createNewContact( const TQString &contactId, Kopete::MetaContact *tqparentContact, const SSI& ssiItem ) = 0;
+	virtual OscarContact *createNewContact( const TQString &contactId, Kopete::MetaContact *parentContact, const SSI& ssiItem ) = 0;
 
 	virtual TQString sanitizedMessage( const TQString& message ) = 0;
 
diff --git a/kopete/protocols/oscar/oscarencodingselectionbase.ui b/kopete/protocols/oscar/oscarencodingselectionbase.ui
index bf10a6ca..97ef3f74 100644
--- a/kopete/protocols/oscar/oscarencodingselectionbase.ui
+++ b/kopete/protocols/oscar/oscarencodingselectionbase.ui
@@ -54,5 +54,5 @@
         </spacer>
     </grid>
 </widget>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/kopete/protocols/oscar/oscarlistcontactsbase.ui b/kopete/protocols/oscar/oscarlistcontactsbase.ui
index a5415391..4f318e78 100644
--- a/kopete/protocols/oscar/oscarlistcontactsbase.ui
+++ b/kopete/protocols/oscar/oscarlistcontactsbase.ui
@@ -45,5 +45,5 @@
         </widget>
     </vbox>
 </widget>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/kopete/protocols/oscar/oscarvisibilitybase.ui b/kopete/protocols/oscar/oscarvisibilitybase.ui
index fe70ffe1..4a3bb1a1 100644
--- a/kopete/protocols/oscar/oscarvisibilitybase.ui
+++ b/kopete/protocols/oscar/oscarvisibilitybase.ui
@@ -166,5 +166,5 @@
     <tabstop>visibleContacts</tabstop>
     <tabstop>invisibleContacts</tabstop>
 </tabstops>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/kopete/protocols/sms/services/gsmlibprefs.ui b/kopete/protocols/sms/services/gsmlibprefs.ui
index 49545bc5..b0bcd890 100644
--- a/kopete/protocols/sms/services/gsmlibprefs.ui
+++ b/kopete/protocols/sms/services/gsmlibprefs.ui
@@ -91,7 +91,7 @@
         </widget>
     </vbox>
 </widget>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>kurlrequester.h</includehint>
     <includehint>klineedit.h</includehint>
diff --git a/kopete/protocols/sms/services/smsclientprefs.ui b/kopete/protocols/sms/services/smsclientprefs.ui
index 40dffc4e..1b10799a 100644
--- a/kopete/protocols/sms/services/smsclientprefs.ui
+++ b/kopete/protocols/sms/services/smsclientprefs.ui
@@ -123,7 +123,7 @@
         </widget>
     </vbox>
 </widget>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>kurlrequester.h</includehint>
     <includehint>klineedit.h</includehint>
diff --git a/kopete/protocols/sms/services/smssendprefs.ui b/kopete/protocols/sms/services/smssendprefs.ui
index b9b1b06a..cdd2220d 100644
--- a/kopete/protocols/sms/services/smssendprefs.ui
+++ b/kopete/protocols/sms/services/smssendprefs.ui
@@ -179,7 +179,7 @@
     <tabstop>program</tabstop>
     <tabstop>provider</tabstop>
 </tabstops>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>kurlrequester.h</includehint>
     <includehint>klineedit.h</includehint>
diff --git a/kopete/protocols/sms/smsaccount.cpp b/kopete/protocols/sms/smsaccount.cpp
index f4cf21f5..bc95a458 100644
--- a/kopete/protocols/sms/smsaccount.cpp
+++ b/kopete/protocols/sms/smsaccount.cpp
@@ -170,9 +170,9 @@ void SMSAccount::slotSendingFailure(const Kopete::Message &msg, const TQString &
 }
 
 bool SMSAccount::createContact( const TQString &contactId,
-	Kopete::MetaContact * tqparentContact )
+	Kopete::MetaContact * parentContact )
 {
-	if (new SMSContact(this, contactId, tqparentContact->displayName(), tqparentContact))
+	if (new SMSContact(this, contactId, parentContact->displayName(), parentContact))
 		return true;
 	else
 		return false;
diff --git a/kopete/protocols/sms/smsaccount.h b/kopete/protocols/sms/smsaccount.h
index 7ab7dbd4..05caa989 100644
--- a/kopete/protocols/sms/smsaccount.h
+++ b/kopete/protocols/sms/smsaccount.h
@@ -68,7 +68,7 @@ protected slots:
 	
 
 protected:
-	bool createContact(const TQString &contactId,  Kopete::MetaContact *tqparentContact);
+	bool createContact(const TQString &contactId,  Kopete::MetaContact *parentContact);
 
 private:
 	bool theSubEnable;
diff --git a/kopete/protocols/sms/ui/smsactprefs.ui b/kopete/protocols/sms/ui/smsactprefs.ui
index 5f8eb9f4..d04814ef 100644
--- a/kopete/protocols/sms/ui/smsactprefs.ui
+++ b/kopete/protocols/sms/ui/smsactprefs.ui
@@ -428,7 +428,7 @@
 <includes>
     <include location="global" impldecl="in implementation">knuminput.h</include>
 </includes>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>krestrictedline.h</includehint>
 </includehints>
diff --git a/kopete/protocols/sms/ui/smsadd.ui b/kopete/protocols/sms/ui/smsadd.ui
index 4b05727b..29e75542 100644
--- a/kopete/protocols/sms/ui/smsadd.ui
+++ b/kopete/protocols/sms/ui/smsadd.ui
@@ -139,5 +139,5 @@
     <tabstop>addNr</tabstop>
     <tabstop>addName</tabstop>
 </tabstops>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/kopete/protocols/sms/ui/smsuserprefs.ui b/kopete/protocols/sms/ui/smsuserprefs.ui
index a21c5037..777b16b7 100644
--- a/kopete/protocols/sms/ui/smsuserprefs.ui
+++ b/kopete/protocols/sms/ui/smsuserprefs.ui
@@ -111,7 +111,7 @@
         </spacer>
     </vbox>
 </widget>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>klineedit.h</includehint>
 </includehints>
diff --git a/kopete/protocols/testbed/testbedaccount.cpp b/kopete/protocols/testbed/testbedaccount.cpp
index e722bed2..e78391ae 100644
--- a/kopete/protocols/testbed/testbedaccount.cpp
+++ b/kopete/protocols/testbed/testbedaccount.cpp
@@ -58,9 +58,9 @@ KActionMenu* TestbedAccount::actionMenu()
 	return mActionMenu;
 }
 
-bool TestbedAccount::createContact(const TQString& contactId, Kopete::MetaContact* tqparentContact)
+bool TestbedAccount::createContact(const TQString& contactId, Kopete::MetaContact* parentContact)
 {
-	TestbedContact* newContact = new TestbedContact( this, contactId, TestbedContact::Echo, tqparentContact->displayName(), tqparentContact );
+	TestbedContact* newContact = new TestbedContact( this, contactId, TestbedContact::Echo, parentContact->displayName(), parentContact );
 	return newContact != 0L;
 }
 
diff --git a/kopete/protocols/testbed/testbedaccount.h b/kopete/protocols/testbed/testbedaccount.h
index 76e2790a..71840ff9 100644
--- a/kopete/protocols/testbed/testbedaccount.h
+++ b/kopete/protocols/testbed/testbedaccount.h
@@ -48,7 +48,7 @@ public:
 	 * Creates a protocol specific Kopete::Contact subclass and adds it to the supplie
 	 * Kopete::MetaContact
 	 */
-	virtual bool createContact(const TQString& contactId, Kopete::MetaContact* tqparentContact);
+	virtual bool createContact(const TQString& contactId, Kopete::MetaContact* parentContact);
 	/**
 	 * Called when Kopete is set globally away
 	 */
diff --git a/kopete/protocols/testbed/testbedaccountpreferences.ui b/kopete/protocols/testbed/testbedaccountpreferences.ui
index 7437db6a..4edf08ca 100644
--- a/kopete/protocols/testbed/testbedaccountpreferences.ui
+++ b/kopete/protocols/testbed/testbedaccountpreferences.ui
@@ -156,5 +156,5 @@
         </widget>
     </vbox>
 </widget>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/kopete/protocols/testbed/testbedaddui.ui b/kopete/protocols/testbed/testbedaddui.ui
index 429b20b1..aa0410dd 100644
--- a/kopete/protocols/testbed/testbedaddui.ui
+++ b/kopete/protocols/testbed/testbedaddui.ui
@@ -103,5 +103,5 @@
         </spacer>
     </vbox>
 </widget>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/kopete/protocols/winpopup/ui/wpaddcontactbase.ui b/kopete/protocols/winpopup/ui/wpaddcontactbase.ui
index c9f63825..8049dab1 100644
--- a/kopete/protocols/winpopup/ui/wpaddcontactbase.ui
+++ b/kopete/protocols/winpopup/ui/wpaddcontactbase.ui
@@ -180,7 +180,7 @@
     <tabstop>mHostGroup</tabstop>
     <tabstop>mRefresh</tabstop>
 </tabstops>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>kcombobox.h</includehint>
     <includehint>klineedit.h</includehint>
diff --git a/kopete/protocols/winpopup/ui/wpeditaccountbase.ui b/kopete/protocols/winpopup/ui/wpeditaccountbase.ui
index b12e9c2c..32c8ead5 100644
--- a/kopete/protocols/winpopup/ui/wpeditaccountbase.ui
+++ b/kopete/protocols/winpopup/ui/wpeditaccountbase.ui
@@ -347,7 +347,7 @@ However, the recommended way is to ask your administrator to create this directo
 <Q_SLOTS>
     <slot>installSamba()</slot>
 </Q_SLOTS>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>kpushbutton.h</includehint>
     <includehint>knuminput.h</includehint>
diff --git a/kopete/protocols/winpopup/ui/wpuserinfowidget.ui b/kopete/protocols/winpopup/ui/wpuserinfowidget.ui
index d717c9c4..aaec0dbe 100644
--- a/kopete/protocols/winpopup/ui/wpuserinfowidget.ui
+++ b/kopete/protocols/winpopup/ui/wpuserinfowidget.ui
@@ -208,7 +208,7 @@
     <tabstop>sOS</tabstop>
     <tabstop>sServer</tabstop>
 </tabstops>
-<tqlayoutdefaults spacing="6" margin="0"/>
+<layoutdefaults spacing="6" margin="0"/>
 <includehints>
     <includehint>klineedit.h</includehint>
     <includehint>klineedit.h</includehint>
diff --git a/kopete/protocols/winpopup/wpaccount.cpp b/kopete/protocols/winpopup/wpaccount.cpp
index addb88bb..9366d31f 100644
--- a/kopete/protocols/winpopup/wpaccount.cpp
+++ b/kopete/protocols/winpopup/wpaccount.cpp
@@ -75,12 +75,12 @@ bool WPAccount::checkHost(const TQString &Name)
 	}
 }
 
-bool WPAccount::createContact(const TQString &contactId, Kopete::MetaContact *tqparentContact )
+bool WPAccount::createContact(const TQString &contactId, Kopete::MetaContact *parentContact )
 {
 //	kdDebug(14170) << "[WPAccount::createContact] contactId: " << contactId << endl;
 
 	if (!contacts()[contactId]) {
-		WPContact *newContact = new WPContact(this, contactId, tqparentContact->displayName(), tqparentContact);
+		WPContact *newContact = new WPContact(this, contactId, parentContact->displayName(), parentContact);
 		return newContact != 0;
 	} else {
 		kdDebug(14170) << "[WPAccount::addContact] Contact already exists" << endl;
diff --git a/kopete/protocols/winpopup/wpaccount.h b/kopete/protocols/winpopup/wpaccount.h
index eb343541..19209a65 100644
--- a/kopete/protocols/winpopup/wpaccount.h
+++ b/kopete/protocols/winpopup/wpaccount.h
@@ -92,7 +92,7 @@ public slots:
 	void setOnlineStatus( const Kopete::OnlineStatus &status , const TQString &reason = TQString());
 
 protected:
-	virtual bool createContact(const TQString &contactId, Kopete::MetaContact *tqparentContact);
+	virtual bool createContact(const TQString &contactId, Kopete::MetaContact *parentContact);
 
 private slots:
 //	void updateAccountId();
diff --git a/kopete/protocols/yahoo/libkyahoo/libyahoo.c b/kopete/protocols/yahoo/libkyahoo/libyahoo.c
index 56b5f968..32e6f2bd 100644
--- a/kopete/protocols/yahoo/libkyahoo/libyahoo.c
+++ b/kopete/protocols/yahoo/libkyahoo/libyahoo.c
@@ -152,7 +152,7 @@ void authresp_0x0b(const char *seed, const char *sn, const char *password, char
 	while (*magic_ptr != (int)NULL) {
 		const char *loc;
 
-		/* Ignore tqparentheses.  */
+		/* Ignore parentheses.  */
 
 		if (*magic_ptr == '(' || *magic_ptr == ')') {
 			magic_ptr++;
diff --git a/kopete/protocols/yahoo/ui/yahooadd.ui b/kopete/protocols/yahoo/ui/yahooadd.ui
index 7aa1bd78..f497da37 100644
--- a/kopete/protocols/yahoo/ui/yahooadd.ui
+++ b/kopete/protocols/yahoo/ui/yahooadd.ui
@@ -93,5 +93,5 @@
         </spacer>
     </vbox>
 </widget>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/kopete/protocols/yahoo/ui/yahooeditaccountbase.ui b/kopete/protocols/yahoo/ui/yahooeditaccountbase.ui
index a9102967..002c740b 100644
--- a/kopete/protocols/yahoo/ui/yahooeditaccountbase.ui
+++ b/kopete/protocols/yahoo/ui/yahooeditaccountbase.ui
@@ -463,5 +463,5 @@
 <Q_SLOTS>
     <slot access="private" specifier="nicht virtual">slotSelectPicture()</slot>
 </Q_SLOTS>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/kopete/protocols/yahoo/ui/yahoogeneralinfowidget.ui b/kopete/protocols/yahoo/ui/yahoogeneralinfowidget.ui
index a9b93dcf..16af6016 100644
--- a/kopete/protocols/yahoo/ui/yahoogeneralinfowidget.ui
+++ b/kopete/protocols/yahoo/ui/yahoogeneralinfowidget.ui
@@ -643,5 +643,5 @@
     <tabstop>homepageEdit</tabstop>
     <tabstop>yahooIdEdit</tabstop>
 </tabstops>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/kopete/protocols/yahoo/ui/yahooinvitelistbase.ui b/kopete/protocols/yahoo/ui/yahooinvitelistbase.ui
index 6c83ac64..c1d88464 100644
--- a/kopete/protocols/yahoo/ui/yahooinvitelistbase.ui
+++ b/kopete/protocols/yahoo/ui/yahooinvitelistbase.ui
@@ -333,5 +333,5 @@
     <slot>btnCancel_clicked()</slot>
     <slot>btnInvite_clicked()</slot>
 </Q_SLOTS>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/kopete/protocols/yahoo/ui/yahoootherinfowidget.ui b/kopete/protocols/yahoo/ui/yahoootherinfowidget.ui
index 98d754d6..197de528 100644
--- a/kopete/protocols/yahoo/ui/yahoootherinfowidget.ui
+++ b/kopete/protocols/yahoo/ui/yahoootherinfowidget.ui
@@ -115,5 +115,5 @@
         </spacer>
     </grid>
 </widget>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/kopete/protocols/yahoo/ui/yahoostealthsetting.ui b/kopete/protocols/yahoo/ui/yahoostealthsetting.ui
index f83b2050..d0254985 100644
--- a/kopete/protocols/yahoo/ui/yahoostealthsetting.ui
+++ b/kopete/protocols/yahoo/ui/yahoostealthsetting.ui
@@ -92,5 +92,5 @@
 <tabstops>
     <tabstop>radioOnline</tabstop>
 </tabstops>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/kopete/protocols/yahoo/ui/yahooverifyaccountbase.ui b/kopete/protocols/yahoo/ui/yahooverifyaccountbase.ui
index 10eccd2e..5a18d662 100644
--- a/kopete/protocols/yahoo/ui/yahooverifyaccountbase.ui
+++ b/kopete/protocols/yahoo/ui/yahooverifyaccountbase.ui
@@ -155,5 +155,5 @@
         <data format="XPM.GZ" length="4833">789c8597596f23470e80dfe75718c3b7c182e9eabb11ec834fc9873cbeaf601fc86ec9966df994cfc5fef794483633934d10c836fcb9582cde55fee5dbd2d9de68e9db2f5f9ee7349fb64bed153d2d7deb5e66b38fdffef3efff7ef99aa64b8baf2c5b4abffeebcb57dc5c6a9720499290640b8613e110ff22eb941b07657e7256f90be742e4a7c6a9ed076791c7a1732efbd784d3f817615a71167db0e55c0a17ce95c88f8ced3c7e74d6f306cea29fd159f583b3e8a75367d18f5bce8df0b63389be67e3ccfcd97716fd78e22cfaf1d459edefedcbedbc63e75af4cf85b33edeb8616cfef1b5b39eb7e72cf6c28b7166fb53678df7b5b3fadf388b3d503a8b3d40c6b9eaa35767d9cf37c6a5e53f73d6f3769d55bedf5f2789ac6bfcf2de1fda33ce4cdfbb716eeb6fce1acf1de3c2f2bbe7acf573605cdafe2b67f5efd359f20bb97165febe38b3c453fd2bfa7cd0a67165fea97c9db416ff1de3b1e9d77a6d12567bf8c159ed9d1ab7969fc2b8d378e2ba304579c93769bd719457fd524f2184cae221f51bd250a8fd3c35ae4cfec1b8b6fa06e3c6eaffc859d651f215b2d0c7efdab8327b969d459e9e8d7bfd57c68df587c43be4c1e20b685c1b9f0b17c1e283cfce927f96f911ca40d63fcbce7afebd31eb3a91b3fa37376ead9e64dea5759606a94f546eb23499883d9bc69932bef4acf22cf594725c1f8bfca9b3c8d3aa711e82c82bb73de3817111a4fe2171d67e1a1b97ba8e87ce5a8f12bfb48b2cfae8ceb85206894f9666135bff2e5c45d6fae894a3393a3f5be13aaeb7729eca4ff2d6ce3f5b701ef2b1c95f0aa7715dfb4de657519675d0fc8d8c9ba0f527f12faab234fd8fc695f1ab716dfa3f84ebb2089dec5f779678d381711d74beae398b7f540b3751bfd6e39ab1c9033b6bbd07e326687dcb3c2da8ecf47cfa301e9bbe37e389c94b3c0a2edba0f5f361dc194b3c8b36eed77acf9c453fab7f6d95587e6e8d83c957c25dc9668fdc5fc538b2c6e3a6e754e7adcc836252b6a9d69bccffb2ad535d67e98fb2ab538befaab3e8439947e5b84e82f6ffa17165f1bd7096fcc1ccb8b67a981b375a0f20f92d2775b078493dd54c75aaef0de9dfba75167fea2eb2f683dc5771388d753fbe396b7fca7c6b52ea2c5e57ce621fcbfdd26464f1812767ed8f63e3ced665de34c464fe9e1bb3d5b3f45bc3dca67a7fc9fba7697b46a9bf66cc13cb8fcc8b66c2960f3832b6f3988dad1e2828b799c53371d6f9766b9c5b7f4afe286983f5c3aeb3be177ace6c1ecc9cb51f6a678def8a7169f351fca710f5a93d9db3d64febacf9981aa76a2f5e3b6b7d5d1af7f6df3aebfb67e4acf93f72d6f972675cd83c7d77d67cac3bebfdfce9acf7eb87b3c66b665cdabc5feed9f44bfd51caade59395dbc4fc3f33cecc9f9b9e35bf786fdccfffc459e7ffc059eb7fe2acefcfd459df13dbceda5f4367bddffed8affdf0665c243a6f769c351f6367f51f7ad6fcefcf9dd57e72567fd959e3dd3a6bbc3b677daf34ce6affadb3dadbdb57263a5f46ce7adf8e9dd5dededfbe5e2f9cb5de5b678df7bb71a5fa59f767dccf77cd57d6f7136c185b7e79d359f3159cf53df7e8acf19e19f7f57ee5acef9b0d67f5b733b6fa844b63f38f07ceea9fcc3fca5b9bef58199b3dbce5acefa53567bd6fee8c73d54f95b3fa3b34b6fcc3b3b3f6dba1b3f6afe6a788fb6bad9f1f3f08f19b90b18ddff0f3dafefc2fe4bb284948f1b7f1e2e73fca4ff012af708ad77883b77f2f8f33bc8b9aeff1011ff1099f718e2ff88a6ff88e1ff8196da33fc92fe30aaee21aaee3060e70889bb885dbb88323dc8d7a407df941be8dd2dfa3ec5e94dac7033cc4233cc6133cc5333cc78bffb327c18029669863812556d1ef1a9ba8168080a1850ec608daaf30814bb882296ec035dc486426700b33b8837b78c0213cc2133ce367af3f7a93c01c5e700b5ee10d6fe11d093ee01396610556f104d6601d36a2d77abf0da2f41036610bb6b1841d18c12e7c873dd887033884233886133885b318297d3fc558e114cee1021208d1e01432c8a180122aa8e3c5190f2322c63bb507995aea62bc37698c9f34a14bba822d9ad235ddd02dcde80e87744f0f7fc823d1233de1363d634d737aa1577aa3ebf8047ba70ffaa4655aa1555aa375b37f0c298e6923ca0fb0a1212cd3266dd136edd08876e93bedd13e1dd0211d997e88f6031dd3099d624e67744e17f15f8b40296594cb273ef61632aa5ff34515d5d43032707c19449fd6e993db283b8217ee62fc0630fa31bf1cdf037c493bb1724ef98a162d30e56bcae185467cc3b731dfa0f935f919dff13daef1033ff2133fc77d039e73d41da55ff90d268b8afba17ea27d30a18edff9833f7999577895d7a88421aff31b6fc0e04ff5c6314acc031ef2266cc4c7ce036ff12ca66a10ff75d95eacfd2ccf3b0bfd38e651ac93f7d83b77f84e47d1e6f1222e0bf9c5ef3ff7a3f690766f4ffd0490aa85affffbf5cbef985d44a8</data>
     </image>
 </images>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/kopete/protocols/yahoo/ui/yahooworkinfowidget.ui b/kopete/protocols/yahoo/ui/yahooworkinfowidget.ui
index 5a61311a..c501d6b5 100644
--- a/kopete/protocols/yahoo/ui/yahooworkinfowidget.ui
+++ b/kopete/protocols/yahoo/ui/yahooworkinfowidget.ui
@@ -229,5 +229,5 @@
     <tabstop>stateEdit</tabstop>
     <tabstop>countryEdit</tabstop>
 </tabstops>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/kopete/protocols/yahoo/yahooaccount.cpp b/kopete/protocols/yahoo/yahooaccount.cpp
index fb2c3447..315b4d45 100644
--- a/kopete/protocols/yahoo/yahooaccount.cpp
+++ b/kopete/protocols/yahoo/yahooaccount.cpp
@@ -663,7 +663,7 @@ YahooContact *YahooAccount::contact( const TQString &id )
 	return static_cast<YahooContact *>(contacts()[id]);
 }
 
-bool YahooAccount::createContact(const TQString &contactId, Kopete::MetaContact *tqparentContact )
+bool YahooAccount::createContact(const TQString &contactId, Kopete::MetaContact *parentContact )
 {
 //	kdDebug(YAHOO_GEN_DEBUG) << " contactId: " << contactId;
 
@@ -674,7 +674,7 @@ bool YahooAccount::createContact(const TQString &contactId, Kopete::MetaContact
 			// -- actualy (oct 2004) this method is only called when new contact are added.  but this will
 			//    maybe change and you will be noticed   --Olivier
 		YahooContact *newContact = new YahooContact( this, contactId,
-		                                             tqparentContact->displayName(), tqparentContact );
+		                                             parentContact->displayName(), parentContact );
 		return newContact != 0;
 	}
 	else
diff --git a/kopete/protocols/yahoo/yahooaccount.h b/kopete/protocols/yahoo/yahooaccount.h
index 4269a6cd..5a093872 100644
--- a/kopete/protocols/yahoo/yahooaccount.h
+++ b/kopete/protocols/yahoo/yahooaccount.h
@@ -153,7 +153,7 @@ protected:
 	/**
 	 * Adds our Yahoo contact to a metacontact
 	 */
-	virtual bool createContact(const TQString &contactId,  Kopete::MetaContact *tqparentContact);
+	virtual bool createContact(const TQString &contactId,  Kopete::MetaContact *parentContact);
 
 	virtual bool createChatContact( const TQString &nick );