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, 44 insertions, 42 deletions

diff --git a/src/kvirc/kvs/kvi_kvs_popupmenu.h b/src/kvirc/kvs/kvi_kvs_popupmenu.h
index e658495..11ca648 100644
--- a/src/kvirc/kvs/kvi_kvs_popupmenu.h
+++ b/src/kvirc/kvs/kvi_kvs_popupmenu.h
@@ -33,8 +33,8 @@
 #include "kvi_kvs_runtimecontext.h"
 
 #include "kvi_tal_popupmenu.h"
-#include <qlabel.h>
-#include <qpixmap.h>
+#include <tqlabel.h>
+#include <tqpixmap.h>
 
 class KviKvsPopupMenu;
 
@@ -69,12 +69,12 @@ class KVIRC_API KviKvsPopupMenuItem
 public:
 	enum Type { Item , Menu , Label , Separator , ExtMenu };
 protected:
-	KviKvsPopupMenuItem(Type t,const QString &szItemName,const QString &szCondition);
-	KviKvsPopupMenuItem(Type t,const QString &szItemName,const KviKvsScript * pCondition);
+	KviKvsPopupMenuItem(Type t,const TQString &szItemName,const TQString &szCondition);
+	KviKvsPopupMenuItem(Type t,const TQString &szItemName,const KviKvsScript * pCondition);
 public:
 	virtual ~KviKvsPopupMenuItem();
 protected:
-	QString        m_szItemName;
+	TQString        m_szItemName;
 	Type           m_eType;
 	KviKvsScript * m_pKvsCondition;
 public:
@@ -83,7 +83,7 @@ public:
 
 	KviKvsPopupMenuItem::Type type(){ return m_eType; };
 
-	const QString & name(){ return m_szItemName; };
+	const TQString & name(){ return m_szItemName; };
 
 	bool isItem(){ return m_eType == Item; };
 	bool isSeparator(){ return m_eType == Separator; };
