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, 43 insertions, 36 deletions

diff --git a/src/modules/options/optw_identity.h b/src/modules/options/optw_identity.h
index 479614c4..5170e4df 100644
--- a/src/modules/options/optw_identity.h
+++ b/src/modules/options/optw_identity.h
@@ -30,43 +30,45 @@
 #include "kvi_settings.h"
 #include "kvi_selectors.h"
 
-#include <qdialog.h>
+#include <tqdialog.h>
 #include "kvi_pixmap.h"
 
 
-class QLineEdit;
-class QCheckBox;
-class QPushButton;
-class QComboBox;
+class TQLineEdit;
+class TQCheckBox;
+class TQPushButton;
+class TQComboBox;
 
-class KviNickAlternativesDialog : public QDialog
+class KviNickAlternativesDialog : public TQDialog
 {
 	friend class KviIdentityGeneralOptionsWidget;
 	Q_OBJECT
+  TQ_OBJECT
 protected:
-	KviNickAlternativesDialog(QWidget * par,const QString &n1,const QString &n2,const QString &n3);
+	KviNickAlternativesDialog(TQWidget * par,const TQString &n1,const TQString &n2,const TQString &n3);
 	~KviNickAlternativesDialog();
 protected:
-	QLineEdit * m_pNickEdit1;
-	QLineEdit * m_pNickEdit2;
-	QLineEdit * m_pNickEdit3;
+	TQLineEdit * m_pNickEdit1;
+	TQLineEdit * m_pNickEdit2;
+	TQLineEdit * m_pNickEdit3;
 protected:
-	void fill(QString &n1,QString &n2,QString &n3);
+	void fill(TQString &n1,TQString &n2,TQString &n3);
 };
 
-class KviAvatarSelectionDialog : public QDialog
+class KviAvatarSelectionDialog : public TQDialog
 {
 	friend class KviIdentityAvatarOptionsWidget;
 	Q_OBJECT
+  TQ_OBJECT
 public:
-	KviAvatarSelectionDialog(QWidget * par,const QString &szInitialPath);
+	KviAvatarSelectionDialog(TQWidget * par,const TQString &szInitialPath);
 	~KviAvatarSelectionDialog();
 protected:
-	QLineEdit   * m_pLineEdit;
-	QString       m_szAvatarName;
+	TQLineEdit   * m_pLineEdit;
+	TQString       m_szAvatarName;
 protected:
-	virtual void closeEvent(QCloseEvent * e);
-	const QString &avatarName(){ return m_szAvatarName; };
+	virtual void closeEvent(TQCloseEvent * e);
+	const TQString &avatarName(){ return m_szAvatarName; };
 protected slots:
 	void okClicked();
 	void cancelClicked();
@@ -75,23 +77,24 @@ protected slots:
 
 class KviHttpRequest;
 
-class KviAvatarDownloadDialog : public QDialog
+class KviAvatarDownloadDialog : public TQDialog
 {
 	friend class KviIdentityAvatarOptionsWidget;
 	Q_OBJECT
+  TQ_OBJECT
 public:
-	KviAvatarDownloadDialog(QWidget * par,const QString &szUrl);
+	KviAvatarDownloadDialog(TQWidget * par,const TQString &szUrl);
 	~KviAvatarDownloadDialog();
 protected:
 	KviHttpRequest * m_pRequest;
-	QLabel         * m_pOutput;
-	QString          m_szErrorMessage;
-	QString          m_szLocalFileName;
-	QString          m_szUrl;
+	TQLabel         * m_pOutput;
+	TQString          m_szErrorMessage;
+	TQString          m_szLocalFileName;
+	TQString          m_szUrl;
 protected:
-	virtual void closeEvent(QCloseEvent * e);
-	const QString & localFileName(){ return m_szLocalFileName; };
-	const QString & errorMessage(){ return m_szErrorMessage; };
+	virtual void closeEvent(TQCloseEvent * e);
+	const TQString & localFileName(){ return m_szLocalFileName; };
+	const TQString & errorMessage(){ return m_szErrorMessage; };
 protected slots:
 	void startDownload();
 	void cancelClicked();
@@ -109,8 +112,9 @@ protected slots:
 class KviIdentityOptionsWidget : public KviOptionsWidget
 {
 	Q_OBJECT
+  TQ_OBJECT
 public:
-	KviIdentityOptionsWidget(QWidget * parent);
+	KviIdentityOptionsWidget(TQWidget * tqparent);
 	~KviIdentityOptionsWidget();
 };
 
@@ -125,14 +129,15 @@ public:
 class KviIdentityGeneralOptionsWidget : public KviOptionsWidget
 {
 	Q_OBJECT
+  TQ_OBJECT
 public:
-	KviIdentityGeneralOptionsWidget(QWidget * pParent);
+	KviIdentityGeneralOptionsWidget(TQWidget * pParent);
 	~KviIdentityGeneralOptionsWidget();
 protected:
-	QString            m_szAltNicknames[3];
+	TQString            m_szAltNicknames[3];
 
-	QComboBox        * m_pAgeCombo;
-	QComboBox        * m_pGenderCombo;
+	TQComboBox        * m_pAgeCombo;
+	TQComboBox        * m_pGenderCombo;
 protected slots:
 	void setNickAlternatives();
 protected:
@@ -149,13 +154,14 @@ protected:
 class KviIdentityAvatarOptionsWidget : public KviOptionsWidget
 {
 	Q_OBJECT
+  TQ_OBJECT
 public:
-	KviIdentityAvatarOptionsWidget(QWidget * pParent);
+	KviIdentityAvatarOptionsWidget(TQWidget * pParent);
 	~KviIdentityAvatarOptionsWidget();
 protected:
-	QCheckBox        * m_pUseAvatarCheck;
-	QLineEdit        * m_pAvatarNameEdit;
-	QPushButton      * m_pChooseAvatarButton;
+	TQCheckBox        * m_pUseAvatarCheck;
+	TQLineEdit        * m_pAvatarNameEdit;
+	TQPushButton      * m_pChooseAvatarButton;
 	KviPixmap        * m_pLocalAvatar;
 	KviPixmapPreview * m_pAvatarPreview;
 protected slots:
@@ -174,8 +180,9 @@ protected:
 class KviIdentityAdvancedOptionsWidget : public KviOptionsWidget
 {
 	Q_OBJECT
+  TQ_OBJECT
 public:
-	KviIdentityAdvancedOptionsWidget(QWidget * pParent);
+	KviIdentityAdvancedOptionsWidget(TQWidget * pParent);
 	~KviIdentityAdvancedOptionsWidget();
 protected:
 	bool               m_bI;