summaryrefslogtreecommitdiffstats
path: root/tderesources/egroupware
diff options
context:
space:
mode:
Diffstat (limited to 'tderesources/egroupware')
-rw-r--r--tderesources/egroupware/debugdialog.h2
-rw-r--r--tderesources/egroupware/kcal_resourcexmlrpc.cpp56
-rw-r--r--tderesources/egroupware/kcal_resourcexmlrpc.h4
-rw-r--r--tderesources/egroupware/kcal_resourcexmlrpcconfig.h4
-rw-r--r--tderesources/egroupware/knotes_resourcexmlrpc.cpp20
-rw-r--r--tderesources/egroupware/knotes_resourcexmlrpc.h4
-rw-r--r--tderesources/egroupware/knotes_resourcexmlrpcconfig.h4
-rw-r--r--tderesources/egroupware/synchronizer.h4
-rw-r--r--tderesources/egroupware/tdeabc_resourcexmlrpc.cpp32
-rw-r--r--tderesources/egroupware/tdeabc_resourcexmlrpc.h4
-rw-r--r--tderesources/egroupware/tdeabc_resourcexmlrpcconfig.h4
-rw-r--r--tderesources/egroupware/xmlrpciface.cpp18
-rw-r--r--tderesources/egroupware/xmlrpciface.h4
13 files changed, 80 insertions, 80 deletions
diff --git a/tderesources/egroupware/debugdialog.h b/tderesources/egroupware/debugdialog.h
index bde17988..008e881e 100644
--- a/tderesources/egroupware/debugdialog.h
+++ b/tderesources/egroupware/debugdialog.h
@@ -31,7 +31,7 @@ class KTextBrowser;
*/
class DebugDialog : public KDialogBase
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/tderesources/egroupware/kcal_resourcexmlrpc.cpp b/tderesources/egroupware/kcal_resourcexmlrpc.cpp
index 676770ed..9ccc24b5 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/kcal_resourcexmlrpc.h b/tderesources/egroupware/kcal_resourcexmlrpc.h
index 0e46c6d3..45cc1344 100644
--- a/tderesources/egroupware/kcal_resourcexmlrpc.h
+++ b/tderesources/egroupware/kcal_resourcexmlrpc.h
@@ -50,9 +50,9 @@ class EGroupwarePrefs;
/**
This class provides access to php/eGroupware calendar via XML-RPC.
*/
-class KDE_EXPORT ResourceXMLRPC : public ResourceCached
+class TDE_EXPORT ResourceXMLRPC : public ResourceCached
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/tderesources/egroupware/kcal_resourcexmlrpcconfig.h b/tderesources/egroupware/kcal_resourcexmlrpcconfig.h
index b99bca73..316b5dfd 100644
--- a/tderesources/egroupware/kcal_resourcexmlrpcconfig.h
+++ b/tderesources/egroupware/kcal_resourcexmlrpcconfig.h
@@ -30,9 +30,9 @@ class KURLRequester;
namespace KCal {
-class KDE_EXPORT ResourceXMLRPCConfig : public KRES::ConfigWidget
+class TDE_EXPORT ResourceXMLRPCConfig : public KRES::ConfigWidget
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/tderesources/egroupware/knotes_resourcexmlrpc.cpp b/tderesources/egroupware/knotes_resourcexmlrpc.cpp
index 9a477076..05306c87 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/knotes_resourcexmlrpc.h b/tderesources/egroupware/knotes_resourcexmlrpc.h
index 336488de..83ee4b27 100644
--- a/tderesources/egroupware/knotes_resourcexmlrpc.h
+++ b/tderesources/egroupware/knotes_resourcexmlrpc.h
@@ -46,9 +46,9 @@ class EGroupwarePrefs;
/**
This class provides access to eGroupware notes via XML-RPC.
*/
-class KDE_EXPORT ResourceXMLRPC : public ResourceNotes
+class TDE_EXPORT ResourceXMLRPC : public ResourceNotes
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/tderesources/egroupware/knotes_resourcexmlrpcconfig.h b/tderesources/egroupware/knotes_resourcexmlrpcconfig.h
index e6b05bee..b451fafb 100644
--- a/tderesources/egroupware/knotes_resourcexmlrpcconfig.h
+++ b/tderesources/egroupware/knotes_resourcexmlrpcconfig.h
@@ -30,9 +30,9 @@ class KURLRequester;
namespace KNotes {
-class KDE_EXPORT ResourceXMLRPCConfig : public KRES::ConfigWidget
+class TDE_EXPORT ResourceXMLRPCConfig : public KRES::ConfigWidget
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/tderesources/egroupware/synchronizer.h b/tderesources/egroupware/synchronizer.h
index ed9fd135..9e14fd93 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 dd791cd8..4e95f792 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/tdeabc_resourcexmlrpc.h b/tderesources/egroupware/tdeabc_resourcexmlrpc.h
index c0ccb944..e5996b5e 100644
--- a/tderesources/egroupware/tdeabc_resourcexmlrpc.h
+++ b/tderesources/egroupware/tdeabc_resourcexmlrpc.h
@@ -37,9 +37,9 @@ namespace TDEABC {
class EGroupwarePrefs;
-class KDE_EXPORT ResourceXMLRPC : public ResourceCached
+class TDE_EXPORT ResourceXMLRPC : public ResourceCached
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/tderesources/egroupware/tdeabc_resourcexmlrpcconfig.h b/tderesources/egroupware/tdeabc_resourcexmlrpcconfig.h
index 57773483..2b06903a 100644
--- a/tderesources/egroupware/tdeabc_resourcexmlrpcconfig.h
+++ b/tderesources/egroupware/tdeabc_resourcexmlrpcconfig.h
@@ -29,9 +29,9 @@ class KURLRequester;
namespace TDEABC {
-class KDE_EXPORT ResourceXMLRPCConfig : public KRES::ConfigWidget
+class TDE_EXPORT ResourceXMLRPCConfig : public KRES::ConfigWidget
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/tderesources/egroupware/xmlrpciface.cpp b/tderesources/egroupware/xmlrpciface.cpp
index 4afb0b84..29d5563e 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 );
}
@@ -222,7 +222,7 @@ TQString Query::marshal( const TQVariant &arg ) const
case TQVariant::ByteArray:
return "<value><base64>" + KCodecs::base64Encode( arg.toByteArray() ) + "</base64></value>\r\n";
case TQVariant::DateTime:
- return "<value><datetime.iso8601>" + arg.toDateTime().toString( Qt::ISODate ) + "</datetime.iso8601></value>\r\n";
+ return "<value><datetime.iso8601>" + arg.toDateTime().toString( TQt::ISODate ) + "</datetime.iso8601></value>\r\n";
case TQVariant::List:
{
TQString markup = "<value><array><data>\r\n";
@@ -279,7 +279,7 @@ TQVariant Query::demarshal( const TQDomElement &elem ) const
else if ( typeName == "base64" )
return TQVariant( KCodecs::base64Decode( TQCString(typeElement.text().latin1()) ) );
else if ( typeName == "datetime" || typeName == "datetime.iso8601" )
- return TQVariant( TQDateTime::fromString( typeElement.text(), Qt::ISODate ) );
+ return TQVariant( TQDateTime::fromString( typeElement.text(), TQt::ISODate ) );
else if ( typeName == "array" )
{
TQValueList<TQVariant> values;
@@ -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 );
diff --git a/tderesources/egroupware/xmlrpciface.h b/tderesources/egroupware/xmlrpciface.h
index df2f3a6d..fb2f23df 100644
--- a/tderesources/egroupware/xmlrpciface.h
+++ b/tderesources/egroupware/xmlrpciface.h
@@ -32,7 +32,7 @@ namespace KXMLRPC
class Query : public TQObject
{
- Q_OBJECT
+ TQ_OBJECT
public:
@@ -77,7 +77,7 @@ namespace KXMLRPC
class Server : public TQObject
{
- Q_OBJECT
+ TQ_OBJECT
public:
Server( const KURL &url = KURL(),