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, 41 insertions, 38 deletions

diff --git a/src/modules/toolbareditor/toolbareditor.h b/src/modules/toolbareditor/toolbareditor.h
index 2c44178..ea2f525 100644
--- a/src/modules/toolbareditor/toolbareditor.h
+++ b/src/modules/toolbareditor/toolbareditor.h
@@ -25,34 +25,35 @@
 //=============================================================================
 
 #include "kvi_settings.h"
-#include <qwidget.h>
-#include <qlabel.h>
-#include <qdialog.h>
-#include <qcolor.h>
+#include <tqwidget.h>
+#include <tqlabel.h>
+#include <tqdialog.h>
+#include <tqcolor.h>
 
-class QPushButton;
+class TQPushButton;
 class KviActionDrawer;
 
-class KviCustomizeToolBarsDialog : public QDialog
+class KviCustomizeToolBarsDialog : public TQDialog
 {
 	Q_OBJECT
+  TQ_OBJECT
 protected:
-	KviCustomizeToolBarsDialog(QWidget * p);
+	KviCustomizeToolBarsDialog(TQWidget * p);
 public:
 	~KviCustomizeToolBarsDialog();
 protected:
 	KviActionDrawer * m_pDrawer;
 	static KviCustomizeToolBarsDialog * m_pInstance;
-	QPushButton * m_pDeleteToolBarButton;
-	QPushButton * m_pRenameToolBarButton;
-	QPushButton * m_pExportToolBarButton;
+	TQPushButton * m_pDeleteToolBarButton;
+	TQPushButton * m_pRenameToolBarButton;
+	TQPushButton * m_pExportToolBarButton;
 public:
 	static KviCustomizeToolBarsDialog * instance(){ return m_pInstance; };
 	static void display();
 	static void cleanup();
 protected:
-	virtual void showEvent(QShowEvent * e);
-	virtual void closeEvent(QCloseEvent *e);
+	virtual void showEvent(TQShowEvent * e);
+	virtual void closeEvent(TQCloseEvent *e);
 protected slots:
 	void closeClicked();
 	void newToolBar();
@@ -62,54 +63,56 @@ protected slots:
 	void currentToolBarChanged();
 };
 
-class QLineEdit;
-class QPushButton;
+class TQLineEdit;
+class TQPushButton;
 
-class KviCustomToolBarPropertiesDialog : public QDialog
+class KviCustomToolBarPropertiesDialog : public TQDialog
 {
 	Q_OBJECT
+  TQ_OBJECT
 public:
-	KviCustomToolBarPropertiesDialog(QWidget * p,const QString &szText,const QString &szId = QString::null,const QString &szLabel = QString::null,const QString &szIconId = QString::null);
+	KviCustomToolBarPropertiesDialog(TQWidget * p,const TQString &szText,const TQString &szId = TQString(),const TQString &szLabel = TQString(),const TQString &szIconId = TQString());
 	~KviCustomToolBarPropertiesDialog();
 protected:
-	QString m_szId;
-	QString m_szOriginalId;
-	QString m_szLabel;
-	QString m_szIconId;
-	QWidget * m_pAdvanced;
-	QLineEdit * m_pIdEdit;
-	QLineEdit * m_pLabelEdit;
-	QLineEdit * m_pIconEdit;
-	QPushButton * m_pIconButton;
-	QPushButton * m_pAdvancedButton;
+	TQString m_szId;
+	TQString m_szOriginalId;
+	TQString m_szLabel;
+	TQString m_szIconId;
+	TQWidget * m_pAdvanced;
+	TQLineEdit * m_pIdEdit;
+	TQLineEdit * m_pLabelEdit;
+	TQLineEdit * m_pIconEdit;
+	TQPushButton * m_pIconButton;
+	TQPushButton * m_pAdvancedButton;
 public:
-	const QString &id(){ return m_szId; };
-	const QString &label(){ return m_szLabel; };
-	const QString &iconId(){ return m_szIconId; };
+	const TQString &id(){ return m_szId; };
+	const TQString &label(){ return m_szLabel; };
+	const TQString &iconId(){ return m_szIconId; };
 protected slots:
 	void okClicked();
 	void advancedClicked();
 	void iconButtonClicked();
-	void labelTextChanged(const QString &s);
+	void labelTextChanged(const TQString &s);
 protected:
-	void iconSelected(const QString &szIconId);
+	void iconSelected(const TQString &szIconId);
 };
 
-class QTimer;
+class TQTimer;
 
-class KviTrashcanLabel : public QLabel
+class KviTrashcanLabel : public TQLabel
 {
 	Q_OBJECT
+  TQ_OBJECT
 public:
-	KviTrashcanLabel(QWidget * p);
+	KviTrashcanLabel(TQWidget * p);
 	virtual ~KviTrashcanLabel();
 protected:
 	unsigned int m_uFlashCount;
-	QTimer * m_pFlashTimer;
-	QColor   m_clrOriginal;
+	TQTimer * m_pFlashTimer;
+	TQColor   m_clrOriginal;
 protected:
-	virtual void dragEnterEvent(QDragEnterEvent * e);
-	virtual void dropEvent(QDropEvent * e);
+	virtual void dragEnterEvent(TQDragEnterEvent * e);
+	virtual void dropEvent(TQDropEvent * e);
 public slots:
 	void flash();
 protected slots: