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

1 files changed, 9 insertions, 9 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();