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, 14 deletions

diff --git a/src/kvirc/module/kvi_moduleextension.h b/src/kvirc/module/kvi_moduleextension.h
index 0d1b2428..7bbc360c 100644
--- a/src/kvirc/module/kvi_moduleextension.h
+++ b/src/kvirc/module/kvi_moduleextension.h
@@ -28,8 +28,8 @@
 #include "kvi_heapobject.h"
 
 #include "kvi_pointerhashtable.h"
-#include <qpixmap.h>
-#include <qvariant.h>
+#include <tqpixmap.h>
+#include <tqvariant.h>
 #include "kvi_pointerhashtable.h"
 
 class KviWindow;
@@ -41,7 +41,7 @@ typedef struct _KviModuleExtensionAllocStructTag
 {
 	KviModuleExtensionDescriptor * pDescriptor; // module extension that this alloc routine refers to
 	KviWindow                    * pWindow;     // may be 0!
-	KviPointerHashTable<QString,QVariant>              * pParams;     // parameter dict (may be 0!)
+	KviPointerHashTable<TQString,TQVariant>              * pParams;     // parameter dict (may be 0!)
 	void                         * pSpecial;    // special parameter passed to the alloc routine, may be 0
 } KviModuleExtensionAllocStruct;
 
@@ -52,41 +52,41 @@ class KVIRC_API KviModuleExtensionDescriptor
 	friend class KviModuleExtension;
 	friend class KviModuleExtensionManager; // only the manager allocates and deallocates these structures
 protected:
-	KviModuleExtensionDescriptor(KviModule * m,const KviStr &szType,const KviStr &szName,const QString &szVisibleName,KviModuleExtensionAllocRoutine r,const QPixmap &pix);
-public: // this has to be public because of QPtrList... but should be protected
+	KviModuleExtensionDescriptor(KviModule * m,const KviStr &szType,const KviStr &szName,const TQString &szVisibleName,KviModuleExtensionAllocRoutine r,const TQPixmap &pix);
+public: // this has to be public because of TQPtrList... but should be protected
 	~KviModuleExtensionDescriptor();
 private:
 	int                              m_iId;            // unique id assigned at creation time
 	KviStr                           m_szType;         // name of the service (toolbar , crypt engine...)
 	KviStr                           m_szName;         // name of the extension
-	QString                          m_szVisibleName;  // name that is VISIBLE and possibly translated
+	TQString                          m_szVisibleName;  // name that is VISIBLE and possibly translated
 	KviStr                           m_szAuthor;       // Author (visible)
 	KviStr                           m_szDescription;  // Description (visible!)
 	int                              m_iFlags;         // Flags (0 if not applicable)
-	QPixmap                        * m_pIcon;          // Icon (may be null!)
+	TQPixmap                        * m_pIcon;          // Icon (may be null!)
 	KviModuleExtensionAllocRoutine   m_allocRoutine;
 	KviPointerList<KviModuleExtension> * m_pObjectList;
 
 	KviModule                      * m_pModule;        // module pointer
 public:
 	// pParams ownership is NOT taken
-	KviModuleExtension * allocate(KviWindow * pWnd = 0,KviPointerHashTable<QString,QVariant> * pParams = 0,void * pSpecial = 0);
+	KviModuleExtension * allocate(KviWindow * pWnd = 0,KviPointerHashTable<TQString,TQVariant> * pParams = 0,void * pSpecial = 0);
 
 	int id(){ return m_iId; };
 	KviModule * module(){ return m_pModule; };
 	const KviStr &type(){ return m_szType; };
 	const KviStr &name(){ return m_szName; };
-	const QString &visibleName(){ return m_szVisibleName; };
+	const TQString &visibleName(){ return m_szVisibleName; };
 	const KviStr &author(){ return m_szAuthor; };
 	const KviStr &description(){ return m_szDescription; };
-	const QPixmap * icon(){ return m_pIcon; };
+	const TQPixmap * icon(){ return m_pIcon; };
 	int flags(){ return m_iFlags; };
 
 	void setAuthor(const KviStr &szAuthor){ m_szAuthor = szAuthor; };
 	void setDescription(const KviStr &szDescription){ m_szDescription = szDescription; };
 	void setVisibleName(const KviStr &szVisibleName){ m_szVisibleName = szVisibleName; };
 	void setFlags(int iFlags){ m_iFlags = iFlags; };
-	void setIcon(const QPixmap &pix);
+	void setIcon(const TQPixmap &pix);
 	
 protected:
 	void registerObject(KviModuleExtension * e);
@@ -110,14 +110,14 @@ protected:
 	KviPointerHashTable<const char *,KviModuleExtensionDescriptorList> * m_pExtensionDict;
 protected:
 	// Only KviModule can call this
-	KviModuleExtensionDescriptor * registerExtension(KviModule * m,const KviStr &szType,const KviStr &szName,const QString &szVisibleName,KviModuleExtensionAllocRoutine r,const QPixmap &icon);
+	KviModuleExtensionDescriptor * registerExtension(KviModule * m,const KviStr &szType,const KviStr &szName,const TQString &szVisibleName,KviModuleExtensionAllocRoutine r,const TQPixmap &icon);
 	void unregisterExtensionsByModule(KviModule * m);
 public:
 	KviModuleExtensionDescriptor * findExtensionDescriptor(const KviStr &szType,const KviStr &szName);
 	static KviModuleExtensionManager * instance(){ return g_pModuleExtensionManager; };
 	KviModuleExtensionDescriptorList * getExtensionList(const KviStr &szType);
-	KviModuleExtension * allocateExtension(const KviStr &szType,const KviStr &szName,KviWindow * pWnd = 0,KviPointerHashTable<QString,QVariant> * pParams = 0,void * pSpecial = 0,const char * preloadModule = 0);
-	KviModuleExtension * allocateExtension(const KviStr &szType,int id,KviWindow * pWnd = 0,KviPointerHashTable<QString,QVariant> * pParams = 0,void * pSpecial = 0,const char * preloadModule = 0);
+	KviModuleExtension * allocateExtension(const KviStr &szType,const KviStr &szName,KviWindow * pWnd = 0,KviPointerHashTable<TQString,TQVariant> * pParams = 0,void * pSpecial = 0,const char * preloadModule = 0);
+	KviModuleExtension * allocateExtension(const KviStr &szType,int id,KviWindow * pWnd = 0,KviPointerHashTable<TQString,TQVariant> * pParams = 0,void * pSpecial = 0,const char * preloadModule = 0);
 private:
 	KviModuleExtensionDescriptorList * allocateExtensionGetDescriptorList(const KviStr &szType,const char * preloadModule);
 };