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

1 files changed, 6 insertions, 5 deletions

diff --git a/kmail/kmkernel.h b/kmail/kmkernel.h
index 3eb19f651..871582ace 100644
--- a/kmail/kmkernel.h
+++ b/kmail/kmkernel.h
@@ -28,7 +28,7 @@ namespace KWallet {
   class Wallet;
 }
 
-/** The KMail namespace tqcontains classes used for KMail.
+/** The KMail namespace contains classes used for KMail.
 * This is to keep them out of the way from all the other
 * un-namespaced classes in libs and the rest of PIM.
 */
@@ -83,9 +83,10 @@ class ConfigureDialog;
 class KDE_EXPORT KMKernel : public TQObject, virtual public KMailIface
 {
   Q_OBJECT
+  TQ_OBJECT
 
 public:
-  KMKernel (TQObject *parent=0, const char *name=0);
+  KMKernel (TQObject *tqparent=0, const char *name=0);
   ~KMKernel ();
 
   /** dcop callable stuff */
@@ -262,12 +263,12 @@ public:
   void quit();
   /**
    * Returns true if the transfer was successful, otherwise false. In any case
-   * destinationDir tqcontains the path to the current mail storage when the
+   * destinationDir contains the path to the current mail storage when the
    * method returns.
    */
   bool transferMail( TQString & destinationDir );
   void ungrabPtrKb(void);
-  void kmailMsgHandler(QtMsgType aType, const char* aMsg);
+  void kmailMsgHandler(TQtMsgType aType, const char* aMsg);
   bool doSessionManagement();
   bool firstInstance() { return the_firstInstance; }
   void setFirstInstance(bool value) { the_firstInstance = value; }
@@ -441,7 +442,7 @@ signals:
 
 private:
   void openReader( bool onlyCheck );
-  KMMsgStatus strToStatus(const TQString &flags);
+  KMMsgtqStatus strTotqStatus(const TQString &flags);
   KMFolder *currentFolder();
 
   KMFolder *the_inboxFolder;