rename the following methods:

tqparent parent tqmask mask git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdenetwork@1246260 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
author: tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> 2011-08-10 22:19:39 +0000
committer: tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> 2011-08-10 22:19:39 +0000
commit: 2bc1d72869b62af05ae4feafd878203b526da8c5 (patch)
tree: 2676903bb600bd9646644856e354940471ad84e2 /kopete/protocols/groupwise
parent: 937b2991d8e78166eea904c80ad04d34607017a4 (diff)
download: tdenetwork-2bc1d72869b62af05ae4feafd878203b526da8c5.tar.gz
tdenetwork-2bc1d72869b62af05ae4feafd878203b526da8c5.zip
125 files changed, 215 insertions, 215 deletions
diff --git a/kopete/protocols/groupwise/gwaccount.cpp b/kopete/protocols/groupwise/gwaccount.cpp
index f034cea7..cb9c7928 100644
--- a/kopete/protocols/groupwise/gwaccount.cpp
+++ b/kopete/protocols/groupwise/gwaccount.cpp
@@ -65,8 +65,8 @@
 
 #include "gwaccount.h"
 
-GroupWiseAccount::GroupWiseAccount( GroupWiseProtocol *tqparent, const TQString& accountID, const char *name )
-: Kopete::ManagedConnectionAccount ( tqparent, accountID, 0, "groupwiseaccount" )
+GroupWiseAccount::GroupWiseAccount( GroupWiseProtocol *parent, const TQString& accountID, const char *name )
+: Kopete::ManagedConnectionAccount ( parent, accountID, 0, "groupwiseaccount" )
 {
 	Q_UNUSED( name );
 	// Init the myself contact
@@ -533,7 +533,7 @@ void GroupWiseAccount::reconcileOfflineChanges()
 					else
 						continue;
 
-				GWFolder * folder = ::tqqt_cast<GWFolder*>( ( *instIt )->tqparent() );
+				GWFolder * folder = ::tqqt_cast<GWFolder*>( ( *instIt )->parent() );
 				if ( folder->id == ( unsigned int )groupId.toInt() )
 				{
 					found = true;
@@ -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.parentId = ::tqqt_cast<GWFolder*>( fld->tqparent() )->id;
+			fi.parentId = ::tqqt_cast<GWFolder*>( fld->parent() )->id;
 			fi.id = fld->id;
 			fi.name = fld->displayName;
 		}
@@ -1227,7 +1227,7 @@ void GroupWiseAccount::deleteContact( GroupWiseContact * contact )
 		for ( ; it != instances.end(); ++it )
 		{
 			DeleteItemTask * dit = new DeleteItemTask( client()->rootTask() );
-			dit->item( ::tqqt_cast<GWFolder*>( (*it)->tqparent() )->id, (*it)->id );
+			dit->item( ::tqqt_cast<GWFolder*>( (*it)->parent() )->id, (*it)->id );
 			TQObject::connect( dit, TQT_SIGNAL( gotContactDeleted( const ContactItem & ) ), TQT_SLOT( receiveContactDeleted( const ContactItem & ) ) );
 			dit->go( true );
 		}
@@ -1499,7 +1499,7 @@ void GroupWiseAccount::syncContact( GroupWiseContact * contact )
 			{
 				GWContactInstanceList::Iterator candidateInst = instIt;
 				++instIt;
-				GWFolder * folder = ::tqqt_cast<GWFolder *>( ( *candidateInst )->tqparent() );
+				GWFolder * folder = ::tqqt_cast<GWFolder *>( ( *candidateInst )->parent() );
 				kdDebug( GROUPWISE_DEBUG_GLOBAL ) << "  - Looking for a match, MC grp '" 
 					<< ( *candidateGrp )->displayName() 
 					<< "', GWFolder '" << folder->displayName << "', objectId is " << folder->id << endl;
@@ -1525,7 +1525,7 @@ void GroupWiseAccount::syncContact( GroupWiseContact * contact )
 			candidateGrp = grpIt;
 			++grpIt;
 			GWContactInstanceList::Iterator instIt = instances.begin();
-			GWFolder * sourceFolder =::tqqt_cast<GWFolder*>( ( *instIt)->tqparent() );
+			GWFolder * sourceFolder =::tqqt_cast<GWFolder*>( ( *instIt)->parent() );
 			kdDebug( GROUPWISE_DEBUG_GLOBAL ) << "  - moving contact instance from group '" << sourceFolder->displayName << "' to group '" << ( *candidateGrp )->displayName() << "'" << endl;
 
 			// create contactItem parameter
@@ -1604,7 +1604,7 @@ void GroupWiseAccount::syncContact( GroupWiseContact * contact )
 		{
 			GWContactInstanceList::Iterator candidateInst = instIt;
 			++instIt;
-			GWFolder * folder =::tqqt_cast<GWFolder*>( ( *candidateInst )->tqparent() );
+			GWFolder * folder =::tqqt_cast<GWFolder*>( ( *candidateInst )->parent() );
 			kdDebug( GROUPWISE_DEBUG_GLOBAL ) << "  - remove contact instance '"<< ( *candidateInst )->id << "' in group '" << folder->displayName << "'" << endl;
 
 			DeleteItemTask * dit = new DeleteItemTask( client()->rootTask() );
@@ -1628,7 +1628,7 @@ void GroupWiseAccount::syncContact( GroupWiseContact * contact )
 				TQValueList< ContactItem > instancesToChange;
 				ContactItem instance;
 				instance.id = (*it)->id;
-				instance.parentId = ::tqqt_cast<GWFolder *>( (*it)->tqparent() )->id;
+				instance.parentId = ::tqqt_cast<GWFolder *>( (*it)->parent() )->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 fbb66697..f05f00a1 100644
--- a/kopete/protocols/groupwise/gwaccount.h
+++ b/kopete/protocols/groupwise/gwaccount.h
@@ -59,7 +59,7 @@ class GroupWiseAccount : public Kopete::ManagedConnectionAccount
 	Q_OBJECT
   TQ_OBJECT
 public:
-	GroupWiseAccount( GroupWiseProtocol *tqparent, const TQString& accountID, const char *name = 0 );
+	GroupWiseAccount( GroupWiseProtocol *parent, const TQString& accountID, const char *name = 0 );
 	~GroupWiseAccount();
 
 	/**
@@ -349,7 +349,7 @@ private:
 	Q_OBJECT
   TQ_OBJECT
   public:
-	OnlineStatusMessageAction ( const Kopete::OnlineStatus& status, const TQString &text, const TQString &message, const TQIconSet &pix, TQObject *tqparent=0, const char *name=0);
+	OnlineStatusMessageAction ( const Kopete::OnlineStatus& status, const TQString &text, const TQString &message, const TQIconSet &pix, TQObject *parent=0, const char *name=0);
   signals:
 	void activated( const Kopete::OnlineStatus& status, const TQString & );
   private slots:
diff --git a/kopete/protocols/groupwise/gwbytestream.cpp b/kopete/protocols/groupwise/gwbytestream.cpp
index 5bd048cd..e9c04a21 100644
--- a/kopete/protocols/groupwise/gwbytestream.cpp
+++ b/kopete/protocols/groupwise/gwbytestream.cpp
@@ -25,8 +25,8 @@
 #include "gwbytestream.h"
 #include "gwerror.h"
 
-KNetworkByteStream::KNetworkByteStream ( TQObject *tqparent, const char */*name*/ )
- : ByteStream ( tqparent )
+KNetworkByteStream::KNetworkByteStream ( TQObject *parent, const char */*name*/ )
+ : ByteStream ( parent )
 {
 	kdDebug ( GROUPWISE_DEBUG_GLOBAL ) << k_funcinfo << "Instantiating new KNetwork byte stream." << endl;
 
diff --git a/kopete/protocols/groupwise/gwbytestream.h b/kopete/protocols/groupwise/gwbytestream.h
index 457d9593..1dcbacdc 100644
--- a/kopete/protocols/groupwise/gwbytestream.h
+++ b/kopete/protocols/groupwise/gwbytestream.h
@@ -38,7 +38,7 @@ Q_OBJECT
   TQ_OBJECT
 
 public:
-	KNetworkByteStream ( TQObject *tqparent = 0, const char *name = 0 );
+	KNetworkByteStream ( TQObject *parent = 0, const char *name = 0 );
 
 	~KNetworkByteStream ();
 
diff --git a/kopete/protocols/groupwise/gwconnector.cpp b/kopete/protocols/groupwise/gwconnector.cpp
index b353a6a2..e5daa9d7 100644
--- a/kopete/protocols/groupwise/gwconnector.cpp
+++ b/kopete/protocols/groupwise/gwconnector.cpp
@@ -25,8 +25,8 @@
 #include "gwerror.h"
 #include "gwbytestream.h"
 
-KNetworkConnector::KNetworkConnector ( TQObject *tqparent, const char */*name*/ )
- : Connector ( tqparent )
+KNetworkConnector::KNetworkConnector ( TQObject *parent, const char */*name*/ )
+ : Connector ( parent )
 {
 	kdDebug ( GROUPWISE_DEBUG_GLOBAL ) << k_funcinfo << "New KNetwork connector." << endl;
 
diff --git a/kopete/protocols/groupwise/gwconnector.h b/kopete/protocols/groupwise/gwconnector.h
index c582fc01..7f3ef3ac 100644
--- a/kopete/protocols/groupwise/gwconnector.h
+++ b/kopete/protocols/groupwise/gwconnector.h
@@ -38,7 +38,7 @@ Q_OBJECT
   TQ_OBJECT
 
 public:
-	KNetworkConnector ( TQObject *tqparent = 0, const char *name = 0 );
+	KNetworkConnector ( TQObject *parent = 0, const char *name = 0 );
 
 	virtual ~KNetworkConnector ();
 
diff --git a/kopete/protocols/groupwise/gwcontact.cpp b/kopete/protocols/groupwise/gwcontact.cpp
index 06ac510f..11f2d23b 100644
--- a/kopete/protocols/groupwise/gwcontact.cpp
+++ b/kopete/protocols/groupwise/gwcontact.cpp
@@ -47,9 +47,9 @@
 using namespace GroupWise;
 
 GroupWiseContact::GroupWiseContact( Kopete::Account* account, const TQString &dn, 
-			Kopete::MetaContact *tqparent, 
+			Kopete::MetaContact *parent, 
 			const int objectId, const int parentId, const int sequence )
-: Kopete::Contact( account, GroupWiseProtocol::dnToDotted( dn ), tqparent ), m_objectId( objectId ), m_parentId( parentId ),
+: Kopete::Contact( account, GroupWiseProtocol::dnToDotted( dn ), parent ), m_objectId( objectId ), m_parentId( parentId ),
   m_sequence( sequence ), m_actionBlock( 0 ), m_archiving( false ), m_deleting( false ), m_messageReceivedOffline( false )
 {
 	if ( dn.find( '=' ) != -1 )
@@ -58,7 +58,7 @@ GroupWiseContact::GroupWiseContact( Kopete::Account* account, const TQString &dn
 	}
 	connect( static_cast< GroupWiseAccount *>( account ), TQT_SIGNAL( privacyChanged( const TQString &, bool ) ),
 			TQT_SLOT( receivePrivacyChanged( const TQString &, bool ) ) );
-	setOnlineStatus( ( tqparent && tqparent->isTemporary() ) ? protocol()->groupwiseUnknown : protocol()->groupwiseOffline );
+	setOnlineStatus( ( parent && parent->isTemporary() ) ? protocol()->groupwiseUnknown : protocol()->groupwiseOffline );
 }
 
 GroupWiseContact::~GroupWiseContact()
diff --git a/kopete/protocols/groupwise/gwcontact.h b/kopete/protocols/groupwise/gwcontact.h
index d3c98a6b..2e81823f 100644
--- a/kopete/protocols/groupwise/gwcontact.h
+++ b/kopete/protocols/groupwise/gwcontact.h
@@ -59,13 +59,13 @@ public:
 	 * Constructor
 	 * @param account The GroupWiseAccount this belongs to.
 	 * @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 parent The Kopete::MetaContact this contact is part of.
 	 * @param objectId The contact's numeric object ID.
-	 * @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).
+	 * @param parentId The ID of this contact's parent (folder).
+	 * @param sequence This contact's sequence number (The position it appears in within its parent).
 	 */
 	GroupWiseContact( Kopete::Account* account, const TQString &uniqueName, 
-			Kopete::MetaContact *tqparent, 
+			Kopete::MetaContact *parent, 
 			const int objectId, const int parentId, const int sequence );
 
     ~GroupWiseContact();
diff --git a/kopete/protocols/groupwise/gwcontactlist.cpp b/kopete/protocols/groupwise/gwcontactlist.cpp
index 306a457c..ecca8912 100644
--- a/kopete/protocols/groupwise/gwcontactlist.cpp
+++ b/kopete/protocols/groupwise/gwcontactlist.cpp
@@ -22,8 +22,8 @@
 #include "gwcontactlist.h"
 #include "gwerror.h" //debug area
 
-GWContactList::GWContactList( TQObject * tqparent )
- : TQObject( tqparent ), rootFolder( new GWFolder( this, 0, 0, TQString() ) )
+GWContactList::GWContactList( TQObject * parent )
+ : TQObject( parent ), rootFolder( new GWFolder( this, 0, 0, TQString() ) )
 {  }
 
 GWFolder * GWContactList::addFolder( unsigned int id, unsigned int sequence, const TQString & displayName )
@@ -34,7 +34,7 @@ GWFolder * GWContactList::addFolder( unsigned int id, unsigned int sequence, con
 		return 0;
 }
 
-GWContactInstance * GWContactList::addContactInstance( unsigned int id, unsigned int tqparent, unsigned int sequence, const TQString & displayName, const TQString & dn )
+GWContactInstance * GWContactList::addContactInstance( unsigned int id, unsigned int parent, unsigned int sequence, const TQString & displayName, const TQString & dn )
 {
 	TQObjectList * l = queryList( "GWFolder", 0, false, true );
 	TQObjectListIt it( *l ); // iterate over the buttons
@@ -43,7 +43,7 @@ GWContactInstance * GWContactList::addContactInstance( unsigned int id, unsigned
     while ( (obj = it.current()) != 0 )
 	{
 		GWFolder * folder = ::tqqt_cast< GWFolder * >( obj );
-		if ( folder && folder->id == tqparent )
+		if ( folder && folder->id == parent )
 		{
 			contact = new GWContactInstance( folder, id, sequence, displayName, dn );
 			break;
@@ -187,12 +187,12 @@ void GWContactList::clear()
 	}
 }
 
-GWContactListItem::GWContactListItem( TQObject * tqparent, unsigned int theId, unsigned int theSequence, const TQString & theDisplayName ) :
-	TQObject( tqparent), id( theId ), sequence( theSequence ), displayName( theDisplayName )
+GWContactListItem::GWContactListItem( TQObject * parent, unsigned int theId, unsigned int theSequence, const TQString & theDisplayName ) :
+	TQObject( parent), id( theId ), sequence( theSequence ), displayName( theDisplayName )
 { }
 
-GWFolder::GWFolder( TQObject * tqparent, unsigned int theId,  unsigned int theSequence, const TQString & theDisplayName ) :
-	GWContactListItem( tqparent, theId, theSequence, theDisplayName )
+GWFolder::GWFolder( TQObject * parent, unsigned int theId,  unsigned int theSequence, const TQString & theDisplayName ) :
+	GWContactListItem( parent, theId, theSequence, theDisplayName )
 { }
 
 void GWFolder::dump( unsigned int depth )
@@ -223,8 +223,8 @@ void GWFolder::dump( unsigned int depth )
 		kdDebug( GROUPWISE_DEBUG_GLOBAL ) << s << "  no contacts." << endl;
 }
 
-GWContactInstance::GWContactInstance( TQObject * tqparent, unsigned int theId, unsigned int theSequence, const TQString & theDisplayName, const TQString & theDn ) :
-	GWContactListItem( tqparent, theId, theSequence, theDisplayName ), dn( theDn )
+GWContactInstance::GWContactInstance( TQObject * parent, unsigned int theId, unsigned int theSequence, const TQString & theDisplayName, const TQString & theDn ) :
+	GWContactListItem( parent, theId, theSequence, theDisplayName ), dn( theDn )
 { }
 
 void GWContactInstance::dump( unsigned int depth )
diff --git a/kopete/protocols/groupwise/gwcontactlist.h b/kopete/protocols/groupwise/gwcontactlist.h
index e6f2dcac..b70de5af 100644
--- a/kopete/protocols/groupwise/gwcontactlist.h
+++ b/kopete/protocols/groupwise/gwcontactlist.h
@@ -44,9 +44,9 @@ class GWContactList : public TQObject
 Q_OBJECT
   TQ_OBJECT
 public:
-	GWContactList( TQObject * tqparent );
+	GWContactList( TQObject * parent );
 	GWFolder * addFolder( unsigned int id, unsigned int sequence, const TQString & displayName );
-	GWContactInstance * addContactInstance( unsigned int id, unsigned int tqparent, unsigned int sequence, const TQString & displayName, const TQString & dn );
+	GWContactInstance * addContactInstance( unsigned int id, unsigned int parent, unsigned int sequence, const TQString & displayName, const TQString & dn );
 	GWFolder * findFolderById( unsigned int id );
 	GWFolder * findFolderByName( const TQString & name );
 	GWContactInstanceList instancesWithDn( const TQString & dn );
@@ -63,7 +63,7 @@ class GWContactListItem : public TQObject
 Q_OBJECT
   TQ_OBJECT
 public:
-	GWContactListItem( TQObject * tqparent, unsigned int theId, unsigned int theSequence, const TQString & theDisplayName );
+	GWContactListItem( TQObject * parent, unsigned int theId, unsigned int theSequence, const TQString & theDisplayName );
 
 	unsigned int id;		// OBJECT_ID
 	unsigned int sequence;	// SEQUENCE_NUMBER
@@ -75,7 +75,7 @@ class GWFolder : public GWContactListItem
 Q_OBJECT
   TQ_OBJECT
 public:
-	GWFolder( TQObject * tqparent, unsigned int theId,  unsigned int theSequence, const TQString & theDisplayName );
+	GWFolder( TQObject * parent, unsigned int theId,  unsigned int theSequence, const TQString & theDisplayName );
 	virtual void dump( unsigned int depth );
 };
 
@@ -84,7 +84,7 @@ class GWContactInstance : public GWContactListItem
 Q_OBJECT
   TQ_OBJECT
 public:
-	GWContactInstance( TQObject * tqparent, unsigned int theId, unsigned int theSequence, const TQString & theDisplayName, const TQString & theDn );
+	GWContactInstance( TQObject * parent, unsigned int theId, unsigned int theSequence, const TQString & theDisplayName, const TQString & theDn );
 	TQString dn;				// DN
 	virtual void dump( unsigned int depth );
 };
diff --git a/kopete/protocols/groupwise/gwprotocol.cpp b/kopete/protocols/groupwise/gwprotocol.cpp
index 0a9e09ee..4e139ce0 100644
--- a/kopete/protocols/groupwise/gwprotocol.cpp
+++ b/kopete/protocols/groupwise/gwprotocol.cpp
@@ -41,8 +41,8 @@ K_EXPORT_COMPONENT_FACTORY( kopete_groupwise, GroupWiseProtocolFactory( "kopete_
 
 GroupWiseProtocol *GroupWiseProtocol::s_protocol = 0L;
 
-GroupWiseProtocol::GroupWiseProtocol( TQObject* tqparent, const char *name, const TQStringList &/*args*/ )
-	: Kopete::Protocol( GroupWiseProtocolFactory::instance(), tqparent, name ),
+GroupWiseProtocol::GroupWiseProtocol( TQObject* parent, const char *name, const TQStringList &/*args*/ )
+	: Kopete::Protocol( GroupWiseProtocolFactory::instance(), parent, name ),
 /* initialise Kopete::OnlineStatus that should be user selectable in the user interface */
 	  groupwiseOffline ( Kopete::OnlineStatus::Offline,    0,  this, GroupWise::Offline, TQString(), 
 			i18n( "Offline" ), i18n( "O&ffline" ), Kopete::OnlineStatusManager::Offline ),
@@ -110,16 +110,16 @@ Kopete::Contact *GroupWiseProtocol::deserializeContact(
 	return new GroupWiseContact(account, dn, metaContact, objectId, parentId, sequence );
 }
 
-AddContactPage * GroupWiseProtocol::createAddContactWidget( TQWidget *tqparent, Kopete::Account *  account )
+AddContactPage * GroupWiseProtocol::createAddContactWidget( TQWidget *parent, Kopete::Account *  account )
 {
 	kdDebug( GROUPWISE_DEBUG_GLOBAL ) << "Creating Add Contact Page" << endl;
-	return new GroupWiseAddContactPage( account, tqparent, "addcontactpage");
+	return new GroupWiseAddContactPage( account, parent, "addcontactpage");
 }
 
-KopeteEditAccountWidget * GroupWiseProtocol::createEditAccountWidget( Kopete::Account *account, TQWidget *tqparent )
+KopeteEditAccountWidget * GroupWiseProtocol::createEditAccountWidget( Kopete::Account *account, TQWidget *parent )
 {
 	kdDebug(GROUPWISE_DEBUG_GLOBAL) << "Creating Edit Account Page" << endl;
-	return new GroupWiseEditAccountWidget( tqparent, account );
+	return new GroupWiseEditAccountWidget( parent, account );
 }
 
 Kopete::Account *GroupWiseProtocol::createNewAccount( const TQString &accountId )
diff --git a/kopete/protocols/groupwise/gwprotocol.h b/kopete/protocols/groupwise/gwprotocol.h
index 001d6f96..95105f17 100644
--- a/kopete/protocols/groupwise/gwprotocol.h
+++ b/kopete/protocols/groupwise/gwprotocol.h
@@ -36,7 +36,7 @@ class GroupWiseProtocol : public Kopete::Protocol
 	Q_OBJECT
   TQ_OBJECT
 public:
-	GroupWiseProtocol(TQObject *tqparent, const char *name, const TQStringList &args);
+	GroupWiseProtocol(TQObject *parent, const char *name, const TQStringList &args);
     ~GroupWiseProtocol();
 	/**
 	 * Convert the serialised data back into a GroupWiseContact and add this
@@ -50,11 +50,11 @@ public:
 	/**
 	 * Generate the widget needed to add GroupWiseContacts
 	 */
-	virtual AddContactPage * createAddContactWidget( TQWidget *tqparent, Kopete::Account *account );
+	virtual AddContactPage * createAddContactWidget( TQWidget *parent, Kopete::Account *account );
 	/**
 	 * Generate the widget needed to add/edit accounts for this protocol
 	 */
-	virtual KopeteEditAccountWidget * createEditAccountWidget( Kopete::Account *account, TQWidget *tqparent );
+	virtual KopeteEditAccountWidget * createEditAccountWidget( Kopete::Account *account, TQWidget *parent );
 	/**
 	 * Generate a GroupWiseAccount
 	 */
diff --git a/kopete/protocols/groupwise/libgroupwise/bytestream.cpp b/kopete/protocols/groupwise/libgroupwise/bytestream.cpp
index 35ef278e..0b20c050 100644
--- a/kopete/protocols/groupwise/libgroupwise/bytestream.cpp
+++ b/kopete/protocols/groupwise/libgroupwise/bytestream.cpp
@@ -63,9 +63,9 @@ public:
 };
 
 //!
-//! Constructs a ByteStream object with tqparent \a tqparent.
-ByteStream::ByteStream(TQObject *tqparent)
-:TQObject(tqparent)
+//! Constructs a ByteStream object with parent \a parent.
+ByteStream::ByteStream(TQObject *parent)
+:TQObject(parent)
 {
 	d = new Private;
 }
diff --git a/kopete/protocols/groupwise/libgroupwise/bytestream.h b/kopete/protocols/groupwise/libgroupwise/bytestream.h
index 5706fff6..b72fad78 100644
--- a/kopete/protocols/groupwise/libgroupwise/bytestream.h
+++ b/kopete/protocols/groupwise/libgroupwise/bytestream.h
@@ -33,7 +33,7 @@ class ByteStream : public TQObject
   TQ_OBJECT
 public:
 	enum Error { ErrRead, ErrWrite, ErrCustom = 10 };
-	ByteStream(TQObject *tqparent=0);
+	ByteStream(TQObject *parent=0);
 	virtual ~ByteStream()=0;
 
 	virtual bool isOpen() const;
diff --git a/kopete/protocols/groupwise/libgroupwise/chatroommanager.cpp b/kopete/protocols/groupwise/libgroupwise/chatroommanager.cpp
index d285b8af..3ee9b947 100644
--- a/kopete/protocols/groupwise/libgroupwise/chatroommanager.cpp
+++ b/kopete/protocols/groupwise/libgroupwise/chatroommanager.cpp
@@ -28,8 +28,8 @@
 
 #include "chatroommanager.h"
 
-ChatroomManager::ChatroomManager( Client * tqparent, const char *name)
-	: TQObject(tqparent, name), m_client( tqparent ), m_replace( false )
+ChatroomManager::ChatroomManager( Client * parent, const char *name)
+	: TQObject(parent, name), m_client( parent ), m_replace( false )
 {
 }
 
diff --git a/kopete/protocols/groupwise/libgroupwise/client.h b/kopete/protocols/groupwise/libgroupwise/client.h
index 9d559bf3..8bdd236d 100644
--- a/kopete/protocols/groupwise/libgroupwise/client.h
+++ b/kopete/protocols/groupwise/libgroupwise/client.h
@@ -47,7 +47,7 @@ Q_OBJECT
 		  EXTERNAL API 
 		 *************/
 		  
-		Client( TQObject *tqparent = 0, uint protocolVersion = 2 );
+		Client( TQObject *parent = 0, uint protocolVersion = 2 );
 		~Client();
 		void setOSName( const TQString &name );
 		void setClientName( const TQString &s );
diff --git a/kopete/protocols/groupwise/libgroupwise/connector.cpp b/kopete/protocols/groupwise/libgroupwise/connector.cpp
index 3b702d7a..849569a0 100644
--- a/kopete/protocols/groupwise/libgroupwise/connector.cpp
+++ b/kopete/protocols/groupwise/libgroupwise/connector.cpp
@@ -20,8 +20,8 @@
 
 #include "connector.h"
 
-Connector::Connector(TQObject *tqparent)
-:TQObject(tqparent)
+Connector::Connector(TQObject *parent)
+:TQObject(parent)
 {
 	setUseSSL(false);
 	setPeerAddressNone();
diff --git a/kopete/protocols/groupwise/libgroupwise/connector.h b/kopete/protocols/groupwise/libgroupwise/connector.h
index d09d0a7f..7654f7f0 100644
--- a/kopete/protocols/groupwise/libgroupwise/connector.h
+++ b/kopete/protocols/groupwise/libgroupwise/connector.h
@@ -31,7 +31,7 @@ class Connector : public TQObject
 	Q_OBJECT
   TQ_OBJECT
 public:
-	Connector(TQObject *tqparent=0);
+	Connector(TQObject *parent=0);
 	virtual ~Connector();
 
 	virtual void connectToServer(const TQString &server)=0;
diff --git a/kopete/protocols/groupwise/libgroupwise/eventprotocol.cpp b/kopete/protocols/groupwise/libgroupwise/eventprotocol.cpp
index d779564a..b6ff646d 100644
--- a/kopete/protocols/groupwise/libgroupwise/eventprotocol.cpp
+++ b/kopete/protocols/groupwise/libgroupwise/eventprotocol.cpp
@@ -25,8 +25,8 @@
 
 using namespace GroupWise;
 
-EventProtocol::EventProtocol(TQObject *tqparent, const char *name)
- : InputProtocolBase(tqparent, name)
+EventProtocol::EventProtocol(TQObject *parent, const char *name)
+ : InputProtocolBase(parent, name)
 {
 }
 
diff --git a/kopete/protocols/groupwise/libgroupwise/eventprotocol.h b/kopete/protocols/groupwise/libgroupwise/eventprotocol.h
index 65c0672b..97e48c22 100644
--- a/kopete/protocols/groupwise/libgroupwise/eventprotocol.h
+++ b/kopete/protocols/groupwise/libgroupwise/eventprotocol.h
@@ -111,7 +111,7 @@ class EventProtocol : public InputProtocolBase
 Q_OBJECT
   TQ_OBJECT
 public:
-    EventProtocol(TQObject *tqparent = 0, const char *name = 0);
+    EventProtocol(TQObject *parent = 0, const char *name = 0);
     ~EventProtocol();
 	/** 
 	 * Attempt to parse the supplied data into an @ref EventTransfer object.  
diff --git a/kopete/protocols/groupwise/libgroupwise/eventtransfer.h b/kopete/protocols/groupwise/libgroupwise/eventtransfer.h
index b55ba48e..594d0d16 100644
--- a/kopete/protocols/groupwise/libgroupwise/eventtransfer.h
+++ b/kopete/protocols/groupwise/libgroupwise/eventtransfer.h
@@ -58,7 +58,7 @@ public:
 	EventTransfer( const TQ_UINT32 eventType, const TQString & source, TQDateTime timeStamp );
 	~EventTransfer();
 	/** 
-	 * Access the bittqmask that describes the transfer's contents.  Use @ref Contents to determine what it contains
+	 * Access the bitmask that describes the transfer's contents.  Use @ref Contents to determine what it contains
 	 */
 	TQ_UINT32 contents();
 	/**
diff --git a/kopete/protocols/groupwise/libgroupwise/gwclientstream.cpp b/kopete/protocols/groupwise/libgroupwise/gwclientstream.cpp
index 8b5f9708..7305f7bc 100644
--- a/kopete/protocols/groupwise/libgroupwise/gwclientstream.cpp
+++ b/kopete/protocols/groupwise/libgroupwise/gwclientstream.cpp
@@ -143,8 +143,8 @@ public:
 	int noop_time;
 };
 
-ClientStream::ClientStream(Connector *conn, TLSHandler *tlsHandler, TQObject *tqparent)
-:Stream(tqparent)
+ClientStream::ClientStream(Connector *conn, TLSHandler *tlsHandler, TQObject *parent)
+:Stream(parent)
 {
 	d = new Private;
 	d->mode = Client;
diff --git a/kopete/protocols/groupwise/libgroupwise/gwclientstream.h b/kopete/protocols/groupwise/libgroupwise/gwclientstream.h
index 749eeaa7..8e2394c3 100644
--- a/kopete/protocols/groupwise/libgroupwise/gwclientstream.h
+++ b/kopete/protocols/groupwise/libgroupwise/gwclientstream.h
@@ -87,7 +87,7 @@ public:
 		BindConflict                // resource in-use
 	};
 
-	ClientStream(Connector *conn, TLSHandler *tlsHandler=0, TQObject *tqparent=0);
+	ClientStream(Connector *conn, TLSHandler *tlsHandler=0, TQObject *parent=0);
 	~ClientStream();
 
 	void connectToServer(const NovellDN &id, bool auth=true);
diff --git a/kopete/protocols/groupwise/libgroupwise/inputprotocolbase.cpp b/kopete/protocols/groupwise/libgroupwise/inputprotocolbase.cpp
index 0a7d7d8d..14a5af70 100644
--- a/kopete/protocols/groupwise/libgroupwise/inputprotocolbase.cpp
+++ b/kopete/protocols/groupwise/libgroupwise/inputprotocolbase.cpp
@@ -23,8 +23,8 @@
 #include "gwfield.h"
 #include "inputprotocolbase.h"
 
-InputProtocolBase::InputProtocolBase(TQObject *tqparent, const char *name)
- : TQObject(tqparent, name)
+InputProtocolBase::InputProtocolBase(TQObject *parent, const char *name)
+ : TQObject(parent, name)
 {
 }
 
diff --git a/kopete/protocols/groupwise/libgroupwise/inputprotocolbase.h b/kopete/protocols/groupwise/libgroupwise/inputprotocolbase.h
index 2f2f9f1e..152ac0f1 100644
--- a/kopete/protocols/groupwise/libgroupwise/inputprotocolbase.h
+++ b/kopete/protocols/groupwise/libgroupwise/inputprotocolbase.h
@@ -33,7 +33,7 @@ Q_OBJECT
   TQ_OBJECT
 public:
 	enum EventProtocolState { Success, NeedMore, OutOfSync, ProtocolError };
-	InputProtocolBase(TQObject *tqparent = 0, const char *name = 0);
+	InputProtocolBase(TQObject *parent = 0, const char *name = 0);
 	~InputProtocolBase();
 
 	/**
diff --git a/kopete/protocols/groupwise/libgroupwise/qca/src/qca.cpp b/kopete/protocols/groupwise/libgroupwise/qca/src/qca.cpp
index f00eee70..9aa7d80b 100644
--- a/kopete/protocols/groupwise/libgroupwise/qca/src/qca.cpp
+++ b/kopete/protocols/groupwise/libgroupwise/qca/src/qca.cpp
@@ -864,8 +864,8 @@ public:
 	TQPtrList<QCA_CertContext> store;
 };
 
-TLS::TLS(TQObject *tqparent)
-:TQObject(tqparent)
+TLS::TLS(TQObject *parent)
+:TQObject(parent)
 {
 	d = new Private;
 }
@@ -1132,8 +1132,8 @@ public:
 	TQByteArray inbuf, outbuf;
 };
 
-SASL::SASL(TQObject *tqparent)
-:TQObject(tqparent)
+SASL::SASL(TQObject *parent)
+:TQObject(parent)
 {
 	d = new Private;
 	reset();
diff --git a/kopete/protocols/groupwise/libgroupwise/qca/src/qca.h b/kopete/protocols/groupwise/libgroupwise/qca/src/qca.h
index dab99d5a..79b028bf 100644
--- a/kopete/protocols/groupwise/libgroupwise/qca/src/qca.h
+++ b/kopete/protocols/groupwise/libgroupwise/qca/src/qca.h
@@ -333,7 +333,7 @@ namespace QCA
 		};
 		enum Error { ErrHandshake, ErrCrypt };
 
-		TLS(TQObject *tqparent=0);
+		TLS(TQObject *parent=0);
 		~TLS();
 
 		void setCertificate(const Cert &cert, const RSAKey &key);
@@ -392,7 +392,7 @@ namespace QCA
 			NoUser,
 			RemoteUnavail
 		};
-		SASL(TQObject *tqparent=0);
+		SASL(TQObject *parent=0);
 		~SASL();
 
 		static void setAppName(const TQString &name);
diff --git a/kopete/protocols/groupwise/libgroupwise/qcatlshandler.cpp b/kopete/protocols/groupwise/libgroupwise/qcatlshandler.cpp
index 1213b6dc..0cf55684 100644
--- a/kopete/protocols/groupwise/libgroupwise/qcatlshandler.cpp
+++ b/kopete/protocols/groupwise/libgroupwise/qcatlshandler.cpp
@@ -30,11 +30,11 @@ public:
 	int state, err;
 };
 
-QCATLSHandler::QCATLSHandler(QCA::TLS *tqparent)
-:TLSHandler(tqparent)
+QCATLSHandler::QCATLSHandler(QCA::TLS *parent)
+:TLSHandler(parent)
 {
 	d = new Private;
-	d->tls = tqparent;
+	d->tls = parent;
 	connect(d->tls, TQT_SIGNAL(handshaken()), TQT_SLOT(tls_handshaken()));
 	connect(d->tls, TQT_SIGNAL(readyRead()), TQT_SLOT(tls_readyRead()));
 	connect(d->tls, TQT_SIGNAL(readyReadOutgoing(int)), TQT_SLOT(tls_readyReadOutgoing(int)));
diff --git a/kopete/protocols/groupwise/libgroupwise/qcatlshandler.h b/kopete/protocols/groupwise/libgroupwise/qcatlshandler.h
index 3a2ee71e..65c89f55 100644
--- a/kopete/protocols/groupwise/libgroupwise/qcatlshandler.h
+++ b/kopete/protocols/groupwise/libgroupwise/qcatlshandler.h
@@ -30,7 +30,7 @@ class QCATLSHandler : public TLSHandler
 	Q_OBJECT
   TQ_OBJECT
 public:
-	QCATLSHandler(QCA::TLS *tqparent);
+	QCATLSHandler(QCA::TLS *parent);
 	~QCATLSHandler();
 
 	QCA::TLS *tls() const;
diff --git a/kopete/protocols/groupwise/libgroupwise/responseprotocol.cpp b/kopete/protocols/groupwise/libgroupwise/responseprotocol.cpp
index c455eaec..50788178 100644
--- a/kopete/protocols/groupwise/libgroupwise/responseprotocol.cpp
+++ b/kopete/protocols/groupwise/libgroupwise/responseprotocol.cpp
@@ -22,7 +22,7 @@
 
 #include "responseprotocol.h"
 
-ResponseProtocol::ResponseProtocol(TQObject* tqparent, const char* name): InputProtocolBase(tqparent, name)
+ResponseProtocol::ResponseProtocol(TQObject* parent, const char* name): InputProtocolBase(parent, name)
 {
 }
 
diff --git a/kopete/protocols/groupwise/libgroupwise/responseprotocol.h b/kopete/protocols/groupwise/libgroupwise/responseprotocol.h
index 9010ef3c..1a9c1b94 100644
--- a/kopete/protocols/groupwise/libgroupwise/responseprotocol.h
+++ b/kopete/protocols/groupwise/libgroupwise/responseprotocol.h
@@ -44,7 +44,7 @@ public:
 	 */
 	enum PacketState { FieldsRead, ProtocolError };
 	
-	ResponseProtocol(TQObject* tqparent, const char* name);
+	ResponseProtocol(TQObject* parent, const char* name);
 	~ResponseProtocol();
 	/** 
 	 * Attempt to parse the supplied data into an @ref Response object.  
diff --git a/kopete/protocols/groupwise/libgroupwise/stream.cpp b/kopete/protocols/groupwise/libgroupwise/stream.cpp
index 87da3baa..d3410578 100644
--- a/kopete/protocols/groupwise/libgroupwise/stream.cpp
+++ b/kopete/protocols/groupwise/libgroupwise/stream.cpp
@@ -19,8 +19,8 @@
 
 #include "stream.h"
 
-Stream::Stream(TQObject *tqparent)
-:TQObject(tqparent)
+Stream::Stream(TQObject *parent)
+:TQObject(parent)
 {
 }
 
diff --git a/kopete/protocols/groupwise/libgroupwise/stream.h b/kopete/protocols/groupwise/libgroupwise/stream.h
index 15544a6c..e07b5e49 100644
--- a/kopete/protocols/groupwise/libgroupwise/stream.h
+++ b/kopete/protocols/groupwise/libgroupwise/stream.h
@@ -46,7 +46,7 @@ public:
 		SystemShutdown
 	};
 
-	Stream(TQObject *tqparent=0);
+	Stream(TQObject *parent=0);
 	virtual ~Stream();
 
 	virtual void close()=0;
diff --git a/kopete/protocols/groupwise/libgroupwise/task.cpp b/kopete/protocols/groupwise/libgroupwise/task.cpp
index 142db094..858c8fde 100644
--- a/kopete/protocols/groupwise/libgroupwise/task.cpp
+++ b/kopete/protocols/groupwise/libgroupwise/task.cpp
@@ -41,22 +41,22 @@ public:
 	Transfer * transfer;
 };
 
-Task::Task(Task *tqparent)
-:TQObject(tqparent)
+Task::Task(Task *parent)
+:TQObject(parent)
 {
 	init();
 	d->transfer = 0;
-	d->client = tqparent->client();
+	d->client = parent->client();
 	d->id = client()->genUniqueId();
 	connect(d->client, TQT_SIGNAL(disconnected()), TQT_SLOT(clientDisconnected()));
 }
 
-Task::Task(Client *tqparent, bool)
+Task::Task(Client *parent, bool)
 :TQObject(0)
 {
 	init();
 
-	d->client = tqparent;
+	d->client = parent;
 	connect(d->client, TQT_SIGNAL(disconnected()), TQT_SLOT(clientDisconnected()));
 }
 
@@ -77,9 +77,9 @@ void Task::init()
 	d->statusCode = 0;
 }
 
-Task *Task::tqparent() const
+Task *Task::parent() const
 {
-	return (Task *)TQObject::tqparent();
+	return (Task *)TQObject::parent();
 }
 
 Client *Task::client() const
diff --git a/kopete/protocols/groupwise/libgroupwise/task.h b/kopete/protocols/groupwise/libgroupwise/task.h
index 8d2bc380..223e7243 100644
--- a/kopete/protocols/groupwise/libgroupwise/task.h
+++ b/kopete/protocols/groupwise/libgroupwise/task.h
@@ -35,11 +35,11 @@ class Task : public TQObject
   TQ_OBJECT
 public:
 	enum { ErrDisc };
-	Task(Task *tqparent);
+	Task(Task *parent);
 	Task( Client *, bool isRoot );
 	virtual ~Task();
 
-	Task *tqparent() const;
+	Task *parent() const;
 	Client *client() const;
 	Transfer *transfer() const;
 	
diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/chatcountstask.cpp b/kopete/protocols/groupwise/libgroupwise/tasks/chatcountstask.cpp
index fa28ece0..fb028c44 100644
--- a/kopete/protocols/groupwise/libgroupwise/tasks/chatcountstask.cpp
+++ b/kopete/protocols/groupwise/libgroupwise/tasks/chatcountstask.cpp
@@ -26,7 +26,7 @@
 
 using namespace GroupWise;
 
-ChatCountsTask::ChatCountsTask(Task* tqparent): RequestTask(tqparent)
+ChatCountsTask::ChatCountsTask(Task* parent): RequestTask(parent)
 {
 	Field::FieldList lst;
 	createTransfer( "chatcounts", lst );
diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/chatcountstask.h b/kopete/protocols/groupwise/libgroupwise/tasks/chatcountstask.h
index 9a052dac..65edb07e 100644
--- a/kopete/protocols/groupwise/libgroupwise/tasks/chatcountstask.h
+++ b/kopete/protocols/groupwise/libgroupwise/tasks/chatcountstask.h
@@ -36,7 +36,7 @@ class ChatCountsTask : public RequestTask
 	Q_OBJECT
   TQ_OBJECT
 	public:
-		ChatCountsTask(Task* tqparent);
+		ChatCountsTask(Task* parent);
 		~ChatCountsTask();
 		bool take( Transfer * transfer );
 		/**
diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/chatpropertiestask.cpp b/kopete/protocols/groupwise/libgroupwise/tasks/chatpropertiestask.cpp
index fe8cf20c..4dceacc1 100644
--- a/kopete/protocols/groupwise/libgroupwise/tasks/chatpropertiestask.cpp
+++ b/kopete/protocols/groupwise/libgroupwise/tasks/chatpropertiestask.cpp
@@ -25,7 +25,7 @@
 
 using namespace GroupWise;
 
-ChatPropertiesTask::ChatPropertiesTask(Task* tqparent): RequestTask(tqparent)
+ChatPropertiesTask::ChatPropertiesTask(Task* parent): RequestTask(parent)
 {
 }
 
diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/chatpropertiestask.h b/kopete/protocols/groupwise/libgroupwise/tasks/chatpropertiestask.h
index dfb73139..e8b05c99 100644
--- a/kopete/protocols/groupwise/libgroupwise/tasks/chatpropertiestask.h
+++ b/kopete/protocols/groupwise/libgroupwise/tasks/chatpropertiestask.h
@@ -37,7 +37,7 @@ class ChatPropertiesTask : public RequestTask
 	Q_OBJECT
   TQ_OBJECT
 	public:
-		ChatPropertiesTask(Task* tqparent);
+		ChatPropertiesTask(Task* parent);
 		~ChatPropertiesTask();
 		/**
 		 * Specify which chatroom to get properties for
diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/conferencetask.cpp b/kopete/protocols/groupwise/libgroupwise/tasks/conferencetask.cpp
index de78465f..3fccc218 100644
--- a/kopete/protocols/groupwise/libgroupwise/tasks/conferencetask.cpp
+++ b/kopete/protocols/groupwise/libgroupwise/tasks/conferencetask.cpp
@@ -23,8 +23,8 @@
 
 #include "conferencetask.h"
 
-ConferenceTask::ConferenceTask( Task* tqparent )
- : EventTask( tqparent )
+ConferenceTask::ConferenceTask( Task* parent )
+ : EventTask( parent )
 {
 	// register all the events that this task monitors
 	registerEvent( GroupWise::ConferenceClosed );
diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/conferencetask.h b/kopete/protocols/groupwise/libgroupwise/tasks/conferencetask.h
index 4a1f6d19..64b9f111 100644
--- a/kopete/protocols/groupwise/libgroupwise/tasks/conferencetask.h
+++ b/kopete/protocols/groupwise/libgroupwise/tasks/conferencetask.h
@@ -38,7 +38,7 @@ class ConferenceTask : public EventTask
 Q_OBJECT
   TQ_OBJECT
 public:
-	ConferenceTask( Task* tqparent );
+	ConferenceTask( Task* parent );
 	~ConferenceTask();
 	bool take( Transfer * transfer );
 signals:
diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/connectiontask.cpp b/kopete/protocols/groupwise/libgroupwise/tasks/connectiontask.cpp
index 3778e80a..3d041208 100644
--- a/kopete/protocols/groupwise/libgroupwise/tasks/connectiontask.cpp
+++ b/kopete/protocols/groupwise/libgroupwise/tasks/connectiontask.cpp
@@ -21,7 +21,7 @@
 
 #include "connectiontask.h"
 
-ConnectionTask::ConnectionTask(Task* tqparent): EventTask(tqparent)
+ConnectionTask::ConnectionTask(Task* parent): EventTask(parent)
 {
 	registerEvent( GroupWise::UserDisconnect );
 	registerEvent( GroupWise::ServerDisconnect );
diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/connectiontask.h b/kopete/protocols/groupwise/libgroupwise/tasks/connectiontask.h
index da7507b1..0bbc2625 100644
--- a/kopete/protocols/groupwise/libgroupwise/tasks/connectiontask.h
+++ b/kopete/protocols/groupwise/libgroupwise/tasks/connectiontask.h
@@ -33,7 +33,7 @@ class ConnectionTask : public EventTask
 Q_OBJECT
   TQ_OBJECT
 public:
-	ConnectionTask(Task* tqparent);
+	ConnectionTask(Task* parent);
 	~ConnectionTask();
 	bool take( Transfer * transfer );
 signals:
diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/createconferencetask.cpp b/kopete/protocols/groupwise/libgroupwise/tasks/createconferencetask.cpp
index e87ee0f4..01d2fa05 100644
--- a/kopete/protocols/groupwise/libgroupwise/tasks/createconferencetask.cpp
+++ b/kopete/protocols/groupwise/libgroupwise/tasks/createconferencetask.cpp
@@ -24,7 +24,7 @@
 
 #include "createconferencetask.h"
 
-CreateConferenceTask::CreateConferenceTask(Task* tqparent): RequestTask(tqparent), m_confId( 0 ), m_guid( BLANK_GUID )
+CreateConferenceTask::CreateConferenceTask(Task* parent): RequestTask(parent), m_confId( 0 ), m_guid( BLANK_GUID )
 {
 
 }
diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/createconferencetask.h b/kopete/protocols/groupwise/libgroupwise/tasks/createconferencetask.h
index c43e5725..69911dac 100644
--- a/kopete/protocols/groupwise/libgroupwise/tasks/createconferencetask.h
+++ b/kopete/protocols/groupwise/libgroupwise/tasks/createconferencetask.h
@@ -33,7 +33,7 @@ class CreateConferenceTask : public RequestTask
 Q_OBJECT
   TQ_OBJECT
 public:
-	CreateConferenceTask(Task* tqparent);
+	CreateConferenceTask(Task* parent);
 	~CreateConferenceTask();
 	/**
 	 * Set up a create conference request
diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/createcontactinstancetask.cpp b/kopete/protocols/groupwise/libgroupwise/tasks/createcontactinstancetask.cpp
index 6f410dcb..d41db4a9 100644
--- a/kopete/protocols/groupwise/libgroupwise/tasks/createcontactinstancetask.cpp
+++ b/kopete/protocols/groupwise/libgroupwise/tasks/createcontactinstancetask.cpp
@@ -21,7 +21,7 @@
 
 #include "createcontactinstancetask.h"
 
-CreateContactInstanceTask::CreateContactInstanceTask(Task* tqparent) : NeedFolderTask(tqparent)
+CreateContactInstanceTask::CreateContactInstanceTask(Task* parent) : NeedFolderTask(parent)
 {
 	// make the client tell the client app (Kopete) when we receive a contact
 	connect( this, TQT_SIGNAL( gotContactAdded( const ContactItem & ) ), client(), TQT_SIGNAL( contactReceived( const ContactItem & ) ) );
diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/createcontactinstancetask.h b/kopete/protocols/groupwise/libgroupwise/tasks/createcontactinstancetask.h
index 19e41f2e..fc7bb184 100644
--- a/kopete/protocols/groupwise/libgroupwise/tasks/createcontactinstancetask.h
+++ b/kopete/protocols/groupwise/libgroupwise/tasks/createcontactinstancetask.h
@@ -24,7 +24,7 @@
 #include "needfoldertask.h"
 
 /**
-Creates a contact on the server.  The response to this action is handled by its tqparent
+Creates a contact on the server.  The response to this action is handled by its parent
 
 @author SUSE AG
 */
@@ -33,7 +33,7 @@ class CreateContactInstanceTask : public NeedFolderTask
 Q_OBJECT
   TQ_OBJECT
 public:
-	CreateContactInstanceTask(Task* tqparent);
+	CreateContactInstanceTask(Task* parent);
 	~CreateContactInstanceTask();
 	/** 
 	 * Sets up the request message.  
diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/createcontacttask.cpp b/kopete/protocols/groupwise/libgroupwise/tasks/createcontacttask.cpp
index bf0873ab..920eec3b 100644
--- a/kopete/protocols/groupwise/libgroupwise/tasks/createcontacttask.cpp
+++ b/kopete/protocols/groupwise/libgroupwise/tasks/createcontacttask.cpp
@@ -24,7 +24,7 @@
 
 #include "createcontacttask.h"
 
-CreateContactTask::CreateContactTask(Task* tqparent): Task(tqparent)
+CreateContactTask::CreateContactTask(Task* parent): Task(parent)
 {
 }
 
diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/createcontacttask.h b/kopete/protocols/groupwise/libgroupwise/tasks/createcontacttask.h
index 1ca6f141..f63a19af 100644
--- a/kopete/protocols/groupwise/libgroupwise/tasks/createcontacttask.h
+++ b/kopete/protocols/groupwise/libgroupwise/tasks/createcontacttask.h
@@ -44,7 +44,7 @@ class CreateContactTask : public Task
 Q_OBJECT
   TQ_OBJECT
 public:
-	CreateContactTask(Task* tqparent);
+	CreateContactTask(Task* parent);
 	~CreateContactTask();
 	/**
 	 * Get the userId of the contact just created
diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/createfoldertask.cpp b/kopete/protocols/groupwise/libgroupwise/tasks/createfoldertask.cpp
index a165cdc2..c6e6a78a 100644
--- a/kopete/protocols/groupwise/libgroupwise/tasks/createfoldertask.cpp
+++ b/kopete/protocols/groupwise/libgroupwise/tasks/createfoldertask.cpp
@@ -20,7 +20,7 @@
 
 #include "createfoldertask.h"
 
-CreateFolderTask::CreateFolderTask(Task* tqparent): ModifyContactListTask(tqparent)
+CreateFolderTask::CreateFolderTask(Task* parent): ModifyContactListTask(parent)
 {
 }
 
diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/createfoldertask.h b/kopete/protocols/groupwise/libgroupwise/tasks/createfoldertask.h
index 448e17a2..37dbc19f 100644
--- a/kopete/protocols/groupwise/libgroupwise/tasks/createfoldertask.h
+++ b/kopete/protocols/groupwise/libgroupwise/tasks/createfoldertask.h
@@ -33,7 +33,7 @@ class CreateFolderTask : public ModifyContactListTask
 Q_OBJECT
   TQ_OBJECT
 public:
-	CreateFolderTask(Task* tqparent);
+	CreateFolderTask(Task* parent);
 	~CreateFolderTask();
 	void folder( const int parentId, const int sequence, const TQString & displayName );
 };
diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/deleteitemtask.cpp b/kopete/protocols/groupwise/libgroupwise/tasks/deleteitemtask.cpp
index ad67cb4c..04ce1fb4 100644
--- a/kopete/protocols/groupwise/libgroupwise/tasks/deleteitemtask.cpp
+++ b/kopete/protocols/groupwise/libgroupwise/tasks/deleteitemtask.cpp
@@ -20,7 +20,7 @@
 
 #include "deleteitemtask.h"
 
-DeleteItemTask::DeleteItemTask(Task* tqparent): ModifyContactListTask(tqparent)
+DeleteItemTask::DeleteItemTask(Task* parent): ModifyContactListTask(parent)
 {
 }
 
diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/deleteitemtask.h b/kopete/protocols/groupwise/libgroupwise/tasks/deleteitemtask.h
index 2e2ed64c..ce2e3bd0 100644
--- a/kopete/protocols/groupwise/libgroupwise/tasks/deleteitemtask.h
+++ b/kopete/protocols/groupwise/libgroupwise/tasks/deleteitemtask.h
@@ -31,7 +31,7 @@ class DeleteItemTask : public ModifyContactListTask
 Q_OBJECT
   TQ_OBJECT
 public:
-	DeleteItemTask(Task* tqparent);
+	DeleteItemTask(Task* parent);
 	~DeleteItemTask();
 	void item( const int parentFolder, const int objectId );
 };
diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/eventtask.cpp b/kopete/protocols/groupwise/libgroupwise/tasks/eventtask.cpp
index 6d252a4d..c6bd2d85 100644
--- a/kopete/protocols/groupwise/libgroupwise/tasks/eventtask.cpp
+++ b/kopete/protocols/groupwise/libgroupwise/tasks/eventtask.cpp
@@ -21,8 +21,8 @@
 #include "gwfield.h"
 #include "eventtask.h"
 
-EventTask::EventTask( Task * tqparent )
-: Task( tqparent )
+EventTask::EventTask( Task * parent )
+: Task( parent )
 {
 }
 
diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/eventtask.h b/kopete/protocols/groupwise/libgroupwise/tasks/eventtask.h
index 5de20281..15ed1761 100644
--- a/kopete/protocols/groupwise/libgroupwise/tasks/eventtask.h
+++ b/kopete/protocols/groupwise/libgroupwise/tasks/eventtask.h
@@ -33,7 +33,7 @@ class EventTask : public Task
 Q_OBJECT
   TQ_OBJECT
 	public:
-		EventTask( Task *tqparent );
+		EventTask( Task *parent );
 	protected:
 		bool forMe( Transfer * transfer, EventTransfer *& event ) const;
 		void registerEvent( GroupWise::Event e );
diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/getchatsearchresultstask.cpp b/kopete/protocols/groupwise/libgroupwise/tasks/getchatsearchresultstask.cpp
index 1c8e1d39..7744552c 100644
--- a/kopete/protocols/groupwise/libgroupwise/tasks/getchatsearchresultstask.cpp
+++ b/kopete/protocols/groupwise/libgroupwise/tasks/getchatsearchresultstask.cpp
@@ -29,7 +29,7 @@
 
 using namespace GroupWise;
 
-GetChatSearchResultsTask::GetChatSearchResultsTask(Task* tqparent): RequestTask(tqparent)
+GetChatSearchResultsTask::GetChatSearchResultsTask(Task* parent): RequestTask(parent)
 {
 }
 
diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/getchatsearchresultstask.h b/kopete/protocols/groupwise/libgroupwise/tasks/getchatsearchresultstask.h
index dcafb3e7..bebe8ff7 100644
--- a/kopete/protocols/groupwise/libgroupwise/tasks/getchatsearchresultstask.h
+++ b/kopete/protocols/groupwise/libgroupwise/tasks/getchatsearchresultstask.h
@@ -38,7 +38,7 @@ class GetChatSearchResultsTask : public RequestTask
   TQ_OBJECT
 	public:
 		enum SearchResultCode { Completed=2, Cancelled=4, Error=5, GettingData=8, DataRetrieved=9 };
-		GetChatSearchResultsTask(Task* tqparent);
+		GetChatSearchResultsTask(Task* parent);
 		~GetChatSearchResultsTask();
 		void poll( int queryHandle);
 		bool take( Transfer * transfer );
diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/getdetailstask.cpp b/kopete/protocols/groupwise/libgroupwise/tasks/getdetailstask.cpp
index 5f2cbe18..61753d84 100644
--- a/kopete/protocols/groupwise/libgroupwise/tasks/getdetailstask.cpp
+++ b/kopete/protocols/groupwise/libgroupwise/tasks/getdetailstask.cpp
@@ -26,8 +26,8 @@
 
 using namespace GroupWise;
 
-GetDetailsTask::GetDetailsTask( Task * tqparent )
- : RequestTask( tqparent )
+GetDetailsTask::GetDetailsTask( Task * parent )
+ : RequestTask( parent )
 {
 }
 
diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/getdetailstask.h b/kopete/protocols/groupwise/libgroupwise/tasks/getdetailstask.h
index c45ad0e9..577ccc45 100644
--- a/kopete/protocols/groupwise/libgroupwise/tasks/getdetailstask.h
+++ b/kopete/protocols/groupwise/libgroupwise/tasks/getdetailstask.h
@@ -36,7 +36,7 @@ class GetDetailsTask : public RequestTask
 Q_OBJECT
   TQ_OBJECT
 public:
-	GetDetailsTask( Task * tqparent );
+	GetDetailsTask( Task * parent );
 	~GetDetailsTask();
 	bool take( Transfer * transfer );
 	void userDNs( const TQStringList & userDNs );
diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/getstatustask.cpp b/kopete/protocols/groupwise/libgroupwise/tasks/getstatustask.cpp
index 68063261..86179b62 100644
--- a/kopete/protocols/groupwise/libgroupwise/tasks/getstatustask.cpp
+++ b/kopete/protocols/groupwise/libgroupwise/tasks/getstatustask.cpp
@@ -22,7 +22,7 @@
 
 #include "getstatustask.h"
 
-GetStatusTask::GetStatusTask(Task* tqparent): RequestTask(tqparent)
+GetStatusTask::GetStatusTask(Task* parent): RequestTask(parent)
 {
 }
 
diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/getstatustask.h b/kopete/protocols/groupwise/libgroupwise/tasks/getstatustask.h
index 9188fdd4..bd291c62 100644
--- a/kopete/protocols/groupwise/libgroupwise/tasks/getstatustask.h
+++ b/kopete/protocols/groupwise/libgroupwise/tasks/getstatustask.h
@@ -32,7 +32,7 @@ class GetStatusTask : public RequestTask
 Q_OBJECT
   TQ_OBJECT
 public:
-	GetStatusTask(Task* tqparent);
+	GetStatusTask(Task* parent);
 	~GetStatusTask();
 	void userDN( const TQString & dn );
 	bool take( Transfer * transfer );
diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/joinchattask.cpp b/kopete/protocols/groupwise/libgroupwise/tasks/joinchattask.cpp
index d8a4c709..a14d6eec 100644
--- a/kopete/protocols/groupwise/libgroupwise/tasks/joinchattask.cpp
+++ b/kopete/protocols/groupwise/libgroupwise/tasks/joinchattask.cpp
@@ -25,7 +25,7 @@
 
 #include "joinchattask.h"
 
-JoinChatTask::JoinChatTask(Task* tqparent): RequestTask(tqparent)
+JoinChatTask::JoinChatTask(Task* parent): RequestTask(parent)
 {
 }
 
diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/joinchattask.h b/kopete/protocols/groupwise/libgroupwise/tasks/joinchattask.h
index 654d1a64..36b14d28 100644
--- a/kopete/protocols/groupwise/libgroupwise/tasks/joinchattask.h
+++ b/kopete/protocols/groupwise/libgroupwise/tasks/joinchattask.h
@@ -36,7 +36,7 @@ class JoinChatTask : public RequestTask
 	Q_OBJECT
   TQ_OBJECT
 	public:
-		JoinChatTask(Task* tqparent);
+		JoinChatTask(Task* parent);
 		~JoinChatTask();
 		void join( const TQString & displayName );
 		bool take( Transfer * transfer );
diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/joinconferencetask.cpp b/kopete/protocols/groupwise/libgroupwise/tasks/joinconferencetask.cpp
index 9ab94d0d..ed4f6bfd 100644
--- a/kopete/protocols/groupwise/libgroupwise/tasks/joinconferencetask.cpp
+++ b/kopete/protocols/groupwise/libgroupwise/tasks/joinconferencetask.cpp
@@ -25,7 +25,7 @@
 
 #include "joinconferencetask.h"
 
-JoinConferenceTask::JoinConferenceTask(Task* tqparent): RequestTask(tqparent)
+JoinConferenceTask::JoinConferenceTask(Task* parent): RequestTask(parent)
 {
 }
 
diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/joinconferencetask.h b/kopete/protocols/groupwise/libgroupwise/tasks/joinconferencetask.h
index 29f34679..0f92379f 100644
--- a/kopete/protocols/groupwise/libgroupwise/tasks/joinconferencetask.h
+++ b/kopete/protocols/groupwise/libgroupwise/tasks/joinconferencetask.h
@@ -36,7 +36,7 @@ class JoinConferenceTask : public RequestTask
 Q_OBJECT
   TQ_OBJECT
 public:
-	JoinConferenceTask(Task* tqparent);
+	JoinConferenceTask(Task* parent);
 	~JoinConferenceTask();
 	void join( const ConferenceGuid & guid );
 	bool take( Transfer * transfer );
diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/keepalivetask.cpp b/kopete/protocols/groupwise/libgroupwise/tasks/keepalivetask.cpp
index d3c75055..ac84ac2b 100644
--- a/kopete/protocols/groupwise/libgroupwise/tasks/keepalivetask.cpp
+++ b/kopete/protocols/groupwise/libgroupwise/tasks/keepalivetask.cpp
@@ -24,7 +24,7 @@
 #include "requestfactory.h"
 #include "keepalivetask.h"
 
-KeepAliveTask::KeepAliveTask(Task* tqparent): RequestTask(tqparent)
+KeepAliveTask::KeepAliveTask(Task* parent): RequestTask(parent)
 {
 }
 
diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/keepalivetask.h b/kopete/protocols/groupwise/libgroupwise/tasks/keepalivetask.h
index dffe1059..b9d9272c 100644
--- a/kopete/protocols/groupwise/libgroupwise/tasks/keepalivetask.h
+++ b/kopete/protocols/groupwise/libgroupwise/tasks/keepalivetask.h
@@ -31,7 +31,7 @@ class KeepAliveTask : public RequestTask
 Q_OBJECT
   TQ_OBJECT
 public:
-	KeepAliveTask(Task* tqparent);
+	KeepAliveTask(Task* parent);
 	~KeepAliveTask();
 	void setup();
 };
diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/leaveconferencetask.cpp b/kopete/protocols/groupwise/libgroupwise/tasks/leaveconferencetask.cpp
index 516c74c3..d2d58b83 100644
--- a/kopete/protocols/groupwise/libgroupwise/tasks/leaveconferencetask.cpp
+++ b/kopete/protocols/groupwise/libgroupwise/tasks/leaveconferencetask.cpp
@@ -20,7 +20,7 @@
 
 #include "leaveconferencetask.h"
 
-LeaveConferenceTask::LeaveConferenceTask(Task* tqparent): RequestTask(tqparent)
+LeaveConferenceTask::LeaveConferenceTask(Task* parent): RequestTask(parent)
 {
 }
 
diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/leaveconferencetask.h b/kopete/protocols/groupwise/libgroupwise/tasks/leaveconferencetask.h
index 72262b9e..30d9e293 100644
--- a/kopete/protocols/groupwise/libgroupwise/tasks/leaveconferencetask.h
+++ b/kopete/protocols/groupwise/libgroupwise/tasks/leaveconferencetask.h
@@ -33,7 +33,7 @@ class LeaveConferenceTask : public RequestTask
 Q_OBJECT
   TQ_OBJECT
 public:
-	LeaveConferenceTask(Task* tqparent);
+	LeaveConferenceTask(Task* parent);
 	~LeaveConferenceTask();
 	void leave( const GroupWise::ConferenceGuid & guid );
 };
diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/logintask.cpp b/kopete/protocols/groupwise/libgroupwise/tasks/logintask.cpp
index a3a0f556..f3d55583 100644
--- a/kopete/protocols/groupwise/libgroupwise/tasks/logintask.cpp
+++ b/kopete/protocols/groupwise/libgroupwise/tasks/logintask.cpp
@@ -25,8 +25,8 @@
 
 #include "logintask.h"
 
-LoginTask::LoginTask( Task * tqparent )
- : RequestTask( tqparent )
+LoginTask::LoginTask( Task * parent )
+ : RequestTask( parent )
 {
 }
 
@@ -67,7 +67,7 @@ bool LoginTask::take( Transfer * transfer )
 	ContactDetails cd = extractUserDetails( loginResponseFields );
 	emit gotMyself( cd );
 
-	// read the privacy settings first, because this affects all contacts' aptqparent status
+	// read the privacy settings first, because this affects all contacts' apparent status
 	extractPrivacy( loginResponseFields );
 
 	extractCustomStatuses( loginResponseFields );
@@ -119,11 +119,11 @@ void LoginTask::extractFolder( Field::MultiField * folderContainer )
 	// name 
 	current = fl.findSingleField( NM_A_SZ_DISPLAY_NAME );
 	folder.name = current->value().toString();
-	// tqparent
+	// parent
 	current = fl.findSingleField( NM_A_SZ_PARENT_ID );
 	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.parentId ).tqarg( folder.sequence ) );
+	client()->debug( TQString( "Got folder: %1, obj: %2, parent: %3, seq: %3." ).tqarg( folder.name ).tqarg(  folder.id ).tqarg( folder.parentId ).tqarg( folder.sequence ) );
 	// tell the world about it
 	emit gotFolder( folder );
 }
@@ -135,7 +135,7 @@ void LoginTask::extractContact( Field::MultiField * contactContainer )
 	ContactItem contact;
 	Field::SingleField * current;
 	Field::FieldList fl = contactContainer->fields();
-	// sequence number, object and tqparent IDs are a numeric values but are stored as strings...
+	// sequence number, object and parent IDs are a numeric values but are stored as strings...
 	current = fl.findSingleField( NM_A_SZ_OBJECT_ID );
 	contact.id = current->value().toInt();
 	current = fl.findSingleField( NM_A_SZ_PARENT_ID );
diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/logintask.h b/kopete/protocols/groupwise/libgroupwise/tasks/logintask.h
index b099be6a..f37add97 100644
--- a/kopete/protocols/groupwise/libgroupwise/tasks/logintask.h
+++ b/kopete/protocols/groupwise/libgroupwise/tasks/logintask.h
@@ -33,7 +33,7 @@ class LoginTask : public RequestTask
 Q_OBJECT
   TQ_OBJECT
 public:
-	LoginTask( Task * tqparent );
+	LoginTask( Task * parent );
 	~LoginTask();
 	/**
 	 * Get the login fields ready to go
diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/modifycontactlisttask.cpp b/kopete/protocols/groupwise/libgroupwise/tasks/modifycontactlisttask.cpp
index be04efad..10233a18 100644
--- a/kopete/protocols/groupwise/libgroupwise/tasks/modifycontactlisttask.cpp
+++ b/kopete/protocols/groupwise/libgroupwise/tasks/modifycontactlisttask.cpp
@@ -23,7 +23,7 @@
 #include "gwerror.h"
 #include "modifycontactlisttask.h"
 
-ModifyContactListTask::ModifyContactListTask(Task* tqparent): RequestTask(tqparent)
+ModifyContactListTask::ModifyContactListTask(Task* parent): RequestTask(parent)
 {
 }
 
@@ -125,7 +125,7 @@ void ModifyContactListTask::processFolderChange( Field::MultiField * container )
 	// name 
 	current = fl.findSingleField( NM_A_SZ_DISPLAY_NAME );
 	folder.name = current->value().toString();
-	// tqparent
+	// parent
 	current = fl.findSingleField( NM_A_SZ_PARENT_ID );
 	folder.parentId = current->value().toInt();
 	if ( container->method() == NMFIELD_METHOD_ADD )
diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/modifycontactlisttask.h b/kopete/protocols/groupwise/libgroupwise/tasks/modifycontactlisttask.h
index 62d02bfa..b0787ce0 100644
--- a/kopete/protocols/groupwise/libgroupwise/tasks/modifycontactlisttask.h
+++ b/kopete/protocols/groupwise/libgroupwise/tasks/modifycontactlisttask.h
@@ -24,7 +24,7 @@
 #include "requesttask.h"
 
 /**
-This is the tqparent of all tasks that manipulate the contact list.  The server responds to each one in the same way, and this task contains a take() to process this response.
+This is the parent of all tasks that manipulate the contact list.  The server responds to each one in the same way, and this task contains a take() to process this response.
 
 @author SUSE AG
 */
@@ -36,7 +36,7 @@ class ModifyContactListTask : public RequestTask
 Q_OBJECT
   TQ_OBJECT
 public:
-	ModifyContactListTask(Task* tqparent);
+	ModifyContactListTask(Task* parent);
 	~ModifyContactListTask();
 	bool take( Transfer * transfer );
 signals:
diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/movecontacttask.cpp b/kopete/protocols/groupwise/libgroupwise/tasks/movecontacttask.cpp
index c9d6aac9..4a24f44f 100644
--- a/kopete/protocols/groupwise/libgroupwise/tasks/movecontacttask.cpp
+++ b/kopete/protocols/groupwise/libgroupwise/tasks/movecontacttask.cpp
@@ -22,7 +22,7 @@
 
 #include "movecontacttask.h"
 
-MoveContactTask::MoveContactTask(Task* tqparent): NeedFolderTask(tqparent)
+MoveContactTask::MoveContactTask(Task* parent): NeedFolderTask(parent)
 {
 	// make the client tell the client app (Kopete) when we receive a contact
 	connect( this, TQT_SIGNAL( gotContactAdded( const ContactItem & ) ), client(), TQT_SIGNAL( contactReceived( const ContactItem & ) ) );
diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/movecontacttask.h b/kopete/protocols/groupwise/libgroupwise/tasks/movecontacttask.h
index adeeb68d..b67a23ac 100644
--- a/kopete/protocols/groupwise/libgroupwise/tasks/movecontacttask.h
+++ b/kopete/protocols/groupwise/libgroupwise/tasks/movecontacttask.h
@@ -33,7 +33,7 @@ class MoveContactTask : public NeedFolderTask
 Q_OBJECT
   TQ_OBJECT
 public:
-	MoveContactTask(Task* tqparent);
+	MoveContactTask(Task* parent);
 	~MoveContactTask();
 	void moveContact( const ContactItem & contact, const int newParent );
 	void moveContactToNewFolder( const ContactItem & contact, const int newSequenceNumber, const TQString & folderDisplayName );
diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/needfoldertask.cpp b/kopete/protocols/groupwise/libgroupwise/tasks/needfoldertask.cpp
index 842ef31c..5a1eb414 100644
--- a/kopete/protocols/groupwise/libgroupwise/tasks/needfoldertask.cpp
+++ b/kopete/protocols/groupwise/libgroupwise/tasks/needfoldertask.cpp
@@ -15,7 +15,7 @@
 
 #include "needfoldertask.h"
 
-NeedFolderTask::NeedFolderTask(Task* tqparent): ModifyContactListTask(tqparent)
+NeedFolderTask::NeedFolderTask(Task* parent): ModifyContactListTask(parent)
 {
 }
 
diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/needfoldertask.h b/kopete/protocols/groupwise/libgroupwise/tasks/needfoldertask.h
index 167197e0..383be314 100644
--- a/kopete/protocols/groupwise/libgroupwise/tasks/needfoldertask.h
+++ b/kopete/protocols/groupwise/libgroupwise/tasks/needfoldertask.h
@@ -24,7 +24,7 @@ class NeedFolderTask : public ModifyContactListTask
 Q_OBJECT
   TQ_OBJECT
 public:
-	NeedFolderTask(Task* tqparent);
+	NeedFolderTask(Task* parent);
 	~NeedFolderTask();
 	void createFolder();
 	virtual void onFolderCreated() = 0;
diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/pollsearchresultstask.cpp b/kopete/protocols/groupwise/libgroupwise/tasks/pollsearchresultstask.cpp
index 3fadb5a5..38870112 100644
--- a/kopete/protocols/groupwise/libgroupwise/tasks/pollsearchresultstask.cpp
+++ b/kopete/protocols/groupwise/libgroupwise/tasks/pollsearchresultstask.cpp
@@ -27,7 +27,7 @@
 
 using namespace GroupWise;
 
-PollSearchResultsTask::PollSearchResultsTask(Task* tqparent): RequestTask(tqparent)
+PollSearchResultsTask::PollSearchResultsTask(Task* parent): RequestTask(parent)
 {
 }
 
diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/pollsearchresultstask.h b/kopete/protocols/groupwise/libgroupwise/tasks/pollsearchresultstask.h
index a882a9b3..ccf0560b 100644
--- a/kopete/protocols/groupwise/libgroupwise/tasks/pollsearchresultstask.h
+++ b/kopete/protocols/groupwise/libgroupwise/tasks/pollsearchresultstask.h
@@ -38,7 +38,7 @@ Q_OBJECT
   TQ_OBJECT
 public:
 	enum SearchResultCode { Pending=0, InProgess=1, Completed=2, TimeOut=3, Cancelled=4, Error=5 };
-	PollSearchResultsTask(Task* tqparent);
+	PollSearchResultsTask(Task* parent);
 	~PollSearchResultsTask();
 	void poll( const TQString & queryHandle);
 	bool take( Transfer * transfer );
diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/privacyitemtask.cpp b/kopete/protocols/groupwise/libgroupwise/tasks/privacyitemtask.cpp
index 2c9ac7ef..508b3306 100644
--- a/kopete/protocols/groupwise/libgroupwise/tasks/privacyitemtask.cpp
+++ b/kopete/protocols/groupwise/libgroupwise/tasks/privacyitemtask.cpp
@@ -20,7 +20,7 @@
 
 #include "privacyitemtask.h"
 
-PrivacyItemTask::PrivacyItemTask( Task* tqparent) : RequestTask( tqparent )
+PrivacyItemTask::PrivacyItemTask( Task* parent) : RequestTask( parent )
 {
 }
 
diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/privacyitemtask.h b/kopete/protocols/groupwise/libgroupwise/tasks/privacyitemtask.h
index de894186..ea0d5e42 100644
--- a/kopete/protocols/groupwise/libgroupwise/tasks/privacyitemtask.h
+++ b/kopete/protocols/groupwise/libgroupwise/tasks/privacyitemtask.h
@@ -33,7 +33,7 @@ class PrivacyItemTask : public RequestTask
 Q_OBJECT
   TQ_OBJECT
 public:
-	PrivacyItemTask( Task* tqparent);
+	PrivacyItemTask( Task* parent);
 	~PrivacyItemTask();
 	void allow( const TQString & dn );
 	void deny( const TQString & dn );
diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/rejectinvitetask.cpp b/kopete/protocols/groupwise/libgroupwise/tasks/rejectinvitetask.cpp
index 9a3f8780..2b252ff5 100644
--- a/kopete/protocols/groupwise/libgroupwise/tasks/rejectinvitetask.cpp
+++ b/kopete/protocols/groupwise/libgroupwise/tasks/rejectinvitetask.cpp
@@ -20,7 +20,7 @@
 
 #include "rejectinvitetask.h"
 
-RejectInviteTask::RejectInviteTask(Task* tqparent): RequestTask(tqparent)
+RejectInviteTask::RejectInviteTask(Task* parent): RequestTask(parent)
 {
 }
 
diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/rejectinvitetask.h b/kopete/protocols/groupwise/libgroupwise/tasks/rejectinvitetask.h
index b7ee62f0..b4903596 100644
--- a/kopete/protocols/groupwise/libgroupwise/tasks/rejectinvitetask.h
+++ b/kopete/protocols/groupwise/libgroupwise/tasks/rejectinvitetask.h
@@ -33,7 +33,7 @@ class RejectInviteTask : public RequestTask
 Q_OBJECT
   TQ_OBJECT
 public:
-	RejectInviteTask(Task* tqparent);
+	RejectInviteTask(Task* parent);
 	~RejectInviteTask();
 	void reject( const GroupWise::ConferenceGuid & guid );
 
diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/requesttask.cpp b/kopete/protocols/groupwise/libgroupwise/tasks/requesttask.cpp
index 12645297..7d4b41aa 100644
--- a/kopete/protocols/groupwise/libgroupwise/tasks/requesttask.cpp
+++ b/kopete/protocols/groupwise/libgroupwise/tasks/requesttask.cpp
@@ -26,8 +26,8 @@
 
 #include "requesttask.h"
 
-RequestTask::RequestTask( Task * tqparent )
-: Task( tqparent )
+RequestTask::RequestTask( Task * parent )
+: Task( parent )
 {
 }
 
diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/requesttask.h b/kopete/protocols/groupwise/libgroupwise/tasks/requesttask.h
index e12bd741..10f6568c 100644
--- a/kopete/protocols/groupwise/libgroupwise/tasks/requesttask.h
+++ b/kopete/protocols/groupwise/libgroupwise/tasks/requesttask.h
@@ -30,7 +30,7 @@ class RequestTask : public Task
 Q_OBJECT
   TQ_OBJECT
 	public:
-		RequestTask( Task *tqparent );
+		RequestTask( Task *parent );
 		bool take( Transfer * transfer );
 		virtual void onGo();
 	protected:
diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/searchchattask.cpp b/kopete/protocols/groupwise/libgroupwise/tasks/searchchattask.cpp
index e0e56634..946450e9 100644
--- a/kopete/protocols/groupwise/libgroupwise/tasks/searchchattask.cpp
+++ b/kopete/protocols/groupwise/libgroupwise/tasks/searchchattask.cpp
@@ -40,7 +40,7 @@
 
 using namespace GroupWise;
 
-SearchChatTask::SearchChatTask(Task* tqparent): RequestTask(tqparent), m_polls( 0 )
+SearchChatTask::SearchChatTask(Task* parent): RequestTask(parent), m_polls( 0 )
 {
 }
 
diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/searchchattask.h b/kopete/protocols/groupwise/libgroupwise/tasks/searchchattask.h
index 4d010ffe..aa87e474 100644
--- a/kopete/protocols/groupwise/libgroupwise/tasks/searchchattask.h
+++ b/kopete/protocols/groupwise/libgroupwise/tasks/searchchattask.h
@@ -39,7 +39,7 @@ class SearchChatTask : public RequestTask
 	public:
 		enum SearchType { FetchAll=0, SinceLastSearch };
 		
-		SearchChatTask(Task* tqparent);
+		SearchChatTask(Task* parent);
 
 		~SearchChatTask();
 	/**
diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/searchusertask.cpp b/kopete/protocols/groupwise/libgroupwise/tasks/searchusertask.cpp
index 2d0522c3..3dde5297 100644
--- a/kopete/protocols/groupwise/libgroupwise/tasks/searchusertask.cpp
+++ b/kopete/protocols/groupwise/libgroupwise/tasks/searchusertask.cpp
@@ -39,7 +39,7 @@
 
 using namespace GroupWise;
 
-SearchUserTask::SearchUserTask(Task* tqparent): RequestTask(tqparent), m_polls( 0 )
+SearchUserTask::SearchUserTask(Task* parent): RequestTask(parent), m_polls( 0 )
 {
 }
 
diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/searchusertask.h b/kopete/protocols/groupwise/libgroupwise/tasks/searchusertask.h
index 5e79ac2f..1fa398d6 100644
--- a/kopete/protocols/groupwise/libgroupwise/tasks/searchusertask.h
+++ b/kopete/protocols/groupwise/libgroupwise/tasks/searchusertask.h
@@ -35,7 +35,7 @@ class SearchUserTask : public RequestTask
 Q_OBJECT
   TQ_OBJECT
 public:
-    SearchUserTask(Task* tqparent);
+    SearchUserTask(Task* parent);
 
     ~SearchUserTask();
 	/**
diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/sendinvitetask.cpp b/kopete/protocols/groupwise/libgroupwise/tasks/sendinvitetask.cpp
index 60d9f986..9fa7d65e 100644
--- a/kopete/protocols/groupwise/libgroupwise/tasks/sendinvitetask.cpp
+++ b/kopete/protocols/groupwise/libgroupwise/tasks/sendinvitetask.cpp
@@ -20,7 +20,7 @@
 
 #include "sendinvitetask.h"
 
-SendInviteTask::SendInviteTask(Task* tqparent): RequestTask(tqparent)
+SendInviteTask::SendInviteTask(Task* parent): RequestTask(parent)
 {
 }
 
diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/sendinvitetask.h b/kopete/protocols/groupwise/libgroupwise/tasks/sendinvitetask.h
index 70672e3e..b08c7259 100644
--- a/kopete/protocols/groupwise/libgroupwise/tasks/sendinvitetask.h
+++ b/kopete/protocols/groupwise/libgroupwise/tasks/sendinvitetask.h
@@ -33,7 +33,7 @@ This sends an invitation to a conference
 class SendInviteTask : public RequestTask
 {
 public:
-	SendInviteTask(Task* tqparent);
+	SendInviteTask(Task* parent);
 	~SendInviteTask();
 	void invite( const GroupWise::ConferenceGuid & guid, const TQStringList & invitees, const GroupWise::OutgoingMessage & msg );
 private:
diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/sendmessagetask.cpp b/kopete/protocols/groupwise/libgroupwise/tasks/sendmessagetask.cpp
index 13e65435..fdf1173f 100644
--- a/kopete/protocols/groupwise/libgroupwise/tasks/sendmessagetask.cpp
+++ b/kopete/protocols/groupwise/libgroupwise/tasks/sendmessagetask.cpp
@@ -20,7 +20,7 @@
 
 #include "sendmessagetask.h"
 
-SendMessageTask::SendMessageTask(Task* tqparent): RequestTask(tqparent)
+SendMessageTask::SendMessageTask(Task* parent): RequestTask(parent)
 {
 }
 
diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/sendmessagetask.h b/kopete/protocols/groupwise/libgroupwise/tasks/sendmessagetask.h
index 95175d77..44559e15 100644
--- a/kopete/protocols/groupwise/libgroupwise/tasks/sendmessagetask.h
+++ b/kopete/protocols/groupwise/libgroupwise/tasks/sendmessagetask.h
@@ -32,7 +32,7 @@ Sends messages to a particular conference on the server
 class SendMessageTask : public RequestTask
 {
 public:
-	SendMessageTask(Task* tqparent);
+	SendMessageTask(Task* parent);
 	~SendMessageTask();
 	
 	void message( const TQStringList & recipientDNList, const OutgoingMessage & msg );
diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/setstatustask.cpp b/kopete/protocols/groupwise/libgroupwise/tasks/setstatustask.cpp
index 696ffffa..6feecc88 100644
--- a/kopete/protocols/groupwise/libgroupwise/tasks/setstatustask.cpp
+++ b/kopete/protocols/groupwise/libgroupwise/tasks/setstatustask.cpp
@@ -22,7 +22,7 @@
 
 using namespace GroupWise; 
 
-SetStatusTask::SetStatusTask(Task* tqparent): RequestTask(tqparent)
+SetStatusTask::SetStatusTask(Task* parent): RequestTask(parent)
 {
 }
 
diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/setstatustask.h b/kopete/protocols/groupwise/libgroupwise/tasks/setstatustask.h
index 72eaf9a4..0c316220 100644
--- a/kopete/protocols/groupwise/libgroupwise/tasks/setstatustask.h
+++ b/kopete/protocols/groupwise/libgroupwise/tasks/setstatustask.h
@@ -32,7 +32,7 @@ class SetStatusTask : public RequestTask
 Q_OBJECT
   TQ_OBJECT
 public:
-	SetStatusTask(Task* tqparent);
+	SetStatusTask(Task* parent);
 	~SetStatusTask();
 	void status( GroupWise::tqStatus newtqStatus, const TQString &awayMessage, const TQString &autoReply );
 	GroupWise::tqStatus requestedtqStatus() const;
diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/statustask.cpp b/kopete/protocols/groupwise/libgroupwise/tasks/statustask.cpp
index fa360a45..7076324a 100644
--- a/kopete/protocols/groupwise/libgroupwise/tasks/statustask.cpp
+++ b/kopete/protocols/groupwise/libgroupwise/tasks/statustask.cpp
@@ -22,7 +22,7 @@
 
 #include "statustask.h"
 
-StatusTask::StatusTask(Task* tqparent): EventTask(tqparent)
+StatusTask::StatusTask(Task* parent): EventTask(parent)
 {
 	registerEvent( GroupWise::StatusChange );
 }
diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/statustask.h b/kopete/protocols/groupwise/libgroupwise/tasks/statustask.h
index 90d46bc7..de5839d7 100644
--- a/kopete/protocols/groupwise/libgroupwise/tasks/statustask.h
+++ b/kopete/protocols/groupwise/libgroupwise/tasks/statustask.h
@@ -31,7 +31,7 @@ class StatusTask : public EventTask
 Q_OBJECT
   TQ_OBJECT
 public:
-	StatusTask(Task* tqparent);
+	StatusTask(Task* parent);
 	~StatusTask();
 	bool take( Transfer * transfer );
 signals:
diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/typingtask.cpp b/kopete/protocols/groupwise/libgroupwise/tasks/typingtask.cpp
index f9136eca..2a421752 100644
--- a/kopete/protocols/groupwise/libgroupwise/tasks/typingtask.cpp
+++ b/kopete/protocols/groupwise/libgroupwise/tasks/typingtask.cpp
@@ -22,7 +22,7 @@
 
 #include "typingtask.h"
 
-TypingTask::TypingTask(Task* tqparent): RequestTask(tqparent)
+TypingTask::TypingTask(Task* parent): RequestTask(parent)
 {
 }
 
diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/typingtask.h b/kopete/protocols/groupwise/libgroupwise/tasks/typingtask.h
index 84fe6e46..7fc63f90 100644
--- a/kopete/protocols/groupwise/libgroupwise/tasks/typingtask.h
+++ b/kopete/protocols/groupwise/libgroupwise/tasks/typingtask.h
@@ -34,7 +34,7 @@ Q_OBJECT
   TQ_OBJECT
 
 public:
-	TypingTask(Task* tqparent);
+	TypingTask(Task* parent);
 	~TypingTask();
 	void typing( const GroupWise::ConferenceGuid & guid, const bool typing );
 };
diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/updatecontacttask.cpp b/kopete/protocols/groupwise/libgroupwise/tasks/updatecontacttask.cpp
index a1e539d9..aa75441d 100644
--- a/kopete/protocols/groupwise/libgroupwise/tasks/updatecontacttask.cpp
+++ b/kopete/protocols/groupwise/libgroupwise/tasks/updatecontacttask.cpp
@@ -24,7 +24,7 @@
 
 using namespace GroupWise; 
 
-UpdateContactTask::UpdateContactTask(Task* tqparent): UpdateItemTask(tqparent)
+UpdateContactTask::UpdateContactTask(Task* parent): UpdateItemTask(parent)
 {
 }
 
diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/updatecontacttask.h b/kopete/protocols/groupwise/libgroupwise/tasks/updatecontacttask.h
index 5ced02a5..17dad6e7 100644
--- a/kopete/protocols/groupwise/libgroupwise/tasks/updatecontacttask.h
+++ b/kopete/protocols/groupwise/libgroupwise/tasks/updatecontacttask.h
@@ -34,7 +34,7 @@ class UpdateContactTask : public UpdateItemTask
 Q_OBJECT
   TQ_OBJECT
 public:
-	UpdateContactTask(Task* tqparent);
+	UpdateContactTask(Task* parent);
 	~UpdateContactTask();
 	void renameContact( const TQString& newName, const TQValueList<GroupWise::ContactItem> & contactInstances );
 	TQString displayName();
diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/updatefoldertask.cpp b/kopete/protocols/groupwise/libgroupwise/tasks/updatefoldertask.cpp
index af0785de..3f8ff7bf 100644
--- a/kopete/protocols/groupwise/libgroupwise/tasks/updatefoldertask.cpp
+++ b/kopete/protocols/groupwise/libgroupwise/tasks/updatefoldertask.cpp
@@ -21,7 +21,7 @@
 
 #include "updatefoldertask.h"
 
-UpdateFolderTask::UpdateFolderTask(Task* tqparent): UpdateItemTask(tqparent)
+UpdateFolderTask::UpdateFolderTask(Task* parent): UpdateItemTask(parent)
 {
 }
 
@@ -39,7 +39,7 @@ void UpdateFolderTask::renameFolder( const TQString & newName, const GroupWise::
 	renamed.name = newName;
 	// add the new version of the folder, marked add
 	lst.append( new Field::MultiField( NM_A_FA_FOLDER, NMFIELD_METHOD_ADD, 0, NMFIELD_TYPE_ARRAY, folderToFields( renamed ) ) );
-	// let our tqparent class package it up as a contactlist in a transfer
+	// let our parent class package it up as a contactlist in a transfer
 	UpdateItemTask::item( lst );
 }
 
diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/updatefoldertask.h b/kopete/protocols/groupwise/libgroupwise/tasks/updatefoldertask.h
index 90882a3d..1f3dcd07 100644
--- a/kopete/protocols/groupwise/libgroupwise/tasks/updatefoldertask.h
+++ b/kopete/protocols/groupwise/libgroupwise/tasks/updatefoldertask.h
@@ -33,7 +33,7 @@ class UpdateFolderTask : public UpdateItemTask
 Q_OBJECT
   TQ_OBJECT
 public:
-	UpdateFolderTask(Task* tqparent);
+	UpdateFolderTask(Task* parent);
 	~UpdateFolderTask();
 	void renameFolder( const TQString & newName, const GroupWise::FolderItem & existing );
 protected: 
diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/updateitemtask.cpp b/kopete/protocols/groupwise/libgroupwise/tasks/updateitemtask.cpp
index 95edb593..1af4ef12 100644
--- a/kopete/protocols/groupwise/libgroupwise/tasks/updateitemtask.cpp
+++ b/kopete/protocols/groupwise/libgroupwise/tasks/updateitemtask.cpp
@@ -20,7 +20,7 @@
 
 #include "updateitemtask.h"
 
-UpdateItemTask::UpdateItemTask( Task* tqparent) : RequestTask( tqparent )
+UpdateItemTask::UpdateItemTask( Task* parent) : RequestTask( parent )
 {
 }
 
diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/updateitemtask.h b/kopete/protocols/groupwise/libgroupwise/tasks/updateitemtask.h
index a988e371..4e0bea2d 100644
--- a/kopete/protocols/groupwise/libgroupwise/tasks/updateitemtask.h
+++ b/kopete/protocols/groupwise/libgroupwise/tasks/updateitemtask.h
@@ -33,7 +33,7 @@ class UpdateItemTask : public RequestTask
 Q_OBJECT
   TQ_OBJECT
 public:
-	UpdateItemTask( Task* tqparent );
+	UpdateItemTask( Task* parent );
 	~UpdateItemTask();
 	void item( Field::FieldList updateItemFields );
 };
diff --git a/kopete/protocols/groupwise/libgroupwise/tlshandler.cpp b/kopete/protocols/groupwise/libgroupwise/tlshandler.cpp
index 21010e57..16527bba 100644
--- a/kopete/protocols/groupwise/libgroupwise/tlshandler.cpp
+++ b/kopete/protocols/groupwise/libgroupwise/tlshandler.cpp
@@ -19,8 +19,8 @@
   
 #include "tlshandler.h"
 
-TLSHandler::TLSHandler(TQObject *tqparent)
-:TQObject(tqparent)
+TLSHandler::TLSHandler(TQObject *parent)
+:TQObject(parent)
 {
 }
 
diff --git a/kopete/protocols/groupwise/libgroupwise/tlshandler.h b/kopete/protocols/groupwise/libgroupwise/tlshandler.h
index 67c47409..8a964101 100644
--- a/kopete/protocols/groupwise/libgroupwise/tlshandler.h
+++ b/kopete/protocols/groupwise/libgroupwise/tlshandler.h
@@ -33,7 +33,7 @@ class TLSHandler : public TQObject
 	Q_OBJECT
   TQ_OBJECT
 public:
-	TLSHandler(TQObject *tqparent=0);
+	TLSHandler(TQObject *parent=0);
 	virtual ~TLSHandler();
 
 	virtual void reset()=0;
diff --git a/kopete/protocols/groupwise/libgroupwise/userdetailsmanager.cpp b/kopete/protocols/groupwise/libgroupwise/userdetailsmanager.cpp
index c10fda5c..f87cfa25 100644
--- a/kopete/protocols/groupwise/libgroupwise/userdetailsmanager.cpp
+++ b/kopete/protocols/groupwise/libgroupwise/userdetailsmanager.cpp
@@ -20,8 +20,8 @@
 
 #include "userdetailsmanager.h"
 
-UserDetailsManager::UserDetailsManager( Client * tqparent, const char *name)
- : TQObject(tqparent, name), m_client( tqparent )
+UserDetailsManager::UserDetailsManager( Client * parent, const char *name)
+ : TQObject(parent, name), m_client( parent )
 {
 }
 
diff --git a/kopete/protocols/groupwise/libgroupwise/userdetailsmanager.h b/kopete/protocols/groupwise/libgroupwise/userdetailsmanager.h
index e7ba7ac4..4f4c8df9 100644
--- a/kopete/protocols/groupwise/libgroupwise/userdetailsmanager.h
+++ b/kopete/protocols/groupwise/libgroupwise/userdetailsmanager.h
@@ -36,7 +36,7 @@ class UserDetailsManager : public TQObject
 Q_OBJECT
   TQ_OBJECT
 public:
-	UserDetailsManager( Client * tqparent, const char *name = 0);
+	UserDetailsManager( Client * parent, const char *name = 0);
 	~UserDetailsManager();
 	/**
 	 * List of DNs that we have already received details for
diff --git a/kopete/protocols/groupwise/ui/gwaddcontactpage.cpp b/kopete/protocols/groupwise/ui/gwaddcontactpage.cpp
index ad0c75be..5ece3882 100644
--- a/kopete/protocols/groupwise/ui/gwaddcontactpage.cpp
+++ b/kopete/protocols/groupwise/ui/gwaddcontactpage.cpp
@@ -45,8 +45,8 @@
 #include "gwaddui.h"
 #include "userdetailsmanager.h"
 
-GroupWiseAddContactPage::GroupWiseAddContactPage( Kopete::Account * owner, TQWidget* tqparent, const char* name )
-		: AddContactPage(tqparent, name)
+GroupWiseAddContactPage::GroupWiseAddContactPage( Kopete::Account * owner, TQWidget* parent, const char* name )
+		: AddContactPage(parent, name)
 {
 	m_account = static_cast<GroupWiseAccount *>( owner );
 	kdDebug(GROUPWISE_DEBUG_GLOBAL) << k_funcinfo << endl;
diff --git a/kopete/protocols/groupwise/ui/gwaddcontactpage.h b/kopete/protocols/groupwise/ui/gwaddcontactpage.h
index 10a36e21..8597a7ec 100644
--- a/kopete/protocols/groupwise/ui/gwaddcontactpage.h
+++ b/kopete/protocols/groupwise/ui/gwaddcontactpage.h
@@ -43,7 +43,7 @@ class GroupWiseAddContactPage : public AddContactPage
 	Q_OBJECT
   TQ_OBJECT
 public:
-    GroupWiseAddContactPage( Kopete::Account * owner, TQWidget* tqparent = 0, const char* name = 0 );
+    GroupWiseAddContactPage( Kopete::Account * owner, TQWidget* parent = 0, const char* name = 0 );
     ~GroupWiseAddContactPage();
 	
     /**
diff --git a/kopete/protocols/groupwise/ui/gwchatpropsdialog.cpp b/kopete/protocols/groupwise/ui/gwchatpropsdialog.cpp
index 41b26f66..1cfee7ee 100644
--- a/kopete/protocols/groupwise/ui/gwchatpropsdialog.cpp
+++ b/kopete/protocols/groupwise/ui/gwchatpropsdialog.cpp
@@ -29,16 +29,16 @@
 
 #include "gwchatpropsdialog.h"
 
-GroupWiseChatPropsDialog::GroupWiseChatPropsDialog( TQWidget * tqparent, const char * name )
- : KDialogBase( tqparent, name, false, i18n( "Chatroom properties" ),
+GroupWiseChatPropsDialog::GroupWiseChatPropsDialog( TQWidget * parent, const char * name )
+ : KDialogBase( parent, name, false, i18n( "Chatroom properties" ),
 				KDialogBase::Ok|KDialogBase::Cancel, Ok, true ), m_dirty( false )
 {
 	initialise();
 }
 
 GroupWiseChatPropsDialog::GroupWiseChatPropsDialog( const GroupWise::Chatroom & room, bool readOnly,
-							   TQWidget * tqparent, const char * name )
-	: KDialogBase( tqparent, name, false, i18n( "Chatroom properties" ),
+							   TQWidget * parent, const char * name )
+	: KDialogBase( parent, name, false, i18n( "Chatroom properties" ),
 				   KDialogBase::Ok|KDialogBase::Cancel, Ok, true ), m_dirty( false )
 {
 	initialise();
diff --git a/kopete/protocols/groupwise/ui/gwchatpropsdialog.h b/kopete/protocols/groupwise/ui/gwchatpropsdialog.h
index d7ba18c3..b3ecc6f3 100644
--- a/kopete/protocols/groupwise/ui/gwchatpropsdialog.h
+++ b/kopete/protocols/groupwise/ui/gwchatpropsdialog.h
@@ -46,12 +46,12 @@ class GroupWiseChatPropsDialog : public KDialogBase
 		/**
 		 * Construct an empty dialog
 		 */
-		GroupWiseChatPropsDialog( TQWidget * tqparent, const char * name );
+		GroupWiseChatPropsDialog( TQWidget * parent, const char * name );
 		/**
 		 * Construct a populated dialog
 		 */
 		GroupWiseChatPropsDialog( const GroupWise::Chatroom & room, bool readOnly,
-									   TQWidget * tqparent, const char * name );
+									   TQWidget * parent, const char * name );
 		
 		~GroupWiseChatPropsDialog() {}
 		
diff --git a/kopete/protocols/groupwise/ui/gwchatsearchdialog.cpp b/kopete/protocols/groupwise/ui/gwchatsearchdialog.cpp
index 5c55310d..b9021b1f 100644
--- a/kopete/protocols/groupwise/ui/gwchatsearchdialog.cpp
+++ b/kopete/protocols/groupwise/ui/gwchatsearchdialog.cpp
@@ -34,8 +34,8 @@
 
 #include "gwchatsearchdialog.h"
 
-GroupWiseChatSearchDialog::GroupWiseChatSearchDialog( GroupWiseAccount * account, TQWidget *tqparent, const char *name )
-	: KDialogBase(  tqparent, name, false, i18n( "Search Chatrooms" ),
+GroupWiseChatSearchDialog::GroupWiseChatSearchDialog( GroupWiseAccount * account, TQWidget *parent, const char *name )
+	: KDialogBase(  parent, name, false, i18n( "Search Chatrooms" ),
 					KDialogBase::Ok|KDialogBase::Apply|KDialogBase::Cancel, Ok, true ), m_account( account )
 {
 	m_widget = new GroupWiseChatSearchWidget( this );
diff --git a/kopete/protocols/groupwise/ui/gwchatsearchdialog.h b/kopete/protocols/groupwise/ui/gwchatsearchdialog.h
index e22860d3..a063284a 100644
--- a/kopete/protocols/groupwise/ui/gwchatsearchdialog.h
+++ b/kopete/protocols/groupwise/ui/gwchatsearchdialog.h
@@ -31,7 +31,7 @@ class GroupWiseChatSearchDialog : public KDialogBase
 	Q_OBJECT
   TQ_OBJECT
 	public:
-		GroupWiseChatSearchDialog( GroupWiseAccount * account, TQWidget * tqparent, const char * name );
+		GroupWiseChatSearchDialog( GroupWiseAccount * account, TQWidget * parent, const char * name );
 		~GroupWiseChatSearchDialog();
 	protected:
 		void populateWidget();
diff --git a/kopete/protocols/groupwise/ui/gwcontactproperties.cpp b/kopete/protocols/groupwise/ui/gwcontactproperties.cpp
index 7c7042dd..e7b6ecb2 100644
--- a/kopete/protocols/groupwise/ui/gwcontactproperties.cpp
+++ b/kopete/protocols/groupwise/ui/gwcontactproperties.cpp
@@ -41,8 +41,8 @@
 
 #include "gwcontactproperties.h"
 
-GroupWiseContactProperties::GroupWiseContactProperties( GroupWiseContact * contact, TQWidget *tqparent, const char *name)
- : TQObject(tqparent, name)
+GroupWiseContactProperties::GroupWiseContactProperties( GroupWiseContact * contact, TQWidget *parent, const char *name)
+ : TQObject(parent, name)
 {
 	init();
 	// set up the contents of the props widget
@@ -56,8 +56,8 @@ GroupWiseContactProperties::GroupWiseContactProperties( GroupWiseContact * conta
 	m_dialog->show();
 }
 
-GroupWiseContactProperties::GroupWiseContactProperties( GroupWise::ContactDetails cd, TQWidget *tqparent, const char *name )
- : TQObject(tqparent, name)
+GroupWiseContactProperties::GroupWiseContactProperties( GroupWise::ContactDetails cd, TQWidget *parent, const char *name )
+ : TQObject(parent, name)
 {
 	init();
 	// set up the contents of the props widget
@@ -78,7 +78,7 @@ GroupWiseContactProperties::~GroupWiseContactProperties()
 
 void GroupWiseContactProperties::init()
 {
-	m_dialog = new KDialogBase( ::tqqt_cast<TQWidget*>( tqparent() ), "gwcontactpropsdialog", false, i18n( "Contact Properties" ), KDialogBase::Ok );
+	m_dialog = new KDialogBase( ::tqqt_cast<TQWidget*>( parent() ), "gwcontactpropsdialog", false, i18n( "Contact Properties" ), KDialogBase::Ok );
 	m_propsWidget = new GroupWiseContactPropsWidget( m_dialog );
 	// set up the context menu and copy action
 	m_copyAction = KStdAction::copy( this, TQT_SLOT( slotCopy() ), 0 );
diff --git a/kopete/protocols/groupwise/ui/gwcontactproperties.h b/kopete/protocols/groupwise/ui/gwcontactproperties.h
index 38cce07d..afb0cd62 100644
--- a/kopete/protocols/groupwise/ui/gwcontactproperties.h
+++ b/kopete/protocols/groupwise/ui/gwcontactproperties.h
@@ -40,11 +40,11 @@ public:
 	/**
 	 * Display properties given a GroupWiseContact
 	 */ 
-	GroupWiseContactProperties( GroupWiseContact * contact, TQWidget *tqparent, const char *name );
+	GroupWiseContactProperties( GroupWiseContact * contact, TQWidget *parent, const char *name );
 	/**
 	 * Display properties given a GroupWise::ContactDetails
 	 */
-	GroupWiseContactProperties( GroupWise::ContactDetails contactDetails, TQWidget *tqparent = 0, const char *name = 0 );
+	GroupWiseContactProperties( GroupWise::ContactDetails contactDetails, TQWidget *parent = 0, const char *name = 0 );
 	~GroupWiseContactProperties();
 protected:
 	void setupProperties( TQMap< TQString, TQString > serverProps );
diff --git a/kopete/protocols/groupwise/ui/gweditaccountwidget.cpp b/kopete/protocols/groupwise/ui/gweditaccountwidget.cpp
index 43ae480d..7f049d7c 100644
--- a/kopete/protocols/groupwise/ui/gweditaccountwidget.cpp
+++ b/kopete/protocols/groupwise/ui/gweditaccountwidget.cpp
@@ -40,8 +40,8 @@
 
 #include "gweditaccountwidget.h"
 
-GroupWiseEditAccountWidget::GroupWiseEditAccountWidget( TQWidget* tqparent, Kopete::Account* theAccount)
-: TQWidget( tqparent ), KopeteEditAccountWidget( theAccount )
+GroupWiseEditAccountWidget::GroupWiseEditAccountWidget( TQWidget* parent, Kopete::Account* theAccount)
+: TQWidget( parent ), KopeteEditAccountWidget( theAccount )
 {
 	kdDebug(GROUPWISE_DEBUG_GLOBAL) << k_funcinfo << endl;
 	m_layout = new TQVBoxLayout( this );
diff --git a/kopete/protocols/groupwise/ui/gweditaccountwidget.h b/kopete/protocols/groupwise/ui/gweditaccountwidget.h
index 24171353..9c21f7fd 100644
--- a/kopete/protocols/groupwise/ui/gweditaccountwidget.h
+++ b/kopete/protocols/groupwise/ui/gweditaccountwidget.h
@@ -38,7 +38,7 @@ class GroupWiseEditAccountWidget : public TQWidget, public KopeteEditAccountWidg
 Q_OBJECT
   TQ_OBJECT
 public:
-    GroupWiseEditAccountWidget( TQWidget* tqparent, Kopete::Account* account);
+    GroupWiseEditAccountWidget( TQWidget* parent, Kopete::Account* account);
 
     ~GroupWiseEditAccountWidget();
 
diff --git a/kopete/protocols/groupwise/ui/gwprivacydialog.cpp b/kopete/protocols/groupwise/ui/gwprivacydialog.cpp
index 462d53ee..e6179882 100644
--- a/kopete/protocols/groupwise/ui/gwprivacydialog.cpp
+++ b/kopete/protocols/groupwise/ui/gwprivacydialog.cpp
@@ -48,8 +48,8 @@ private:
 	TQString m_dn;
 };
 
-GroupWisePrivacyDialog::GroupWisePrivacyDialog( GroupWiseAccount * account, TQWidget *tqparent, const char *name )
- : KDialogBase(  tqparent, name, false, i18n( "Account specific privacy settings", "Manage Privacy for %1" ).tqarg( account->accountId() ),
+GroupWisePrivacyDialog::GroupWisePrivacyDialog( GroupWiseAccount * account, TQWidget *parent, const char *name )
+ : KDialogBase(  parent, name, false, i18n( "Account specific privacy settings", "Manage Privacy for %1" ).tqarg( account->accountId() ),
  KDialogBase::Ok|KDialogBase::Apply|KDialogBase::Cancel, Ok, true ), m_account( account ), m_dirty( false ), m_searchDlg(0)
 {
 	m_privacy = new GroupWisePrivacyWidget( this );
diff --git a/kopete/protocols/groupwise/ui/gwprivacydialog.h b/kopete/protocols/groupwise/ui/gwprivacydialog.h
index 0211e85e..57bb6e83 100644
--- a/kopete/protocols/groupwise/ui/gwprivacydialog.h
+++ b/kopete/protocols/groupwise/ui/gwprivacydialog.h
@@ -36,7 +36,7 @@ class GroupWisePrivacyDialog : public KDialogBase
 Q_OBJECT
   TQ_OBJECT
 public:
-	GroupWisePrivacyDialog( GroupWiseAccount * account, TQWidget * tqparent, const char * name );
+	GroupWisePrivacyDialog( GroupWiseAccount * account, TQWidget * parent, const char * name );
 	~GroupWisePrivacyDialog();
 protected:
 	void commitChanges();
diff --git a/kopete/protocols/groupwise/ui/gwreceiveinvitationdialog.cpp b/kopete/protocols/groupwise/ui/gwreceiveinvitationdialog.cpp
index d8846bbd..547de1b5 100644
--- a/kopete/protocols/groupwise/ui/gwreceiveinvitationdialog.cpp
+++ b/kopete/protocols/groupwise/ui/gwreceiveinvitationdialog.cpp
@@ -33,8 +33,8 @@
 
 #include "gwreceiveinvitationdialog.h"
 
-ReceiveInvitationDialog::ReceiveInvitationDialog( GroupWiseAccount * account, const ConferenceEvent & event, TQWidget *tqparent, const char *name)
- : KDialogBase( i18n("Invitation to Conversation"), KDialogBase::Yes|KDialogBase::No, KDialogBase::Yes, KDialogBase::No, tqparent, name, false )
+ReceiveInvitationDialog::ReceiveInvitationDialog( GroupWiseAccount * account, const ConferenceEvent & event, TQWidget *parent, const char *name)
+ : KDialogBase( i18n("Invitation to Conversation"), KDialogBase::Yes|KDialogBase::No, KDialogBase::Yes, KDialogBase::No, parent, name, false )
 {
 	m_account = account;
 	m_guid = event.guid;	
diff --git a/kopete/protocols/groupwise/ui/gwreceiveinvitationdialog.h b/kopete/protocols/groupwise/ui/gwreceiveinvitationdialog.h
index 20cb28e6..688071fd 100644
--- a/kopete/protocols/groupwise/ui/gwreceiveinvitationdialog.h
+++ b/kopete/protocols/groupwise/ui/gwreceiveinvitationdialog.h
@@ -33,7 +33,7 @@ class ReceiveInvitationDialog : public KDialogBase
 Q_OBJECT
   TQ_OBJECT
 public:
-	ReceiveInvitationDialog( GroupWiseAccount * account, const ConferenceEvent & event, TQWidget *tqparent, const char *name );
+	ReceiveInvitationDialog( GroupWiseAccount * account, const ConferenceEvent & event, TQWidget *parent, const char *name );
 	~ReceiveInvitationDialog();
 signals:
 	void invitationAccepted( bool, const GroupWise::ConferenceGuid & guid );
diff --git a/kopete/protocols/groupwise/ui/gwsearch.cpp b/kopete/protocols/groupwise/ui/gwsearch.cpp
index dc0788eb..b3f2428e 100644
--- a/kopete/protocols/groupwise/ui/gwsearch.cpp
+++ b/kopete/protocols/groupwise/ui/gwsearch.cpp
@@ -40,8 +40,8 @@
 class GWSearchResultsLVI : public TQListViewItem
 {
 public:
-	GWSearchResultsLVI( TQListView * tqparent, GroupWise::ContactDetails details, int status, const TQPixmap & statusPM/*, const TQString & userId */)
-	: TQListViewItem( tqparent, TQString(), details.givenName, details.surname, GroupWiseProtocol::protocol()->dnToDotted( details.dn ) ), m_details( details ), m_status( status )
+	GWSearchResultsLVI( TQListView * parent, GroupWise::ContactDetails details, int status, const TQPixmap & statusPM/*, const TQString & userId */)
+	: TQListViewItem( parent, TQString(), details.givenName, details.surname, GroupWiseProtocol::protocol()->dnToDotted( details.dn ) ), m_details( details ), m_status( status )
 	{
 		setPixmap( 0, statusPM );
 	}
@@ -56,8 +56,8 @@ public:
 	int m_status;
 };
 
-GroupWiseContactSearch::GroupWiseContactSearch( GroupWiseAccount * account, TQListView::SelectionMode mode, bool onlineOnly,  TQWidget *tqparent, const char *name)
- : GroupWiseContactSearchWidget(tqparent, name), m_account( account ), m_onlineOnly( onlineOnly )
+GroupWiseContactSearch::GroupWiseContactSearch( GroupWiseAccount * account, TQListView::SelectionMode mode, bool onlineOnly,  TQWidget *parent, const char *name)
+ : GroupWiseContactSearchWidget(parent, name), m_account( account ), m_onlineOnly( onlineOnly )
 {
 	m_results->setSelectionMode( mode );
 	m_results->setAllColumnsShowFocus( true );
diff --git a/kopete/protocols/groupwise/ui/gwsearch.h b/kopete/protocols/groupwise/ui/gwsearch.h
index c3aee10a..c4e11364 100644
--- a/kopete/protocols/groupwise/ui/gwsearch.h
+++ b/kopete/protocols/groupwise/ui/gwsearch.h
@@ -36,7 +36,7 @@ Q_OBJECT
   TQ_OBJECT
 public:
 	GroupWiseContactSearch( GroupWiseAccount * account, TQListView::SelectionMode mode, bool onlineOnly, 
-			TQWidget *tqparent = 0, const char *name = 0);
+			TQWidget *parent = 0, const char *name = 0);
 	~GroupWiseContactSearch();
 	TQValueList< GroupWise::ContactDetails > selectedResults();
 signals:
@@ -47,7 +47,7 @@ protected slots:
 	void slotClear();
 	void slotDoSearch();
 	void slotGotSearchResults();
-	// shows a GroupWiseContactProperties for the selected contact.  Dialog's tqparent is this instance
+	// shows a GroupWiseContactProperties for the selected contact.  Dialog's parent is this instance
 	void slotShowDetails();
 	void slotValidateSelection();
 private:
author	tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>	2011-08-10 22:19:39 +0000
committer	tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>	2011-08-10 22:19:39 +0000
commit	2bc1d72869b62af05ae4feafd878203b526da8c5 (patch)
tree	2676903bb600bd9646644856e354940471ad84e2 /kopete/protocols/groupwise
parent	937b2991d8e78166eea904c80ad04d34607017a4 (diff)
download	tdenetwork-2bc1d72869b62af05ae4feafd878203b526da8c5.tar.gz tdenetwork-2bc1d72869b62af05ae4feafd878203b526da8c5.zip