Initial conversion of kdepim to TQt

This will probably require some tweaking before it will build under Qt4,
however Qt3 builds are OK.  Any alterations this commit makes to kdepim
behaviour under Qt3 are unintentional and should be fixed.


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdepim@1227832 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

16 files changed, 52 insertions, 43 deletions

diff --git a/kresources/egroupware/debugdialog.h b/kresources/egroupware/debugdialog.h
index c28987711..52ddb2273 100644
--- a/kresources/egroupware/debugdialog.h
+++ b/kresources/egroupware/debugdialog.h
@@ -32,6 +32,7 @@ class KTextBrowser;
 class DebugDialog : public KDialogBase
 {
   Q_OBJECT
+  TQ_OBJECT
 
   public:
     /**
diff --git a/kresources/egroupware/kabc_resourcexmlrpc.cpp b/kresources/egroupware/kabc_resourcexmlrpc.cpp
index 115484c6a..ae789ef62 100644
--- a/kresources/egroupware/kabc_resourcexmlrpc.cpp
+++ b/kresources/egroupware/kabc_resourcexmlrpc.cpp
@@ -479,7 +479,7 @@ void ResourceXMLRPC::writeContact( const Addressee &addr, TQMap<TQString, TQVari
   TQMap<TQString, TQVariant> catMap;
   int counter = 0;
   for ( catIt = categories.begin(); catIt != categories.end(); ++catIt ) {
-    TQMap<TQString, int>::ConstIterator it = mCategoryMap.find( *catIt );
+    TQMap<TQString, int>::ConstIterator it = mCategoryMap.tqfind( *catIt );
     if ( it == mCategoryMap.end() ) // new category
       catMap.insert( TQString::number( counter-- ), *catIt );
     else
@@ -575,9 +575,9 @@ void ResourceXMLRPC::writeContact( const Addressee &addr, TQMap<TQString, TQVari
   const TQStringList customFields = addr.customs();
   TQStringList::ConstIterator it;
   for ( it = customFields.begin(); it != customFields.end(); ++it ) {
-    int colon = (*it).find( ":" );
+    int colon = (*it).tqfind( ":" );
     TQString identifier = (*it).left( colon );
-    int dash = identifier.find( "-" );
+    int dash = identifier.tqfind( "-" );
     TQString app = identifier.left( dash );
     TQString name = identifier.mid( dash + 1 );
     TQString value = (*it).mid( colon + 1 );
@@ -752,7 +752,7 @@ void ResourceXMLRPC::loadCategoriesFinished( const TQValueList<TQVariant> &mapLi
     mCategoryMap.insert( it.data().toString(), it.key().toInt() );
 
     TQStringList categories = prefs->customCategories();
-    if ( categories.find( it.data().toString() ) == categories.end() )
+    if ( categories.tqfind( it.data().toString() ) == categories.end() )
       categories.append( it.data().toString() );
 
     prefs->mCustomCategories = categories;
diff --git a/kresources/egroupware/kabc_resourcexmlrpc.h b/kresources/egroupware/kabc_resourcexmlrpc.h
index 0ce56a038..e7ae1c53f 100644
--- a/kresources/egroupware/kabc_resourcexmlrpc.h
+++ b/kresources/egroupware/kabc_resourcexmlrpc.h
@@ -40,6 +40,7 @@ class EGroupwarePrefs;
 class KDE_EXPORT ResourceXMLRPC : public ResourceCached
 {
   Q_OBJECT
+  TQ_OBJECT
 
   public:
     ResourceXMLRPC( const KConfig* );
diff --git a/kresources/egroupware/kabc_resourcexmlrpcconfig.cpp b/kresources/egroupware/kabc_resourcexmlrpcconfig.cpp
index 02a2f1ad3..459a6b6f7 100644
--- a/kresources/egroupware/kabc_resourcexmlrpcconfig.cpp
+++ b/kresources/egroupware/kabc_resourcexmlrpcconfig.cpp
@@ -33,8 +33,8 @@
 
 using namespace KABC;
 
-ResourceXMLRPCConfig::ResourceXMLRPCConfig( TQWidget* parent,  const char* name )
-  : KRES::ConfigWidget( parent, name )
+ResourceXMLRPCConfig::ResourceXMLRPCConfig( TQWidget* tqparent,  const char* name )
+  : KRES::ConfigWidget( tqparent, name )
 {
   TQGridLayout *mainLayout = new TQGridLayout( this, 4, 2, 0, KDialog::spacingHint() );
 
diff --git a/kresources/egroupware/kabc_resourcexmlrpcconfig.h b/kresources/egroupware/kabc_resourcexmlrpcconfig.h
index f73b2e0aa..a680cfb01 100644
--- a/kresources/egroupware/kabc_resourcexmlrpcconfig.h
+++ b/kresources/egroupware/kabc_resourcexmlrpcconfig.h
@@ -32,9 +32,10 @@ namespace KABC {
 class KDE_EXPORT ResourceXMLRPCConfig : public KRES::ConfigWidget
 { 
   Q_OBJECT
+  TQ_OBJECT
 
   public:
-    ResourceXMLRPCConfig( TQWidget* parent = 0, const char* name = 0 );
+    ResourceXMLRPCConfig( TQWidget* tqparent = 0, const char* name = 0 );
 
   public slots:
     void loadSettings( KRES::Resource* );
diff --git a/kresources/egroupware/kcal_resourcexmlrpc.cpp b/kresources/egroupware/kcal_resourcexmlrpc.cpp
index 15864a374..6bbdc2342 100644
--- a/kresources/egroupware/kcal_resourcexmlrpc.cpp
+++ b/kresources/egroupware/kcal_resourcexmlrpc.cpp
@@ -250,7 +250,7 @@ bool ResourceXMLRPC::doLoad()
   columns.insert( "type", "task" );
   args.insert( "filter", "none" );
   args.insert( "col_filter", columns );
-  args.insert( "order", "id_parent" );
+  args.insert( "order", "id_tqparent" );
 
   mServer->call( SearchTodosCommand, args,
                  this, TQT_SLOT( listTodosFinished( const TQValueList<TQVariant>&, const TQVariant& ) ),
@@ -651,7 +651,7 @@ void ResourceXMLRPC::loadEventCategoriesFinished( const TQValueList<TQVariant> &
   for ( it = map.begin(); it != map.end(); ++it ) {
     mEventCategoryMap.insert( it.data().toString(), it.key().toInt() );
 
-    if ( prefs.mCustomCategories.find( it.data().toString() ) == prefs.mCustomCategories.end() )
+    if ( prefs.mCustomCategories.tqfind( it.data().toString() ) == prefs.mCustomCategories.end() )
       prefs.mCustomCategories.append( it.data().toString() );
   }
 
@@ -756,7 +756,7 @@ void ResourceXMLRPC::loadTodoCategoriesFinished( const TQValueList<TQVariant> &m
   for ( it = map.begin(); it != map.end(); ++it ) {
     mTodoCategoryMap.insert( it.data().toString(), it.key().toInt() );
 
-    if ( prefs.mCustomCategories.find( it.data().toString() ) == prefs.mCustomCategories.end() )
+    if ( prefs.mCustomCategories.tqfind( it.data().toString() ) == prefs.mCustomCategories.end() )
       prefs.mCustomCategories.append( it.data().toString() );
   }
 
@@ -964,7 +964,7 @@ void ResourceXMLRPC::writeEvent( Event *event, TQMap<TQString, TQVariant> &args
   TQMap<TQString, TQVariant> catMap;
   int counter = 0;
   for ( catIt = categories.begin(); catIt != categories.end(); ++catIt ) {
-    TQMap<TQString, int>::Iterator it = mEventCategoryMap.find( *catIt );
+    TQMap<TQString, int>::Iterator it = mEventCategoryMap.tqfind( *catIt );
     if ( it == mEventCategoryMap.end() ) // new category
       catMap.insert( TQString::number( counter-- ), *catIt );
     else
@@ -1099,7 +1099,7 @@ void ResourceXMLRPC::writeTodo( Todo* todo, TQMap<TQString, TQVariant>& args )
   TQStringList::ConstIterator catIt;
   int counter = 0;
   for ( catIt = categories.begin(); catIt != categories.end(); ++catIt ) {
-    TQMap<TQString, int>::Iterator it = mTodoCategoryMap.find( *catIt );
+    TQMap<TQString, int>::Iterator it = mTodoCategoryMap.tqfind( *catIt );
     if ( it == mTodoCategoryMap.end() )
       catMap.insert( TQString::number( counter-- ), *catIt );
     else
@@ -1114,8 +1114,8 @@ void ResourceXMLRPC::writeTodo( Todo* todo, TQMap<TQString, TQVariant>& args )
   // SUBTODO
   Incidence *inc = todo->relatedTo();
   if ( inc ) {
-    TQString parentUid = idMapper().remoteId( inc->uid() );
-    args.insert( "id_parent", parentUid );
+    TQString tqparentUid = idMapper().remoteId( inc->uid() );
+    args.insert( "id_tqparent", tqparentUid );
   }
 
   // STATE
@@ -1172,13 +1172,13 @@ void ResourceXMLRPC::readTodo( const TQMap<TQString, TQVariant>& args, Todo *tod
   }
 
   // SUBTODO
-  TQString parentId = args[ "id_parent" ].toString();
-  if ( parentId != "0" ) { // we are a sub todo
-    TQString localParentUid = idMapper().localId( parentId );
-    if ( !localParentUid.isEmpty() ) { // found parent todo
-      Todo *parent = mCalendar.todo( localParentUid );
-      if ( parent )
-        todo->setRelatedTo( parent );
+  TQString tqparentId = args[ "id_tqparent" ].toString();
+  if ( tqparentId != "0" ) { // we are a sub todo
+    TQString localParentUid = idMapper().localId( tqparentId );
+    if ( !localParentUid.isEmpty() ) { // found tqparent todo
+      Todo *tqparent = mCalendar.todo( localParentUid );
+      if ( tqparent )
+        todo->setRelatedTo( tqparent );
     }
   }
 
diff --git a/kresources/egroupware/kcal_resourcexmlrpc.h b/kresources/egroupware/kcal_resourcexmlrpc.h
index 763164117..6d538d73c 100644
--- a/kresources/egroupware/kcal_resourcexmlrpc.h
+++ b/kresources/egroupware/kcal_resourcexmlrpc.h
@@ -53,6 +53,7 @@ class EGroupwarePrefs;
 class KDE_EXPORT ResourceXMLRPC : public ResourceCached
 {
   Q_OBJECT
+  TQ_OBJECT
 
   public:
     ResourceXMLRPC( const KConfig* );
diff --git a/kresources/egroupware/kcal_resourcexmlrpcconfig.cpp b/kresources/egroupware/kcal_resourcexmlrpcconfig.cpp
index 36e3b9486..740602b50 100644
--- a/kresources/egroupware/kcal_resourcexmlrpcconfig.cpp
+++ b/kresources/egroupware/kcal_resourcexmlrpcconfig.cpp
@@ -34,8 +34,8 @@
 
 using namespace KCal;
 
-ResourceXMLRPCConfig::ResourceXMLRPCConfig( TQWidget* parent,  const char* name )
-  : KRES::ConfigWidget( parent, name )
+ResourceXMLRPCConfig::ResourceXMLRPCConfig( TQWidget* tqparent,  const char* name )
+  : KRES::ConfigWidget( tqparent, name )
 {
   TQGridLayout *mainLayout = new TQGridLayout( this, 4, 2, 0, KDialog::spacingHint() );
 
diff --git a/kresources/egroupware/kcal_resourcexmlrpcconfig.h b/kresources/egroupware/kcal_resourcexmlrpcconfig.h
index f71359aa3..d070eebf4 100644
--- a/kresources/egroupware/kcal_resourcexmlrpcconfig.h
+++ b/kresources/egroupware/kcal_resourcexmlrpcconfig.h
@@ -33,9 +33,10 @@ namespace KCal {
 class KDE_EXPORT ResourceXMLRPCConfig : public KRES::ConfigWidget
 { 
   Q_OBJECT
+  TQ_OBJECT
 
   public:
-    ResourceXMLRPCConfig( TQWidget* parent = 0, const char* name = 0 );
+    ResourceXMLRPCConfig( TQWidget* tqparent = 0, const char* name = 0 );
 
   public slots:
     void loadSettings( KRES::Resource* );
diff --git a/kresources/egroupware/knotes_resourcexmlrpc.cpp b/kresources/egroupware/knotes_resourcexmlrpc.cpp
index 6446a833d..ada19144b 100644
--- a/kresources/egroupware/knotes_resourcexmlrpc.cpp
+++ b/kresources/egroupware/knotes_resourcexmlrpc.cpp
@@ -132,7 +132,7 @@ bool ResourceXMLRPC::load()
   args.clear();
   args.insert( "filter", "none" );
   args.insert( "col_filter", columns );
-  args.insert( "order", "id_parent" );
+  args.insert( "order", "id_tqparent" );
 
   mServer->call( SearchNotesCommand, args,
                  this, TQT_SLOT( listNotesFinished( const TQValueList<TQVariant>&, const TQVariant& ) ),
diff --git a/kresources/egroupware/knotes_resourcexmlrpc.h b/kresources/egroupware/knotes_resourcexmlrpc.h
index 7301ef902..eeb47e139 100644
--- a/kresources/egroupware/knotes_resourcexmlrpc.h
+++ b/kresources/egroupware/knotes_resourcexmlrpc.h
@@ -49,6 +49,7 @@ class EGroupwarePrefs;
 class KDE_EXPORT ResourceXMLRPC : public ResourceNotes
 {
   Q_OBJECT
+  TQ_OBJECT
 
   public:
     ResourceXMLRPC( const KConfig* );
diff --git a/kresources/egroupware/knotes_resourcexmlrpcconfig.cpp b/kresources/egroupware/knotes_resourcexmlrpcconfig.cpp
index 224cb9914..0e2816b12 100644
--- a/kresources/egroupware/knotes_resourcexmlrpcconfig.cpp
+++ b/kresources/egroupware/knotes_resourcexmlrpcconfig.cpp
@@ -34,8 +34,8 @@
 
 using namespace KNotes;
 
-ResourceXMLRPCConfig::ResourceXMLRPCConfig( TQWidget* parent,  const char* name )
-  : KRES::ConfigWidget( parent, name )
+ResourceXMLRPCConfig::ResourceXMLRPCConfig( TQWidget* tqparent,  const char* name )
+  : KRES::ConfigWidget( tqparent, name )
 {
   TQGridLayout *mainLayout = new TQGridLayout( this, 4, 2, 0, KDialog::spacingHint() );
 
diff --git a/kresources/egroupware/knotes_resourcexmlrpcconfig.h b/kresources/egroupware/knotes_resourcexmlrpcconfig.h
index 63119ab72..70201f609 100644
--- a/kresources/egroupware/knotes_resourcexmlrpcconfig.h
+++ b/kresources/egroupware/knotes_resourcexmlrpcconfig.h
@@ -33,9 +33,10 @@ namespace KNotes {
 class KDE_EXPORT ResourceXMLRPCConfig : public KRES::ConfigWidget
 { 
   Q_OBJECT
+  TQ_OBJECT
 
   public:
-    ResourceXMLRPCConfig( TQWidget* parent = 0, const char* name = 0 );
+    ResourceXMLRPCConfig( TQWidget* tqparent = 0, const char* name = 0 );
 
   public slots:
     void loadSettings( KRES::Resource* );
diff --git a/kresources/egroupware/todostatemapper.cpp b/kresources/egroupware/todostatemapper.cpp
index 5c8fcf84d..0793bd609 100644
--- a/kresources/egroupware/todostatemapper.cpp
+++ b/kresources/egroupware/todostatemapper.cpp
@@ -114,7 +114,7 @@ void TodoStateMapper::addTodoState( const TQString &uid, int localState, const T
 
 TQString TodoStateMapper::remoteState( const TQString &uid, int localState )
 {
-  if ( mTodoStateMap.find( uid ) == mTodoStateMap.end() )
+  if ( mTodoStateMap.tqfind( uid ) == mTodoStateMap.end() )
     kdError() << "TodoStateMapper: no entry for " << uid << " found" << endl;
 
   TodoStateMapEntry entry = mTodoStateMap[ uid ];
diff --git a/kresources/egroupware/xmlrpciface.cpp b/kresources/egroupware/xmlrpciface.cpp
index 68bade033..bd31a194a 100644
--- a/kresources/egroupware/xmlrpciface.cpp
+++ b/kresources/egroupware/xmlrpciface.cpp
@@ -54,9 +54,9 @@ namespace KXMLRPC
   };
 }
 
-Query *Query::create( const TQVariant &id, TQObject *parent, const char *name )
+Query *Query::create( const TQVariant &id, TQObject *tqparent, const char *name )
 {
-  return new Query( id, parent, name );
+  return new Query( id, tqparent, name );
 }
 
 void Query::call( const TQString &server, const TQString &method,
@@ -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";
@@ -253,7 +253,7 @@ TQString Query::marshal( const TQVariant &arg ) const
       default:
       kdWarning() << "Failed to marshal unknown variant type: " << arg.type() << endl;
   };
-  return TQString::null;
+  return TQString();
 }
 
 TQVariant Query::demarshal( const TQDomElement &elem ) const
@@ -279,7 +279,7 @@ TQVariant Query::demarshal( const TQDomElement &elem ) const
   else if ( typeName == "base64" )
     return TQVariant( KCodecs::base64Decode( 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;
@@ -310,8 +310,8 @@ TQVariant Query::demarshal( const TQDomElement &elem ) const
   return TQVariant();
 }
 
-Query::Query( const TQVariant &id, TQObject *parent, const char *name )
-  : TQObject( parent, name ), m_id( id )
+Query::Query( const TQVariant &id, TQObject *tqparent, const char *name )
+  : TQObject( tqparent, name ), m_id( id )
 {}
 
 Query::~Query()
@@ -321,8 +321,8 @@ Query::~Query()
     (*it)->kill();
 }
 
-Server::Server( const KURL &url, TQObject *parent, const char *name )
-    : TQObject( parent, name )
+Server::Server( const KURL &url, TQObject *tqparent, const char *name )
+    : TQObject( tqparent, name )
 {
   if ( url.isValid() )
     m_url = url;
diff --git a/kresources/egroupware/xmlrpciface.h b/kresources/egroupware/xmlrpciface.h
index a1460c21c..5c49eee8b 100644
--- a/kresources/egroupware/xmlrpciface.h
+++ b/kresources/egroupware/xmlrpciface.h
@@ -30,14 +30,15 @@ namespace KXMLRPC
   class Server;
   class Result;
 
-  class Query : public QObject
+  class Query : public TQObject
   {
     Q_OBJECT
+  TQ_OBJECT
     public:
 
 
       static Query *create( const TQVariant &id = TQVariant(),
-                            TQObject *parent = 0, const char *name = 0 );
+                            TQObject *tqparent = 0, const char *name = 0 );
 
     public slots:
       void call( const TQString &server, const TQString &method,
@@ -65,7 +66,7 @@ namespace KXMLRPC
       TQString marshal( const TQVariant &v ) const;
       TQVariant demarshal( const TQDomElement &e ) const;
 
-      Query( const TQVariant &id, TQObject *parent = 0, const char *name = 0 );
+      Query( const TQVariant &id, TQObject *tqparent = 0, const char *name = 0 );
       ~Query();
 
       TQByteArray m_buffer;
@@ -74,12 +75,13 @@ namespace KXMLRPC
       TQValueList<KIO::Job*> m_pendingJobs;
   };
 
-  class Server : public QObject
+  class Server : public TQObject
   {
     Q_OBJECT
+  TQ_OBJECT
     public:
       Server( const KURL &url = KURL(),
-              TQObject *parent = 0, const char *name = 0 );
+              TQObject *tqparent = 0, const char *name = 0 );
       ~Server();
 
       const KURL &url() const { return m_url; }