summaryrefslogtreecommitdiffstats
path: root/kopete/protocols/groupwise/gwaccount.cpp
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-07-09 02:23:29 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-07-09 02:23:29 +0000
commitd0be1721b4656109c9e21cc0ecb6f23b343b7c26 (patch)
tree211c399f4274325783e6f9995153aac359876116 /kopete/protocols/groupwise/gwaccount.cpp
parent1fff1cf07591b1226eb568e95283091eedbeff1d (diff)
downloadtdenetwork-d0be1721b4656109c9e21cc0ecb6f23b343b7c26.tar.gz
tdenetwork-d0be1721b4656109c9e21cc0ecb6f23b343b7c26.zip
Remove the tq in front of these incorrectly TQt4-converted methods/data members:
tqrepaint[...] tqinvalidate[...] tqparent[...] tqmask[...] tqlayout[...] tqalignment[...] git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdenetwork@1240522 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kopete/protocols/groupwise/gwaccount.cpp')
-rw-r--r--kopete/protocols/groupwise/gwaccount.cpp40
1 files changed, 20 insertions, 20 deletions
diff --git a/kopete/protocols/groupwise/gwaccount.cpp b/kopete/protocols/groupwise/gwaccount.cpp
index ff5b53b4..ddcf1918 100644
--- a/kopete/protocols/groupwise/gwaccount.cpp
+++ b/kopete/protocols/groupwise/gwaccount.cpp
@@ -855,11 +855,11 @@ void GroupWiseAccount::receiveFolder( const FolderItem & folder )
kdDebug( GROUPWISE_DEBUG_GLOBAL ) << k_funcinfo
<< " objectId: " << folder.id
<< " sequence: " << folder.sequence
- << " tqparentId: " << folder.tqparentId
+ << " parentId: " << folder.parentId
<< " displayName: " << folder.name << endl;
- if ( folder.tqparentId != 0 )
+ if ( folder.parentId != 0 )
{
- kdWarning( GROUPWISE_DEBUG_GLOBAL ) << " - received a nested folder. These were not supported in GroupWise or Kopete as of Sept 2004, aborting! (tqparentId = " << folder.tqparentId << ")" << endl;
+ kdWarning( GROUPWISE_DEBUG_GLOBAL ) << " - received a nested folder. These were not supported in GroupWise or Kopete as of Sept 2004, aborting! (parentId = " << folder.parentId << ")" << endl;
return;
}
@@ -910,13 +910,13 @@ void GroupWiseAccount::receiveContact( const ContactItem & contact )
kdDebug( GROUPWISE_DEBUG_GLOBAL ) << k_funcinfo
<< " objectId: " << contact.id
<< ", sequence: " << contact.sequence
- << ", tqparentId: " << contact.tqparentId
+ << ", parentId: " << contact.parentId
<< ", dn: " << contact.dn
<< ", displayName: " << contact.displayName << endl;
//kdDebug( GROUPWISE_DEBUG_GLOBAL ) << "\n dotted notation is '" << protocol()->dnToDotted( contact.dn ) << "'\n" <<endl;
// add to new style contact list
- GWContactInstance * gwInst = m_serverListModel->addContactInstance( contact.id, contact.tqparentId, contact.sequence, contact.displayName, contact.dn );
+ GWContactInstance * gwInst = m_serverListModel->addContactInstance( contact.id, contact.parentId, contact.sequence, contact.displayName, contact.dn );
Q_ASSERT( gwInst );
GroupWiseContact * c = contactForDN( contact.dn );
@@ -925,21 +925,21 @@ void GroupWiseAccount::receiveContact( const ContactItem & contact )
{
Kopete::MetaContact *metaContact = new Kopete::MetaContact();
metaContact->setDisplayName( contact.displayName );
- c = new GroupWiseContact( this, contact.dn, metaContact, contact.id, contact.tqparentId, contact.sequence );
+ c = new GroupWiseContact( this, contact.dn, metaContact, contact.id, contact.parentId, contact.sequence );
Kopete::ContactList::self()->addMetaContact( metaContact );
}
// add the metacontact to the ContactItem's group, if not there aleady
- if ( contact.tqparentId == 0 )
+ if ( contact.parentId == 0 )
c->metaContact()->addToGroup( Kopete::Group::topLevel() );
else
{
// check the metacontact is in the group this listing-of-the-contact is in...
- GWFolder * folder = m_serverListModel->findFolderById( contact.tqparentId );
+ GWFolder * folder = m_serverListModel->findFolderById( contact.parentId );
if ( !folder ) // inconsistent
{
kdDebug( GROUPWISE_DEBUG_GLOBAL ) << " - ERROR - contact's folder doesn't exist on server" << endl;
DeleteItemTask * dit = new DeleteItemTask( client()->rootTask() );
- dit->item( contact.tqparentId, contact.id );
+ dit->item( contact.parentId, contact.id );
// TQObject::connect( dit, TQT_SIGNAL( gotContactDeleted( const ContactItem & ) ), TQT_SLOT( receiveContactDeleted( const ContactItem & ) ) );
dit->go( true );
return;
@@ -1092,7 +1092,7 @@ void GroupWiseAccount::sendMessage( const GroupWise::ConferenceGuid &guid, const
}
}
-bool GroupWiseAccount::createContact( const TQString& contactId, Kopete::MetaContact* tqparentContact )
+bool GroupWiseAccount::createContact( const TQString& contactId, Kopete::MetaContact* parentContact )
{
kdDebug ( GROUPWISE_DEBUG_GLOBAL ) << k_funcinfo << "contactId: " << contactId << endl;
@@ -1101,7 +1101,7 @@ bool GroupWiseAccount::createContact( const TQString& contactId, Kopete::MetaCon
// Set object id to 0 if not found - they do not exist on the server
bool topLevel = false;
TQValueList< FolderItem > folders;
- Kopete::GroupList groupList = tqparentContact->groups();
+ Kopete::GroupList groupList = parentContact->groups();
for ( Kopete::Group *group = groupList.first(); group; group = groupList.next() )
{
if ( group->type() == Kopete::Group::TopLevel ) // no need to create it on the server
@@ -1117,7 +1117,7 @@ bool GroupWiseAccount::createContact( const TQString& contactId, Kopete::MetaCon
{
kdDebug( GROUPWISE_DEBUG_GLOBAL ) << fld->displayName << endl;
//FIXME - get rid of FolderItem & co
- fi.tqparentId = ::tqqt_cast<GWFolder*>( fld->tqparent() )->id;
+ fi.parentId = ::tqqt_cast<GWFolder*>( fld->tqparent() )->id;
fi.id = fld->id;
fi.name = fld->displayName;
}
@@ -1125,7 +1125,7 @@ bool GroupWiseAccount::createContact( const TQString& contactId, Kopete::MetaCon
{
kdDebug( GROUPWISE_DEBUG_GLOBAL ) << "folder: " << group->displayName() <<
"not found in server list model." << endl;
- fi.tqparentId = 0;
+ fi.parentId = 0;
fi.id = 0;
fi.name = group->displayName();
}
@@ -1144,7 +1144,7 @@ bool GroupWiseAccount::createContact( const TQString& contactId, Kopete::MetaCon
//
// Since ToMetaContact expects synchronous contact creation
// we have to create the contact optimistically.
- GroupWiseContact * gc = new GroupWiseContact( this, contactId, tqparentContact, 0, 0, 0 );
+ GroupWiseContact * gc = new GroupWiseContact( this, contactId, parentContact, 0, 0, 0 );
ContactDetails dt = client()->userDetailsManager()->details( contactId );
TQString displayAs;
if ( dt.fullName.isEmpty() )
@@ -1164,7 +1164,7 @@ bool GroupWiseAccount::createContact( const TQString& contactId, Kopete::MetaCon
// get the contact's full name to use as the display name of the created contact
CreateContactTask * cct = new CreateContactTask( client()->rootTask() );
- cct->contactFromUserId( contactId, tqparentContact->displayName(), highestFreeSequence, folders, topLevel );
+ cct->contactFromUserId( contactId, parentContact->displayName(), highestFreeSequence, folders, topLevel );
TQObject::connect( cct, TQT_SIGNAL( finished() ), TQT_SLOT( receiveContactCreated() ) );
cct->go( true );
return true;
@@ -1470,7 +1470,7 @@ void GroupWiseAccount::syncContact( GroupWiseContact * contact )
kdDebug( GROUPWISE_DEBUG_GLOBAL ) << " = CONTACT '" << contact->nickName() << "' IS IN " << contact->metaContact()->groups().count() << " MC GROUPS, AND HAS " << m_serverListModel->instancesWithDn( contact->dn() ).count() << " CONTACT LIST INSTANCES." << endl;
kdDebug( GROUPWISE_DEBUG_GLOBAL ) << " = LOOKING FOR NOOP GROUP MEMBERSHIPS" << endl;
- // 1) Seek matches between CLIs and MCGs and remove from the lists without taking any action. match on objectid, tqparentid
+ // 1) Seek matches between CLIs and MCGs and remove from the lists without taking any action. match on objectid, parentid
// 2) Each remaining unmatched pair is a move, initiate and remove - need to take care to always use greatest unused sequence number - if we have to set the sequence number to the following sequence number within the folder, we may have a problem where after the first move, we have to wait for the state of the CLIs to be updated pending the completion of the first move - this would be difficult to cope with, because our current lists would be out of date, or we'd have to restart the sync - assuming the first move created a new matched CLI-MCG pair, we could do that with little cost.
// 3) Any remaining entries in MCG list are adds, carry out
// 4) Any remaining entries in CLI list are removes, carry out
@@ -1531,7 +1531,7 @@ void GroupWiseAccount::syncContact( GroupWiseContact * contact )
// create contactItem parameter
ContactItem instance;
instance.id = ( *instIt )->id;
- instance.tqparentId = sourceFolder->id;
+ instance.parentId = sourceFolder->id;
instance.sequence = ( *instIt )->sequence;
instance.dn = ( *instIt )->dn;
instance.displayName = contact->nickName();
@@ -1579,8 +1579,8 @@ void GroupWiseAccount::syncContact( GroupWiseContact * contact )
// does this group exist on the server? Create the contact appropriately
if ( destinationFolder )
{
- int tqparentId = destinationFolder->id;
- ccit->contactFromUserId( contact->dn(), contact->metaContact()->displayName(), tqparentId );
+ int parentId = destinationFolder->id;
+ ccit->contactFromUserId( contact->dn(), contact->metaContact()->displayName(), parentId );
}
else
{
@@ -1628,7 +1628,7 @@ void GroupWiseAccount::syncContact( GroupWiseContact * contact )
TQValueList< ContactItem > instancesToChange;
ContactItem instance;
instance.id = (*it)->id;
- instance.tqparentId = ::tqqt_cast<GWFolder *>( (*it)->tqparent() )->id;
+ instance.parentId = ::tqqt_cast<GWFolder *>( (*it)->tqparent() )->id;
instance.sequence = (*it)->sequence;
instance.dn = contact->dn();
instance.displayName = contact->nickName();