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, 23 insertions, 22 deletions

diff --git a/src/kvirc/ui/kvi_statusbar.h b/src/kvirc/ui/kvi_statusbar.h
index 119c93d8..0030ea5c 100644
--- a/src/kvirc/ui/kvi_statusbar.h
+++ b/src/kvirc/ui/kvi_statusbar.h
@@ -28,29 +28,29 @@
 #include "kvi_pointerlist.h"
 #include "kvi_heapobject.h"
 
-#include <qstring.h>
+#include <tqstring.h>
 #include "kvi_pointerhashtable.h"
-#include <qstatusbar.h>
+#include <tqstatusbar.h>
 
 class KviFrame;
 
-class QTimer;
-class QLabel;
+class TQTimer;
+class TQLabel;
 class KviTalPopupMenu;
 
 class KVIRC_API KviStatusBarMessage : public KviHeapObject
 {
 	friend class KviStatusBar;
 protected:
-	QString      m_szText;
+	TQString      m_szText;
 	unsigned int m_uTimeout;
 	unsigned int m_uPriority;
 public:
-	KviStatusBarMessage(const QString &szText,unsigned int uTimeout = 8000,unsigned int uPriority = 0)
+	KviStatusBarMessage(const TQString &szText,unsigned int uTimeout = 8000,unsigned int uPriority = 0)
 		: KviHeapObject(), m_szText(szText), m_uTimeout(uTimeout), m_uPriority(uPriority) {};
 	~KviStatusBarMessage(){};
 public:
-	const QString & text(){ return m_szText; };
+	const TQString & text(){ return m_szText; };
 	unsigned int timeout(){ return m_uTimeout; };
 	unsigned int priority(){ return m_uPriority; };
 };
@@ -61,21 +61,22 @@ class KviStatusBarAppletDescriptor;
 class KviIrcContext;
 class KviDynamicToolTip;
 
-class KVIRC_API KviStatusBar : public QStatusBar
+class KVIRC_API KviStatusBar : public TQStatusBar
 {
 	friend class KviStatusBarApplet;
 	friend class KviFrame;
 	Q_OBJECT
+  TQ_OBJECT
 public:
 	KviStatusBar(KviFrame * pFrame);
 	~KviStatusBar();
 protected:
 	KviFrame                                 * m_pFrame;
 	KviPointerList<KviStatusBarMessage>          * m_pMessageQueue;
-	QTimer                                   * m_pMessageTimer;
-	QLabel                                   * m_pMessageLabel;
+	TQTimer                                   * m_pMessageTimer;
+	TQLabel                                   * m_pMessageLabel;
 	KviPointerList<KviStatusBarApplet>           * m_pAppletList;
-	KviPointerHashTable<QString,KviStatusBarAppletDescriptor>      * m_pAppletDescriptors;
+	KviPointerHashTable<TQString,KviStatusBarAppletDescriptor>      * m_pAppletDescriptors;
 	KviTalPopupMenu                               * m_pContextPopup;
 	KviTalPopupMenu                               * m_pAppletsPopup;
 	KviStatusBarApplet                       * m_pClickedApplet;
@@ -88,25 +89,25 @@ protected slots:
 	void messageTimerFired();
 protected:
 	void showFirstMessageInQueue();
-	virtual void paintEvent(QPaintEvent * e);
-	virtual void mousePressEvent(QMouseEvent * e);
-	virtual void mouseMoveEvent(QMouseEvent * e);
-	virtual void mouseReleaseEvent(QMouseEvent * e);
-	virtual void resizeEvent(QResizeEvent * e);
-	virtual bool event(QEvent * e);
+	virtual void paintEvent(TQPaintEvent * e);
+	virtual void mousePressEvent(TQMouseEvent * e);
+	virtual void mouseMoveEvent(TQMouseEvent * e);
+	virtual void mouseReleaseEvent(TQMouseEvent * e);
+	virtual void resizeEvent(TQResizeEvent * e);
+	virtual bool event(TQEvent * e);
 	void registerApplet(KviStatusBarApplet * a);
 	void unregisterApplet(KviStatusBarApplet * a);
 	void recalcMinimumHeight();
-	void layoutChildren();
-	void updateLayout(){ recalcMinimumHeight(); layoutChildren(); };
+	void tqlayoutChildren();
+	void updateLayout(){ recalcMinimumHeight(); tqlayoutChildren(); };
 	void save();
 	void load();
-	KviStatusBarApplet * createApplet(const QString &szInternalName);
+	KviStatusBarApplet * createApplet(const TQString &szInternalName);
 	void showLayoutHelp();
 public:
 	bool appletExists(KviStatusBarApplet * pApplet);
 	// pnt is global!
-	KviStatusBarApplet * appletAt(const QPoint &pnt,bool bBestMatch = false);
+	KviStatusBarApplet * appletAt(const TQPoint &pnt,bool bBestMatch = false);
 
 	KviTalPopupMenu * contextPopup();
 	// takes the ownership of pMsg
@@ -124,7 +125,7 @@ protected slots:
 	void appletsPopupActivated(int id);
 	void removeClickedApplet();
 	void setPermanentMessage();
-	void tipRequest(KviDynamicToolTip *pTip,const QPoint &pnt);
+	void tipRequest(KviDynamicToolTip *pTip,const TQPoint &pnt);
 };
 
 #endif //!_KVI_STATUSBAR_H_