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, 68 insertions, 65 deletions

diff --git a/src/modules/options/optw_servers.h b/src/modules/options/optw_servers.h
index ea71c6d3..d03f8246 100644
--- a/src/modules/options/optw_servers.h
+++ b/src/modules/options/optw_servers.h
@@ -27,9 +27,9 @@
 
 #include "kvi_optionswidget.h"
 #include "kvi_tal_listview.h"
-#include <qdialog.h>
-#include <qbuttongroup.h>
-#include <qtabwidget.h>
+#include <tqdialog.h>
+#include <tqbuttongroup.h>
+#include <tqtabwidget.h>
 
 class KviIrcServer;
 class KviIrcNetwork;
@@ -41,8 +41,8 @@ class KviMexServerImport;
 class KviServerOptionsListViewItem : public KviTalListViewItem
 {
 public:
-	KviServerOptionsListViewItem(KviTalListView *parent,const QPixmap &pm,const KviIrcNetwork *n);
-	KviServerOptionsListViewItem(KviTalListViewItem *parent,const QPixmap &pm,const KviIrcServer *s);
+	KviServerOptionsListViewItem(KviTalListView *tqparent,const TQPixmap &pm,const KviIrcNetwork *n);
+	KviServerOptionsListViewItem(KviTalListViewItem *tqparent,const TQPixmap &pm,const KviIrcServer *s);
 	~KviServerOptionsListViewItem();
 public:
 	KviIrcServer * m_pServerData;
@@ -51,47 +51,48 @@ public:
 	void updateVisibleStrings();
 };
 
-class QLabel;
-class QLineEdit;
+class TQLabel;
+class TQLineEdit;
 class KviIpEditor;
 class KviIrcServer;
-class QCheckBox;
+class TQCheckBox;
 class KviTalPopupMenu;
 class KviScriptEditor;
-class QComboBox;
-class QPushButton;
-class QToolButton;
+class TQComboBox;
+class TQPushButton;
+class TQToolButton;
 class KviNickServRule;
 class KviNickServRuleEditor;
 
 
-class KviNetworkDetailsWidget : public QDialog
+class KviNetworkDetailsWidget : public TQDialog
 {
 	Q_OBJECT
+  TQ_OBJECT
 public:
-	KviNetworkDetailsWidget(QWidget * par,KviIrcNetwork * d);
+	KviNetworkDetailsWidget(TQWidget * par,KviIrcNetwork * d);
 	~KviNetworkDetailsWidget();
 protected:
 	KviScriptEditor       * m_pOnConnectEditor;
 	KviScriptEditor       * m_pOnLoginEditor;
 
-	QLineEdit             * m_pUserEditor;
-	QLineEdit             * m_pPassEditor;
-	QLineEdit             * m_pNickEditor;
-	QLineEdit             * m_pRealEditor;
-	QLineEdit             * m_pDescEditor;
+	TQLineEdit             * m_pUserEditor;
+	TQLineEdit             * m_pPassEditor;
+	TQLineEdit             * m_pNickEditor;
+	TQLineEdit             * m_pRealEditor;
+	TQLineEdit             * m_pDescEditor;
 
-	QComboBox             * m_pEncodingEditor;
+	TQComboBox             * m_pEncodingEditor;
 	
-	QCheckBox             * m_pAutoConnectCheck;
+	TQCheckBox             * m_pAutoConnectCheck;
 	
 	KviTalListView             * m_pNickServListView;
-	QCheckBox             * m_pNickServCheck;
-	QPushButton           * m_pAddRuleButton;
-	QPushButton           * m_pDelRuleButton;
-	QPushButton           * m_pEditRuleButton;
+	TQCheckBox             * m_pNickServCheck;
+	TQPushButton           * m_pAddRuleButton;
+	TQPushButton           * m_pDelRuleButton;
+	TQPushButton           * m_pEditRuleButton;
 
-	QStringList             m_lstChannels;
+	TQStringList             m_lstChannels;
 	KviCahnnelListSelector * m_pChannelListSelector;
 public:
 	void fillData(KviIrcNetwork * d);
@@ -102,42 +103,43 @@ protected slots:
 	void editNickServRule();
 };
 
