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, 35 insertions, 31 deletions

diff --git a/src/modules/url/libkviurl.h b/src/modules/url/libkviurl.h
index 05d56ce8..a0cc1ead 100644
--- a/src/modules/url/libkviurl.h
+++ b/src/modules/url/libkviurl.h
@@ -21,23 +21,23 @@
 //
 
 
-#include <qdialog.h>
-#include <qlayout.h>
+#include <tqdialog.h>
+#include <tqlayout.h>
 #include "kvi_tal_listview.h"
-#include <qstring.h>
-#include <qpushbutton.h>
-#include <qfile.h>
+#include <tqstring.h>
+#include <tqpushbutton.h>
+#include <tqfile.h>
 #ifdef COMPILE_USE_QT4
-	#include <q3textstream.h>
+	#include <tq3textstream.h>
 #else
-	#include <qtextstream.h>
+	#include <tqtextstream.h>
 #endif
-#include <qcheckbox.h>
+#include <tqcheckbox.h>
 #include "kvi_tal_listbox.h"
-#include <qmenubar.h>
-#include <qinputdialog.h>
-#include <qtoolbutton.h>
-#include <qiconset.h>
+#include <tqmenubar.h>
+#include <tqinputdialog.h>
+#include <tqtoolbutton.h>
+#include <tqiconset.h>
 
 #include "kvi_locale.h"
 #include "kvi_config.h"
@@ -48,20 +48,21 @@
 #include "kvi_mextoolbar.h"
 #include "kvi_styled_controls.h"
 
-#include <qpixmap.h>
+#include <tqpixmap.h>
 
 typedef struct _KviUrl
 {
-	QString url;
-	QString window;
+	TQString url;
+	TQString window;
 	int count;
-	QString timestamp;
+	TQString timestamp;
 } KviUrl;
 
 
 class UrlDialog : public KviWindow
 {
 	Q_OBJECT
+  TQ_OBJECT
 public:
 	UrlDialog(KviPointerList<KviUrl> *g_pList);
 	~UrlDialog();
@@ -70,11 +71,11 @@ private:
 	KviTalPopupMenu *m_pListPopup;	// dynamic popup menu
 	KviStr m_szUrl;			// used to pass urls to sayToWin slot
 protected:
-	QPixmap *myIconPtr();
-	void resizeEvent(QResizeEvent *);
+	TQPixmap *myIconPtr();
+	void resizeEvent(TQResizeEvent *);
 public:
 	KviTalListView *m_pUrlList;
-	void addUrl(QString url, QString window, QString count, QString timestamp);
+	void addUrl(TQString url, TQString window, TQString count, TQString timestamp);
 //	void saveProperties();
 protected slots:
 	void config();
@@ -86,22 +87,23 @@ protected slots:
 	void remove();
 	void findtext();
 	void dblclk_url(KviTalListViewItem *item);
-	void popup(KviTalListViewItem *item, const QPoint &p, int col);
+	void popup(KviTalListViewItem *item, const TQPoint &p, int col);
 	void sayToWin(int);
 };
 
-class BanFrame : public QFrame
+class BanFrame : public TQFrame
 {
 	Q_OBJECT
+  TQ_OBJECT
 public:
-	BanFrame(QWidget *parent=0, const char *name=0, bool banEnable = false);
+	BanFrame(TQWidget *tqparent=0, const char *name=0, bool banEnable = false);
 	~BanFrame();
 	void saveBans();
 private:
 	KviStyledCheckBox *m_pEnable;
 	KviTalListBox *m_pBanList;
-	QPushButton *m_pAddBtn;
-	QPushButton *m_pRemoveBtn;
+	TQPushButton *m_pAddBtn;
+	TQPushButton *m_pRemoveBtn;
 protected slots:
 	void enableClicked();
 	void addBan();
@@ -110,16 +112,17 @@ protected slots:
 
 #define cbnum 2
 
-class ConfigDialog : public QDialog
+class ConfigDialog : public TQDialog
 {
 	Q_OBJECT
+  TQ_OBJECT
 public:
 	ConfigDialog();
 	~ConfigDialog();
 private:
 	KviStyledCheckBox *cb[cbnum];
 	BanFrame *m_pBanFrame;
-	void closeEvent(QCloseEvent *);
+	void closeEvent(TQCloseEvent *);
 protected slots:
 	void acceptbtn();
 	void discardbtn();
@@ -130,15 +133,16 @@ protected slots:
 class KviUrlAction : public KviKvsAction
 {
 	Q_OBJECT
+  TQ_OBJECT
 public:
-	KviUrlAction(QObject * pParent);
+	KviUrlAction(TQObject * pParent);
 	~KviUrlAction();
 protected:
-	QPixmap * m_pBigIcon;
-	QPixmap * m_pSmallIcon;
+	TQPixmap * m_pBigIcon;
+	TQPixmap * m_pSmallIcon;
 public:
-	virtual QPixmap * bigIcon();
-	virtual QPixmap * smallIcon();
+	virtual TQPixmap * bigIcon();
+	virtual TQPixmap * smallIcon();
 };
 
 #endif