diff options
author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-07-09 02:23:29 +0000 |
---|---|---|
committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-07-09 02:23:29 +0000 |
commit | d0be1721b4656109c9e21cc0ecb6f23b343b7c26 (patch) | |
tree | 211c399f4274325783e6f9995153aac359876116 /kopete/protocols/groupwise | |
parent | 1fff1cf07591b1226eb568e95283091eedbeff1d (diff) | |
download | tdenetwork-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')
34 files changed, 76 insertions, 76 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(); diff --git a/kopete/protocols/groupwise/gwaccount.h b/kopete/protocols/groupwise/gwaccount.h index 314769f0..fbb66697 100644 --- a/kopete/protocols/groupwise/gwaccount.h +++ b/kopete/protocols/groupwise/gwaccount.h @@ -74,7 +74,7 @@ public: * Creates a protocol specific Kopete::Contact subclass and adds it to the supplied * Kopete::MetaContact */ - virtual bool createContact(const TQString& contactId, Kopete::MetaContact* tqparentContact); + virtual bool createContact(const TQString& contactId, Kopete::MetaContact* parentContact); /** * Delete a contact on the server */ diff --git a/kopete/protocols/groupwise/gwaddui.ui b/kopete/protocols/groupwise/gwaddui.ui index 4de7649d..6302f869 100644 --- a/kopete/protocols/groupwise/gwaddui.ui +++ b/kopete/protocols/groupwise/gwaddui.ui @@ -109,5 +109,5 @@ </spacer> </vbox> </widget> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kopete/protocols/groupwise/gwcontact.cpp b/kopete/protocols/groupwise/gwcontact.cpp index dd74fc67..0dd78a71 100644 --- a/kopete/protocols/groupwise/gwcontact.cpp +++ b/kopete/protocols/groupwise/gwcontact.cpp @@ -48,8 +48,8 @@ using namespace GroupWise; GroupWiseContact::GroupWiseContact( Kopete::Account* account, const TQString &dn, Kopete::MetaContact *tqparent, - const int objectId, const int tqparentId, const int sequence ) -: Kopete::Contact( account, GroupWiseProtocol::dnToDotted( dn ), tqparent ), m_objectId( objectId ), m_parentId( tqparentId ), + const int objectId, const int parentId, const int sequence ) +: Kopete::Contact( account, GroupWiseProtocol::dnToDotted( dn ), tqparent ), m_objectId( objectId ), m_parentId( parentId ), m_sequence( sequence ), m_actionBlock( 0 ), m_archiving( false ), m_deleting( false ), m_messageReceivedOffline( false ) { if ( dn.tqfind( '=' ) != -1 ) diff --git a/kopete/protocols/groupwise/gwcontact.h b/kopete/protocols/groupwise/gwcontact.h index 183df1a4..d3c98a6b 100644 --- a/kopete/protocols/groupwise/gwcontact.h +++ b/kopete/protocols/groupwise/gwcontact.h @@ -61,12 +61,12 @@ public: * @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 objectId The contact's numeric object ID. - * @param tqparentId The ID of this contact's tqparent (folder). + * @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). */ GroupWiseContact( Kopete::Account* account, const TQString &uniqueName, Kopete::MetaContact *tqparent, - const int objectId, const int tqparentId, const int sequence ); + const int objectId, const int parentId, const int sequence ); ~GroupWiseContact(); @@ -132,11 +132,11 @@ public: */ void setDeleting( bool deleting ); /** - * Marks this contact as having sent a message whilst aptqparently offline + * Marks this contact as having sent a message whilst apparently offline */ void setMessageReceivedOffline( bool on ); /** - * Has this contact sent a message whilst aptqparently offline? + * Has this contact sent a message whilst apparently offline? */ bool messageReceivedOffline() const; diff --git a/kopete/protocols/groupwise/gwprotocol.cpp b/kopete/protocols/groupwise/gwprotocol.cpp index 176a4b92..4abdab9f 100644 --- a/kopete/protocols/groupwise/gwprotocol.cpp +++ b/kopete/protocols/groupwise/gwprotocol.cpp @@ -94,7 +94,7 @@ Kopete::Contact *GroupWiseProtocol::deserializeContact( TQString accountId = serializedData[ "accountId" ]; TQString displayName = serializedData[ "displayName" ]; int objectId = serializedData[ "objectId" ].toInt(); - int tqparentId = serializedData[ "tqparentId" ].toInt(); + int parentId = serializedData[ "parentId" ].toInt(); int sequence = serializedData[ "sequenceNumber" ].toInt(); TQDict<Kopete::Account> accounts = Kopete::AccountManager::self()->accounts( this ); @@ -107,7 +107,7 @@ Kopete::Contact *GroupWiseProtocol::deserializeContact( } // FIXME: creating a contact with a userId here - return new GroupWiseContact(account, dn, metaContact, objectId, tqparentId, sequence ); + return new GroupWiseContact(account, dn, metaContact, objectId, parentId, sequence ); } AddContactPage * GroupWiseProtocol::createAddContactWidget( TQWidget *tqparent, Kopete::Account * account ) diff --git a/kopete/protocols/groupwise/libgroupwise/coreprotocol.cpp b/kopete/protocols/groupwise/libgroupwise/coreprotocol.cpp index e48bf368..7b071f35 100644 --- a/kopete/protocols/groupwise/libgroupwise/coreprotocol.cpp +++ b/kopete/protocols/groupwise/libgroupwise/coreprotocol.cpp @@ -278,7 +278,7 @@ void CoreProtocol::fieldsToWire( Field::FieldList fields, int depth ) continue; // GAIM writes these tags to the secure socket separately - if we can't connect, check here - // NM Protocol 1 writes them in an aptqparently arbitrary order + // NM Protocol 1 writes them in an apparently arbitrary order // tag //dout.writeRawBytes( GW_URLVAR_TAG, sizeof( GW_URLVAR_TAG ) ); //dout << field->tag(); diff --git a/kopete/protocols/groupwise/libgroupwise/coreprotocol.h b/kopete/protocols/groupwise/libgroupwise/coreprotocol.h index 50ac0f65..ea3a2626 100644 --- a/kopete/protocols/groupwise/libgroupwise/coreprotocol.h +++ b/kopete/protocols/groupwise/libgroupwise/coreprotocol.h @@ -109,7 +109,7 @@ class Transfer; * ascii text, * latin1 as hexadecimal, * escaped tqunicode code points (encoded/escaped as \uUNICODEVALUE?, with or without a space between the end of the tqunicode value and the ? ) - * Outgoing messages may contain rich text, and additionally the plain text encoded as UTF8, but this plain payload is aptqparently ignored by the server + * Outgoing messages may contain rich text, and additionally the plain text encoded as UTF8, but this plain payload is apparently ignored by the server * */ class CoreProtocol : public TQObject diff --git a/kopete/protocols/groupwise/libgroupwise/gwerror.h b/kopete/protocols/groupwise/libgroupwise/gwerror.h index a6afa5c8..f5de53ce 100644 --- a/kopete/protocols/groupwise/libgroupwise/gwerror.h +++ b/kopete/protocols/groupwise/libgroupwise/gwerror.h @@ -123,14 +123,14 @@ namespace GroupWise { uint id; uint sequence; - uint tqparentId; + uint parentId; TQString name; }; struct ContactItem { uint id; - uint tqparentId; + uint parentId; uint sequence; TQString dn; TQString displayName; diff --git a/kopete/protocols/groupwise/libgroupwise/gwfield.h b/kopete/protocols/groupwise/libgroupwise/gwfield.h index 1f8deea2..6d3cb5a9 100644 --- a/kopete/protocols/groupwise/libgroupwise/gwfield.h +++ b/kopete/protocols/groupwise/libgroupwise/gwfield.h @@ -22,7 +22,7 @@ #define GWFIELD_H /* Field types */ -/* Comments: ^1 not used ^2 ignored ^3 aptqparently only used in _field_to_string for debug */ +/* Comments: ^1 not used ^2 ignored ^3 apparently only used in _field_to_string for debug */ /* Otherwise: widely used */ #define NMFIELD_TYPE_INVALID 0 /* ^1 */ diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/createcontactinstancetask.cpp b/kopete/protocols/groupwise/libgroupwise/tasks/createcontactinstancetask.cpp index ae1a6984..6f410dcb 100644 --- a/kopete/protocols/groupwise/libgroupwise/tasks/createcontactinstancetask.cpp +++ b/kopete/protocols/groupwise/libgroupwise/tasks/createcontactinstancetask.cpp @@ -31,9 +31,9 @@ CreateContactInstanceTask::~CreateContactInstanceTask() { } -void CreateContactInstanceTask::contactFromUserId( const TQString & userId, const TQString & displayName, const int tqparentFolder ) +void CreateContactInstanceTask::contactFromUserId( const TQString & userId, const TQString & displayName, const int parentFolder ) { - contact( new Field::SingleField( NM_A_SZ_USERID, 0, NMFIELD_TYPE_UTF8, userId ), displayName, tqparentFolder ); + contact( new Field::SingleField( NM_A_SZ_USERID, 0, NMFIELD_TYPE_UTF8, userId ), displayName, parentFolder ); } void CreateContactInstanceTask::contactFromUserIdAndFolder( const TQString & userId, const TQString & displayName, const int folderSequence, const TQString & folderDisplayName ) @@ -46,9 +46,9 @@ void CreateContactInstanceTask::contactFromUserIdAndFolder( const TQString & use m_folderDisplayName = folderDisplayName; } -void CreateContactInstanceTask::contactFromDN( const TQString & dn, const TQString & displayName, const int tqparentFolder ) +void CreateContactInstanceTask::contactFromDN( const TQString & dn, const TQString & displayName, const int parentFolder ) { - contact( new Field::SingleField( NM_A_SZ_DN, 0, NMFIELD_TYPE_UTF8, dn ), displayName, tqparentFolder ); + contact( new Field::SingleField( NM_A_SZ_DN, 0, NMFIELD_TYPE_UTF8, dn ), displayName, parentFolder ); } void CreateContactInstanceTask::contactFromDNAndFolder( const TQString & dn, const TQString & displayName, const int folderSequence, const TQString & folderDisplayName ) @@ -61,10 +61,10 @@ void CreateContactInstanceTask::contactFromDNAndFolder( const TQString & dn, con m_folderDisplayName = folderDisplayName; } -void CreateContactInstanceTask::contact( Field::SingleField * id, const TQString & displayName, const int tqparentFolder ) +void CreateContactInstanceTask::contact( Field::SingleField * id, const TQString & displayName, const int parentFolder ) { Field::FieldList lst; - lst.append( new Field::SingleField( NM_A_SZ_PARENT_ID, 0, NMFIELD_TYPE_UTF8, TQString::number( tqparentFolder ) ) ); + lst.append( new Field::SingleField( NM_A_SZ_PARENT_ID, 0, NMFIELD_TYPE_UTF8, TQString::number( parentFolder ) ) ); // this is either a user Id or a DN lst.append( id ); if ( displayName.isEmpty() ) // fallback so that the contact is created diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/createcontactinstancetask.h b/kopete/protocols/groupwise/libgroupwise/tasks/createcontactinstancetask.h index 84347964..19e41f2e 100644 --- a/kopete/protocols/groupwise/libgroupwise/tasks/createcontactinstancetask.h +++ b/kopete/protocols/groupwise/libgroupwise/tasks/createcontactinstancetask.h @@ -38,13 +38,13 @@ public: /** * Sets up the request message. */ - void contactFromUserId( const TQString & userId, const TQString & displayName, const int tqparentFolder ); - void contactFromDN( const TQString & dn, const TQString & displayName, const int tqparentFolder ); + void contactFromUserId( const TQString & userId, const TQString & displayName, const int parentFolder ); + void contactFromDN( const TQString & dn, const TQString & displayName, const int parentFolder ); void contactFromUserIdAndFolder( const TQString & userId, const TQString & displayName, const int folderSequence, const TQString & folderDisplayName ); void contactFromDNAndFolder( const TQString & dn, const TQString & displayName, const int folderSequence, const TQString & folderDisplayName ); void onGo(); protected: - void contact( Field::SingleField * id, const TQString & displayName, const int tqparentFolder ); + void contact( Field::SingleField * id, const TQString & displayName, const int parentFolder ); void onFolderCreated(); private: TQString m_userId; diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/createcontacttask.cpp b/kopete/protocols/groupwise/libgroupwise/tasks/createcontacttask.cpp index 4e9d3e8a..bf0873ab 100644 --- a/kopete/protocols/groupwise/libgroupwise/tasks/createcontacttask.cpp +++ b/kopete/protocols/groupwise/libgroupwise/tasks/createcontacttask.cpp @@ -113,7 +113,7 @@ void CreateContactTask::slotContactAdded( const ContactItem & addedContact ) return; } client()->debug( TQString( "CreateContactTask::slotContactAdded() - Contact Instance %1 was created on the server, with objectId %2 in folder %3" ).tqarg - ( addedContact.displayName ).tqarg( addedContact.id ).tqarg( addedContact.tqparentId ) ); + ( addedContact.displayName ).tqarg( addedContact.id ).tqarg( addedContact.parentId ) ); if ( m_dn.isEmpty() ) m_dn = addedContact.dn; @@ -123,7 +123,7 @@ void CreateContactTask::slotContactAdded( const ContactItem & addedContact ) m_folders.pop_back(); // clear the topLevel flag once the corresponding server side entry has been successfully created - if ( addedContact.tqparentId == 0 ) + if ( addedContact.parentId == 0 ) m_topLevel = false; if ( m_folders.isEmpty() && !m_topLevel ) diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/createcontacttask.h b/kopete/protocols/groupwise/libgroupwise/tasks/createcontacttask.h index 8b973361..1ca6f141 100644 --- a/kopete/protocols/groupwise/libgroupwise/tasks/createcontacttask.h +++ b/kopete/protocols/groupwise/libgroupwise/tasks/createcontacttask.h @@ -65,7 +65,7 @@ public: * @param topLevel is the folder also in the top level folder? */ void contactFromUserId( const TQString & userId, const TQString & displayName, const int firstSeqNo, const TQValueList< FolderItem > folders, bool topLevel ); - //void contactFromDN( const TQString & dn, const TQString & displayName, const int tqparentFolder ); + //void contactFromDN( const TQString & dn, const TQString & displayName, const int parentFolder ); /** * This task doesn't do any I/O itself, so this take prints an error and returns false; */ diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/createfoldertask.cpp b/kopete/protocols/groupwise/libgroupwise/tasks/createfoldertask.cpp index 363882d8..a165cdc2 100644 --- a/kopete/protocols/groupwise/libgroupwise/tasks/createfoldertask.cpp +++ b/kopete/protocols/groupwise/libgroupwise/tasks/createfoldertask.cpp @@ -29,10 +29,10 @@ CreateFolderTask::~CreateFolderTask() { } -void CreateFolderTask::folder( const int tqparentId, const int sequence, const TQString & displayName ) +void CreateFolderTask::folder( const int parentId, const int sequence, const TQString & displayName ) { Field::FieldList lst; - lst.append( new Field::SingleField( NM_A_SZ_PARENT_ID, 0, NMFIELD_TYPE_UTF8, TQString::number( tqparentId ) ) ); + lst.append( new Field::SingleField( NM_A_SZ_PARENT_ID, 0, NMFIELD_TYPE_UTF8, TQString::number( parentId ) ) ); lst.append( new Field::SingleField( NM_A_SZ_DISPLAY_NAME, 0, NMFIELD_TYPE_UTF8, displayName ) ); lst.append( new Field::SingleField( NM_A_SZ_SEQUENCE_NUMBER, 0, NMFIELD_TYPE_UTF8, TQString::number( sequence ) ) ); createTransfer( "createfolder", lst ); diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/createfoldertask.h b/kopete/protocols/groupwise/libgroupwise/tasks/createfoldertask.h index 4befdf40..448e17a2 100644 --- a/kopete/protocols/groupwise/libgroupwise/tasks/createfoldertask.h +++ b/kopete/protocols/groupwise/libgroupwise/tasks/createfoldertask.h @@ -35,7 +35,7 @@ Q_OBJECT public: CreateFolderTask(Task* tqparent); ~CreateFolderTask(); - void folder( const int tqparentId, const int sequence, const TQString & displayName ); + void folder( const int parentId, const int sequence, const TQString & displayName ); }; #endif diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/deleteitemtask.cpp b/kopete/protocols/groupwise/libgroupwise/tasks/deleteitemtask.cpp index 4559c1f7..ad67cb4c 100644 --- a/kopete/protocols/groupwise/libgroupwise/tasks/deleteitemtask.cpp +++ b/kopete/protocols/groupwise/libgroupwise/tasks/deleteitemtask.cpp @@ -29,7 +29,7 @@ DeleteItemTask::~DeleteItemTask() { } -void DeleteItemTask::item( const int tqparentFolder, const int objectId ) +void DeleteItemTask::item( const int parentFolder, const int objectId ) { if ( objectId == 0 ) { @@ -37,7 +37,7 @@ void DeleteItemTask::item( const int tqparentFolder, const int objectId ) return; } Field::FieldList lst; - lst.append( new Field::SingleField( NM_A_SZ_PARENT_ID, 0, NMFIELD_TYPE_UTF8, TQString::number( tqparentFolder ) ) ); + lst.append( new Field::SingleField( NM_A_SZ_PARENT_ID, 0, NMFIELD_TYPE_UTF8, TQString::number( parentFolder ) ) ); // this is either a user Id or a DN lst.append( new Field::SingleField( NM_A_SZ_OBJECT_ID, 0, NMFIELD_TYPE_UTF8, TQString::number( objectId ) ) ); createTransfer( "deletecontact", lst ); diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/deleteitemtask.h b/kopete/protocols/groupwise/libgroupwise/tasks/deleteitemtask.h index 15ea9702..2e2ed64c 100644 --- a/kopete/protocols/groupwise/libgroupwise/tasks/deleteitemtask.h +++ b/kopete/protocols/groupwise/libgroupwise/tasks/deleteitemtask.h @@ -33,7 +33,7 @@ Q_OBJECT public: DeleteItemTask(Task* tqparent); ~DeleteItemTask(); - void item( const int tqparentFolder, const int objectId ); + void item( const int parentFolder, const int objectId ); }; #endif diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/logintask.cpp b/kopete/protocols/groupwise/libgroupwise/tasks/logintask.cpp index a09af45a..2474aaaa 100644 --- a/kopete/protocols/groupwise/libgroupwise/tasks/logintask.cpp +++ b/kopete/protocols/groupwise/libgroupwise/tasks/logintask.cpp @@ -121,9 +121,9 @@ void LoginTask::extractFolder( Field::MultiField * folderContainer ) folder.name = current->value().toString(); // tqparent current = fl.findSingleField( NM_A_SZ_PARENT_ID ); - folder.tqparentId = current->value().toInt(); + 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.tqparentId ).tqarg( folder.sequence ) ); + client()->debug( TQString( "Got folder: %1, obj: %2, tqparent: %3, seq: %3." ).tqarg( folder.name ).tqarg( folder.id ).tqarg( folder.parentId ).tqarg( folder.sequence ) ); // tell the world about it emit gotFolder( folder ); } @@ -139,7 +139,7 @@ void LoginTask::extractContact( Field::MultiField * contactContainer ) current = fl.findSingleField( NM_A_SZ_OBJECT_ID ); contact.id = current->value().toInt(); current = fl.findSingleField( NM_A_SZ_PARENT_ID ); - contact.tqparentId = current->value().toInt(); + contact.parentId = current->value().toInt(); current = fl.findSingleField( NM_A_SZ_SEQUENCE_NUMBER ); contact.sequence = current->value().toInt(); current = fl.findSingleField( NM_A_SZ_DISPLAY_NAME ); @@ -206,13 +206,13 @@ ContactDetails LoginTask::extractUserDetails( Field::FieldList & fields ) if ( propList ) { // Hello A Nagappan. GW gave us a multiple field where we previously got a single field - TQString tqparentName = propList->tag(); + TQString parentName = propList->tag(); Field::FieldList propFields = propList->fields(); const Field::FieldListIterator end = propFields.end(); for ( Field::FieldListIterator it = propFields.begin(); it != end; ++it ) { propField = dynamic_cast<Field::SingleField *>( *it ); - if ( propField /*&& propField->tag() == tqparentName */) + if ( propField /*&& propField->tag() == parentName */) { TQString propValue = propField->value().toString(); TQString contents = propMap[ propField->tag() ]; diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/modifycontactlisttask.cpp b/kopete/protocols/groupwise/libgroupwise/tasks/modifycontactlisttask.cpp index 703c0582..be04efad 100644 --- a/kopete/protocols/groupwise/libgroupwise/tasks/modifycontactlisttask.cpp +++ b/kopete/protocols/groupwise/libgroupwise/tasks/modifycontactlisttask.cpp @@ -92,7 +92,7 @@ void ModifyContactListTask::processContactChange( Field::MultiField * container current = fl.findSingleField( NM_A_SZ_OBJECT_ID ); contact.id = current->value().toInt(); current = fl.findSingleField( NM_A_SZ_PARENT_ID ); - contact.tqparentId = current->value().toInt(); + contact.parentId = current->value().toInt(); current = fl.findSingleField( NM_A_SZ_SEQUENCE_NUMBER ); contact.sequence = current->value().toInt(); current = fl.findSingleField( NM_A_SZ_DISPLAY_NAME ); @@ -127,7 +127,7 @@ void ModifyContactListTask::processFolderChange( Field::MultiField * container ) folder.name = current->value().toString(); // tqparent current = fl.findSingleField( NM_A_SZ_PARENT_ID ); - folder.tqparentId = current->value().toInt(); + folder.parentId = current->value().toInt(); if ( container->method() == NMFIELD_METHOD_ADD ) emit gotFolderAdded( folder ); else if ( container->method() == NMFIELD_METHOD_DELETE ) diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/movecontacttask.cpp b/kopete/protocols/groupwise/libgroupwise/tasks/movecontacttask.cpp index 044a4e24..c9d6aac9 100644 --- a/kopete/protocols/groupwise/libgroupwise/tasks/movecontacttask.cpp +++ b/kopete/protocols/groupwise/libgroupwise/tasks/movecontacttask.cpp @@ -39,7 +39,7 @@ void MoveContactTask::moveContact( const ContactItem & contact, const int newPar // TODO: - write a contact_item_to_fields method and factor duplicate code like this out Field::FieldList contactFields; contactFields.append( new Field::SingleField( NM_A_SZ_OBJECT_ID, 0, NMFIELD_TYPE_UTF8, contact.id ) ); - contactFields.append( new Field::SingleField( NM_A_SZ_PARENT_ID, 0, NMFIELD_TYPE_UTF8, contact.tqparentId ) ); + contactFields.append( new Field::SingleField( NM_A_SZ_PARENT_ID, 0, NMFIELD_TYPE_UTF8, contact.parentId ) ); contactFields.append( new Field::SingleField( NM_A_SZ_SEQUENCE_NUMBER, 0, NMFIELD_TYPE_UTF8, contact.sequence ) ); if ( !contact.dn.isNull() ) contactFields.append( new Field::SingleField( NM_A_SZ_DN, 0, NMFIELD_TYPE_UTF8, contact.dn ) ); diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/pollsearchresultstask.cpp b/kopete/protocols/groupwise/libgroupwise/tasks/pollsearchresultstask.cpp index ae0f9456..1cc33e75 100644 --- a/kopete/protocols/groupwise/libgroupwise/tasks/pollsearchresultstask.cpp +++ b/kopete/protocols/groupwise/libgroupwise/tasks/pollsearchresultstask.cpp @@ -155,7 +155,7 @@ GroupWise::ContactDetails PollSearchResultsTask::extractUserDetails( Field::Fiel Field::MultiField * propList = dynamic_cast<Field::MultiField*>( *it ); if ( propList ) { - TQString tqparentName = propList->tag(); + TQString parentName = propList->tag(); Field::FieldList propFields = propList->fields(); const Field::FieldListIterator end = propFields.end(); for ( Field::FieldListIterator it = propFields.begin(); it != end; ++it ) diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/updatecontacttask.cpp b/kopete/protocols/groupwise/libgroupwise/tasks/updatecontacttask.cpp index e1a863a7..a1e539d9 100644 --- a/kopete/protocols/groupwise/libgroupwise/tasks/updatecontacttask.cpp +++ b/kopete/protocols/groupwise/libgroupwise/tasks/updatecontacttask.cpp @@ -48,7 +48,7 @@ void UpdateContactTask::renameContact( const TQString & newName, const TQValueLi { Field::FieldList contactFields; contactFields.append( new Field::SingleField( NM_A_SZ_OBJECT_ID, 0, NMFIELD_TYPE_UTF8, (*it).id ) ); - contactFields.append( new Field::SingleField( NM_A_SZ_PARENT_ID, 0, NMFIELD_TYPE_UTF8, (*it).tqparentId ) ); + contactFields.append( new Field::SingleField( NM_A_SZ_PARENT_ID, 0, NMFIELD_TYPE_UTF8, (*it).parentId ) ); contactFields.append( new Field::SingleField( NM_A_SZ_SEQUENCE_NUMBER, 0, NMFIELD_TYPE_UTF8, (*it).sequence ) ); if ( !(*it).dn.isNull() ) contactFields.append( new Field::SingleField( NM_A_SZ_DN, 0, NMFIELD_TYPE_UTF8, (*it).dn ) ); @@ -61,7 +61,7 @@ void UpdateContactTask::renameContact( const TQString & newName, const TQValueLi { Field::FieldList contactFields; contactFields.append( new Field::SingleField( NM_A_SZ_OBJECT_ID, 0, NMFIELD_TYPE_UTF8, (*it).id ) ); - contactFields.append( new Field::SingleField( NM_A_SZ_PARENT_ID, 0, NMFIELD_TYPE_UTF8, (*it).tqparentId ) ); + contactFields.append( new Field::SingleField( NM_A_SZ_PARENT_ID, 0, NMFIELD_TYPE_UTF8, (*it).parentId ) ); contactFields.append( new Field::SingleField( NM_A_SZ_SEQUENCE_NUMBER, 0, NMFIELD_TYPE_UTF8, (*it).sequence ) ); if ( !(*it).dn.isNull() ) contactFields.append( new Field::SingleField( NM_A_SZ_DN, 0, NMFIELD_TYPE_UTF8, (*it).dn ) ); diff --git a/kopete/protocols/groupwise/ui/gwaccountpreferences.ui b/kopete/protocols/groupwise/ui/gwaccountpreferences.ui index 6b3d89f7..21f774b5 100644 --- a/kopete/protocols/groupwise/ui/gwaccountpreferences.ui +++ b/kopete/protocols/groupwise/ui/gwaccountpreferences.ui @@ -316,5 +316,5 @@ <data format="PNG" length="866">89504e470d0a1a0a0000000d4948445200000016000000160806000000c4b46c3b0000032949444154388db59531681b6714c77f32373c8186ef0305eea005093258900eca26d30e3174a8a807d1c9ee940e5d4a276f09a414e22974ee609a4c75a0857a70a20c199ce93424e43414aee0c26910dc8105f7410df706413a7c915551db049a3e38b87bf7bedffddfc7ff7d578be398456c6c6cbce13d441cc7b5da02fcf4e8e99bde7a8f899b501515d959f64e10e71cd949c6e8d508e6cb7cb050fae49727444d87ed08a566dc0cea545a621b96725e62c522f312c4929ff9e7725e6203439282ec0bc72f74150c30c927d89690163f539619a044564973a1980ae54c01c136a1db518a0024808942780dead16a27e7e0ca55949a81668023b242fcd2901c394663072cd408ad75e18b6d43a7076143710aa1b9049ccd326e064a5979e8f0191cfc5878544368af1b24807caa4cfe507ef8aea0bf6dd8b92de7f00bc1562c95e64416e297f216aadcfa3ca43f10da1f8243112286871507fb05c3c7059d568bde96c5885b01af2d6e4a2db10dc8ff128e0fdd39f4cbaf8576dbe170702afcf6b86467bbce57df8680f0d3230767e0e62bdc55c5e53c476742fabbc318437f209886c3cd41d4b0f74049c78ef21476ef5846cf7ded2831848d55f0aa62816caade11adb7ed2fa0f71ce9d8619ac2e627824a45a72b00e413c5a95c0cf63e052bbe2014bfa738c3de3d251dfb0f8a80fda04e6480600113cc558a11a0e10b93a9225886cff04a8d10868662eab87f37271e59f2136f85a855bfda15f9594eb7a3b4ae0b933f95e161c5ceed88f254e97f2ad49b75eedf8562e2d8fb264355314da1dbada866abe47fedb106d01f78b71fec170c8f7276ef58da3de8f64a76bf6f634283730e9d2b9b8390ce0dae565c6a8e04b0710b746678f8a8e0e18382d173a1d7151c909fe4e84ccf57be3e76245b115143584ee73f27afc8e80b4c667e4c37b7054c8be1afde0de978a9c63485fea0457cec70aa089015ab9297e0938c240573cdb7651a4a7f20f43feb304a72aac2e73bd723da1fe5746ec0682bc26070f38c345905d7e238f6077c00dd8f85280211fcd91af84b02ef94a50c004502c1394813252f14575ca09839242f9484cb42df31e763edd237ff31d6c0ffa3fe17f0fb86c7715cfb1ba8bd86cc8d2decd30000000049454e44ae426082</data> </image> </images> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kopete/protocols/groupwise/ui/gwaddcontactpage.cpp b/kopete/protocols/groupwise/ui/gwaddcontactpage.cpp index 5f48d727..ad0c75be 100644 --- a/kopete/protocols/groupwise/ui/gwaddcontactpage.cpp +++ b/kopete/protocols/groupwise/ui/gwaddcontactpage.cpp @@ -73,7 +73,7 @@ GroupWiseAddContactPage::~GroupWiseAddContactPage() // i18n( "There was an error while carrying out your search. Please change your search terms or try again later." ) } -bool GroupWiseAddContactPage::apply( Kopete::Account* account, Kopete::MetaContact* tqparentContact ) +bool GroupWiseAddContactPage::apply( Kopete::Account* account, Kopete::MetaContact* parentContact ) { if ( validateData() ) { @@ -91,7 +91,7 @@ bool GroupWiseAddContactPage::apply( Kopete::Account* account, Kopete::MetaConta else return false; - return ( account->addContact ( contactId, tqparentContact, Kopete::Account::ChangeKABC ) ); + return ( account->addContact ( contactId, parentContact, Kopete::Account::ChangeKABC ) ); } else return false; diff --git a/kopete/protocols/groupwise/ui/gwaddui.ui b/kopete/protocols/groupwise/ui/gwaddui.ui index 6c360392..4f036f8b 100644 --- a/kopete/protocols/groupwise/ui/gwaddui.ui +++ b/kopete/protocols/groupwise/ui/gwaddui.ui @@ -133,5 +133,5 @@ <slot>setEnabled(bool)</slot> </connection> </connections> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kopete/protocols/groupwise/ui/gwchatpropswidget.ui b/kopete/protocols/groupwise/ui/gwchatpropswidget.ui index 651a3b17..726376a5 100644 --- a/kopete/protocols/groupwise/ui/gwchatpropswidget.ui +++ b/kopete/protocols/groupwise/ui/gwchatpropswidget.ui @@ -384,7 +384,7 @@ </widget> </vbox> </widget> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>klistbox.h</includehint> <includehint>kpushbutton.h</includehint> diff --git a/kopete/protocols/groupwise/ui/gwchatsearchwidget.ui b/kopete/protocols/groupwise/ui/gwchatsearchwidget.ui index c239ce86..63ffca38 100644 --- a/kopete/protocols/groupwise/ui/gwchatsearchwidget.ui +++ b/kopete/protocols/groupwise/ui/gwchatsearchwidget.ui @@ -108,7 +108,7 @@ </widget> </vbox> </widget> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>klistview.h</includehint> <includehint>kpushbutton.h</includehint> diff --git a/kopete/protocols/groupwise/ui/gwcontactpropswidget.ui b/kopete/protocols/groupwise/ui/gwcontactpropswidget.ui index 12e0deb2..b403abec 100644 --- a/kopete/protocols/groupwise/ui/gwcontactpropswidget.ui +++ b/kopete/protocols/groupwise/ui/gwcontactpropswidget.ui @@ -204,7 +204,7 @@ </widget> </vbox> </widget> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>klistview.h</includehint> </includehints> diff --git a/kopete/protocols/groupwise/ui/gwcontactsearch.ui b/kopete/protocols/groupwise/ui/gwcontactsearch.ui index 8c215959..508f4015 100644 --- a/kopete/protocols/groupwise/ui/gwcontactsearch.ui +++ b/kopete/protocols/groupwise/ui/gwcontactsearch.ui @@ -382,5 +382,5 @@ <tabstop>m_details</tabstop> <tabstop>m_firstNameOperation</tabstop> </tabstops> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kopete/protocols/groupwise/ui/gwcustomstatusedit.ui b/kopete/protocols/groupwise/ui/gwcustomstatusedit.ui index 366cb717..9ef4caad 100644 --- a/kopete/protocols/groupwise/ui/gwcustomstatusedit.ui +++ b/kopete/protocols/groupwise/ui/gwcustomstatusedit.ui @@ -88,5 +88,5 @@ </widget> </vbox> </widget> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kopete/protocols/groupwise/ui/gwcustomstatuswidget.ui b/kopete/protocols/groupwise/ui/gwcustomstatuswidget.ui index df25aaef..821c6030 100644 --- a/kopete/protocols/groupwise/ui/gwcustomstatuswidget.ui +++ b/kopete/protocols/groupwise/ui/gwcustomstatuswidget.ui @@ -105,7 +105,7 @@ </widget> </hbox> </widget> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>klistview.h</includehint> </includehints> diff --git a/kopete/protocols/groupwise/ui/gwprivacy.ui b/kopete/protocols/groupwise/ui/gwprivacy.ui index 13070437..1f4b6bcb 100644 --- a/kopete/protocols/groupwise/ui/gwprivacy.ui +++ b/kopete/protocols/groupwise/ui/gwprivacy.ui @@ -189,5 +189,5 @@ </widget> </vbox> </widget> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kopete/protocols/groupwise/ui/gwshowinvitation.ui b/kopete/protocols/groupwise/ui/gwshowinvitation.ui index 08253705..48c061a9 100644 --- a/kopete/protocols/groupwise/ui/gwshowinvitation.ui +++ b/kopete/protocols/groupwise/ui/gwshowinvitation.ui @@ -131,5 +131,5 @@ </widget> </vbox> </widget> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> </UI> |