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, 67 insertions, 66 deletions

diff --git a/src/modules/notifier/notifierwindowtabs.h b/src/modules/notifier/notifierwindowtabs.h
index 555906b8..42501dab 100644
--- a/src/modules/notifier/notifierwindowtabs.h
+++ b/src/modules/notifier/notifierwindowtabs.h
@@ -24,12 +24,12 @@
 //
 //=============================================================================
 
-#include <qfont.h>
-#include <qmap.h>
-#include <qobject.h>
-#include <qpixmap.h>
-#include <qpoint.h>
-#include <qrect.h>
+#include <tqfont.h>
+#include <tqmap.h>
+#include <tqobject.h>
+#include <tqpixmap.h>
+#include <tqpoint.h>
+#include <tqrect.h>
 #include "kvi_settings.h"
 #include "kvi_pointerlist.h"
 #include "notifiersettings.h"
@@ -38,7 +38,7 @@
 #include "notifiermessage.h"
 
 
-class QPainter;
+class TQPainter;
 class KviWindow;
 class KviNotifierWindowTab;
 
@@ -47,11 +47,12 @@ typedef struct wndTabPair_s {
 	KviWindow * pWnd;
 } wndTabPair;
 
-class KviNotifierWindowTab : public QObject // this class defines an object for every single tab about the tabs area
+class KviNotifierWindowTab : public TQObject // this class defines an object for every single tab about the tabs area
 {
 	Q_OBJECT
+  TQ_OBJECT
 public:
-	KviNotifierWindowTab(KviWindow *, QString);
+	KviNotifierWindowTab(KviWindow *, TQString);
 	~KviNotifierWindowTab();
 
 // ================================
@@ -60,14 +61,14 @@ public:
 private:
 	bool m_bFocused;
 	
-	QColor m_cLabel;
-	QColor m_clrHighlightedLabel;
-	QColor m_clrNormalLabel;
-	QColor m_clrChangedLabel;
+	TQColor m_cLabel;
+	TQColor m_clrHighlightedLabel;
+	TQColor m_clrNormalLabel;
+	TQColor m_clrChangedLabel;
 
-	QRect m_rect;
+	TQRect m_rect;
 
-	QString	m_label;
+	TQString	m_label;
 
 	KviPointerList<KviNotifierMessage> * m_pMessageList;
 	KviWindow * m_pWnd;
@@ -104,9 +105,9 @@ public:
 	void setState(TabState state);
 	void setRect(int x, int y, int w, int h) { m_rect.setX(x); m_rect.setY(y); m_rect.setWidth(w); m_rect.setHeight(h); };
 	
-	QColor labelColor() {return m_cLabel; }
-	QRect rect() { return m_rect; };
-	QString label() { return m_label; };
+	TQColor labelColor() {return m_cLabel; }
+	TQRect rect() { return m_rect; };
+	TQString label() { return m_label; };
 	
 	KviNotifierMessage * currentMessage() { return m_pCurrentMessage; };
 	KviPointerList<KviNotifierMessage> * messageList() { return m_pMessageList; };
@@ -130,59 +131,59 @@ protected:
 class KviNotifierWindowTabs // this class defines the tabs area
 {
 public:
-	KviNotifierWindowTabs(QRect r);
+	KviNotifierWindowTabs(TQRect r);
 	~KviNotifierWindowTabs();
 
 // ================================
 // Put members declaration below...
 // ================================
 private:
-	QRect 	m_rct;
-	QPoint	m_pnt;
+	TQRect 	m_rct;
+	TQPoint	m_pnt;
 
-	QMap<KviWindow *, KviNotifierWindowTab *> m_tabMap;
+	TQMap<KviWindow *, KviNotifierWindowTab *> m_tabMap;
 	KviPointerList<KviNotifierWindowTab> m_tabPtrList;
 	KviPointerList<KviNotifierWindowTab> m_lastVisitedTabPtrList;
 	
-	QFont * m_pFocusedFont;
-	QFont * m_pUnfocusedFont;
+	TQFont * m_pFocusedFont;
+	TQFont * m_pUnfocusedFont;
 	
 	KviNotifierWindowTab * m_pTabFocused;
 	KviWindow * m_pWndTabFocused;
 
-	QRect	m_rctNextIcon;
-	QRect	m_rctPrevIcon;
-	QRect	m_rctCloseTabIcon;
-	QRect	m_rctCloseTabIconHotArea;
-	QRect	m_rctTabs;
+	TQRect	m_rctNextIcon;
+	TQRect	m_rctPrevIcon;
+	TQRect	m_rctCloseTabIcon;
+	TQRect	m_rctCloseTabIconHotArea;
+	TQRect	m_rctTabs;
 
-	QPainter * m_pPainter;
-	QPixmap * m_pPixmap;
+	TQPainter * m_pPainter;
+	TQPixmap * m_pPixmap;
 	
-	QPixmap	m_pixDX;
-	QPixmap	m_pixSX;
-	QPixmap	m_pixBKG;
-	QPixmap m_pixSXFocused;
-	QPixmap m_pixDXFocused;
-	QPixmap m_pixBKGFocused;
-	QPixmap m_pixSXUnfocused;
-	QPixmap m_pixDXUnfocused;
-	QPixmap m_pixBKGUnfocused;
-
-	QPixmap m_pixIconTabPrev;
-	QPixmap m_pixIconTabPrev_out;
-	QPixmap m_pixIconTabPrev_over;
-	QPixmap m_pixIconTabPrev_clicked;
+	TQPixmap	m_pixDX;
+	TQPixmap	m_pixSX;
+	TQPixmap	m_pixBKG;
+	TQPixmap m_pixSXFocused;
+	TQPixmap m_pixDXFocused;
+	TQPixmap m_pixBKGFocused;
+	TQPixmap m_pixSXUnfocused;
+	TQPixmap m_pixDXUnfocused;
+	TQPixmap m_pixBKGUnfocused;
+
+	TQPixmap m_pixIconTabPrev;
+	TQPixmap m_pixIconTabPrev_out;
+	TQPixmap m_pixIconTabPrev_over;
+	TQPixmap m_pixIconTabPrev_clicked;
 	
-	QPixmap m_pixIconTabNext;
-	QPixmap m_pixIconTabNext_out;
-	QPixmap m_pixIconTabNext_over;
-	QPixmap m_pixIconTabNext_clicked;
+	TQPixmap m_pixIconTabNext;
+	TQPixmap m_pixIconTabNext_out;
+	TQPixmap m_pixIconTabNext_over;
+	TQPixmap m_pixIconTabNext_clicked;
 
-	QPixmap m_pixIconCloseTab;
-	QPixmap m_pixIconCloseTab_off;
-	QPixmap m_pixIconCloseTab_on;
-	QPixmap m_pixIconCloseTab_clicked;
+	TQPixmap m_pixIconCloseTab;
+	TQPixmap m_pixIconCloseTab_off;
+	TQPixmap m_pixIconCloseTab_on;
+	TQPixmap m_pixIconCloseTab_clicked;
 
 	int m_closeTabIconState;
 	int m_iTabToStartFrom;
@@ -209,17 +210,17 @@ public:
 	void closeTab(KviWindow * pWnd); // referes to void closeTab(KviWindow * pWnd, KviNotifierWindowTab * pTab);
 	void closeTab(KviNotifierWindowTab * pTab); // referes to void closeTab(KviWindow * pWnd, KviNotifierWindowTab * pTab);
 	void closeTab(KviWindow * pWnd, KviNotifierWindowTab * pTab);
-	void draw(QPainter *);
+	void draw(TQPainter *);
 	void needToRedraw() { m_bNeedToRedraw = true; };
 	void markAllMessagesAsHistoric();
-	void mouseMoveEvent(QMouseEvent * e);
-	void mousePressEvent(QMouseEvent * e);
-	void mouseReleaseEvent(QMouseEvent * e);
+	void mouseMoveEvent(TQMouseEvent * e);
+	void mousePressEvent(TQMouseEvent * e);
+	void mouseReleaseEvent(TQMouseEvent * e);
 	void next();
 	void prev();
 	void recalculatePositions();
 	void resetIcons();
-	void resize(QRect);
+	void resize(TQRect);
 	void scrollTabsLeft();
 	void scrollTabsRight();
 	void setCloseTabIcon(int state);
@@ -237,16 +238,16 @@ public:
 	int x() { return m_pnt.x(); };
 	int y() { return m_pnt.y(); };
 
-	QFont * fontFocused() { return m_pFocusedFont; };
-	QFont * fontUnfocused() { return m_pUnfocusedFont; };
+	TQFont * fontFocused() { return m_pFocusedFont; };
+	TQFont * fontUnfocused() { return m_pUnfocusedFont; };
 
-	QPixmap * tabFocusedPixSx() {return &m_pixSXFocused; };
-	QPixmap * tabFocusedPixDx() {return &m_pixDXFocused; };
-	QPixmap * tabUnfocusedPixSx() {return &m_pixSXUnfocused; };
-	QPixmap * tabUnfocusedPixDx() {return &m_pixDXUnfocused; };
+	TQPixmap * tabFocusedPixSx() {return &m_pixSXFocused; };
+	TQPixmap * tabFocusedPixDx() {return &m_pixDXFocused; };
+	TQPixmap * tabUnfocusedPixSx() {return &m_pixSXUnfocused; };
+	TQPixmap * tabUnfocusedPixDx() {return &m_pixDXUnfocused; };
 
-	QRect rect() {return m_rct;};
-	QRect rctCloseTabIconHotArea() {return m_rctCloseTabIconHotArea; };
+	TQRect rect() {return m_rct;};
+	TQRect rctCloseTabIconHotArea() {return m_rctCloseTabIconHotArea; };
 
 	KviNotifierWindowTab * currentTab() { return m_pTabFocused; };