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

15 files changed, 36 insertions, 32 deletions

diff --git a/wizards/egroupwarewizard.cpp b/wizards/egroupwarewizard.cpp
index 4ab53c3b2..8fbb579a9 100644
--- a/wizards/egroupwarewizard.cpp
+++ b/wizards/egroupwarewizard.cpp
@@ -366,7 +366,7 @@ TQString EGroupwareWizard::validate()
       mXMLRPC->text().isEmpty() )
     return i18n( "Please fill in all fields." );
 
-  return TQString::null;
+  return TQString();
 }
 
 void EGroupwareWizard::usrReadConfig()
diff --git a/wizards/groupwarewizard.cpp b/wizards/groupwarewizard.cpp
index 48ac3b5a7..12d1f7fe9 100644
--- a/wizards/groupwarewizard.cpp
+++ b/wizards/groupwarewizard.cpp
@@ -28,8 +28,8 @@
 
 #include "groupwarewizard.h"
 
-GroupwareWizard::GroupwareWizard( TQWidget *parent, const char *name )
-  : TQWidget( parent, name )
+GroupwareWizard::GroupwareWizard( TQWidget *tqparent, const char *name )
+  : TQWidget( tqparent, name )
 {
   setCaption( i18n( "KDE Groupware Wizard" ) );
 
diff --git a/wizards/groupwarewizard.h b/wizards/groupwarewizard.h
index 6946c360e..b5b6a5261 100644
--- a/wizards/groupwarewizard.h
+++ b/wizards/groupwarewizard.h
@@ -29,9 +29,10 @@ class OverViewPage;
 class GroupwareWizard : public TQWidget
 {
   Q_OBJECT
+  TQ_OBJECT
 
   public:
-    GroupwareWizard( TQWidget *parent, const char *name = 0 );
+    GroupwareWizard( TQWidget *tqparent, const char *name = 0 );
     ~GroupwareWizard();
 
   private:
diff --git a/wizards/groupwisewizard.cpp b/wizards/groupwisewizard.cpp
index 0bddf3da8..bb5275302 100644
--- a/wizards/groupwisewizard.cpp
+++ b/wizards/groupwisewizard.cpp
@@ -129,7 +129,7 @@ class CreateGroupwiseKabcResource : public KConfigPropagator::Change
       KABC::ResourceGroupwise *r = new KABC::ResourceGroupwise( url, user,
                                                                 password,
                                                                 TQStringList(),
-                                                                TQString::null );
+                                                                TQString() );
       r->setResourceName( i18n("GroupWise") );
       m.add( r );
       m.writeConfig();
@@ -370,7 +370,7 @@ TQString GroupwiseWizard::validate()
       return i18n( "Please fill in all fields." );
   }
 
-  return TQString::null;
+  return TQString();
 }
 
 void GroupwiseWizard::usrReadConfig()
