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, 59 insertions, 55 deletions

diff --git a/src/modules/actioneditor/actioneditor.h b/src/modules/actioneditor/actioneditor.h
index fc112614..7c2b2736 100644
--- a/src/modules/actioneditor/actioneditor.h
+++ b/src/modules/actioneditor/actioneditor.h
@@ -26,7 +26,7 @@
 
 #include "kvi_window.h"
 
-#include <qwidget.h>
+#include <tqwidget.h>
 #include "kvi_tal_listview.h"
 #include "kvi_styled_controls.h"
 
@@ -35,26 +35,26 @@ class KviActionEditorListViewItem;
 class KviActionData
 {
 public:
-	QString m_szName;
-	QString m_szScriptCode;
-	QString m_szVisibleName;
-	QString m_szDescription;
-	QString m_szCategory;
-	QString m_szBigIcon;
-	QString m_szSmallIcon;
-	QString m_szKeySequence;
+	TQString m_szName;
+	TQString m_szScriptCode;
+	TQString m_szVisibleName;
+	TQString m_szDescription;
+	TQString m_szCategory;
+	TQString m_szBigIcon;
+	TQString m_szSmallIcon;
+	TQString m_szKeySequence;
 	unsigned int m_uFlags;
 	KviActionEditorListViewItem * m_pItem; // ummigarba tanto...
 public:
-	KviActionData(const QString &szName,
-		const QString &szScriptCode,
-		const QString &szVisibleName,
-		const QString &szDescription,
-		const QString &szCategory,
-		const QString &szBigIcon,
-		const QString &szSmallIcon,
+	KviActionData(const TQString &szName,
+		const TQString &szScriptCode,
+		const TQString &szVisibleName,
+		const TQString &szDescription,
+		const TQString &szCategory,
+		const TQString &szBigIcon,
+		const TQString &szSmallIcon,
 		unsigned int uFlags,
-		const QString &szKeySequence,
+		const TQString &szKeySequence,
 		KviActionEditorListViewItem * pItem)
 	: m_szName(szName), m_szScriptCode(szScriptCode), m_szVisibleName(szVisibleName),
 		m_szDescription(szDescription), m_szCategory(szCategory), m_szBigIcon(szBigIcon),
@@ -64,18 +64,18 @@ public:
 };
 
 
-class QLineEdit;
-class QComboBox;
+class TQLineEdit;
+class TQComboBox;
 class KviScriptEditor;
-class QToolButton;
-class QSimpleRichText;
-class QPushButton;
+class TQToolButton;
+class TQSimpleRichText;
+class TQPushButton;
 
 #ifdef COMPILE_USE_QT4
-	#include <q3simplerichtext.h>
-	#define QSimpleRichText Q3SimpleRichText
+	#include <tq3simplerichtext.h>
+	#define TQSimpleRichText Q3SimpleRichText
 #else
-	#include <qsimplerichtext.h>
+	#include <tqsimplerichtext.h>
 #endif
 
 
@@ -87,51 +87,53 @@ public:
 	~KviActionEditorListViewItem();
 protected:
 	KviActionData * m_pActionData;
-	QSimpleRichText * m_pText;
-	QPixmap * m_pIcon;
+	TQSimpleRichText * m_pText;
+	TQPixmap * m_pIcon;
 	KviTalListView * m_pListView;
-	QString m_szKey;
+	TQString m_szKey;
 public:
 	KviActionData * actionData(){ return m_pActionData; };
 	void setupForActionData();
 public:
-	virtual void paintCell(QPainter * p,const QColorGroup & cg,int column,int width,int align);
+	virtual void paintCell(TQPainter * p,const TQColorGroup & cg,int column,int width,int align);
 	virtual void setup();
-	virtual QString key(int,bool) const;
+	virtual TQString key(int,bool) const;
 };
 
 
 class KviActionEditorListView : public KviTalListView
 {
 	Q_OBJECT
+  TQ_OBJECT
 public:
-	KviActionEditorListView(QWidget * pParent);
+	KviActionEditorListView(TQWidget * pParent);
 	~KviActionEditorListView();
 protected:
-	virtual void resizeEvent(QResizeEvent * e);
+	virtual void resizeEvent(TQResizeEvent * e);
 };
 
 class KviActionEditor;
 
