TQt4 port kvirc

This enables compilation under both Qt3 and Qt4


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

1 files changed, 14 insertions, 13 deletions

diff --git a/src/kvilib/ext/kvi_crypt.h b/src/kvilib/ext/kvi_crypt.h
index ae3bc4f0..8b36d0be 100644
--- a/src/kvilib/ext/kvi_crypt.h
+++ b/src/kvilib/ext/kvi_crypt.h
@@ -42,7 +42,7 @@
 #include "kvi_heapobject.h"
 #include "kvi_pointerhashtable.h"
 
-#include <qobject.h>
+#include <tqobject.h>
 
 #ifdef COMPILE_CRYPT_SUPPORT
 	class KviCryptEngine;
@@ -51,12 +51,13 @@
 	typedef void (*crypt_engine_deallocator_func)(KviCryptEngine *);
 #endif //COMPILE_CRYPT_SUPPORT
 
-	// we must include this declaration to make moc happy even
+	// we must include this declaration to make tqmoc happy even
 	// if we're not compiling the crypt support
 	
-	class KVILIB_API KviCryptEngine : public QObject, public KviHeapObject
+	class KVILIB_API KviCryptEngine : public TQObject, public KviHeapObject
 	{
 		Q_OBJECT
+  TQ_OBJECT
 		friend class KviCryptEngineManager;
 	public:
 		KviCryptEngine();
@@ -65,7 +66,7 @@
 #ifdef COMPILE_CRYPT_SUPPORT
 	private:
 		crypt_engine_deallocator_func m_deallocFunc;    // this is accessed by KviCryptEngineManager only
-		QString                       m_szLastError;
+		TQString                       m_szLastError;
 		int                           m_iMaxEncryptLen;
 	public:
 		void setMaxEncryptLen(int m){ m_iMaxEncryptLen = m; };
@@ -101,13 +102,13 @@
 		// of the last error or an empty string if there
 		// was no error after the last init() call.
 		//
-		const QString &lastError(){ return m_szLastError; };
+		const TQString &lastError(){ return m_szLastError; };
 	protected:
 		//
 		// The following two should have clear meaning
 		//
 		void clearLastError(){ m_szLastError = ""; };
-		void setLastError(const QString &err){ m_szLastError = err; };
+		void setLastError(const TQString &err){ m_szLastError = err; };
 #endif //COMPILE_CRYPT_SUPPORT
 	};
 
@@ -123,9 +124,9 @@
 		KviCryptEngineDescription(){};
 		virtual ~KviCryptEngineDescription(){};
 	public:
-		QString                       szName;           // engine name
-		QString                       szDescription;    // details
-		QString                       szAuthor;         // algorithm author
+		TQString                       szName;           // engine name
+		TQString                       szDescription;    // details
+		TQString                       szAuthor;         // algorithm author
 		int                           iFlags;           // properties
 		crypt_engine_allocator_func   allocFunc;        // engine allocator
 		crypt_engine_deallocator_func deallocFunc;      // deallocation function (if called from outside the origin module)
@@ -139,18 +140,18 @@
 		KviCryptEngineManager();
 		virtual ~KviCryptEngineManager();
 	private:
-		KviPointerHashTable<QString,KviCryptEngineDescription> * m_pEngineDict;
+		KviPointerHashTable<TQString,KviCryptEngineDescription> * m_pEngineDict;
 	public:
-		const KviPointerHashTable<QString,KviCryptEngineDescription> * engineDict(){ return m_pEngineDict; };
+		const KviPointerHashTable<TQString,KviCryptEngineDescription> * engineDict(){ return m_pEngineDict; };
 		void registerEngine(KviCryptEngineDescription * d);
-		void unregisterEngine(const QString &szName);
+		void unregisterEngine(const TQString &szName);
 		void unregisterEngines(void * providerHandle);
 		//
 		// Allocates a crypt engine
 		// Please note that the engine may be deleted from outside
 		// so you'd better connect the "destroyed" signal
 		//
-		KviCryptEngine * allocateEngine(const QString &szName);
+		KviCryptEngine * allocateEngine(const TQString &szName);
 		void deallocateEngine(KviCryptEngine * e);
 	};