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, 59 insertions, 58 deletions

diff --git a/src/modules/notifier/notifierwindow.h b/src/modules/notifier/notifierwindow.h
index be5e3b6e..dfc9d6de 100644
--- a/src/modules/notifier/notifierwindow.h
+++ b/src/modules/notifier/notifierwindow.h
@@ -26,17 +26,17 @@
 
 #include "kvi_settings.h"
 
-#include <qbitmap.h>
-#include <qcolor.h>
-#include <qcursor.h>
-#include <qdatetime.h> 
-#include <qfont.h>
-#include <qimage.h>
-#include <qlineedit.h>
-#include <qpixmap.h>
-#include <qrect.h>
-#include <qtimer.h>
-#include <qwidget.h>
+#include <tqbitmap.h>
+#include <tqcolor.h>
+#include <tqcursor.h>
+#include <tqdatetime.h> 
+#include <tqfont.h>
+#include <tqimage.h>
+#include <tqlineedit.h>
+#include <tqpixmap.h>
+#include <tqrect.h>
+#include <tqtimer.h>
+#include <tqwidget.h>
 
 #include "kvi_qstring.h"
 #include "kvi_pointerlist.h"
@@ -52,34 +52,35 @@ class KviNotifierWindowBorder;
 class KviNotifierWindowProgressBar;
 class KviNotifierWindowTabs;
 
-class QPainter;
-class QPopupMenu;
+class TQPainter;
+class TQPopupMenu;
 
 extern kvi_time_t g_tNotifierDisabledUntil;
 
