diff options
Diffstat (limited to 'tderesources/egroupware/tdeabc_resourcexmlrpc.cpp')
| -rw-r--r-- | tderesources/egroupware/tdeabc_resourcexmlrpc.cpp | 72 |
1 files changed, 36 insertions, 36 deletions
diff --git a/tderesources/egroupware/tdeabc_resourcexmlrpc.cpp b/tderesources/egroupware/tdeabc_resourcexmlrpc.cpp index 1929bd19..232eb94f 100644 --- a/tderesources/egroupware/tdeabc_resourcexmlrpc.cpp +++ b/tderesources/egroupware/tdeabc_resourcexmlrpc.cpp @@ -26,7 +26,7 @@ #include <kdebug.h> #include <tdelocale.h> #include <kmdcodec.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kstringhandler.h> #include <libkcal/freebusyurlstore.h> #include <libtdepim/kpimprefs.h> @@ -153,14 +153,14 @@ bool ResourceXMLRPC::doOpen() mServer->setUrl( KURL( mPrefs->url() ) ); mServer->setUserAgent( "KDE-AddressBook" ); - TQMap<TQString, TQVariant> args; + TQStringVariantMap args; args.insert( "domain", mPrefs->domain() ); args.insert( "username", mPrefs->user() ); args.insert( "password", mPrefs->password() ); mServer->call( "system.login", TQVariant( args ), - this, TQT_SLOT( loginFinished( const TQValueList<TQVariant>&, const TQVariant& ) ), - this, TQT_SLOT( fault( int, const TQString&, const TQVariant& ) ) ); + this, TQ_SLOT( loginFinished( const TQValueList<TQVariant>&, const TQVariant& ) ), + this, TQ_SLOT( fault( int, const TQString&, const TQVariant& ) ) ); mSynchronizer->start(); @@ -169,13 +169,13 @@ bool ResourceXMLRPC::doOpen() void ResourceXMLRPC::doClose() { - TQMap<TQString, TQVariant> args; + TQStringVariantMap args; args.insert( "sessionid", mSessionID ); args.insert( "kp3", mKp3 ); mServer->call( "system.logout", TQVariant( args ), - this, TQT_SLOT( logoutFinished( const TQValueList<TQVariant>&, const TQVariant& ) ), - this, TQT_SLOT( fault( int, const TQString&, const TQVariant& ) ) ); + this, TQ_SLOT( logoutFinished( const TQValueList<TQVariant>&, const TQVariant& ) ), + this, TQ_SLOT( fault( int, const TQString&, const TQVariant& ) ) ); mSynchronizer->start(); } @@ -196,7 +196,7 @@ bool ResourceXMLRPC::asyncLoad() loadCache(); - TQMap<TQString, TQVariant> args; + TQStringVariantMap args; args.insert( "start", "0" ); args.insert( "query", "" ); args.insert( "filter", "" ); @@ -205,16 +205,16 @@ bool ResourceXMLRPC::asyncLoad() args.insert( "include_users", "calendar" ); mServer->call( SearchContactsCommand, args, - this, TQT_SLOT( listContactsFinished( const TQValueList<TQVariant>&, const TQVariant& ) ), - this, TQT_SLOT( fault( int, const TQString&, const TQVariant& ) ) ); + this, TQ_SLOT( listContactsFinished( const TQValueList<TQVariant>&, const TQVariant& ) ), + this, TQ_SLOT( fault( int, const TQString&, const TQVariant& ) ) ); - mServer->call( LoadCategoriesCommand, TQVariant( false, 0 ), - this, TQT_SLOT( loadCategoriesFinished( const TQValueList<TQVariant>&, const TQVariant& ) ), - this, TQT_SLOT( fault( int, const TQString&, const TQVariant& ) ) ); + mServer->call( LoadCategoriesCommand, TQVariant( false ), + this, TQ_SLOT( loadCategoriesFinished( const TQValueList<TQVariant>&, const TQVariant& ) ), + this, TQ_SLOT( fault( int, const TQString&, const TQVariant& ) ) ); mServer->call( LoadCustomFieldsCommand, TQVariant( TQValueList<TQVariant>() ), - this, TQT_SLOT( loadCustomFieldsFinished( const TQValueList<TQVariant>&, const TQVariant& ) ), - this, TQT_SLOT( fault( int, const TQString&, const TQVariant& ) ) ); + this, TQ_SLOT( loadCustomFieldsFinished( const TQValueList<TQVariant>&, const TQVariant& ) ), + this, TQ_SLOT( fault( int, const TQString&, const TQVariant& ) ) ); return true; } @@ -249,12 +249,12 @@ bool ResourceXMLRPC::asyncSave( Ticket* ) void ResourceXMLRPC::addContact( const Addressee& addr ) { - TQMap<TQString, TQVariant> args; + TQStringVariantMap args; writeContact( addr, args ); mServer->call( AddContactCommand, args, - this, TQT_SLOT( addContactFinished( const TQValueList<TQVariant>&, const TQVariant& ) ), - this, TQT_SLOT( addContactFault( int, const TQString&, const TQVariant& ) ), + this, TQ_SLOT( addContactFinished( const TQValueList<TQVariant>&, const TQVariant& ) ), + this, TQ_SLOT( addContactFault( int, const TQString&, const TQVariant& ) ), TQVariant( addr.uid() ) ); } @@ -265,13 +265,13 @@ void ResourceXMLRPC::updateContact( const Addressee& addr ) return; } - TQMap<TQString, TQVariant> args; + TQStringVariantMap args; writeContact( addr, args ); args.insert( "id", idMapper().remoteId( addr.uid() ) ); mServer->call( AddContactCommand, args, - this, TQT_SLOT( updateContactFinished( const TQValueList<TQVariant>&, const TQVariant& ) ), - this, TQT_SLOT( updateContactFault( int, const TQString&, const TQVariant& ) ), + this, TQ_SLOT( updateContactFinished( const TQValueList<TQVariant>&, const TQVariant& ) ), + this, TQ_SLOT( updateContactFault( int, const TQString&, const TQVariant& ) ), TQVariant( addr.uid() ) ); } @@ -284,15 +284,15 @@ void ResourceXMLRPC::deleteContact( const Addressee& addr ) } mServer->call( DeleteContactCommand, idMapper().remoteId( addr.uid() ), - this, TQT_SLOT( deleteContactFinished( const TQValueList<TQVariant>&, const TQVariant& ) ), - this, TQT_SLOT( deleteContactFault( int, const TQString&, const TQVariant& ) ), + this, TQ_SLOT( deleteContactFinished( const TQValueList<TQVariant>&, const TQVariant& ) ), + this, TQ_SLOT( deleteContactFault( int, const TQString&, const TQVariant& ) ), TQVariant( addr.uid() ) ); } void ResourceXMLRPC::loginFinished( const TQValueList<TQVariant> &variant, const TQVariant& ) { - TQMap<TQString, TQVariant> map = variant[0].toMap(); + TQStringVariantMap map = variant[0].toMap(); KURL url( mPrefs->url() ); if ( map[ "GOAWAY" ].toString() == "XOXO" ) { // failed @@ -313,7 +313,7 @@ void ResourceXMLRPC::loginFinished( const TQValueList<TQVariant> &variant, void ResourceXMLRPC::logoutFinished( const TQValueList<TQVariant> &variant, const TQVariant& ) { - TQMap<TQString, TQVariant> map = variant[0].toMap(); + TQStringVariantMap map = variant[0].toMap(); if ( map[ "GOODBYE" ].toString() != "XOXO" ) addressBook()->error( i18n( "Logout failed, please check your username and password." ) ); @@ -335,7 +335,7 @@ void ResourceXMLRPC::listContactsFinished( const TQValueList<TQVariant> &mapList TDEABC::Addressee::List serverContacts; for ( contactIt = contactList.begin(); contactIt != contactList.end(); ++contactIt ) { - const TQMap<TQString, TQVariant> map = (*contactIt).toMap(); + const TQStringVariantMap map = (*contactIt).toMap(); Addressee addr; TQString uid; @@ -451,7 +451,7 @@ TQString ResourceXMLRPC::addrTypesToTypeStr( int typeMask ) return types.join( ";" ); } -void ResourceXMLRPC::writeContact( const Addressee &addr, TQMap<TQString, TQVariant> &args ) +void ResourceXMLRPC::writeContact( const Addressee &addr, TQStringVariantMap &args ) { args.insert( "access", ( addr.secrecy().type() == Secrecy::Private ? "private" : "public" ) ); args.insert( "fn", addr.formattedName() ); @@ -476,7 +476,7 @@ void ResourceXMLRPC::writeContact( const Addressee &addr, TQMap<TQString, TQVari TQStringList::ConstIterator catIt; const TQStringList categories = addr.categories(); - TQMap<TQString, TQVariant> catMap; + TQStringVariantMap catMap; int counter = 0; for ( catIt = categories.begin(); catIt != categories.end(); ++catIt ) { TQMap<TQString, int>::ConstIterator it = mCategoryMap.find( *catIt ); @@ -593,11 +593,11 @@ void ResourceXMLRPC::writeContact( const Addressee &addr, TQMap<TQString, TQVari args.insert( "freebusy_url", url ); } -void ResourceXMLRPC::readContact( const TQMap<TQString, TQVariant> &args, Addressee &addr, TQString &uid ) +void ResourceXMLRPC::readContact( const TQStringVariantMap &args, Addressee &addr, TQString &uid ) { Address addrOne, addrTwo; - TQMap<TQString, TQVariant>::ConstIterator it; + TQStringVariantMap::ConstIterator it; for ( it = args.begin(); it != args.end(); ++it ) { if ( it.key() == "id" ) { uid = it.data().toString(); @@ -710,8 +710,8 @@ void ResourceXMLRPC::readContact( const TQMap<TQString, TQVariant> &args, Addres addr.insertEmail( it.data().toString(), false ); } else if ( it.key() == "email_home_type" ) { } else if ( it.key() == "cat_id" ) { - const TQMap<TQString, TQVariant> categories = it.data().toMap(); - TQMap<TQString, TQVariant>::ConstIterator it; + const TQStringVariantMap categories = it.data().toMap(); + TQStringVariantMap::ConstIterator it; for ( it = categories.begin(); it != categories.end(); ++it ) addr.insertCategory( it.data().toString() ); @@ -744,8 +744,8 @@ void ResourceXMLRPC::loadCategoriesFinished( const TQValueList<TQVariant> &mapLi { mCategoryMap.clear(); - const TQMap<TQString, TQVariant> map = mapList[ 0 ].toMap(); - TQMap<TQString, TQVariant>::ConstIterator it; + const TQStringVariantMap map = mapList[ 0 ].toMap(); + TQStringVariantMap::ConstIterator it; KABPrefs *prefs = KABPrefs::instance(); for ( it = map.begin(); it != map.end(); ++it ) { @@ -764,8 +764,8 @@ void ResourceXMLRPC::loadCustomFieldsFinished( const TQValueList<TQVariant> &map { mCustomFieldsMap.clear(); - const TQMap<TQString, TQVariant> map = mapList[ 0 ].toMap(); - TQMap<TQString, TQVariant>::ConstIterator it; + const TQStringVariantMap map = mapList[ 0 ].toMap(); + TQStringVariantMap::ConstIterator it; for ( it = map.begin(); it != map.end(); ++it ) mCustomFieldsMap.insert( it.key(), it.data().toString() ); |
