Use new TQ_METHOD, TQ_SIGNAL, TQ_SLOT defines

Signed-off-by: Michele Calgaro <[email protected]>
(cherry picked from commit 3b3f9ec8f31978030c17309fae48335bea5c1587)

5 files changed, 63 insertions, 63 deletions

diff --git a/tderesources/egroupware/kcal_resourcexmlrpc.cpp b/tderesources/egroupware/kcal_resourcexmlrpc.cpp
index 676770ed7..9ccc24b53 100644
--- a/tderesources/egroupware/kcal_resourcexmlrpc.cpp
+++ b/tderesources/egroupware/kcal_resourcexmlrpc.cpp
@@ -197,8 +197,8 @@ bool ResourceXMLRPC::doOpen()
   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();
 
@@ -214,8 +214,8 @@ void ResourceXMLRPC::doClose()
   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();
 }
@@ -243,8 +243,8 @@ bool ResourceXMLRPC::doLoad()
   args.insert( "end", TQDateTime( TQDate::currentDate().addDays( 2000 ) ) );
 
   mServer->call( SearchEventsCommand, args,
-                 this, TQT_SLOT( listEventsFinished( const TQValueList<TQVariant>&, const TQVariant& ) ),
-                 this, TQT_SLOT( fault( int, const TQString&, const TQVariant& ) ) );
+                 this, TQ_SLOT( listEventsFinished( const TQValueList<TQVariant>&, const TQVariant& ) ),
+                 this, TQ_SLOT( fault( int, const TQString&, const TQVariant& ) ) );
   args.clear();
 
   columns.insert( "type", "task" );
@@ -253,16 +253,16 @@ bool ResourceXMLRPC::doLoad()
   args.insert( "order", "id_parent" );
 
   mServer->call( SearchTodosCommand, args,
-                 this, TQT_SLOT( listTodosFinished( const TQValueList<TQVariant>&, const TQVariant& ) ),
-                 this, TQT_SLOT( fault( int, const TQString&, const TQVariant& ) ) );
+                 this, TQ_SLOT( listTodosFinished( const TQValueList<TQVariant>&, const TQVariant& ) ),
+                 this, TQ_SLOT( fault( int, const TQString&, const TQVariant& ) ) );
 
   mServer->call( LoadEventCategoriesCommand, TQVariant( TQStringVariantMap() ),
-                 this, TQT_SLOT( loadEventCategoriesFinished( const TQValueList<TQVariant>&, const TQVariant& ) ),
-                 this, TQT_SLOT( fault( int, const TQString&, const TQVariant& ) ) );
+                 this, TQ_SLOT( loadEventCategoriesFinished( const TQValueList<TQVariant>&, const TQVariant& ) ),
+                 this, TQ_SLOT( fault( int, const TQString&, const TQVariant& ) ) );
 
   mServer->call( LoadTodoCategoriesCommand, TQVariant( false ),
-                 this, TQT_SLOT( loadTodoCategoriesFinished( const TQValueList<TQVariant>&, const TQVariant& ) ),
-                 this, TQT_SLOT( fault( int, const TQString&, const TQVariant& ) ) );
+                 this, TQ_SLOT( loadTodoCategoriesFinished( const TQValueList<TQVariant>&, const TQVariant& ) ),
+                 this, TQ_SLOT( fault( int, const TQString&, const TQVariant& ) ) );
   return true;
 }
 
@@ -286,8 +286,8 @@ bool ResourceXMLRPC::doSave()
 
       args.insert( "id", idMapper().remoteId( (*evIt)->uid() ).toInt() );
       mServer->call( AddEventCommand, TQVariant( args ),
-                     this, TQT_SLOT( updateEventFinished( const TQValueList<TQVariant>&, const TQVariant& ) ),
-                     this, TQT_SLOT( fault( int, const TQString&, const TQVariant& ) ) );
+                     this, TQ_SLOT( updateEventFinished( const TQValueList<TQVariant>&, const TQVariant& ) ),
+                     this, TQ_SLOT( fault( int, const TQString&, const TQVariant& ) ) );
       counter++;
     }
   }
@@ -302,8 +302,8 @@ bool ResourceXMLRPC::doSave()
 
       args.insert( "id", idMapper().remoteId( (*todoIt)->uid() ).toInt() );
       mServer->call( AddTodoCommand, TQVariant( args ),
-                     this, TQT_SLOT( updateTodoFinished( const TQValueList<TQVariant>&, const TQVariant& ) ),
-                     this, TQT_SLOT( fault( int, const TQString&, const TQVariant& ) ) );
+                     this, TQ_SLOT( updateTodoFinished( const TQValueList<TQVariant>&, const TQVariant& ) ),
+                     this, TQ_SLOT( fault( int, const TQString&, const TQVariant& ) ) );
       counter++;
     }
   }
