From 6d2f3127be206390c4c576fc174ad6edeb020dfe Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Sat, 1 Jun 2019 17:18:13 +0900 Subject: Adjusted to use new TQStringVariantMap type. Signed-off-by: Michele Calgaro --- .../lib/backends/chiasmus/chiasmusbackend.cpp | 2 +- certmanager/lib/backends/chiasmus/obtainkeysjob.h | 2 +- certmanager/lib/cryptplugwrapper.h | 2 +- certmanager/lib/kleo/cryptobackend.h | 9 +-- kmail/kmcommands.cpp | 4 +- kmail/kmcomposewin.cpp | 2 +- kmail/messagecomposer.cpp | 2 +- kmail/objecttreeparser.cpp | 4 +- libemailfunctions/idmapper.cpp | 12 ++-- libemailfunctions/idmapper.h | 2 +- tderesources/blogging/API_Blogger.cpp | 8 +-- tderesources/blogging/API_Blogger.h | 2 +- tderesources/blogging/xmlrpcjob.cpp | 8 +-- tderesources/egroupware/kcal_resourcexmlrpc.cpp | 82 +++++++++++----------- tderesources/egroupware/kcal_resourcexmlrpc.h | 8 +-- tderesources/egroupware/knotes_resourcexmlrpc.cpp | 14 ++-- tderesources/egroupware/knotes_resourcexmlrpc.h | 4 +- tderesources/egroupware/tdeabc_resourcexmlrpc.cpp | 36 +++++----- tderesources/egroupware/tdeabc_resourcexmlrpc.h | 4 +- tderesources/egroupware/xmlrpciface.cpp | 8 +-- 20 files changed, 106 insertions(+), 109 deletions(-) diff --git a/certmanager/lib/backends/chiasmus/chiasmusbackend.cpp b/certmanager/lib/backends/chiasmus/chiasmusbackend.cpp index f6885b3c..e89070f3 100644 --- a/certmanager/lib/backends/chiasmus/chiasmusbackend.cpp +++ b/certmanager/lib/backends/chiasmus/chiasmusbackend.cpp @@ -374,7 +374,7 @@ public: DecryptVerifyJob * decryptVerifyJob( bool ) const { return 0; } RefreshKeysJob * refreshKeysJob() const { return 0; } - SpecialJob * specialJob( const char * type, const TQMap & args ) const { + SpecialJob * specialJob( const char * type, const TQStringVariantMap & args ) const { if ( tqstricmp( type, "x-obtain-keys" ) == 0 && args.size() == 0 ) return new ObtainKeysJob(); if ( tqstricmp( type, "x-encrypt" ) == 0 && args.size() == 0 ) diff --git a/certmanager/lib/backends/chiasmus/obtainkeysjob.h b/certmanager/lib/backends/chiasmus/obtainkeysjob.h index 10ed5d5f..da19257b 100644 --- a/certmanager/lib/backends/chiasmus/obtainkeysjob.h +++ b/certmanager/lib/backends/chiasmus/obtainkeysjob.h @@ -56,7 +56,7 @@ namespace Kleo { To use, create an ObtainKeysJob instance like this: Kleo::SpecialJob * job = - protocol->specialJob("x-obtain-keys", TQMap()); + protocol->specialJob("x-obtain-keys", TQStringVariantMap()); The resulting TQVariant will contain a TQStringList containing the diff --git a/certmanager/lib/cryptplugwrapper.h b/certmanager/lib/cryptplugwrapper.h index 39fd680a..a8ea1112 100644 --- a/certmanager/lib/cryptplugwrapper.h +++ b/certmanager/lib/cryptplugwrapper.h @@ -813,7 +813,7 @@ public: Kleo::DecryptVerifyJob * decryptVerifyJob( bool textmode=false ) const; Kleo::RefreshKeysJob * refreshKeysJob() const; - Kleo::SpecialJob * specialJob( const char *, const TQMap & ) const { return 0; } + Kleo::SpecialJob * specialJob( const char *, const TQStringVariantMap & ) const { return 0; } GpgME::ImportResult importCertificate( const char* data, size_t length ); diff --git a/certmanager/lib/kleo/cryptobackend.h b/certmanager/lib/kleo/cryptobackend.h index 6cb690d0..215c4e3c 100644 --- a/certmanager/lib/kleo/cryptobackend.h +++ b/certmanager/lib/kleo/cryptobackend.h @@ -2,7 +2,7 @@ kleo/cryptobackend.h This file is part of libkleopatra, the KDE keymanagement library - Copyright (c) 2004,2005 Klarälvdalens Datakonsult AB + Copyright (c) 2004,2005 Klar�lvdalens Datakonsult AB Libkleopatra is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as @@ -34,6 +34,7 @@ #define __KLEO_CRYPTOBACKEND_H__ #include +#include namespace Kleo { class CryptoConfig; @@ -54,10 +55,6 @@ namespace Kleo { class SpecialJob; } -class TQString; -class TQVariant; -template class TQMap; - namespace Kleo { class CryptoBackend { @@ -114,7 +111,7 @@ namespace Kleo { virtual DecryptVerifyJob * decryptVerifyJob( bool textmode=false ) const = 0; virtual RefreshKeysJob * refreshKeysJob() const = 0; - virtual SpecialJob * specialJob( const char * type, const TQMap & args ) const = 0; + virtual SpecialJob * specialJob( const char * type, const TQStringVariantMap & args ) const = 0; }; } diff --git a/kmail/kmcommands.cpp b/kmail/kmcommands.cpp index a6185013..3194cee1 100644 --- a/kmail/kmcommands.cpp +++ b/kmail/kmcommands.cpp @@ -3239,7 +3239,7 @@ void KMHandleAttachmentCommand::atmEncryptWithChiasmus() if ( !chiasmus ) return; - const STD_NAMESPACE_PREFIX auto_ptr listjob( chiasmus->specialJob( "x-obtain-keys", TQMap() ) ); + const STD_NAMESPACE_PREFIX auto_ptr listjob( chiasmus->specialJob( "x-obtain-keys", TQStringVariantMap() ) ); if ( !listjob.get() ) { const TQString msg = i18n( "Chiasmus backend does not offer the " "\"x-obtain-keys\" function. Please report this bug." ); @@ -3280,7 +3280,7 @@ void KMHandleAttachmentCommand::atmEncryptWithChiasmus() GlobalSettings::setChiasmusDecryptionKey( selectorDlg.key() ); assert( !GlobalSettings::chiasmusDecryptionKey().isEmpty() ); - Kleo::SpecialJob * job = chiasmus->specialJob( "x-decrypt", TQMap() ); + Kleo::SpecialJob * job = chiasmus->specialJob( "x-decrypt", TQStringVariantMap() ); if ( !job ) { const TQString msg = i18n( "Chiasmus backend does not offer the " "\"x-decrypt\" function. Please report this bug." ); diff --git a/kmail/kmcomposewin.cpp b/kmail/kmcomposewin.cpp index 2add2b3a..bcdbe4a6 100644 --- a/kmail/kmcomposewin.cpp +++ b/kmail/kmcomposewin.cpp @@ -5311,7 +5311,7 @@ void KMComposeWin::slotEncryptChiasmusToggled( bool on ) { return; } - STD_NAMESPACE_PREFIX auto_ptr job( chiasmus->specialJob( "x-obtain-keys", TQMap() ) ); + STD_NAMESPACE_PREFIX auto_ptr job( chiasmus->specialJob( "x-obtain-keys", TQStringVariantMap() ) ); if ( !job.get() ) { const TQString msg = i18n( "Chiasmus backend does not offer the " "\"x-obtain-keys\" function. Please report this bug." ); diff --git a/kmail/messagecomposer.cpp b/kmail/messagecomposer.cpp index 9b5763dd..60ceed94 100644 --- a/kmail/messagecomposer.cpp +++ b/kmail/messagecomposer.cpp @@ -552,7 +552,7 @@ bool MessageComposer::encryptWithChiasmus( const Kleo::CryptoBackend::Protocol * const TQByteArray& body, TQByteArray& resultData ) { - std::auto_ptr job( chiasmus->specialJob( "x-encrypt", TQMap() ) ); + std::auto_ptr job( chiasmus->specialJob( "x-encrypt", TQStringVariantMap() ) ); if ( !job.get() ) { const TQString msg = i18n( "Chiasmus backend does not offer the " "\"x-encrypt\" function. Please report this bug." ); diff --git a/kmail/objecttreeparser.cpp b/kmail/objecttreeparser.cpp index 2b736d2c..71858bd1 100644 --- a/kmail/objecttreeparser.cpp +++ b/kmail/objecttreeparser.cpp @@ -1853,7 +1853,7 @@ bool ObjectTreeParser::decryptChiasmus( const TQByteArray& data, TQByteArray& bo if ( !chiasmus ) return false; - const STD_NAMESPACE_PREFIX auto_ptr listjob( chiasmus->specialJob( "x-obtain-keys", TQMap() ) ); + const STD_NAMESPACE_PREFIX auto_ptr listjob( chiasmus->specialJob( "x-obtain-keys", TQStringVariantMap() ) ); if ( !listjob.get() ) { errorText = i18n( "Chiasmus backend does not offer the " "\"x-obtain-keys\" function. Please report this bug." ); @@ -1892,7 +1892,7 @@ bool ObjectTreeParser::decryptChiasmus( const TQByteArray& data, TQByteArray& bo GlobalSettings::setChiasmusDecryptionKey( selectorDlg.key() ); assert( !GlobalSettings::chiasmusDecryptionKey().isEmpty() ); - const STD_NAMESPACE_PREFIX auto_ptr job( chiasmus->specialJob( "x-decrypt", TQMap() ) ); + const STD_NAMESPACE_PREFIX auto_ptr job( chiasmus->specialJob( "x-decrypt", TQStringVariantMap() ) ); if ( !job.get() ) { errorText = i18n( "Chiasmus backend does not offer the " "\"x-decrypt\" function. Please report this bug." ); diff --git a/libemailfunctions/idmapper.cpp b/libemailfunctions/idmapper.cpp index 296b3af6..34bcf6cc 100644 --- a/libemailfunctions/idmapper.cpp +++ b/libemailfunctions/idmapper.cpp @@ -95,7 +95,7 @@ bool IdMapper::save() TQString content; - TQMap::Iterator it; + TQStringVariantMap::Iterator it; for ( it = mIdMap.begin(); it != mIdMap.end(); ++it ) { TQString fingerprint( "" ); if ( mFingerprintMap.contains( it.key() ) ) @@ -122,7 +122,7 @@ void IdMapper::setRemoteId( const TQString &localId, const TQString &remoteId ) void IdMapper::removeRemoteId( const TQString &remoteId ) { - TQMap::Iterator it; + TQStringVariantMap::Iterator it; for ( it = mIdMap.begin(); it != mIdMap.end(); ++it ) if ( it.data().toString() == remoteId ) { mIdMap.remove( it ); @@ -133,7 +133,7 @@ void IdMapper::removeRemoteId( const TQString &remoteId ) TQString IdMapper::remoteId( const TQString &localId ) const { - TQMap::ConstIterator it; + TQStringVariantMap::ConstIterator it; it = mIdMap.find( localId ); if ( it != mIdMap.end() ) @@ -144,7 +144,7 @@ TQString IdMapper::remoteId( const TQString &localId ) const TQString IdMapper::localId( const TQString &remoteId ) const { - TQMap::ConstIterator it; + TQStringVariantMap::ConstIterator it; for ( it = mIdMap.begin(); it != mIdMap.end(); ++it ) if ( it.data().toString() == remoteId ) return it.key(); @@ -156,7 +156,7 @@ TQString IdMapper::asString() const { TQString content; - TQMap::ConstIterator it; + TQStringVariantMap::ConstIterator it; for ( it = mIdMap.begin(); it != mIdMap.end(); ++it ) { TQString fp; if ( mFingerprintMap.contains( it.key() ) ) @@ -183,7 +183,7 @@ const TQString& IdMapper::fingerprint( const TQString &localId ) const TQMap IdMapper::remoteIdMap() const { TQMap reverseMap; - TQMap::ConstIterator it; + TQStringVariantMap::ConstIterator it; for ( it = mIdMap.begin(); it != mIdMap.end(); ++it ) { reverseMap.insert( it.data().toString(), it.key() ); } diff --git a/libemailfunctions/idmapper.h b/libemailfunctions/idmapper.h index 7c6c98cf..50075aef 100644 --- a/libemailfunctions/idmapper.h +++ b/libemailfunctions/idmapper.h @@ -147,7 +147,7 @@ class KDE_EXPORT IdMapper TQString filename(); private: - TQMap mIdMap; + TQStringVariantMap mIdMap; TQMap mFingerprintMap; TQString mPath; diff --git a/tderesources/blogging/API_Blogger.cpp b/tderesources/blogging/API_Blogger.cpp index 984cc378..ead54dcd 100644 --- a/tderesources/blogging/API_Blogger.cpp +++ b/tderesources/blogging/API_Blogger.cpp @@ -159,7 +159,7 @@ bool APIBlogger::interpretUserInfoJob( TDEIO::Job *job ) TQValueList::ConstIterator end = posts.end(); for ( ; it != end; ++it ) { kdDebug () << "MIDDLE: " << ( *it ).typeName() << endl; - const TQMap postInfo = ( *it ).toMap(); + const TQStringVariantMap postInfo = ( *it ).toMap(); const TQString nickname = postInfo[ "nickname" ].toString(); const TQString userid = postInfo[ "userid" ].toString(); const TQString email = postInfo[ "email" ].toString(); @@ -188,7 +188,7 @@ kdDebug() << "APIBlogger::interpretListFoldersJob, no error!" << endl; TQValueList::ConstIterator end = posts.end(); for ( ; it != end; ++it ) { kdDebug () << "MIDDLE: " << ( *it ).typeName() << endl; - const TQMap postInfo = ( *it ).toMap(); + const TQStringVariantMap postInfo = ( *it ).toMap(); const TQString id( postInfo[ "blogid" ].toString() ); const TQString name( postInfo[ "blogName" ].toString() ); @@ -230,7 +230,7 @@ bool APIBlogger::interpretDownloadItemsJob( TDEIO::Job *job ) for ( ; it != end; ++it ) { BlogPosting posting; kdDebug () << "MIDDLE: " << ( *it ).typeName() << endl; - const TQMap postInfo = ( *it ).toMap(); + const TQStringVariantMap postInfo = ( *it ).toMap(); if ( readPostingFromMap( &posting, postInfo ) ) { KCal::Journal *j = journalFromPosting( &posting ); // dumpBlog( &posting ); @@ -252,7 +252,7 @@ bool APIBlogger::interpretDownloadItemsJob( TDEIO::Job *job ) } -bool APIBlogger::readPostingFromMap( BlogPosting *post, const TQMap &postInfo ) +bool APIBlogger::readPostingFromMap( BlogPosting *post, const TQStringVariantMap &postInfo ) { // FIXME: if ( !post ) return false; diff --git a/tderesources/blogging/API_Blogger.h b/tderesources/blogging/API_Blogger.h index d7d5f43b..4c78f01f 100644 --- a/tderesources/blogging/API_Blogger.h +++ b/tderesources/blogging/API_Blogger.h @@ -50,7 +50,7 @@ class APIBlogger : public APIBlog bool interpretListItemsJob( TDEIO::Job *job ); bool interpretDownloadItemsJob( TDEIO::Job *job ); protected: - bool readPostingFromMap( BlogPosting *post, const TQMap &postInfo ); + bool readPostingFromMap( BlogPosting *post, const TQStringVariantMap &postInfo ); }; } diff --git a/tderesources/blogging/xmlrpcjob.cpp b/tderesources/blogging/xmlrpcjob.cpp index 5f57f1f6..70eb1d8c 100644 --- a/tderesources/blogging/xmlrpcjob.cpp +++ b/tderesources/blogging/xmlrpcjob.cpp @@ -278,9 +278,9 @@ TQString XmlrpcJob::marshal( const TQVariant &arg ) case TQVariant::Map: { TQString markup = "\r\n"; - TQMap map = arg.toMap(); - TQMap::ConstIterator it = map.begin(); - TQMap::ConstIterator end = map.end(); + TQStringVariantMap map = arg.toMap(); + TQStringVariantMap::ConstIterator it = map.begin(); + TQStringVariantMap::ConstIterator end = map.end(); for ( ; it != end; ++it ) { markup += "\r\n"; @@ -357,7 +357,7 @@ kdDebug()<<"Demarshalling element \"" << elem.text() <<"\"" << endl; } else if ( typeName == "struct" ) { - TQMap map; + TQStringVariantMap map; TQDomNode memberNode = typeElement.firstChild(); while ( !memberNode.isNull() ) { const TQString key = memberNode.toElement().elementsByTagName( "name" ).item( 0 ).toElement().text(); diff --git a/tderesources/egroupware/kcal_resourcexmlrpc.cpp b/tderesources/egroupware/kcal_resourcexmlrpc.cpp index 319c8979..676770ed 100644 --- a/tderesources/egroupware/kcal_resourcexmlrpc.cpp +++ b/tderesources/egroupware/kcal_resourcexmlrpc.cpp @@ -191,7 +191,7 @@ bool ResourceXMLRPC::doOpen() mServer->setUrl( KURL( mPrefs->url() ) ); mServer->setUserAgent( "KDE-Calendar" ); - TQMap args; + TQStringVariantMap args; args.insert( "domain", mPrefs->domain() ); args.insert( "username", mPrefs->user() ); args.insert( "password", mPrefs->password() ); @@ -209,7 +209,7 @@ void ResourceXMLRPC::doClose() { kdDebug(5800) << "ResourceXMLRPC::doClose()" << endl; - TQMap args; + TQStringVariantMap args; args.insert( "sessionid", mSessionID ); args.insert( "kp3", mKp3 ); @@ -238,7 +238,7 @@ bool ResourceXMLRPC::doLoad() mTodoStateMapper.setIdentifier( type() + "_" + identifier() ); mTodoStateMapper.load(); - TQMap args, columns; + TQStringVariantMap args, columns; args.insert( "start", TQDateTime( TQDate::currentDate().addDays( -12 ) ) ); args.insert( "end", TQDateTime( TQDate::currentDate().addDays( 2000 ) ) ); @@ -256,7 +256,7 @@ bool ResourceXMLRPC::doLoad() this, TQT_SLOT( listTodosFinished( const TQValueList&, const TQVariant& ) ), this, TQT_SLOT( fault( int, const TQString&, const TQVariant& ) ) ); - mServer->call( LoadEventCategoriesCommand, TQVariant( TQMap() ), + mServer->call( LoadEventCategoriesCommand, TQVariant( TQStringVariantMap() ), this, TQT_SLOT( loadEventCategoriesFinished( const TQValueList&, const TQVariant& ) ), this, TQT_SLOT( fault( int, const TQString&, const TQVariant& ) ) ); @@ -281,7 +281,7 @@ bool ResourceXMLRPC::doSave() uint counter = 0; for ( evIt = events.begin(); evIt != events.end(); ++evIt ) { if ( !(*evIt)->isReadOnly() ) { - TQMap args; + TQStringVariantMap args; writeEvent( (*evIt), args ); args.insert( "id", idMapper().remoteId( (*evIt)->uid() ).toInt() ); @@ -297,7 +297,7 @@ bool ResourceXMLRPC::doSave() for ( todoIt = todos.begin(); todoIt != todos.end(); ++todoIt ) { if ( !(*todoIt)->isReadOnly() ) { - TQMap args; + TQStringVariantMap args; writeTodo( (*todoIt), args ); args.insert( "id", idMapper().remoteId( (*todoIt)->uid() ).toInt() ); @@ -329,7 +329,7 @@ TDEABC::Lock *ResourceXMLRPC::lock() bool ResourceXMLRPC::addEvent( Event* ev ) { - TQMap args; + TQStringVariantMap args; disableChangeNotification(); @@ -409,7 +409,7 @@ Event::List ResourceXMLRPC::rawEvents() bool ResourceXMLRPC::addTodo( Todo *todo ) { - TQMap args; + TQStringVariantMap args; disableChangeNotification(); @@ -516,7 +516,7 @@ void ResourceXMLRPC::reload() void ResourceXMLRPC::loginFinished( const TQValueList& variant, const TQVariant& ) { - TQMap map = variant[ 0 ].toMap(); + TQStringVariantMap map = variant[ 0 ].toMap(); KURL url = KURL( mPrefs->url() ); if ( map[ "GOAWAY" ].toString() == "XOXO" ) { // failed @@ -536,7 +536,7 @@ void ResourceXMLRPC::loginFinished( const TQValueList& variant, void ResourceXMLRPC::logoutFinished( const TQValueList& variant, const TQVariant& ) { - TQMap map = variant[ 0 ].toMap(); + TQStringVariantMap map = variant[ 0 ].toMap(); if ( map[ "GOODBYE" ].toString() != "XOXO" ) kdError() << "logout failed" << endl; @@ -562,7 +562,7 @@ void ResourceXMLRPC::listEventsFinished( const TQValueList& list, bool changed = false; for ( eventIt = eventList.begin(); eventIt != eventList.end(); ++eventIt ) { - TQMap map = (*eventIt).toMap(); + TQStringVariantMap map = (*eventIt).toMap(); Event *event = new Event; event->setFloats( false ); @@ -644,8 +644,8 @@ void ResourceXMLRPC::loadEventCategoriesFinished( const TQValueList & { mEventCategoryMap.clear(); - const TQMap map = mapList[ 0 ].toMap(); - TQMap::ConstIterator it; + const TQStringVariantMap map = mapList[ 0 ].toMap(); + TQStringVariantMap::ConstIterator it; KPimPrefs prefs( "korganizerrc" ); for ( it = map.begin(); it != map.end(); ++it ) { @@ -673,7 +673,7 @@ void ResourceXMLRPC::listTodosFinished( const TQValueList& list, bool changed = false; for ( todoIt = todoList.begin(); todoIt != todoList.end(); ++todoIt ) { - TQMap map = (*todoIt).toMap(); + TQStringVariantMap map = (*todoIt).toMap(); Todo *todo = new Todo; @@ -749,8 +749,8 @@ void ResourceXMLRPC::loadTodoCategoriesFinished( const TQValueList &m { mTodoCategoryMap.clear(); - const TQMap map = mapList[ 0 ].toMap(); - TQMap::ConstIterator it; + const TQStringVariantMap map = mapList[ 0 ].toMap(); + TQStringVariantMap::ConstIterator it; KPimPrefs prefs( "korganizerrc" ); for ( it = map.begin(); it != map.end(); ++it ) { @@ -773,7 +773,7 @@ void ResourceXMLRPC::fault( int error, const TQString& errorMsg, mSynchronizer->stop(); } -void ResourceXMLRPC::readEvent( const TQMap &args, Event *event, +void ResourceXMLRPC::readEvent( const TQStringVariantMap &args, Event *event, TQString &uid ) { // for recurrence @@ -784,7 +784,7 @@ void ResourceXMLRPC::readEvent( const TQMap &args, Event *e TQDateTime rEndDate; TQValueList rExceptions; - TQMap::ConstIterator it; + TQStringVariantMap::ConstIterator it; for ( it = args.begin(); it != args.end(); ++it ) { if ( it.key() == "id" ) { uid = it.data().toString(); @@ -816,8 +816,8 @@ void ResourceXMLRPC::readEvent( const TQMap &args, Event *e event->setSecrecy( (it.data().toString() == "public" ? Incidence::SecrecyPublic : Incidence::SecrecyPrivate) ); } else if ( it.key() == "category" ) { - const TQMap categories = it.data().toMap(); - TQMap::ConstIterator catIt; + const TQStringVariantMap categories = it.data().toMap(); + TQStringVariantMap::ConstIterator catIt; TQStringList eventCategories; for ( catIt = categories.begin(); catIt != categories.end(); ++catIt ) { @@ -850,17 +850,17 @@ void ResourceXMLRPC::readEvent( const TQMap &args, Event *e } else if ( it.key() == "recur_data" ) { rData = it.data().toInt(); } else if ( it.key() == "recur_exception" ) { - const TQMap dateList = it.data().toMap(); - TQMap::ConstIterator dateIt; + const TQStringVariantMap dateList = it.data().toMap(); + TQStringVariantMap::ConstIterator dateIt; for ( dateIt = dateList.begin(); dateIt != dateList.end(); ++dateIt ) rExceptions.append( (*dateIt).toDateTime() ); } else if ( it.key() == "participants" ) { - const TQMap persons = it.data().toMap(); - TQMap::ConstIterator personsIt; + const TQStringVariantMap persons = it.data().toMap(); + TQStringVariantMap::ConstIterator personsIt; for ( personsIt = persons.begin(); personsIt != persons.end(); ++personsIt ) { - TQMap person = (*personsIt).toMap(); + TQStringVariantMap person = (*personsIt).toMap(); Attendee::PartStat status = Attendee::InProcess; if ( person[ "status" ] == "A" ) status = Attendee::Accepted; @@ -878,11 +878,11 @@ void ResourceXMLRPC::readEvent( const TQMap &args, Event *e event->addAttendee( attendee ); } } else if ( it.key() == "alarm" ) { - const TQMap alarmList = it.data().toMap(); - TQMap::ConstIterator alarmIt; + const TQStringVariantMap alarmList = it.data().toMap(); + TQStringVariantMap::ConstIterator alarmIt; for ( alarmIt = alarmList.begin(); alarmIt != alarmList.end(); ++alarmIt ) { - TQMap alarm = (*alarmIt).toMap(); + TQStringVariantMap alarm = (*alarmIt).toMap(); Alarm *vAlarm = event->newAlarm(); vAlarm->setText( event->summary() ); @@ -940,7 +940,7 @@ void ResourceXMLRPC::readEvent( const TQMap &args, Event *e setRights( event, rights ); } -void ResourceXMLRPC::writeEvent( Event *event, TQMap &args ) +void ResourceXMLRPC::writeEvent( Event *event, TQStringVariantMap &args ) { args.insert( "start", event->dtStart() ); @@ -961,7 +961,7 @@ void ResourceXMLRPC::writeEvent( Event *event, TQMap &args // CATEGORY const TQStringList categories = event->categories(); TQStringList::ConstIterator catIt; - TQMap catMap; + TQStringVariantMap catMap; int counter = 0; for ( catIt = categories.begin(); catIt != categories.end(); ++catIt ) { TQMap::Iterator it = mEventCategoryMap.find( *catIt ); @@ -990,7 +990,7 @@ void ResourceXMLRPC::writeEvent( Event *event, TQMap &args args.insert( "recur_interval", int( 0 ) ); args.insert( "recur_enddate", TQDateTime() ); args.insert( "recur_data", int( 0 ) ); - args.insert( "recur_exception", TQMap() ); + args.insert( "recur_exception", TQStringVariantMap() ); } else { switch ( rec->recurrenceType() ) { case Recurrence::rDaily: @@ -1036,7 +1036,7 @@ void ResourceXMLRPC::writeEvent( Event *event, TQMap &args // TODO: Also use exception dates! const TQValueList dates = event->recurrence()->exDateTimes(); TQValueList::ConstIterator dateIt; - TQMap exMap; + TQStringVariantMap exMap; int counter = 0; for ( dateIt = dates.begin(); dateIt != dates.end(); ++dateIt, ++counter ) exMap.insert( TQString::number( counter ), *dateIt ); @@ -1047,9 +1047,9 @@ void ResourceXMLRPC::writeEvent( Event *event, TQMap &args // PARTICIPANTS const Attendee::List attendees = event->attendees(); Attendee::List::ConstIterator attIt; - TQMap persons; + TQStringVariantMap persons; for ( attIt = attendees.begin(); attIt != attendees.end(); ++attIt ) { - TQMap person; + TQStringVariantMap person; TQString status; if ( (*attIt)->status() == Attendee::Accepted ) @@ -1072,9 +1072,9 @@ void ResourceXMLRPC::writeEvent( Event *event, TQMap &args // ALARMS const Alarm::List alarms = event->alarms(); Alarm::List::ConstIterator alarmIt; - TQMap alarmMap; + TQStringVariantMap alarmMap; for ( alarmIt = alarms.begin(); alarmIt != alarms.end(); ++alarmIt ) { - TQMap alarm; + TQStringVariantMap alarm; alarm.insert( "time", (*alarmIt)->time() ); alarm.insert( "offset", (*alarmIt)->startOffset().asSeconds() ); alarm.insert( "enabled", ( (*alarmIt)->enabled() ? int( 1 ) : int( 0 ) ) ); @@ -1085,7 +1085,7 @@ void ResourceXMLRPC::writeEvent( Event *event, TQMap &args args.insert( "alarm", alarmMap ); } -void ResourceXMLRPC::writeTodo( Todo* todo, TQMap& args ) +void ResourceXMLRPC::writeTodo( Todo* todo, TQStringVariantMap& args ) { args.insert( "subject", todo->summary() ); args.insert( "des", todo->description() ); @@ -1093,7 +1093,7 @@ void ResourceXMLRPC::writeTodo( Todo* todo, TQMap& args ) (todo->secrecy() == Todo::SecrecyPublic ? "public" : "private" ) ); // CATEGORIES - TQMap catMap; + TQStringVariantMap catMap; const TQStringList categories = todo->categories(); TQStringList::ConstIterator catIt; @@ -1124,7 +1124,7 @@ void ResourceXMLRPC::writeTodo( Todo* todo, TQMap& args ) args.insert( "status", status ); } -void ResourceXMLRPC::readTodo( const TQMap& args, Todo *todo, TQString &uid ) +void ResourceXMLRPC::readTodo( const TQStringVariantMap& args, Todo *todo, TQString &uid ) { uid = args[ "id" ].toString(); @@ -1141,8 +1141,8 @@ void ResourceXMLRPC::readTodo( const TQMap& args, Todo *tod todo->setSecrecy( args[ "access" ].toString() == "public" ? Todo::SecrecyPublic : Todo::SecrecyPrivate ); // CATEGORIES - const TQMap categories = args[ "category" ].toMap(); - TQMap::ConstIterator it; + const TQStringVariantMap categories = args[ "category" ].toMap(); + TQStringVariantMap::ConstIterator it; TQStringList todoCategories; for ( it = categories.begin(); it != categories.end(); ++it ) { diff --git a/tderesources/egroupware/kcal_resourcexmlrpc.h b/tderesources/egroupware/kcal_resourcexmlrpc.h index 27199581..776bc68b 100644 --- a/tderesources/egroupware/kcal_resourcexmlrpc.h +++ b/tderesources/egroupware/kcal_resourcexmlrpc.h @@ -206,11 +206,11 @@ class KDE_EXPORT ResourceXMLRPC : public ResourceCached void init(); void initEGroupware(); - void writeEvent( Event*, TQMap& ); - void readEvent( const TQMap&, Event*, TQString& ); + void writeEvent( Event*, TQStringVariantMap& ); + void readEvent( const TQStringVariantMap&, Event*, TQString& ); - void writeTodo( Todo*, TQMap& ); - void readTodo( const TQMap&, Todo*, TQString& ); + void writeTodo( Todo*, TQStringVariantMap& ); + void readTodo( const TQStringVariantMap&, Todo*, TQString& ); void checkLoadingFinished(); diff --git a/tderesources/egroupware/knotes_resourcexmlrpc.cpp b/tderesources/egroupware/knotes_resourcexmlrpc.cpp index 15d76b23..9a477076 100644 --- a/tderesources/egroupware/knotes_resourcexmlrpc.cpp +++ b/tderesources/egroupware/knotes_resourcexmlrpc.cpp @@ -117,7 +117,7 @@ bool ResourceXMLRPC::load() mServer->setUrl( KURL( mPrefs->url() ) ); mServer->setUserAgent( "KDE-Notes" ); - TQMap args, columns; + TQStringVariantMap args, columns; args.insert( "domain", mPrefs->domain() ); args.insert( "username", mPrefs->user() ); args.insert( "password", mPrefs->password() ); @@ -152,7 +152,7 @@ bool ResourceXMLRPC::save() bool ResourceXMLRPC::addNote( KCal::Journal *journal ) { - TQMap args; + TQStringVariantMap args; writeNote( journal, args ); KCal::Journal *oldJournal = mCalendar.journal( journal->uid() ); @@ -223,7 +223,7 @@ KCal::Alarm::List ResourceXMLRPC::alarms( const TQDateTime& from, const TQDateTi void ResourceXMLRPC::loginFinished( const TQValueList& variant, const TQVariant& ) { - TQMap map = variant[ 0 ].toMap(); + TQStringVariantMap map = variant[ 0 ].toMap(); KURL url = KURL( mPrefs->url() ); if ( map[ "GOAWAY" ].toString() == "XOXO" ) { // failed @@ -243,7 +243,7 @@ void ResourceXMLRPC::loginFinished( const TQValueList& variant, void ResourceXMLRPC::logoutFinished( const TQValueList& variant, const TQVariant& ) { - TQMap map = variant[ 0 ].toMap(); + TQStringVariantMap map = variant[ 0 ].toMap(); if ( map[ "GOODBYE" ].toString() != "XOXO" ) kdError() << "logout failed" << endl; @@ -271,7 +271,7 @@ void ResourceXMLRPC::listNotesFinished( const TQValueList &list, cons TQValueList::Iterator noteIt; for ( noteIt = noteList.begin(); noteIt != noteList.end(); ++noteIt ) { - TQMap map = (*noteIt).toMap(); + TQStringVariantMap map = (*noteIt).toMap(); KCal::Journal *journal = new KCal::Journal(); @@ -315,7 +315,7 @@ void ResourceXMLRPC::fault( int error, const TQString& errorMsg, const TQVariant mSynchronizer->stop(); } -void ResourceXMLRPC::writeNote( KCal::Journal* journal, TQMap& args ) +void ResourceXMLRPC::writeNote( KCal::Journal* journal, TQStringVariantMap& args ) { args.insert( "subject", journal->summary() ); args.insert( "des", journal->description() ); @@ -323,7 +323,7 @@ void ResourceXMLRPC::writeNote( KCal::Journal* journal, TQMapsecrecy() == KCal::Journal::SecrecyPublic ? "public" : "private" ) ); } -void ResourceXMLRPC::readNote( const TQMap& args, KCal::Journal *journal, TQString &uid ) +void ResourceXMLRPC::readNote( const TQStringVariantMap& args, KCal::Journal *journal, TQString &uid ) { uid = args[ "id" ].toString(); diff --git a/tderesources/egroupware/knotes_resourcexmlrpc.h b/tderesources/egroupware/knotes_resourcexmlrpc.h index 3550aed4..2e91d66f 100644 --- a/tderesources/egroupware/knotes_resourcexmlrpc.h +++ b/tderesources/egroupware/knotes_resourcexmlrpc.h @@ -84,8 +84,8 @@ class KDE_EXPORT ResourceXMLRPC : public ResourceNotes void init(); void initEGroupware(); - void writeNote( KCal::Journal*, TQMap& ); - void readNote( const TQMap&, KCal::Journal*, TQString& ); + void writeNote( KCal::Journal*, TQStringVariantMap& ); + void readNote( const TQStringVariantMap&, KCal::Journal*, TQString& ); KCal::CalendarLocal mCalendar; KXMLRPC::Server *mServer; diff --git a/tderesources/egroupware/tdeabc_resourcexmlrpc.cpp b/tderesources/egroupware/tdeabc_resourcexmlrpc.cpp index 5f92d1c5..dd791cd8 100644 --- a/tderesources/egroupware/tdeabc_resourcexmlrpc.cpp +++ b/tderesources/egroupware/tdeabc_resourcexmlrpc.cpp @@ -153,7 +153,7 @@ bool ResourceXMLRPC::doOpen() mServer->setUrl( KURL( mPrefs->url() ) ); mServer->setUserAgent( "KDE-AddressBook" ); - TQMap args; + TQStringVariantMap args; args.insert( "domain", mPrefs->domain() ); args.insert( "username", mPrefs->user() ); args.insert( "password", mPrefs->password() ); @@ -169,7 +169,7 @@ bool ResourceXMLRPC::doOpen() void ResourceXMLRPC::doClose() { - TQMap args; + TQStringVariantMap args; args.insert( "sessionid", mSessionID ); args.insert( "kp3", mKp3 ); @@ -196,7 +196,7 @@ bool ResourceXMLRPC::asyncLoad() loadCache(); - TQMap args; + TQStringVariantMap args; args.insert( "start", "0" ); args.insert( "query", "" ); args.insert( "filter", "" ); @@ -249,7 +249,7 @@ bool ResourceXMLRPC::asyncSave( Ticket* ) void ResourceXMLRPC::addContact( const Addressee& addr ) { - TQMap args; + TQStringVariantMap args; writeContact( addr, args ); mServer->call( AddContactCommand, args, @@ -265,7 +265,7 @@ void ResourceXMLRPC::updateContact( const Addressee& addr ) return; } - TQMap args; + TQStringVariantMap args; writeContact( addr, args ); args.insert( "id", idMapper().remoteId( addr.uid() ) ); @@ -292,7 +292,7 @@ void ResourceXMLRPC::deleteContact( const Addressee& addr ) void ResourceXMLRPC::loginFinished( const TQValueList &variant, const TQVariant& ) { - TQMap 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 &variant, void ResourceXMLRPC::logoutFinished( const TQValueList &variant, const TQVariant& ) { - TQMap 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 &mapList TDEABC::Addressee::List serverContacts; for ( contactIt = contactList.begin(); contactIt != contactList.end(); ++contactIt ) { - const TQMap 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 &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 catMap; + TQStringVariantMap catMap; int counter = 0; for ( catIt = categories.begin(); catIt != categories.end(); ++catIt ) { TQMap::ConstIterator it = mCategoryMap.find( *catIt ); @@ -593,11 +593,11 @@ void ResourceXMLRPC::writeContact( const Addressee &addr, TQMap &args, Addressee &addr, TQString &uid ) +void ResourceXMLRPC::readContact( const TQStringVariantMap &args, Addressee &addr, TQString &uid ) { Address addrOne, addrTwo; - TQMap::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 &args, Addres addr.insertEmail( it.data().toString(), false ); } else if ( it.key() == "email_home_type" ) { } else if ( it.key() == "cat_id" ) { - const TQMap categories = it.data().toMap(); - TQMap::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 &mapLi { mCategoryMap.clear(); - const TQMap map = mapList[ 0 ].toMap(); - TQMap::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 &map { mCustomFieldsMap.clear(); - const TQMap map = mapList[ 0 ].toMap(); - TQMap::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() ); diff --git a/tderesources/egroupware/tdeabc_resourcexmlrpc.h b/tderesources/egroupware/tdeabc_resourcexmlrpc.h index 719c35c0..6458b809 100644 --- a/tderesources/egroupware/tdeabc_resourcexmlrpc.h +++ b/tderesources/egroupware/tdeabc_resourcexmlrpc.h @@ -91,8 +91,8 @@ class KDE_EXPORT ResourceXMLRPC : public ResourceCached TQString addrTypesToTypeStr( int ); - void writeContact( const Addressee&, TQMap& ); - void readContact( const TQMap&, Addressee &addr, TQString& ); + void writeContact( const Addressee&, TQStringVariantMap& ); + void readContact( const TQStringVariantMap&, Addressee &addr, TQString& ); EGroupwarePrefs *mPrefs; diff --git a/tderesources/egroupware/xmlrpciface.cpp b/tderesources/egroupware/xmlrpciface.cpp index dbbabc68..4afb0b84 100644 --- a/tderesources/egroupware/xmlrpciface.cpp +++ b/tderesources/egroupware/xmlrpciface.cpp @@ -237,9 +237,9 @@ TQString Query::marshal( const TQVariant &arg ) const case TQVariant::Map: { TQString markup = "\r\n"; - TQMap map = arg.toMap(); - TQMap::ConstIterator it = map.begin(); - TQMap::ConstIterator end = map.end(); + TQStringVariantMap map = arg.toMap(); + TQStringVariantMap::ConstIterator it = map.begin(); + TQStringVariantMap::ConstIterator end = map.end(); for ( ; it != end; ++it ) { markup += "\r\n"; @@ -293,7 +293,7 @@ TQVariant Query::demarshal( const TQDomElement &elem ) const } else if ( typeName == "struct" ) { - TQMap map; + TQStringVariantMap map; TQDomNode memberNode = typeElement.firstChild(); while ( !memberNode.isNull() ) { -- cgit v1.2.3