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

3 files changed, 19 insertions, 18 deletions

diff --git a/src/modules/socketspy/libkvisocketspy.cpp b/src/modules/socketspy/libkvisocketspy.cpp
index c4076620..ceb79951 100644
--- a/src/modules/socketspy/libkvisocketspy.cpp
+++ b/src/modules/socketspy/libkvisocketspy.cpp
@@ -29,7 +29,7 @@
 #include "kvi_window.h"
 #include "kvi_locale.h"
 
-#include <qsplitter.h>
+#include <tqsplitter.h>
 
 KviPointerList<KviSocketSpyWindow> * g_pSocketSpyWindowList = 0;
 
diff --git a/src/modules/socketspy/socketspywindow.cpp b/src/modules/socketspy/socketspywindow.cpp
index 4d59b5aa..6ab0154b 100644
--- a/src/modules/socketspy/socketspywindow.cpp
+++ b/src/modules/socketspy/socketspywindow.cpp
@@ -28,7 +28,7 @@
 #include "kvi_locale.h"
 #include "kvi_console.h"
 
-#include <qsplitter.h>
+#include <tqsplitter.h>
 //#include "kvi_module.h"
 
 extern KviPointerList<KviSocketSpyWindow> * g_pSocketSpyWindowList;
@@ -38,9 +38,9 @@ KviSocketSpyWindow::KviSocketSpyWindow(KviFrame * lpFrm,KviConsole * lpConsole)
 {
 	g_pSocketSpyWindowList->append(this);
 	#ifdef COMPILE_USE_QT4
-	m_pSplitter = new QSplitter(Qt::Horizontal,this,"splitter");
+	m_pSplitter = new TQSplitter(Qt::Horizontal,this,"splitter");
 	#else
-	m_pSplitter = new QSplitter(QSplitter::Horizontal,this,"splitter");
+	m_pSplitter = new TQSplitter(Qt::Horizontal,this,"splitter");
 #endif
 	m_pIrcView = new KviIrcView(m_pSplitter,lpFrm,this);
 	// Ensure proper focusing
@@ -57,19 +57,19 @@ void KviSocketSpyWindow::die()
 	close();
 }
 
-QPixmap * KviSocketSpyWindow::myIconPtr()
+TQPixmap * KviSocketSpyWindow::myIconPtr()
 {
 	return g_pIconManager->getSmallIcon(KVI_SMALLICON_SPY);
 }
 
-void KviSocketSpyWindow::resizeEvent(QResizeEvent *e)
+void KviSocketSpyWindow::resizeEvent(TQResizeEvent *e)
 {
 	m_pSplitter->setGeometry(0,0,width(),height());
 }
 
-QSize KviSocketSpyWindow::sizeHint() const
+TQSize KviSocketSpyWindow::tqsizeHint() const
 {
-	return m_pIrcView->sizeHint();
+	return m_pIrcView->tqsizeHint();
 }
 
 void KviSocketSpyWindow::getBaseLogFileName(KviStr &buffer)
@@ -79,20 +79,20 @@ void KviSocketSpyWindow::getBaseLogFileName(KviStr &buffer)
 
 void KviSocketSpyWindow::fillCaptionBuffers()
 {
-	KviQString::sprintf(m_szPlainTextCaption,__tr2qs("Socket Spy [IRC Context %u]"),m_pConsole->ircContextId());
+	KviTQString::sprintf(m_szPlainTextCaption,__tr2qs("Socket Spy [IRC Context %u]"),m_pConsole->ircContextId());
 
-	KviQString::sprintf(m_szHtmlActiveCaption,
+	KviTQString::sprintf(m_szHtmlActiveCaption,
 		__tr2qs("<nobr><font color=\"%s\"><b>Socket Spy</b></font> " \
 			"<font color=\"%s\">[IRC Context %u]</font></nobr>"),
-		KVI_OPTION_COLOR(KviOption_colorCaptionTextActive).name().ascii(),
-		KVI_OPTION_COLOR(KviOption_colorCaptionTextActive2).name().ascii(),
+		TQString(KVI_OPTION_COLOR(KviOption_colorCaptionTextActive).name()).ascii(),
+		TQString(KVI_OPTION_COLOR(KviOption_colorCaptionTextActive2).name()).ascii(),
 		m_pConsole->ircContextId());
 
-	KviQString::sprintf(m_szHtmlInactiveCaption,
+	KviTQString::sprintf(m_szHtmlInactiveCaption,
 		__tr2qs("<nobr><font color=\"%s\"><b>Socket Spy</b></font> " \
 			"<font color=\"%s\">[IRC Context %u]</font></nobr>"),
-		KVI_OPTION_COLOR(KviOption_colorCaptionTextInactive).name().ascii(),
-		KVI_OPTION_COLOR(KviOption_colorCaptionTextInactive2).name().ascii(),
+		TQString(KVI_OPTION_COLOR(KviOption_colorCaptionTextInactive).name()).ascii(),
+		TQString(KVI_OPTION_COLOR(KviOption_colorCaptionTextInactive2).name()).ascii(),
 		m_pConsole->ircContextId());
 }
 
diff --git a/src/modules/socketspy/socketspywindow.h b/src/modules/socketspy/socketspywindow.h
index ab516d3e..b210ce0b 100644
--- a/src/modules/socketspy/socketspywindow.h
+++ b/src/modules/socketspy/socketspywindow.h
@@ -31,17 +31,18 @@ class KviConsole;
 class KviSocketSpyWindow : public KviWindow, public KviIrcDataStreamMonitor
 {
 	Q_OBJECT
+  TQ_OBJECT
 public:
 	KviSocketSpyWindow(KviFrame * lpFrm,KviConsole * lpConsole);
 	~KviSocketSpyWindow();
 protected:
-	virtual QPixmap * myIconPtr();
+	virtual TQPixmap * myIconPtr();
 	virtual void fillCaptionBuffers();
-	virtual void resizeEvent(QResizeEvent *e);
+	virtual void resizeEvent(TQResizeEvent *e);
 	virtual void getBaseLogFileName(KviStr &buffer);
 	virtual void applyOptions();
 public:
-	virtual QSize sizeHint() const;
+	virtual TQSize tqsizeHint() const;
 	virtual void incomingMessage(const char * message);
 	// message is NOT null terminated! For proxy connections it might spit out binary data!
 	virtual void outgoingMessage(const char * message,int len);