@@ -340,8 +340,8 @@ bool ResourceXMLRPC::addEvent( Event* ev )
       writeEvent( ev, args );
       args.insert( "id", idMapper().remoteId( ev->uid() ).toInt() );
       mServer->call( AddEventCommand, TQVariant( args ),
-                     this, TQT_SLOT( updateEventFinished( const TQValueList<TQVariant>&, const TQVariant& ) ),
-                     this, TQT_SLOT( fault( int, const TQString&, const TQVariant& ) ) );
+                     this, TQ_SLOT( updateEventFinished( const TQValueList<TQVariant>&, const TQVariant& ) ),
+                     this, TQ_SLOT( fault( int, const TQString&, const TQVariant& ) ) );
 
       mCalendar.deleteIncidence( oldEvent );
       mCalendar.addIncidence( ev );
@@ -350,8 +350,8 @@ bool ResourceXMLRPC::addEvent( Event* ev )
   } else { // new event
     writeEvent( ev, args );
     mServer->call( AddEventCommand, TQVariant( args ),
-                   this, TQT_SLOT( addEventFinished( const TQValueList<TQVariant>&, const TQVariant& ) ),
-                   this, TQT_SLOT( fault( int, const TQString&, const TQVariant& ) ),
+                   this, TQ_SLOT( addEventFinished( const TQValueList<TQVariant>&, const TQVariant& ) ),
+                   this, TQ_SLOT( fault( int, const TQString&, const TQVariant& ) ),
                    TQVariant( ev->uid() ) );
 
     mCalendar.addEvent( ev );
@@ -369,9 +369,9 @@ bool ResourceXMLRPC::deleteEvent( Event* ev )
     return false;
 
   mServer->call( DeleteEventCommand, idMapper().remoteId( ev->uid() ).toInt(),
-                 this, TQT_SLOT( deleteEventFinished( const TQValueList<TQVariant>&,
+                 this, TQ_SLOT( deleteEventFinished( const TQValueList<TQVariant>&,
                                                   const TQVariant& ) ),
-                 this, TQT_SLOT( fault( int, const TQString&, const TQVariant& ) ),
+                 this, TQ_SLOT( fault( int, const TQString&, const TQVariant& ) ),
                  TQVariant( ev->uid() ) );
   return true;
 }
@@ -420,8 +420,8 @@ bool ResourceXMLRPC::addTodo( Todo *todo )
       writeTodo( todo, args );
       args.insert( "id", idMapper().remoteId( todo->uid() ).toInt() );
       mServer->call( AddTodoCommand, TQVariant( args ),
-                     this, TQT_SLOT( updateTodoFinished( const TQValueList<TQVariant>&, const TQVariant& ) ),
-                     this, TQT_SLOT( fault( int, const TQString&, const TQVariant& ) ) );
+                     this, TQ_SLOT( updateTodoFinished( const TQValueList<TQVariant>&, const TQVariant& ) ),
+                     this, TQ_SLOT( fault( int, const TQString&, const TQVariant& ) ) );
 
       mCalendar.deleteIncidence( oldTodo );
       mCalendar.addIncidence( todo );
@@ -430,8 +430,8 @@ bool ResourceXMLRPC::addTodo( Todo *todo )
   } else { // new todo
     writeTodo( todo, args );
     mServer->call( AddTodoCommand, TQVariant( args ),
-                   this, TQT_SLOT( addTodoFinished( const TQValueList<TQVariant>&, const TQVariant& ) ),
-                   this, TQT_SLOT( fault( int, const TQString&, const TQVariant& ) ),
+                   this, TQ_SLOT( addTodoFinished( const TQValueList<TQVariant>&, const TQVariant& ) ),
+                   this, TQ_SLOT( fault( int, const TQString&, const TQVariant& ) ),
                    TQVariant( todo->uid() ) );
 
     mCalendar.addTodo( todo );
@@ -449,9 +449,9 @@ bool ResourceXMLRPC::deleteTodo( Todo *todo )
     return false;
 
   mServer->call( DeleteTodoCommand, idMapper().remoteId( todo->uid() ).toInt(),
-                 this, TQT_SLOT( deleteTodoFinished( const TQValueList<TQVariant>&,
+                 this, TQ_SLOT( deleteTodoFinished( const TQValueList<TQVariant>&,
                                                  const TQVariant& ) ),
-                 this, TQT_SLOT( fault( int, const TQString&, const TQVariant& ) ),
+                 this, TQ_SLOT( fault( int, const TQString&, const TQVariant& ) ),
                  TQVariant( todo->uid() ) );
   return true;
 }
diff --git a/tderesources/egroupware/knotes_resourcexmlrpc.cpp b/tderesources/egroupware/knotes_resourcexmlrpc.cpp
index 9a4770760..05306c876 100644
--- a/tderesources/egroupware/knotes_resourcexmlrpc.cpp
+++ b/tderesources/egroupware/knotes_resourcexmlrpc.cpp
@@ -123,8 +123,8 @@ bool ResourceXMLRPC::load()
   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();
 
@@ -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();
 
diff --git a/tderesources/egroupware/synchronizer.h b/tderesources/egroupware/synchronizer.h
index ed9fd1353..9e14fd93a 100644
--- a/tderesources/egroupware/synchronizer.h
+++ b/tderesources/egroupware/synchronizer.h
@@ -37,8 +37,8 @@
     ...
 
     job = TDEIO::file_copy( url, file, -1, true );
-    connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ),
-             TQT_SLOT( slotResult( TDEIO::Job * ) ) );
+    connect( job, TQ_SIGNAL( result( TDEIO::Job * ) ),
+             TQ_SLOT( slotResult( TDEIO::Job * ) ) );
 
     mSynchronizer.start(); // will block here until the slot was called
     ...