-class KviSingleActionEditor : public QWidget
+class KviSingleActionEditor : public TQWidget
 {
 	Q_OBJECT
+  TQ_OBJECT
 public:
-	KviSingleActionEditor(QWidget * par,KviActionEditor * ed);
+	KviSingleActionEditor(TQWidget * par,KviActionEditor * ed);
 	~KviSingleActionEditor();
 protected:
 	KviActionEditor * m_pActionEditor;
 	KviActionData * m_pActionData;
-	QLineEdit * m_pNameEdit;
-	QLineEdit * m_pVisibleNameEdit;
-	QComboBox * m_pCategoryCombo;
+	TQLineEdit * m_pNameEdit;
+	TQLineEdit * m_pVisibleNameEdit;
+	TQComboBox * m_pCategoryCombo;
 	KviScriptEditor * m_pScriptEditor;
-	QLineEdit * m_pKeySequenceEdit;
-	QLineEdit * m_pDescriptionEdit;
-	QLineEdit * m_pSmallIconEdit;
-	QLineEdit * m_pBigIconEdit;
-	QToolButton * m_pSmallIconButton;
-	QToolButton * m_pBigIconButton;
+	TQLineEdit * m_pKeySequenceEdit;
+	TQLineEdit * m_pDescriptionEdit;
+	TQLineEdit * m_pSmallIconEdit;
+	TQLineEdit * m_pBigIconEdit;
+	TQToolButton * m_pSmallIconButton;
+	TQToolButton * m_pBigIconButton;
 	KviStyledCheckBox * m_pNeedsContextCheck;
 	KviStyledCheckBox * m_pNeedsConnectionCheck;
 	KviStyledCheckBox * m_pEnableAtLoginCheck;
@@ -156,28 +158,29 @@ protected slots:
 	void channelQueryOrConsoleWindowCheckToggled(bool);
 };
 
-class QSplitter;
+class TQSplitter;
 
-class KviActionEditor : public QWidget
+class KviActionEditor : public TQWidget
 {
 	friend class KviActionEditorWindow;
 	Q_OBJECT
+  TQ_OBJECT
 public:
-	KviActionEditor(QWidget * par);
+	KviActionEditor(TQWidget * par);
 	~KviActionEditor();
 protected:
 	KviActionEditorListView * m_pListView;
 	KviSingleActionEditor * m_pSingleActionEditor;
-	QSplitter * m_pSplitter;
-	QPushButton * m_pNewActionButton;
-	QPushButton * m_pDeleteActionsButton;
-	QPushButton * m_pExportActionsButton;
+	TQSplitter * m_pSplitter;
+	TQPushButton * m_pNewActionButton;
+	TQPushButton * m_pDeleteActionsButton;
+	TQPushButton * m_pExportActionsButton;
 public:
 	void commit();
-	bool actionExists(const QString &szName);
+	bool actionExists(const TQString &szName);
 protected:
 	int selectedCount();
-	QString nameForAutomaticAction(const QString &szTemplate);
+	TQString nameForAutomaticAction(const TQString &szTemplate);
 protected slots:
 	void currentChanged(KviTalListViewItem * it);
 	void newAction();
@@ -189,15 +192,16 @@ protected slots:
 class KviActionEditorWindow : public KviWindow
 {
 	Q_OBJECT
+  TQ_OBJECT
 public:
 	KviActionEditorWindow(KviFrame * lpFrm);
 	~KviActionEditorWindow();
 protected:
 	KviActionEditor * m_pEditor;
-	QWidget         * m_pBase;
+	TQWidget         * m_pBase;
 protected:
-	virtual QPixmap * myIconPtr();
-	virtual void resizeEvent(QResizeEvent *e);
+	virtual TQPixmap * myIconPtr();
+	virtual void resizeEvent(TQResizeEvent *e);
 	virtual void getConfigGroupName(KviStr &szName);
 	virtual void saveProperties(KviConfig *);
 	virtual void loadProperties(KviConfig *);