diff --git a/wizards/groupwisewizard.h b/wizards/groupwisewizard.h
index d186e9cec..bd8252b1d 100644
--- a/wizards/groupwisewizard.h
+++ b/wizards/groupwisewizard.h
@@ -31,6 +31,7 @@ class TQGroupBox;
 class KDE_EXPORT GroupwiseWizard : public KConfigWizard
 {
     Q_OBJECT
+  TQ_OBJECT
   public:
     GroupwiseWizard();
     ~GroupwiseWizard();
diff --git a/wizards/kmailchanges.cpp b/wizards/kmailchanges.cpp
index 4ad256f78..66fdd2169 100644
--- a/wizards/kmailchanges.cpp
+++ b/wizards/kmailchanges.cpp
@@ -285,11 +285,11 @@ void CreateDisconnectedImapAccount::apply()
     // let's use the server name after that.
     TQString accountName = mAccountName;
     const TQStringList identities = identityManager.identities();
-    if ( identities.find( accountName ) != identities.end() ) {
+    if ( identities.tqfind( accountName ) != identities.end() ) {
       accountName = mServer;
       int i = 2;
       // And if there's already one, number them
-      while ( identities.find( accountName ) != identities.end() ) {
+      while ( identities.tqfind( accountName ) != identities.end() ) {
         accountName = mServer + " " + TQString::number( i++ );
       }
     }
diff --git a/wizards/kolabkmailchanges.cpp b/wizards/kolabkmailchanges.cpp
index 97e3a83ab..68ff847a8 100644
--- a/wizards/kolabkmailchanges.cpp
+++ b/wizards/kolabkmailchanges.cpp
@@ -108,7 +108,7 @@ void createKMailChanges( KConfigPropagator::Change::List& changes )
   TQString defaultDomain = KolabConfig::self()->server();
   const TQString server = KolabConfig::self()->server();
   TQString user = KolabConfig::self()->user();
-  int pos = user.find( "@" );
+  int pos = user.tqfind( "@" );
   // with kolab the userid _is_ the full email
   if ( pos > 0 ) {
     // The user typed in a full email address. Assume it's correct
diff --git a/wizards/kolabwizard.cpp b/wizards/kolabwizard.cpp
index 59b7a2514..9deaa373c 100644
--- a/wizards/kolabwizard.cpp
+++ b/wizards/kolabwizard.cpp
@@ -59,7 +59,7 @@ class SetupLDAPSearchAccount : public KConfigPropagator::Change
       // If the user gave a full email address, the domain name
       // of that overrides the server name for the ldap dn
       const TQString user = KolabConfig::self()->user();
-      int pos = user.find( "@" );
+      int pos = user.tqfind( "@" );
       if ( pos > 0 ) {
         const TQString h = user.mid( pos+1 );
         if ( !h.isEmpty() )
@@ -181,7 +181,7 @@ class KolabPropagator : public KConfigPropagator
 
       TQString user = KolabConfig::self()->user();
       // We now use the full email address in the freebusy URL
-      //int pos = user.find( "@" );
+      //int pos = user.tqfind( "@" );
       //if ( pos > 0 ) user = user.left( pos );
 
       KURL publishURL = freeBusyBaseUrl;
@@ -311,7 +311,7 @@ TQString KolabWizard::validate()
       mRealNameEdit->text().isEmpty() ||
       mPasswordEdit->text().isEmpty() )
     return i18n( "Please fill in all fields." );
-  return TQString::null;
+  return TQString();
 }
 
 void KolabWizard::usrReadConfig()
diff --git a/wizards/overviewpage.cpp b/wizards/overviewpage.cpp
index a15b580eb..74933d677 100644
--- a/wizards/overviewpage.cpp
+++ b/wizards/overviewpage.cpp
@@ -40,8 +40,8 @@
 
 #include "overviewpage.h"
 
-OverViewPage::OverViewPage( TQWidget *parent, const char *name )
-  : TQWidget( parent, name )
+OverViewPage::OverViewPage( TQWidget *tqparent, const char *name )
+  : TQWidget( tqparent, name )
 {
   TQGridLayout *tqlayout = new TQGridLayout( this, 7, 4, KDialog::marginHint(),
                                          KDialog::spacingHint() );
diff --git a/wizards/overviewpage.h b/wizards/overviewpage.h
index 487b14ce9..ebe850306 100644
--- a/wizards/overviewpage.h
+++ b/wizards/overviewpage.h
@@ -24,12 +24,13 @@
 
 #include <tqwidget.h>
 
-class OverViewPage : public QWidget
+class OverViewPage : public TQWidget
 {
   Q_OBJECT
+  TQ_OBJECT
 
   public:
-    OverViewPage( TQWidget *parent, const char *name = 0 );
+    OverViewPage( TQWidget *tqparent, const char *name = 0 );
     ~OverViewPage();
 
   private slots:
diff --git a/wizards/scalixwizard.cpp b/wizards/scalixwizard.cpp
index beb059481..0291a22e0 100644
--- a/wizards/scalixwizard.cpp
+++ b/wizards/scalixwizard.cpp
@@ -210,8 +210,8 @@ class SynchronizeScalixAccount : public KConfigPropagator::Change
       TQString error;
       TQCString dcopService;
       int result = KDCOPServiceStarter::self()->
-        findServiceFor( "DCOP/ResourceBackend/IMAP", TQString::null,
-                        TQString::null, &error, &dcopService );
+        findServiceFor( "DCOP/ResourceBackend/IMAP", TQString(),
+                        TQString(), &error, &dcopService );
       if ( result != 0 ) {
         KMessageBox::error( 0, i18n( "Unable to start KMail to trigger initial synchronization with Scalix server" ) );
         delete msg;
@@ -458,7 +458,7 @@ TQString ScalixWizard::validate()
        mPasswordEdit->text().isEmpty() )
     return i18n( "Please fill in all fields." );
 
-  return TQString::null;
+  return TQString();
 }
 
 void ScalixWizard::usrReadConfig()
diff --git a/wizards/servertype.h b/wizards/servertype.h
index 8e6954b4c..2f660dc59 100644
--- a/wizards/servertype.h
+++ b/wizards/servertype.h
@@ -27,7 +27,7 @@
 
 #include <tqobject.h>
 
-class ServerType : public QObject
+class ServerType : public TQObject
 {
   public:
     class ConnectionInfo
@@ -50,12 +50,12 @@ class ServerType : public QObject
     };
 
     /**
-      This map tqcontains the uids and the user visible names
+      This map contains the uids and the user visible names
       of a server type.
      */
     typedef TQValueList<ConnectionInfo> ConnectionInfoList;
 
-    ServerType( TQObject *parent, const char *name ):TQObject(parent, name) {}
+    ServerType( TQObject *tqparent, const char *name ):TQObject(tqparent, name) {}
     virtual ~ServerType() {}
 
     /**
@@ -104,7 +104,7 @@ class ServerType : public QObject
 class ServerTypeFactory : public KLibFactory
 {
   public:
-    virtual ServerType *serverType( TQObject *parent, const char *name = 0 ) = 0;
+    virtual ServerType *serverType( TQObject *tqparent, const char *name = 0 ) = 0;
 
     /**
       Returns the identifier.
diff --git a/wizards/servertypemanager.cpp b/wizards/servertypemanager.cpp
index bedb4e285..d7c9287f7 100644
--- a/wizards/servertypemanager.cpp
+++ b/wizards/servertypemanager.cpp
@@ -28,8 +28,8 @@
 ServerTypeManager* ServerTypeManager::mSelf = 0;
 static KStaticDeleter<ServerTypeManager> serverManagerDeleter;
 
-ServerTypeManager::ServerTypeManager( TQObject *parent, const char *name )
-  : TQObject( parent, name )
+ServerTypeManager::ServerTypeManager( TQObject *tqparent, const char *name )
+  : TQObject( tqparent, name )
 {
   loadPlugins();
 }
@@ -54,18 +54,18 @@ TQStringList ServerTypeManager::identifiers() const
 
 TQString ServerTypeManager::title( const TQString& identifier ) const
 {
-  ServerTypeFactoryMap::ConstIterator it = mServerTypeFactoryMap.find( identifier );
+  ServerTypeFactoryMap::ConstIterator it = mServerTypeFactoryMap.tqfind( identifier );
   if ( it == mServerTypeFactoryMap.end() )
-    return TQString::null;
+    return TQString();
   else
     return it.data()->title();
 }
 
 ServerType* ServerTypeManager::serverType( const TQString& identifier )
 {
-  ServerTypeMap::ConstIterator serverIt = mServerTypeMap.find( identifier );
+  ServerTypeMap::ConstIterator serverIt = mServerTypeMap.tqfind( identifier );
   if ( serverIt == mServerTypeMap.end() ) { // none server type loaded yet
-    ServerTypeFactoryMap::Iterator it = mServerTypeFactoryMap.find( identifier );
+    ServerTypeFactoryMap::Iterator it = mServerTypeFactoryMap.tqfind( identifier );
     if ( it == mServerTypeFactoryMap.end() ) // no factory for this type
       return 0;
 
diff --git a/wizards/servertypemanager.h b/wizards/servertypemanager.h
index 4d2ae289f..c3070dd40 100644
--- a/wizards/servertypemanager.h
+++ b/wizards/servertypemanager.h
@@ -26,9 +26,10 @@
 
 #include "servertype.h"
 
-class ServerTypeManager : public QObject
+class ServerTypeManager : public TQObject
 {
   Q_OBJECT
+  TQ_OBJECT
 
   public:
     static ServerTypeManager* self();
@@ -60,7 +61,7 @@ class ServerTypeManager : public QObject
 
     void loadPlugins();
 
-    ServerTypeManager( TQObject *parent, const char *name = 0 );
+    ServerTypeManager( TQObject *tqparent, const char *name = 0 );
 
     static ServerTypeManager* mSelf;
 
diff --git a/wizards/sloxwizard.cpp b/wizards/sloxwizard.cpp
index 5cfdd2bbf..d717f24c2 100644
--- a/wizards/sloxwizard.cpp
+++ b/wizards/sloxwizard.cpp
@@ -269,7 +269,7 @@ TQString SloxWizard::validate()
       mUserEdit->text().isEmpty() ||
       mPasswordEdit->text().isEmpty() )
     return i18n( "Please fill in all fields." );
-  return TQString::null;
+  return TQString();
 }
 
 void SloxWizard::usrReadConfig()