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, 9 insertions, 7 deletions

diff --git a/certmanager/lib/backends/qgpgme/qgpgmecryptoconfig.h b/certmanager/lib/backends/qgpgme/qgpgmecryptoconfig.h
index 20a01d315..de766de30 100644
--- a/certmanager/lib/backends/qgpgme/qgpgmecryptoconfig.h
+++ b/certmanager/lib/backends/qgpgme/qgpgmecryptoconfig.h
@@ -20,18 +20,18 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this program with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
 */
 
-#ifndef KLEO_QGPGMECRYPTOCONFIG_H
-#define KLEO_QGPGMECRYPTOCONFIG_H
+#ifndef KLEO_TQGPGMECRYPTOCONFIG_H
+#define KLEO_TQGPGMECRYPTOCONFIG_H
 
 #include <kleo/cryptoconfig.h>
 #include <tqdict.h>
@@ -49,6 +49,7 @@ class QGpgMECryptoConfigEntry;
 class QGpgMECryptoConfig : public TQObject, public Kleo::CryptoConfig {
 
   Q_OBJECT
+  TQ_OBJECT
 public:
   /**
    * Constructor
@@ -80,6 +81,7 @@ class QGpgMECryptoConfigGroup;
 class QGpgMECryptoConfigComponent : public TQObject, public Kleo::CryptoConfigComponent {
 
   Q_OBJECT
+  TQ_OBJECT
 public:
   QGpgMECryptoConfigComponent( QGpgMECryptoConfig*, const TQString& name, const TQString& description );
   ~QGpgMECryptoConfigComponent();
@@ -112,7 +114,7 @@ public:
   ~QGpgMECryptoConfigGroup() {}
 
   TQString name() const { return mName; }
-  TQString iconName() const { return TQString::null; }
+  TQString iconName() const { return TQString(); }
   TQString description() const { return mDescription; }
   Kleo::CryptoConfigEntry::Level level() const { return mLevel; }
   TQStringList entryList() const;
@@ -183,4 +185,4 @@ private:
   uint mSet : 1;
 };
 
-#endif /* KLEO_QGPGMECRYPTOCONFIG_H */
+#endif /* KLEO_TQGPGMECRYPTOCONFIG_H */