-class KviNotifierWindow : public QWidget
+class KviNotifierWindow : public TQWidget
 {
 	Q_OBJECT
+  TQ_OBJECT
 public:
 	KviNotifierWindow();
 	~KviNotifierWindow();
 protected:
-	QTimer * m_pShowHideTimer;
-	QTimer * m_pProgressTimer;
-	QTimer * m_pBlinkTimer;
-	QTimer * m_pAutoHideTimer;
+	TQTimer * m_pShowHideTimer;
+	TQTimer * m_pProgressTimer;
+	TQTimer * m_pBlinkTimer;
+	TQTimer * m_pAutoHideTimer;
 	State   m_eState;
 	bool    m_bBlinkOn;
 	double  m_dOpacity;
-	QImage  m_imgDesktop;            // the desktop screenshot
-	QPixmap m_pixBackground;         // our background image
-	QPixmap m_pixBackgroundHighlighted;
-	QPixmap m_pixForeground;         // we paint the stuff HERE
+	TQImage  m_imgDesktop;            // the desktop screenshot
+	TQPixmap m_pixBackground;         // our background image
+	TQPixmap m_pixBackgroundHighlighted;
+	TQPixmap m_pixForeground;         // we paint the stuff HERE
 	
-	// Notifier graphic layout
-	QPixmap m_pixBckgrnd;
+	// Notifier graphic tqlayout
+	TQPixmap m_pixBckgrnd;
 
-	QImage  m_imgBuffer;             // here we merge the two images
+	TQImage  m_imgBuffer;             // here we merge the two images
 
 	bool    m_bCloseDown;
 	bool    m_bPrevDown;
@@ -89,18 +90,18 @@ protected:
 
 	bool	m_bKeyShiftPressed;
 
-	QFont * m_pDefaultFont;
-	QFont * m_pTitleFont;
+	TQFont * m_pDefaultFont;
+	TQFont * m_pTitleFont;
 	
-	QRect	m_wndRect;
+	TQRect	m_wndRect;
 
-	QColor  m_clrCurText;
-	QColor  m_clrOldText[NUM_OLD_COLORS];
-	QColor  m_clrHistoricText;
-	QColor  m_clrTitle;
+	TQColor  m_clrCurText;
+	TQColor  m_clrOldText[NUM_OLD_COLORS];
+	TQColor  m_clrHistoricText;
+	TQColor  m_clrTitle;
 
 	KviNotifierMessage * m_pCurrentMessage;
-	QLineEdit * m_pLineEdit;
+	TQLineEdit * m_pLineEdit;
 
 	bool	m_bDragging;
 	bool	m_bLeftButtonIsPressed;
@@ -109,22 +110,22 @@ protected:
 	
 	int		m_whereResizing;
 	
-	QPoint       m_pntDrag;
-	QPoint       m_pntPos;
-	QPoint		 m_pntClick;
+	TQPoint       m_pntDrag;
+	TQPoint       m_pntPos;
+	TQPoint		 m_pntClick;
 	int          m_iInputHeight;
 	int          m_iBlinkTimeout;
 	int          m_iBlinkCount;
-	QPopupMenu * m_pContextPopup;
-	QPopupMenu * m_pDisablePopup;
+	TQPopupMenu * m_pContextPopup;
+	TQPopupMenu * m_pDisablePopup;
 	KviWindow * m_pWindowToRaise;
 	kvi_time_t  m_tAutoHideAt;
 	kvi_time_t  m_tStartedAt;
-	QTime	    m_qtStartedAt;
+	TQTime	    m_qtStartedAt;
 	bool		m_bDisableHideOnMainWindowGotAttention;
 	//bool		m_bForceShowing;
 	
-	QCursor m_cursor;
+	TQCursor m_cursor;
 	
 	KviNotifierWindowTabs 		* m_pWndTabs;
 	KviNotifierWindowProgressBar	* m_pProgressBar;
@@ -133,27 +134,27 @@ protected:
 public:
 	void doShow(bool bDoAnimate);
 	void doHide(bool bDoAnimate);
-	const QFont & defaultFont(){ return *m_pDefaultFont; };
+	const TQFont & defaultFont(){ return *m_pDefaultFont; };
 	int textWidth();
-	void addMessage(KviWindow * pWnd,const QString &szImageId,const QString &szText,unsigned int uMessageTime);
+	void addMessage(KviWindow * pWnd,const TQString &szImageId,const TQString &szText,unsigned int uMessageTime);
 	State state() { return m_eState; };
 	void setDisableHideOnMainWindowGotAttention(bool b){ m_bDisableHideOnMainWindowGotAttention = b; };
 	int countTabs();
 	void showLineEdit(bool bShow);
 protected:
-	virtual void showEvent(QShowEvent *e);
-	virtual void hideEvent(QHideEvent * e);
-	virtual void paintEvent(QPaintEvent * e);
-	virtual void mousePressEvent(QMouseEvent * e);
-	virtual void mouseReleaseEvent(QMouseEvent * e);
-	virtual void mouseMoveEvent(QMouseEvent * e);
-	virtual void leaveEvent(QEvent * e);
-	virtual void enterEvent(QEvent * e);
-	virtual void mouseDoubleClickEvent(QMouseEvent * e);
-	virtual void wheelEvent(QWheelEvent * e);
-	virtual bool eventFilter(QObject * pEdit,QEvent * e);
-	virtual void keyPressEvent ( QKeyEvent * e );
-	virtual void keyReleaseEvent ( QKeyEvent * e );
+	virtual void showEvent(TQShowEvent *e);
+	virtual void hideEvent(TQHideEvent * e);
+	virtual void paintEvent(TQPaintEvent * e);
+	virtual void mousePressEvent(TQMouseEvent * e);
+	virtual void mouseReleaseEvent(TQMouseEvent * e);
+	virtual void mouseMoveEvent(TQMouseEvent * e);
+	virtual void leaveEvent(TQEvent * e);
+	virtual void enterEvent(TQEvent * e);
+	virtual void mouseDoubleClickEvent(TQMouseEvent * e);
+	virtual void wheelEvent(TQWheelEvent * e);
+	virtual bool eventFilter(TQObject * pEdit,TQEvent * e);
+	virtual void keyPressEvent ( TQKeyEvent * e );
+	virtual void keyReleaseEvent ( TQKeyEvent * e );
 protected slots:
 	void blink();
 	void heartbeat();
@@ -172,7 +173,7 @@ protected slots:
 	void autoHide();
 	void progressUpdate();
 private:
-	void contextPopup(const QPoint &pos);
+	void contextPopup(const TQPoint &pos);
 	void startBlinking();
 	void markAllMessagesAsHistoric();
 	void computeRect();
@@ -185,10 +186,10 @@ private:
 	void nextButtonClicked();
 	bool shouldHideIfMainWindowGotAttention();
 	void setCursor(int);
-	void resize(QPoint p, bool = true);
+	void resize(TQPoint p, bool = true);
 	void redrawWindow();
 	void redrawText();
-	bool checkResizing(QPoint);
+	bool checkResizing(TQPoint);
 };
 
 #endif //_NOTIFIERWINDOW_H_