diff --git a/tderesources/egroupware/tdeabc_resourcexmlrpc.cpp b/tderesources/egroupware/tdeabc_resourcexmlrpc.cpp
index dd791cd87..4e95f792d 100644
--- a/tderesources/egroupware/tdeabc_resourcexmlrpc.cpp
+++ b/tderesources/egroupware/tdeabc_resourcexmlrpc.cpp
@@ -159,8 +159,8 @@ bool ResourceXMLRPC::doOpen()
   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();
 
@@ -174,8 +174,8 @@ void ResourceXMLRPC::doClose()
   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();
 }
@@ -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 ),
-                 this, TQT_SLOT( loadCategoriesFinished( const TQValueList<TQVariant>&, const TQVariant& ) ),
-                 this, TQT_SLOT( fault( int, const TQString&, const TQVariant& ) ) );
+                 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;
 }
@@ -253,8 +253,8 @@ void ResourceXMLRPC::addContact( const Addressee& addr )
   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() ) );
 }
 
@@ -270,8 +270,8 @@ void ResourceXMLRPC::updateContact( const Addressee& addr )
 
   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,8 +284,8 @@ 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() ) );
 }
 
diff --git a/tderesources/egroupware/xmlrpciface.cpp b/tderesources/egroupware/xmlrpciface.cpp
index 3f4b9aa47..29d5563ec 100644
--- a/tderesources/egroupware/xmlrpciface.cpp
+++ b/tderesources/egroupware/xmlrpciface.cpp
@@ -78,10 +78,10 @@ void Query::call( const TQString &server, const TQString &method,
   job->addMetaData( "content-type", "Content-Type: text/xml; charset=utf-8" );
   job->addMetaData( "ConnectTimeout", "50" );
 
-  connect( job, TQT_SIGNAL( data( TDEIO::Job *, const TQByteArray & ) ),
-           this, TQT_SLOT( slotData( TDEIO::Job *, const TQByteArray & ) ) );
-  connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ),
-           this, TQT_SLOT( slotResult( TDEIO::Job * ) ) );
+  connect( job, TQ_SIGNAL( data( TDEIO::Job *, const TQByteArray & ) ),
+           this, TQ_SLOT( slotData( TDEIO::Job *, const TQByteArray & ) ) );
+  connect( job, TQ_SIGNAL( result( TDEIO::Job * ) ),
+           this, TQ_SLOT( slotResult( TDEIO::Job * ) ) );
 
   m_pendingJobs.append( job );
 }
@@ -360,9 +360,9 @@ void Server::call( const TQString &method, const TQValueList<TQVariant> &args,
     kdWarning() << "Cannot execute call to " << method << ": empty server URL" << endl;
 
   Query *query = Query::create( id, this );
-  connect( query, TQT_SIGNAL( message( const TQValueList<TQVariant> &, const TQVariant& ) ), msgObj, messageSlot );
-  connect( query, TQT_SIGNAL( fault( int, const TQString&, const TQVariant& ) ), faultObj, faultSlot );
-  connect( query, TQT_SIGNAL( finished( Query* ) ), this, TQT_SLOT( queryFinished( Query* ) ) );
+  connect( query, TQ_SIGNAL( message( const TQValueList<TQVariant> &, const TQVariant& ) ), msgObj, messageSlot );
+  connect( query, TQ_SIGNAL( fault( int, const TQString&, const TQVariant& ) ), faultObj, faultSlot );
+  connect( query, TQ_SIGNAL( finished( Query* ) ), this, TQ_SLOT( queryFinished( Query* ) ) );
   mPendingQueries.append( query );
 
   query->call( m_url.url(), method, args, m_userAgent );