1 files changed, 18 insertions, 18 deletions

diff --git a/tderesources/egroupware/knotes_resourcexmlrpc.cpp b/tderesources/egroupware/knotes_resourcexmlrpc.cpp
index 15d76b23..80262ed7 100644
--- a/tderesources/egroupware/knotes_resourcexmlrpc.cpp
+++ b/tderesources/egroupware/knotes_resourcexmlrpc.cpp
@@ -24,7 +24,7 @@
 
 #include <kdebug.h>
 #include <tdelocale.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <kstringhandler.h>
 #include <kurl.h>
 
@@ -117,14 +117,14 @@ bool ResourceXMLRPC::load()
   mServer->setUrl( KURL( mPrefs->url() ) );
   mServer->setUserAgent( "KDE-Notes" );
 
-  TQMap<TQString, TQVariant> args, columns;
+  TQStringVariantMap args, columns;
   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();
 
@@ -135,8 +135,8 @@ bool ResourceXMLRPC::load()
   args.insert( "order", "id_parent" );
 
   mServer->call( SearchNotesCommand, args,
-                 this, TQT_SLOT( listNotesFinished( const TQValueList<TQVariant>&, const TQVariant& ) ),
-                 this, TQT_SLOT( fault( int, const TQString&, const TQVariant& ) ) );
+                 this, TQ_SLOT( listNotesFinished( const TQValueList<TQVariant>&, const TQVariant& ) ),
+                 this, TQ_SLOT( fault( int, const TQString&, const TQVariant& ) ) );
 
   mSynchronizer->start();
 
@@ -152,7 +152,7 @@ bool ResourceXMLRPC::save()
 
 bool ResourceXMLRPC::addNote( KCal::Journal *journal )
 {
-  TQMap<TQString, TQVariant> args;
+  TQStringVariantMap args;
   writeNote( journal, args );
 
   KCal::Journal *oldJournal = mCalendar.journal( journal->uid() );
@@ -163,15 +163,15 @@ bool ResourceXMLRPC::addNote( KCal::Journal *journal )
       writeNote( journal, args );
       args.insert( "id", mUidMap[ journal->uid() ].toInt() );
       mServer->call( AddNoteCommand, TQVariant( args ),
-                     this, TQT_SLOT( updateNoteFinished( const TQValueList<TQVariant>&, const TQVariant& ) ),
-                     this, TQT_SLOT( fault( int, const TQString&, const TQVariant& ) ) );
+                     this, TQ_SLOT( updateNoteFinished( const TQValueList<TQVariant>&, const TQVariant& ) ),
+                     this, TQ_SLOT( fault( int, const TQString&, const TQVariant& ) ) );
       mCalendar.addJournal( journal );
       added = true;
     }
   } else {
     mServer->call( AddNoteCommand, TQVariant( args ),
-                   this, TQT_SLOT( addNoteFinished( const TQValueList<TQVariant>&, const TQVariant& ) ),
-                   this, TQT_SLOT( fault( int, const TQString&, const TQVariant& ) ),
+                   this, TQ_SLOT( addNoteFinished( const TQValueList<TQVariant>&, const TQVariant& ) ),
+                   this, TQ_SLOT( fault( int, const TQString&, const TQVariant& ) ),
                    TQVariant( journal->uid() ) );
 
     mCalendar.addJournal( journal );
@@ -189,8 +189,8 @@ bool ResourceXMLRPC::deleteNote( KCal::Journal *journal )
   int id = mUidMap[ journal->uid() ].toInt();
 
   mServer->call( DeleteNoteCommand, id,
-                 this, TQT_SLOT( deleteNoteFinished( const TQValueList<TQVariant>&, const TQVariant& ) ),
-                 this, TQT_SLOT( fault( int, const TQString&, const TQVariant& ) ),
+                 this, TQ_SLOT( deleteNoteFinished( const TQValueList<TQVariant>&, const TQVariant& ) ),
+                 this, TQ_SLOT( fault( int, const TQString&, const TQVariant& ) ),
                  TQVariant( journal->uid() ) );
   mSynchronizer->start();
 
@@ -223,7 +223,7 @@ KCal::Alarm::List ResourceXMLRPC::alarms( const TQDateTime& from, const TQDateTi
 void ResourceXMLRPC::loginFinished( const TQValueList<TQVariant>& variant,
                                     const TQVariant& )
 {
-  TQMap<TQString, TQVariant> 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<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" )
     kdError() << "logout failed" << endl;
@@ -271,7 +271,7 @@ void ResourceXMLRPC::listNotesFinished( const TQValueList<TQVariant> &list, cons
   TQValueList<TQVariant>::Iterator noteIt;
 
   for ( noteIt = noteList.begin(); noteIt != noteList.end(); ++noteIt ) {
-    TQMap<TQString, TQVariant> 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<TQString, TQVariant>& 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, TQMap<TQString, TQVarian
                (journal->secrecy() == KCal::Journal::SecrecyPublic ? "public" : "private" ) );
 }
 
-void ResourceXMLRPC::readNote( const TQMap<TQString, TQVariant>& args, KCal::Journal *journal, TQString &uid )
+void ResourceXMLRPC::readNote( const TQStringVariantMap& args, KCal::Journal *journal, TQString &uid )
 {
   uid = args[ "id" ].toString();