TDE
/
tdenetwork
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/tdenetwork
0
0
Fork 0
Code Issues Releases Wiki Activity

Replaced various '#define' with actual strings - part 4

Browse Source 
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
pull/64/head
Michele Calgaro 1 year ago
parent c872aae88b
commit 335c366622
Signed by: MicheleC
GPG Key ID: 2A75B7CA8ADED5CF
3 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File

14
kopete/protocols/groupwise/gwaccount.cpp
Unescape View File

@ -533,7 +533,7 @@ void GroupWiseAccount::reconcileOfflineChanges()
else else
continue; continue;
GWFolder * folder = ::tqqt_cast<GWFolder*>( ( *instIt )->parent() ); GWFolder * folder = ::tqt_cast<GWFolder*>( ( *instIt )->parent() );
if ( folder->id == ( unsigned int )groupId.toInt() ) if ( folder->id == ( unsigned int )groupId.toInt() )
{ {
found = true; found = true;
@ -1117,7 +1117,7 @@ bool GroupWiseAccount::createContact( const TQString& contactId, Kopete::MetaCon
{ {
kdDebug( GROUPWISE_DEBUG_GLOBAL ) << fld->displayName << endl; kdDebug( GROUPWISE_DEBUG_GLOBAL ) << fld->displayName << endl;
//FIXME - get rid of FolderItem & co //FIXME - get rid of FolderItem & co
fi.parentId = ::tqqt_cast<GWFolder*>( fld->parent() )->id; fi.parentId = ::tqt_cast<GWFolder*>( fld->parent() )->id;
fi.id = fld->id; fi.id = fld->id;
fi.name = fld->displayName; fi.name = fld->displayName;
} }
@ -1227,7 +1227,7 @@ void GroupWiseAccount::deleteContact( GroupWiseContact * contact )
for ( ; it != instances.end(); ++it ) for ( ; it != instances.end(); ++it )
{ {
DeleteItemTask * dit = new DeleteItemTask( client()->rootTask() ); DeleteItemTask * dit = new DeleteItemTask( client()->rootTask() );
dit->item( ::tqqt_cast<GWFolder*>( (*it)->parent() )->id, (*it)->id ); dit->item( ::tqt_cast<GWFolder*>( (*it)->parent() )->id, (*it)->id );
TQObject::connect( dit, TQT_SIGNAL( gotContactDeleted( const ContactItem & ) ), TQT_SLOT( receiveContactDeleted( const ContactItem & ) ) ); TQObject::connect( dit, TQT_SIGNAL( gotContactDeleted( const ContactItem & ) ), TQT_SLOT( receiveContactDeleted( const ContactItem & ) ) );
dit->go( true ); dit->go( true );
} }
@ -1499,7 +1499,7 @@ void GroupWiseAccount::syncContact( GroupWiseContact * contact )
{ {
GWContactInstanceList::Iterator candidateInst = instIt; GWContactInstanceList::Iterator candidateInst = instIt;
++instIt; ++instIt;
GWFolder * folder = ::tqqt_cast<GWFolder *>( ( *candidateInst )->parent() ); GWFolder * folder = ::tqt_cast<GWFolder *>( ( *candidateInst )->parent() );
kdDebug( GROUPWISE_DEBUG_GLOBAL ) << " - Looking for a match, MC grp '" kdDebug( GROUPWISE_DEBUG_GLOBAL ) << " - Looking for a match, MC grp '"
<< ( *candidateGrp )->displayName() << ( *candidateGrp )->displayName()
<< "', GWFolder '" << folder->displayName << "', objectId is " << folder->id << endl; << "', GWFolder '" << folder->displayName << "', objectId is " << folder->id << endl;
@ -1525,7 +1525,7 @@ void GroupWiseAccount::syncContact( GroupWiseContact * contact )
candidateGrp = grpIt; candidateGrp = grpIt;
++grpIt; ++grpIt;
GWContactInstanceList::Iterator instIt = instances.begin(); GWContactInstanceList::Iterator instIt = instances.begin();
GWFolder * sourceFolder =::tqqt_cast<GWFolder*>( ( *instIt)->parent() ); GWFolder * sourceFolder =::tqt_cast<GWFolder*>( ( *instIt)->parent() );
kdDebug( GROUPWISE_DEBUG_GLOBAL ) << " - moving contact instance from group '" << sourceFolder->displayName << "' to group '" << ( *candidateGrp )->displayName() << "'" << endl; kdDebug( GROUPWISE_DEBUG_GLOBAL ) << " - moving contact instance from group '" << sourceFolder->displayName << "' to group '" << ( *candidateGrp )->displayName() << "'" << endl;
// create contactItem parameter // create contactItem parameter
@ -1604,7 +1604,7 @@ void GroupWiseAccount::syncContact( GroupWiseContact * contact )
{ {
GWContactInstanceList::Iterator candidateInst = instIt; GWContactInstanceList::Iterator candidateInst = instIt;
++instIt; ++instIt;
GWFolder * folder =::tqqt_cast<GWFolder*>( ( *candidateInst )->parent() ); GWFolder * folder =::tqt_cast<GWFolder*>( ( *candidateInst )->parent() );
kdDebug( GROUPWISE_DEBUG_GLOBAL ) << " - remove contact instance '"<< ( *candidateInst )->id << "' in group '" << folder->displayName << "'" << endl; kdDebug( GROUPWISE_DEBUG_GLOBAL ) << " - remove contact instance '"<< ( *candidateInst )->id << "' in group '" << folder->displayName << "'" << endl;
DeleteItemTask * dit = new DeleteItemTask( client()->rootTask() ); DeleteItemTask * dit = new DeleteItemTask( client()->rootTask() );
@ -1628,7 +1628,7 @@ void GroupWiseAccount::syncContact( GroupWiseContact * contact )
TQValueList< ContactItem > instancesToChange; TQValueList< ContactItem > instancesToChange;
ContactItem instance; ContactItem instance;
instance.id = (*it)->id; instance.id = (*it)->id;
instance.parentId = ::tqqt_cast<GWFolder *>( (*it)->parent() )->id; instance.parentId = ::tqt_cast<GWFolder *>( (*it)->parent() )->id;
instance.sequence = (*it)->sequence; instance.sequence = (*it)->sequence;
instance.dn = contact->dn(); instance.dn = contact->dn();
instance.displayName = contact->nickName(); instance.displayName = contact->nickName();

18
kopete/protocols/groupwise/gwcontactlist.cpp
Unescape View File

@ -42,7 +42,7 @@ GWContactInstance * GWContactList::addContactInstance( unsigned int id, unsigned
GWContactInstance * contact = 0; GWContactInstance * contact = 0;
while ( (obj = it.current()) != 0 ) while ( (obj = it.current()) != 0 )
{ {
GWFolder * folder = ::tqqt_cast< GWFolder * >( obj ); GWFolder * folder = ::tqt_cast< GWFolder * >( obj );
if ( folder && folder->id == parent ) if ( folder && folder->id == parent )
{ {
contact = new GWContactInstance( folder, id, sequence, displayName, dn ); contact = new GWContactInstance( folder, id, sequence, displayName, dn );
@ -62,7 +62,7 @@ GWFolder * GWContactList::findFolderById( unsigned int id )
GWFolder * candidate, * folder = 0; GWFolder * candidate, * folder = 0;
while ( (obj = it.current()) != 0 ) while ( (obj = it.current()) != 0 )
{ {
candidate = ::tqqt_cast< GWFolder * >( obj ); candidate = ::tqt_cast< GWFolder * >( obj );
if ( candidate->id == id ) if ( candidate->id == id )
{ {
folder = candidate; folder = candidate;
@ -82,7 +82,7 @@ GWFolder * GWContactList::findFolderByName( const TQString & displayName )
GWFolder * folder = 0; GWFolder * folder = 0;
while ( (obj = it.current()) != 0 ) while ( (obj = it.current()) != 0 )
{ {
GWFolder * candidate = ::tqqt_cast< GWFolder * >( obj ); GWFolder * candidate = ::tqt_cast< GWFolder * >( obj );
if ( candidate->displayName == displayName ) if ( candidate->displayName == displayName )
{ {
folder = candidate; folder = candidate;
@ -102,7 +102,7 @@ int GWContactList::maxSequenceNumber()
unsigned int sequence = 0; unsigned int sequence = 0;
while ( (obj = it.current()) != 0 ) while ( (obj = it.current()) != 0 )
{ {
GWFolder * current = ::tqqt_cast< GWFolder * >( obj ); GWFolder * current = ::tqt_cast< GWFolder * >( obj );
sequence = TQMAX( sequence, current->sequence ); sequence = TQMAX( sequence, current->sequence );
++it; ++it;
} }
@ -119,7 +119,7 @@ GWContactInstanceList GWContactList::instancesWithDn( const TQString & dn )
while ( (obj = it.current()) != 0 ) while ( (obj = it.current()) != 0 )
{ {
++it; ++it;
GWContactInstance * current = ::tqqt_cast<GWContactInstance *>( obj ); GWContactInstance * current = ::tqt_cast<GWContactInstance *>( obj );
if ( current->dn == dn ) if ( current->dn == dn )
matches.append( current ); matches.append( current );
} }
@ -141,7 +141,7 @@ void GWContactList::removeInstanceById( unsigned int id )
while ( (obj = it.current()) != 0 ) while ( (obj = it.current()) != 0 )
{ {
++it; ++it;
GWContactInstance * current = ::tqqt_cast<GWContactInstance *>( obj ); GWContactInstance * current = ::tqt_cast<GWContactInstance *>( obj );
if ( current->id == id ) if ( current->id == id )
{ {
delete current; delete current;
@ -161,7 +161,7 @@ void GWContactList::dump()
TQObject *obj; TQObject *obj;
while ( (obj = it.current()) != 0 ) while ( (obj = it.current()) != 0 )
{ {
GWFolder * folder = ::tqqt_cast< GWFolder * >( obj ); GWFolder * folder = ::tqt_cast< GWFolder * >( obj );
if ( folder ) if ( folder )
folder->dump( 1 ); folder->dump( 1 );
++it; ++it;
@ -208,12 +208,12 @@ void GWFolder::dump( unsigned int depth )
while ( (obj = it.current()) != 0 ) while ( (obj = it.current()) != 0 )
{ {
++it; ++it;
GWContactInstance * instance = ::tqqt_cast< GWContactInstance * >( obj ); GWContactInstance * instance = ::tqt_cast< GWContactInstance * >( obj );
if (instance) if (instance)
instance->dump( depth ); instance->dump( depth );
else else
{ {
GWFolder * folder = ::tqqt_cast< GWFolder * >( obj ); GWFolder * folder = ::tqt_cast< GWFolder * >( obj );
if ( folder ) if ( folder )
folder->dump( depth ); folder->dump( depth );
} }

2
kopete/protocols/groupwise/ui/gwcontactproperties.cpp
Unescape View File

@ -78,7 +78,7 @@ GroupWiseContactProperties::~GroupWiseContactProperties()
void GroupWiseContactProperties::init() void GroupWiseContactProperties::init()
{ {
m_dialog = new KDialogBase( ::tqqt_cast<TQWidget*>( parent() ), "gwcontactpropsdialog", false, i18n( "Contact Properties" ), KDialogBase::Ok ); m_dialog = new KDialogBase( ::tqt_cast<TQWidget*>( parent() ), "gwcontactpropsdialog", false, i18n( "Contact Properties" ), KDialogBase::Ok );
m_propsWidget = new GroupWiseContactPropsWidget( m_dialog ); m_propsWidget = new GroupWiseContactPropsWidget( m_dialog );
// set up the context menu and copy action // set up the context menu and copy action
m_copyAction = KStdAction::copy( this, TQT_SLOT( slotCopy() ), 0 ); m_copyAction = KStdAction::copy( this, TQT_SLOT( slotCopy() ), 0 );

Write Preview
Loading…
Cancel
Save