-class KviServerDetailsWidget : public QDialog
+class KviServerDetailsWidget : public TQDialog
 {
 	Q_OBJECT
+  TQ_OBJECT
 public:
-	KviServerDetailsWidget(QWidget * par,KviIrcServer * s);
+	KviServerDetailsWidget(TQWidget * par,KviIrcServer * s);
 	~KviServerDetailsWidget();
 protected:
-	QString                 m_szHostname;
-	QLabel                * m_pHeaderLabel;
+	TQString                 m_szHostname;
+	TQLabel                * m_pHeaderLabel;
 	KviScriptEditor       * m_pOnConnectEditor;
 	KviScriptEditor       * m_pOnLoginEditor;
-	QLineEdit             * m_pUserEditor;
-	QLineEdit             * m_pPassEditor;
-	QLineEdit             * m_pNickEditor;
-	QLineEdit             * m_pRealEditor;
-	QLineEdit             * m_pDescEditor;
-	QLineEdit             * m_pIdEditor;
-	QComboBox             * m_pLinkFilterEditor;
-	QComboBox             * m_pEncodingEditor;
+	TQLineEdit             * m_pUserEditor;
+	TQLineEdit             * m_pPassEditor;
+	TQLineEdit             * m_pNickEditor;
+	TQLineEdit             * m_pRealEditor;
+	TQLineEdit             * m_pDescEditor;
+	TQLineEdit             * m_pIdEditor;
+	TQComboBox             * m_pLinkFilterEditor;
+	TQComboBox             * m_pEncodingEditor;
 	KviIpEditor           * m_pIpEditor;
-	QCheckBox             * m_pCacheIpCheck;
-	QCheckBox             * m_pUseSSLCheck;
-	QCheckBox             * m_pUseDefaultInitUMode;
-	QCheckBox             * m_pIMode;
-	QCheckBox             * m_pWMode;
-	QCheckBox             * m_pSMode;
-	QCheckBox             * m_pUseAutoConnect;
-	QCheckBox             * m_pUseIPV6Check;
-	QLineEdit             * m_pPortEditor;
-	QStringList             m_lstChannels;
+	TQCheckBox             * m_pCacheIpCheck;
+	TQCheckBox             * m_pUseSSLCheck;
+	TQCheckBox             * m_pUseDefaultInitUMode;
+	TQCheckBox             * m_pIMode;
+	TQCheckBox             * m_pWMode;
+	TQCheckBox             * m_pSMode;
+	TQCheckBox             * m_pUseAutoConnect;
+	TQCheckBox             * m_pUseIPV6Check;
+	TQLineEdit             * m_pPortEditor;
+	TQStringList             m_lstChannels;
 	KviCahnnelListSelector * m_pChannelListSelector;
 	
-	QComboBox             * m_pProxyEditor;
+	TQComboBox             * m_pProxyEditor;
 protected slots:
 	void useDefaultInitUModeToggled(bool);
-	void portEditorTextChanged(const QString &);
+	void portEditorTextChanged(const TQString &);
 	void useIPV6CheckToggled(bool);
 public:
 	void setHeaderLabelText();
@@ -154,34 +156,35 @@ public:
 class KviServerOptionsWidget : public KviOptionsWidget
 {
 	Q_OBJECT
+  TQ_OBJECT
 public:
-	KviServerOptionsWidget(QWidget * parent);
+	KviServerOptionsWidget(TQWidget * tqparent);
 	~KviServerOptionsWidget();
 protected:
 	KviTalListView                    * m_pListView;
-	QLabel                       * m_pSrvNetLabel;
-	QLineEdit                    * m_pSrvNetEdit;
-	//QLabel                       * m_pPortLabel;
-	//QLineEdit                    * m_pPortEdit;
-	QPushButton                  * m_pDetailsButton;
+	TQLabel                       * m_pSrvNetLabel;
+	TQLineEdit                    * m_pSrvNetEdit;
+	//TQLabel                       * m_pPortLabel;
+	//TQLineEdit                    * m_pPortEdit;
+	TQPushButton                  * m_pDetailsButton;
 	KviTalPopupMenu                   * m_pRecentPopup;
 	KviTalPopupMenu                   * m_pContextPopup;
 	KviTalPopupMenu                   * m_pImportPopup;
 	KviIrcServer                 * m_pClipboard;
-	//QCheckBox                    * m_pIpV6Check;
-	QPushButton                  * m_pConnectCurrent;
-	QPushButton                  * m_pConnectNew;
+	//TQCheckBox                    * m_pIpV6Check;
+	TQPushButton                  * m_pConnectCurrent;
+	TQPushButton                  * m_pConnectNew;
 	KviServerOptionsListViewItem * m_pLastEditedItem;
 	KviServerDetailsWidget       * m_pServerDetailsDialog;
 	KviNetworkDetailsWidget      * m_pNetworkDetailsDialog;
 	KviMexServerImport           * m_pImportFilter;
 
-	QToolButton                  * m_pNewServerButton;
-	QToolButton                  * m_pNewNetworkButton;
-	QToolButton                  * m_pRemoveButton;
-	QToolButton                  * m_pCopyServerButton;
-	QToolButton                  * m_pPasteServerButton;
-	QToolButton                  * m_pImportButton;
+	TQToolButton                  * m_pNewServerButton;
+	TQToolButton                  * m_pNewNetworkButton;
+	TQToolButton                  * m_pRemoveButton;
+	TQToolButton                  * m_pCopyServerButton;
+	TQToolButton                  * m_pPasteServerButton;
+	TQToolButton                  * m_pImportButton;
 private:
 	void fillServerList();
 	void saveLastItem();
@@ -191,7 +194,7 @@ protected slots:
 	void importServer(const KviIrcServer & s,const char * network);
 	void importPopupAboutToShow();
 	void listViewItemSelectionChanged(KviTalListViewItem *it);
-	void listViewRightButtonPressed(KviTalListViewItem *it,const QPoint &pnt,int col);
+	void listViewRightButtonPressed(KviTalListViewItem *it,const TQPoint &pnt,int col);
 	void newNetwork();
 	void removeCurrent();
 	void newServer();