@@ -107,8 +107,8 @@ class KVIRC_API KviKvsPopupMenuItemSeparator : public KviKvsPopupMenuItem
 {
 	friend class KviKvsPopupMenu;
 protected:
-	KviKvsPopupMenuItemSeparator(const QString &szItemName,const QString &szCondition);
-	KviKvsPopupMenuItemSeparator(const QString &szItemName,const KviKvsScript * pCondition);
+	KviKvsPopupMenuItemSeparator(const TQString &szItemName,const TQString &szCondition);
+	KviKvsPopupMenuItemSeparator(const TQString &szItemName,const KviKvsScript * pCondition);
 public:
 	virtual ~KviKvsPopupMenuItemSeparator();
 public:
@@ -120,8 +120,8 @@ public:
 class KVIRC_API KviKvsPopupMenuItemWithTextAndIcon : public KviKvsPopupMenuItem
 {
 protected:
-	KviKvsPopupMenuItemWithTextAndIcon(KviKvsPopupMenuItem::Type t,const QString &szItemName,const QString &szText,const QString &szIcon,const QString &szCondition);
-	KviKvsPopupMenuItemWithTextAndIcon(KviKvsPopupMenuItem::Type t,const QString &szItemName,const KviKvsScript * pText,const KviKvsScript * pIcon,const KviKvsScript * pCondition);
+	KviKvsPopupMenuItemWithTextAndIcon(KviKvsPopupMenuItem::Type t,const TQString &szItemName,const TQString &szText,const TQString &szIcon,const TQString &szCondition);
+	KviKvsPopupMenuItemWithTextAndIcon(KviKvsPopupMenuItem::Type t,const TQString &szItemName,const KviKvsScript * pText,const KviKvsScript * pIcon,const KviKvsScript * pCondition);
 public:
 	virtual ~KviKvsPopupMenuItemWithTextAndIcon();
 protected:
@@ -131,17 +131,18 @@ public:
 	virtual KviKvsScript * kvsIcon();
 	virtual KviKvsScript * kvsText();
 	// this just returns a string , eventually empty
-	QString evaluateText(KviKvsPopupMenuTopLevelData * pData);
+	TQString evaluateText(KviKvsPopupMenuTopLevelData * pData);
 	// this just returns the icon , eventually
-	QPixmap * evaluateIcon(KviKvsPopupMenuTopLevelData * pData);
+	TQPixmap * evaluateIcon(KviKvsPopupMenuTopLevelData * pData);
 };
 
 class KviKvsPopupMenuItemLabel;
 
 // this acts as signal relay
-class KVIRC_API KviKvsPopupMenuItemLabelHelper : public QObject
+class KVIRC_API KviKvsPopupMenuItemLabelHelper : public TQObject
 {
 	Q_OBJECT
+  TQ_OBJECT
 	friend class KviKvsPopupMenuItemLabel;
 protected:
 	KviKvsPopupMenuItemLabelHelper(KviKvsPopupMenuItemLabel * pItem);
@@ -157,12 +158,12 @@ class KVIRC_API KviKvsPopupMenuItemLabel : public KviKvsPopupMenuItemWithTextAnd
 	friend class KviKvsPopupMenuItemLabelHelper;
 	friend class KviKvsPopupMenu;
 protected:
-	KviKvsPopupMenuItemLabel(const QString &szItemName,const QString &szText,const QString &szIcon,const QString &szCondition);
-	KviKvsPopupMenuItemLabel(const QString &szItemName,const KviKvsScript * pText,const KviKvsScript * pIcon,const KviKvsScript * pCondition);
+	KviKvsPopupMenuItemLabel(const TQString &szItemName,const TQString &szText,const TQString &szIcon,const TQString &szCondition);
+	KviKvsPopupMenuItemLabel(const TQString &szItemName,const KviKvsScript * pText,const KviKvsScript * pIcon,const KviKvsScript * pCondition);
 public:
 	virtual ~KviKvsPopupMenuItemLabel();
 protected:
-	QLabel * m_pLabel;
+	TQLabel * m_pLabel;
 	KviKvsPopupMenuItemLabelHelper * m_pSignalRelay;
 public:
 	virtual void fill(KviKvsPopupMenu * pMenu,KviKvsPopupMenuTopLevelData * pData,int iIdx);
@@ -177,8 +178,8 @@ class KVIRC_API KviKvsPopupMenuItemItem : public KviKvsPopupMenuItemWithTextAndI
 {
 	friend class KviKvsPopupMenu;
 protected:
-	KviKvsPopupMenuItemItem(const QString &szItemName,const QString &szCode,const QString &szText,const QString &szIcon,const QString &szCondition);
-	KviKvsPopupMenuItemItem(const QString &szItemName,const KviKvsScript * pCode,const KviKvsScript * pText,const KviKvsScript * pIcon,const KviKvsScript * pCondition);
+	KviKvsPopupMenuItemItem(const TQString &szItemName,const TQString &szCode,const TQString &szText,const TQString &szIcon,const TQString &szCondition);
+	KviKvsPopupMenuItemItem(const TQString &szItemName,const KviKvsScript * pCode,const KviKvsScript * pText,const KviKvsScript * pIcon,const KviKvsScript * pCondition);
 public:
 	virtual ~KviKvsPopupMenuItemItem();
 protected:
@@ -194,8 +195,8 @@ class KVIRC_API KviKvsPopupMenuItemMenu : public KviKvsPopupMenuItemWithTextAndI
 {
 	friend class KviKvsPopupMenu;
 protected:
-	KviKvsPopupMenuItemMenu(const QString &szItemName,KviKvsPopupMenu * pMenu,const QString &szText,const QString &szIcon,const QString &szCondition);
-	KviKvsPopupMenuItemMenu(const QString &szItemName,KviKvsPopupMenu * pMenu,const KviKvsScript * pText,const KviKvsScript * pIcon,const KviKvsScript * pCondition);
+	KviKvsPopupMenuItemMenu(const TQString &szItemName,KviKvsPopupMenu * pMenu,const TQString &szText,const TQString &szIcon,const TQString &szCondition);
+	KviKvsPopupMenuItemMenu(const TQString &szItemName,KviKvsPopupMenu * pMenu,const KviKvsScript * pText,const KviKvsScript * pIcon,const KviKvsScript * pCondition);
 public:
 	virtual ~KviKvsPopupMenuItemMenu();
 protected:
@@ -211,15 +212,15 @@ class KVIRC_API KviKvsPopupMenuItemExtMenu : public KviKvsPopupMenuItemWithTextA
 {
 	friend class KviKvsPopupMenu;
 protected:
-	KviKvsPopupMenuItemExtMenu(const QString &szItemName,const QString &szMenuName,const QString &szText,const QString &szIcon,const QString &szCondition);
-	KviKvsPopupMenuItemExtMenu(const QString &szItemName,const QString &szMenuName,const KviKvsScript * pText,const KviKvsScript * pIcon,const KviKvsScript * pCondition);
+	KviKvsPopupMenuItemExtMenu(const TQString &szItemName,const TQString &szMenuName,const TQString &szText,const TQString &szIcon,const TQString &szCondition);
+	KviKvsPopupMenuItemExtMenu(const TQString &szItemName,const TQString &szMenuName,const KviKvsScript * pText,const KviKvsScript * pIcon,const KviKvsScript * pCondition);
 public:
 	virtual ~KviKvsPopupMenuItemExtMenu();
 protected:
-	QString m_szMenuName;
+	TQString m_szMenuName;
 	KviKvsPopupMenu * m_pMenu; // owned!
 public:
-	const QString & extName(){ return m_szMenuName; };
+	const TQString & extName(){ return m_szMenuName; };
 	virtual void fill(KviKvsPopupMenu * pMenu,KviKvsPopupMenuTopLevelData * pData,int iIdx);
 	virtual void clear();
 	virtual KviKvsPopupMenuItem * clone() const;
@@ -241,13 +242,14 @@ class KVIRC_API KviKvsPopupMenu : public KviTalPopupMenu
 	friend class KviKvsPopupManager;
 	friend class KviSinglePopupEditor;
 	Q_OBJECT
+  TQ_OBJECT
 public:
-	KviKvsPopupMenu(const QString &szName);
+	KviKvsPopupMenu(const TQString &szName);
 	~KviKvsPopupMenu();
 protected:
 	KviPointerList<KviKvsPopupMenuItem>  * m_pItemList;
 private:
-	QString                            m_szName;
+	TQString                            m_szName;
 	KviKvsPopupMenu                  * m_pParentPopup;
 	KviPointerList<KviKvsScript>         * m_pPrologues;
 	KviPointerList<KviKvsScript>         * m_pEpilogues;
@@ -256,36 +258,36 @@ private:
 	KviKvsPopupMenuTopLevelData      * m_pTempTopLevelData;
 	bool                               m_bSetupDone;
 public:
-	const QString & popupName(){ return m_szName; };
-	void setPopupName(const QString &szName){ m_szName = szName; };
+	const TQString & popupName(){ return m_szName; };
+	void setPopupName(const TQString &szName){ m_szName = szName; };
 	void copyFrom(const KviKvsPopupMenu * src);
 	KviKvsPopupMenuTopLevelData * topLevelData();
 	KviKvsPopupMenu * topLevelPopup();
 	bool isLocked();
 	void lock(bool bLock);
-	KviKvsPopupMenu * addPopup(const QString &szItemName,const QString &szText,const QString &szIcon,const QString &szCondition);
-	void addSeparator(const QString &szItemName,const QString &szCondition);
-	void addLabel(const QString &szItemName,const QString &szText,const QString &szIcon,const QString &szCondition);
-	void addItem(const QString &szItemName,const QString &szCode,const QString &szText,const QString &szIcon,const QString &szCondition);
-	void addExtPopup(const QString &szItemName,const QString &szPopupName,const QString szText,const QString &szIcon,const QString &szCondition);
-	void doPopup(const QPoint & pnt,KviWindow * wnd,KviKvsVariantList * pParams,bool bTestMode = false);
+	KviKvsPopupMenu * addPopup(const TQString &szItemName,const TQString &szText,const TQString &szIcon,const TQString &szCondition);
+	void addSeparator(const TQString &szItemName,const TQString &szCondition);
+	void addLabel(const TQString &szItemName,const TQString &szText,const TQString &szIcon,const TQString &szCondition);
+	void addItem(const TQString &szItemName,const TQString &szCode,const TQString &szText,const TQString &szIcon,const TQString &szCondition);
+	void addExtPopup(const TQString &szItemName,const TQString &szPopupName,const TQString szText,const TQString &szIcon,const TQString &szCondition);
+	void doPopup(const TQPoint & pnt,KviWindow * wnd,KviKvsVariantList * pParams,bool bTestMode = false);
 	bool isEmpty(){ return m_pItemList->isEmpty() && m_pPrologues->isEmpty() && m_pEpilogues->isEmpty(); };
 	void doClear();
-	void addPrologue(const QString &szItemName,const QString &szCode);
-	void addEpilogue(const QString &szItemName,const QString &szCode);
-	bool removeItemByName(const QString &szItemName,bool bRecursive);
+	void addPrologue(const TQString &szItemName,const TQString &szCode);
+	void addEpilogue(const TQString &szItemName,const TQString &szCode);
+	bool removeItemByName(const TQString &szItemName,bool bRecursive);
 	KviPointerList<KviKvsScript> * epilogues(){ return m_pEpilogues; };
 	KviPointerList<KviKvsScript> * prologues(){ return m_pPrologues; };
-	KviKvsPopupMenu * parentPopup(){ return m_pParentPopup; };
-	void generateDefPopup(QString &buffer);
+	KviKvsPopupMenu * tqparentPopup(){ return m_pParentPopup; };
+	void generateDefPopup(TQString &buffer);
 	void setParentPopup(KviKvsPopupMenu * par){ m_pParentPopup = par; };
-	void generateDefPopupCore(QString &buffer);
+	void generateDefPopupCore(TQString &buffer);
 protected:
 	void addItemInternal(KviKvsPopupMenuItem * it);
 	void executePrologues(KviKvsPopupMenuTopLevelData * pData);
 	void executeEpilogues(KviKvsPopupMenuTopLevelData * pData);
-	void load(const QString &prefix,KviConfig * cfg);
-	void save(const QString &prefix,KviConfig * cfg);
+	void load(const TQString &prefix,KviConfig * cfg);
+	void save(const TQString &prefix,KviConfig * cfg);
 private slots:
 	void setupMenuContents();
 protected: