From 335c366622612e7641001c7b4de62024152f0ff1 Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Sun, 26 Nov 2023 02:32:58 +0900 Subject: Replaced various '#define' with actual strings - part 4 Signed-off-by: Michele Calgaro --- kopete/protocols/groupwise/gwaccount.cpp | 14 +++++++------- kopete/protocols/groupwise/gwcontactlist.cpp | 18 +++++++++--------- kopete/protocols/groupwise/ui/gwcontactproperties.cpp | 2 +- 3 files changed, 17 insertions(+), 17 deletions(-) diff --git a/kopete/protocols/groupwise/gwaccount.cpp b/kopete/protocols/groupwise/gwaccount.cpp index b98d5911..e5d016de 100644 --- a/kopete/protocols/groupwise/gwaccount.cpp +++ b/kopete/protocols/groupwise/gwaccount.cpp @@ -533,7 +533,7 @@ void GroupWiseAccount::reconcileOfflineChanges() else continue; - GWFolder * folder = ::tqqt_cast( ( *instIt )->parent() ); + GWFolder * folder = ::tqt_cast( ( *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( fld->parent() )->id; + fi.parentId = ::tqt_cast( 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( (*it)->parent() )->id, (*it)->id ); + dit->item( ::tqt_cast( (*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( ( *candidateInst )->parent() ); + GWFolder * folder = ::tqt_cast( ( *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( ( *instIt)->parent() ); + GWFolder * sourceFolder =::tqt_cast( ( *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( ( *candidateInst )->parent() ); + GWFolder * folder =::tqt_cast( ( *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( (*it)->parent() )->id; + instance.parentId = ::tqt_cast( (*it)->parent() )->id; instance.sequence = (*it)->sequence; instance.dn = contact->dn(); instance.displayName = contact->nickName(); diff --git a/kopete/protocols/groupwise/gwcontactlist.cpp b/kopete/protocols/groupwise/gwcontactlist.cpp index ecca8912..08810b85 100644 --- a/kopete/protocols/groupwise/gwcontactlist.cpp +++ b/kopete/protocols/groupwise/gwcontactlist.cpp @@ -42,7 +42,7 @@ GWContactInstance * GWContactList::addContactInstance( unsigned int id, unsigned GWContactInstance * contact = 0; while ( (obj = it.current()) != 0 ) { - GWFolder * folder = ::tqqt_cast< GWFolder * >( obj ); + GWFolder * folder = ::tqt_cast< GWFolder * >( obj ); if ( folder && folder->id == parent ) { contact = new GWContactInstance( folder, id, sequence, displayName, dn ); @@ -62,7 +62,7 @@ GWFolder * GWContactList::findFolderById( unsigned int id ) GWFolder * candidate, * folder = 0; while ( (obj = it.current()) != 0 ) { - candidate = ::tqqt_cast< GWFolder * >( obj ); + candidate = ::tqt_cast< GWFolder * >( obj ); if ( candidate->id == id ) { folder = candidate; @@ -82,7 +82,7 @@ GWFolder * GWContactList::findFolderByName( const TQString & displayName ) GWFolder * folder = 0; while ( (obj = it.current()) != 0 ) { - GWFolder * candidate = ::tqqt_cast< GWFolder * >( obj ); + GWFolder * candidate = ::tqt_cast< GWFolder * >( obj ); if ( candidate->displayName == displayName ) { folder = candidate; @@ -102,7 +102,7 @@ int GWContactList::maxSequenceNumber() unsigned int sequence = 0; while ( (obj = it.current()) != 0 ) { - GWFolder * current = ::tqqt_cast< GWFolder * >( obj ); + GWFolder * current = ::tqt_cast< GWFolder * >( obj ); sequence = TQMAX( sequence, current->sequence ); ++it; } @@ -119,7 +119,7 @@ GWContactInstanceList GWContactList::instancesWithDn( const TQString & dn ) while ( (obj = it.current()) != 0 ) { ++it; - GWContactInstance * current = ::tqqt_cast( obj ); + GWContactInstance * current = ::tqt_cast( obj ); if ( current->dn == dn ) matches.append( current ); } @@ -141,7 +141,7 @@ void GWContactList::removeInstanceById( unsigned int id ) while ( (obj = it.current()) != 0 ) { ++it; - GWContactInstance * current = ::tqqt_cast( obj ); + GWContactInstance * current = ::tqt_cast( obj ); if ( current->id == id ) { delete current; @@ -161,7 +161,7 @@ void GWContactList::dump() TQObject *obj; while ( (obj = it.current()) != 0 ) { - GWFolder * folder = ::tqqt_cast< GWFolder * >( obj ); + GWFolder * folder = ::tqt_cast< GWFolder * >( obj ); if ( folder ) folder->dump( 1 ); ++it; @@ -208,12 +208,12 @@ void GWFolder::dump( unsigned int depth ) while ( (obj = it.current()) != 0 ) { ++it; - GWContactInstance * instance = ::tqqt_cast< GWContactInstance * >( obj ); + GWContactInstance * instance = ::tqt_cast< GWContactInstance * >( obj ); if (instance) instance->dump( depth ); else { - GWFolder * folder = ::tqqt_cast< GWFolder * >( obj ); + GWFolder * folder = ::tqt_cast< GWFolder * >( obj ); if ( folder ) folder->dump( depth ); } diff --git a/kopete/protocols/groupwise/ui/gwcontactproperties.cpp b/kopete/protocols/groupwise/ui/gwcontactproperties.cpp index 48b69e2d..4d13b5b9 100644 --- a/kopete/protocols/groupwise/ui/gwcontactproperties.cpp +++ b/kopete/protocols/groupwise/ui/gwcontactproperties.cpp @@ -78,7 +78,7 @@ GroupWiseContactProperties::~GroupWiseContactProperties() void GroupWiseContactProperties::init() { - m_dialog = new KDialogBase( ::tqqt_cast( parent() ), "gwcontactpropsdialog", false, i18n( "Contact Properties" ), KDialogBase::Ok ); + m_dialog = new KDialogBase( ::tqt_cast( 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 ); -- cgit v1.2.1