From d0be1721b4656109c9e21cc0ecb6f23b343b7c26 Mon Sep 17 00:00:00 2001 From: tpearson Date: Sat, 9 Jul 2011 02:23:29 +0000 Subject: 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 --- .../libgroupwise/tasks/createcontactinstancetask.cpp | 12 ++++++------ .../groupwise/libgroupwise/tasks/createcontactinstancetask.h | 6 +++--- .../groupwise/libgroupwise/tasks/createcontacttask.cpp | 4 ++-- .../groupwise/libgroupwise/tasks/createcontacttask.h | 2 +- .../groupwise/libgroupwise/tasks/createfoldertask.cpp | 4 ++-- .../groupwise/libgroupwise/tasks/createfoldertask.h | 2 +- .../groupwise/libgroupwise/tasks/deleteitemtask.cpp | 4 ++-- .../protocols/groupwise/libgroupwise/tasks/deleteitemtask.h | 2 +- kopete/protocols/groupwise/libgroupwise/tasks/logintask.cpp | 10 +++++----- .../groupwise/libgroupwise/tasks/modifycontactlisttask.cpp | 4 ++-- .../groupwise/libgroupwise/tasks/movecontacttask.cpp | 2 +- .../groupwise/libgroupwise/tasks/pollsearchresultstask.cpp | 2 +- .../groupwise/libgroupwise/tasks/updatecontacttask.cpp | 4 ++-- 13 files changed, 29 insertions(+), 29 deletions(-) (limited to 'kopete/protocols/groupwise/libgroupwise/tasks') 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( *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( *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 ) ); -- cgit v1.2.1