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/kvirc/ui/kvi_ircview.h b/src/kvirc/ui/kvi_ircview.h
index 62ee3e7..e462a73 100644
--- a/src/kvirc/ui/kvi_ircview.h
+++ b/src/kvirc/ui/kvi_ircview.h
@@ -28,14 +28,14 @@
 #include "kvi_string.h"
 #include "kvi_pointerlist.h"
 
-#include <qwidget.h>
-#include <qpixmap.h>      // needed
-
-class QScrollBar;
-class QLineEdit;
-class QFile;
-class QToolButton;
-class QFontMetrics;
+#include <tqwidget.h>
+#include <tqpixmap.h>      // needed
+
+class TQScrollBar;
+class TQLineEdit;
+class TQFile;
+class TQToolButton;
+class TQFontMetrics;
 class KviTalPopupMenu;
 
 class KviWindow;
@@ -51,30 +51,31 @@ typedef struct _KviIrcViewWrappedBlockSelectionInfoTag KviIrcViewWrappedBlockSel
 
 #define KVI_IRCVIEW_INVALID_LINE_MARK_INDEX 0xffffffff
 
-class KVIRC_API KviIrcView : public QWidget
+class KVIRC_API KviIrcView : public TQWidget
 {
 	Q_OBJECT
-	Q_PROPERTY(int TransparencyCapable READ dummyRead)
-	// we cannot #ifdef due to a bug in moc
-	Q_PROPERTY(bool usePaintOnScreen READ getPaintOnScreen WRITE setPaintOnScreen)
+  TQ_OBJECT
+	TQ_PROPERTY(int TransparencyCapable READ dummyRead)
+	// we cannot #ifdef due to a bug in tqmoc
+	TQ_PROPERTY(bool usePaintOnScreen READ getPaintOnScreen WRITE setPaintOnScreen)
 public:
 	friend class KviIrcViewToolTip;
 	friend class KviIrcViewToolWidget;
 public:
-	KviIrcView(QWidget *parent,KviFrame *pFrm,KviWindow *pWnd);
+	KviIrcView(TQWidget *tqparent,KviFrame *pFrm,KviWindow *pWnd);
 	~KviIrcView();
 public:
 	int dummyRead() const { return 0; };
 #ifdef COMPILE_USE_QT4
-	bool getPaintOnScreen() const { return testAttribute(Qt::WA_PaintOnScreen);};
-	void setPaintOnScreen(bool bFlag){setAttribute(Qt::WA_PaintOnScreen,bFlag);} ;
+	bool getPaintOnScreen() const { return testAttribute(TQt::WA_PaintOnScreen);};
+	void setPaintOnScreen(bool bFlag){setAttribute(TQt::WA_PaintOnScreen,bFlag);} ;
 #else
-	// hack to fix moc bug on win qt4
+	// hack to fix tqmoc bug on win qt4
 	bool getPaintOnScreen() const { return 0;};
 	void setPaintOnScreen(bool bFlag){} ;
 #endif
 private:
-//	QDate                       m_lastLogDay;
+//	TQDate                       m_lastLogDay;
 	int		 	                m_iFlushTimer;
 	KviIrcViewLine            * m_pFirstLine;
 	KviIrcViewLine            * m_pCurLine;    // Bottom line in the view
@@ -92,9 +93,9 @@ private:
 
 	unsigned int                m_uNextLineIndex;
 
-	QPixmap                   * m_pPrivateBackgroundPixmap;
-	QScrollBar                * m_pScrollBar;
-	QToolButton               * m_pToolsButton;
+	TQPixmap                   * m_pPrivateBackgroundPixmap;
+	TQScrollBar                * m_pScrollBar;
+	TQToolButton               * m_pToolsButton;
 	KviTalPopupMenu           * m_pToolsPopup;
 
 	KviIrcViewToolWidget      * m_pToolWidget;
@@ -113,8 +114,8 @@ private:
 	int                         m_iIconWidth;
 	int                         m_iIconSideSpacing;
 
-	QPoint                      m_mousePressPos;
-	QPoint                      m_mouseCurrentPos;
+	TQPoint                      m_mousePressPos;
+	TQPoint                      m_mouseCurrentPos;
 
 	// Selection
 	int                         m_iSelectionBegin;
@@ -131,20 +132,20 @@ private:
 	int                         m_iSelectTimer;
 	int                         m_iMouseTimer;
 	//int                         m_iTipTimer;
-	QString                     m_szLastSelection;
-	QString                     m_szLastSelectionLine;
+	TQString                     m_szLastSelection;
+	TQString                     m_szLastSelectionLine;
 	KviWindow                 * m_pKviWindow;
 	KviIrcViewWrappedBlockSelectionInfo * m_pWrappedBlockSelectionInfo;
-	QFile                     * m_pLogFile;
+	TQFile                     * m_pLogFile;
 	KviFrame                  * m_pFrm;
 	bool                        m_bAcceptDrops;
 	int                         m_iUnprocessedPaintEventRequests;
 	bool                        m_bPostedPaintEventPending;
 	KviPointerList<KviIrcViewLine> * m_pMessagesStoppedWhileSelecting;
 	KviIrcView                * m_pMasterView;
-	QFontMetrics              * m_pFm;               // assume this valid only inside a paint event (may be 0 in other circumstances)
+	TQFontMetrics              * m_pFm;               // assume this valid only inside a paint event (may be 0 in other circumstances)
 	
-	QMouseEvent              *  m_pLastEvent;
+	TQMouseEvent              *  m_pLastEvent;
 	
 	KviIrcViewToolTip         * m_pToolTip;
 	bool m_bHaveUnreadedHighlightedMessages;
@@ -162,28 +163,28 @@ public:
 	bool hasLineMark(){ return m_uLineMarkLineIndex != KVI_IRCVIEW_INVALID_LINE_MARK_INDEX; };
 	void removeHeadLine(bool bRepaint=false);
 	void emptyBuffer(bool bRepaint=true);
-	void getTextBuffer(QString &buffer);
+	void getTextBuffer(TQString &buffer);
 	void setMaxBufferSize(int maxBufSize,bool bRepaint=true);
 	int  maxBufferSize(){ return m_iMaxLines; }; //Never used ?
 	bool saveBuffer(const char *filename);
-	void findNext(const QString& szText,bool bCaseS = false,bool bRegExp = false,bool bExtended = false);
-	void findPrev(const QString& szText,bool bCaseS = false,bool bRegExp = false,bool bExtended = false);
-	KviWindow * parentKviWindow(){ return m_pKviWindow; };
+	void findNext(const TQString& szText,bool bCaseS = false,bool bRegExp = false,bool bExtended = false);
+	void findPrev(const TQString& szText,bool bCaseS = false,bool bRegExp = false,bool bExtended = false);
+	KviWindow * tqparentKviWindow(){ return m_pKviWindow; };
 	KviConsole * console();
 	// A null pixmap passed here unsets the private backgrdound.
-	void setPrivateBackgroundPixmap(const QPixmap &pixmap,bool bRepaint=true);
+	void setPrivateBackgroundPixmap(const TQPixmap &pixmap,bool bRepaint=true);
 	bool hasPrivateBackgroundPixmap(){ return (m_pPrivateBackgroundPixmap != 0); };
 
 	//==============================================================================================
 	// Logging
 	// Stops previous logging session too...
-	bool startLogging(const QString& fname = QString::null,bool bPrependCurBuffer = false);
+	bool startLogging(const TQString& fname = TQString(),bool bPrependCurBuffer = false);
 	void stopLogging();
 	bool isLogging(){ return (m_pLogFile != 0); };
 	void getLogFileName(KviStr &buffer);
-	void getLogFileName(QString &buffer);
+	void getLogFileName(TQString &buffer);
 	//void add2Log(const char *buffer,int buf_len=-1);
-	void add2Log(const QString &szBuffer,int iMsgType=0);
+	void add2Log(const TQString &szBuffer,int iMsgType=0);
 
 	//==============================================================================================
 	// Channel view splitting
@@ -196,10 +197,10 @@ public:
 	void nextLine();
 	void nextPage();
 	void prevPage();
-	virtual QSize sizeHint() const;
-	const QString & lastLineOfText();
-	const QString & lastMessageText();
-	virtual void setFont(const QFont &f);
+	virtual TQSize tqsizeHint() const;
+	const TQString & lastLineOfText();
+	const TQString & lastMessageText();
+	virtual void setFont(const TQFont &f);
 public slots:
 	void flushLog();
 	void showToolsPopup();
@@ -217,33 +218,33 @@ signals:
 private:
 	void setCursorLine(KviIrcViewLine * l);
 	KviIrcViewLine * getVisibleLineAt(int xPos,int yPos);
-	void getLinkEscapeCommand(QString &buffer,const QString &escape_cmd,const QString &escape_label);
+	void getLinkEscapeCommand(TQString &buffer,const TQString &escape_cmd,const TQString &escape_label);
 	void appendLine(KviIrcViewLine *ptr,bool bRepaint);
 	void postUpdateEvent();
 	void fastScroll(int lines = 1);
 	const kvi_wchar_t * getTextLine(int msg_type,const kvi_wchar_t * data_ptr,KviIrcViewLine *line_ptr,bool bEnableTimeStamp = true);
 	void calculateLineWraps(KviIrcViewLine *ptr,int maxWidth);
-	void recalcFontVariables(const QFontMetrics &fm,const QFontInfo &fi);
+	void recalcFontVariables(const TQFontMetrics &fm,const TQFontInfo &fi);
 	bool checkSelectionBlock(KviIrcViewLine * line,int left,int bottom,int bufIndex);
 	void calculateSelectionBounds();
-	KviIrcViewWrappedBlock * getLinkUnderMouse(int xPos,int yPos,QRect * pRect = 0,QString * linkCmd = 0,QString * linkText = 0);
-	void doLinkToolTip(const QRect &rct,QString &linkCmd,QString &linkText);
+	KviIrcViewWrappedBlock * getLinkUnderMouse(int xPos,int yPos,TQRect * pRect = 0,TQString * linkCmd = 0,TQString * linkText = 0);
+	void doLinkToolTip(const TQRect &rct,TQString &linkCmd,TQString &linkText);
 protected:
-	virtual void paintEvent(QPaintEvent *);
-	virtual void resizeEvent(QResizeEvent *);
-	virtual void mousePressEvent(QMouseEvent *e);
-	virtual void mouseRealPressEvent(QMouseEvent *e);
-	virtual void mouseReleaseEvent(QMouseEvent *);
-	virtual void mouseDoubleClickEvent(QMouseEvent *e);
-	virtual void mouseMoveEvent(QMouseEvent *e);
-	virtual void timerEvent(QTimerEvent *e);
-	virtual void dragEnterEvent(QDragEnterEvent *e);
-	virtual void dropEvent(QDropEvent *e);
-	virtual bool event(QEvent *e);
-	virtual void wheelEvent(QWheelEvent *e);
-	virtual void keyPressEvent(QKeyEvent *e);
-	void maybeTip(const QPoint &pnt);
-	virtual void leaveEvent ( QEvent * );
+	virtual void paintEvent(TQPaintEvent *);
+	virtual void resizeEvent(TQResizeEvent *);
+	virtual void mousePressEvent(TQMouseEvent *e);
+	virtual void mouseRealPressEvent(TQMouseEvent *e);
+	virtual void mouseReleaseEvent(TQMouseEvent *);
+	virtual void mouseDoubleClickEvent(TQMouseEvent *e);
+	virtual void mouseMoveEvent(TQMouseEvent *e);
+	virtual void timerEvent(TQTimerEvent *e);
+	virtual void dragEnterEvent(TQDragEnterEvent *e);
+	virtual void dropEvent(TQDropEvent *e);
+	virtual bool event(TQEvent *e);
+	virtual void wheelEvent(TQWheelEvent *e);
+	virtual void keyPressEvent(TQKeyEvent *e);
+	void maybeTip(const TQPoint &pnt);
+	virtual void leaveEvent ( TQEvent * );
 protected slots:
 	virtual void scrollBarPositionChanged(int newValue);
 	void masterDead();