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, 97 insertions, 97 deletions

diff --git a/src/kvirc/ui/kvi_query.cpp b/src/kvirc/ui/kvi_query.cpp
index c32c33f..ed1801f 100644
--- a/src/kvirc/ui/kvi_query.cpp
+++ b/src/kvirc/ui/kvi_query.cpp
@@ -55,21 +55,21 @@
 
 #include "kvi_kvs_eventtriggers.h"
 
-#include <qpixmap.h>
-#include <qsplitter.h>
+#include <tqpixmap.h>
+#include <tqsplitter.h>
 #include "kvi_tal_hbox.h"
-#include <qtoolbutton.h>
+#include <tqtoolbutton.h>
 #include "kvi_draganddrop.h"
 #include "kvi_valuelist.h"
 
-KviQuery::KviQuery(KviFrame * lpFrm,KviConsole * lpConsole,const QString &nick)
-: KviWindow(KVI_WINDOW_TYPE_QUERY,lpFrm,nick,lpConsole)
+KviQuery::KviQuery(KviFrame * lpFrm,KviConsole * lpConsole,const TQString &nick)
+: KviWindow(KVI_WINDOW_TYPE_TQUERY,lpFrm,nick,lpConsole)
 {
 
 	m_iFlags = 0;
 	connection()->registerQuery(this);
 
-	//m_pTopSplitter = new QSplitter(QSplitter::Horizontal,this,"top_splitter");
+	//m_pTopSplitter = new TQSplitter(TQSplitter::Horizontal,this,"top_splitter");
 	m_pButtonBox = new KviTalHBox(this);
 	m_pLabel = new KviThemedLabel(m_pButtonBox,"query_label");
 	m_pLabel->setAutoHeight(1);
@@ -79,24 +79,24 @@ KviQuery::KviQuery(KviFrame * lpFrm,KviConsole * lpConsole,const QString &nick)
 	// The button box on the right
 	//KviTalHBox * box = new KviTalHBox(m_pTopSplitter,"button_box");
 	if(KVI_OPTION_BOOL(KviOption_boolShowExtendedInfoInQueryLabel))
-		m_pButtonGrid= (QFrame*) new KviTalGrid(2,Qt::Horizontal,m_pButtonBox);
+		m_pButtonGrid= (TQFrame*) new KviTalGrid(2,Qt::Horizontal,m_pButtonBox);
 	else
-		m_pButtonGrid= (QFrame*) new KviTalGrid(4,Qt::Horizontal,m_pButtonBox);
+		m_pButtonGrid= (TQFrame*) new KviTalGrid(4,Qt::Horizontal,m_pButtonBox);
 
 	createTextEncodingButton(m_pButtonGrid);
 
 #ifdef COMPILE_USE_QT4
-	m_pSplitter = new QSplitter(Qt::Horizontal,this,"main_splitter");
+	m_pSplitter = new TQSplitter(Qt::Horizontal,this,"main_splitter");
 #else
-	m_pSplitter = new QSplitter(QSplitter::Horizontal,this,"main_splitter");
+	m_pSplitter = new TQSplitter(Qt::Horizontal,this,"main_splitter");
 #endif
 	m_pIrcView = new KviIrcView(m_pSplitter,lpFrm,this);
-	connect(m_pIrcView,SIGNAL(rightClicked()),this,SLOT(textViewRightClicked()));
+	connect(m_pIrcView,TQT_SIGNAL(rightClicked()),this,TQT_SLOT(textViewRightClicked()));
 	//m_pEditorsContainer= new KviToolWindowsContainer(m_pSplitter);
 		
 		
 	m_pListViewButton = new KviWindowToolPageButton(KVI_SMALLICON_HIDELISTVIEW,KVI_SMALLICON_SHOWLISTVIEW,__tr2qs("Show User List"),buttonContainer(),true,"list_view_button");
-	connect(m_pListViewButton,SIGNAL(clicked()),this,SLOT(toggleListView()));
+	connect(m_pListViewButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(toggleListView()));
 	
 #ifdef COMPILE_CRYPT_SUPPORT
 	createCryptControllerButton(m_pButtonGrid);
@@ -110,7 +110,7 @@ KviQuery::KviQuery(KviFrame * lpFrm,KviConsole * lpConsole,const QString &nick)
 	// FIXME: #warning "Maybe tell the user all that we know about the remote end(s)....channels..."
 
 	m_pIrcView->enableDnd(TRUE);
-	connect(m_pIrcView,SIGNAL(fileDropped(const char *)),this,SLOT(slotDndEvents(const char *)));
+	connect(m_pIrcView,TQT_SIGNAL(fileDropped(const char *)),this,TQT_SLOT(slotDndEvents(const char *)));
 	
 	updateCaption();
 }
@@ -118,7 +118,7 @@ KviQuery::KviQuery(KviFrame * lpFrm,KviConsole * lpConsole,const QString &nick)
 KviQuery::~KviQuery()
 {
 	m_pUserListView->partAll();
-	if(type() == KVI_WINDOW_TYPE_DEADQUERY)
+	if(type() == KVI_WINDOW_TYPE_DEADTQUERY)
 		context()->unregisterDeadQuery(this);
 	else
 		connection()->unregisterQuery(this);
@@ -126,7 +126,7 @@ KviQuery::~KviQuery()
 
 void KviQuery::updateLabelText()
 {
-	QString szText=getInfoLabelText();
+	TQString szText=getInfoLabelText();
 	if(szText!=m_pLabel->text())
 	{
 		m_pLabel->setText(szText);
@@ -134,14 +134,14 @@ void KviQuery::updateLabelText()
 	}
 }
 
-QString KviQuery::getInfoLabelTipText()
+TQString KviQuery::getInfoLabelTipText()
 {
-	QString txt;
-	KviIrcUserEntry * e = connection()->userDataBase()->find(m_szName);
+	TQString txt;
+	KviIrcUserEntry * e = connection()->userDataBase()->tqfind(m_szName);
 	if(e)
 	{
-		QString tmp;
-		QString szMask;
+		TQString tmp;
+		TQString szMask;
 		if(e->hasUser()) 
 			szMask+=e->user();
 		else 
@@ -152,7 +152,7 @@ QString KviQuery::getInfoLabelTipText()
 		else 
 			szMask+="*";
 		tmp+="\n";
-		QString szChans;
+		TQString szChans;
 		connection()->getCommonChannels(m_szName,szChans,0);
 		if(console()->connection())
 		{
@@ -167,13 +167,13 @@ QString KviQuery::getInfoLabelTipText()
 			txt +=          "<tr><td>";
 		
 			if(e->hasRealName())
-				tmp=__tr2qs("%1 is %2 (%3)").arg(m_szName).arg(szMask).arg(KviMircCntrl::stripControlBytes(e->realName()));
+				tmp=__tr2qs("%1 is %2 (%3)").tqarg(m_szName).tqarg(szMask).tqarg(KviMircCntrl::stripControlBytes(e->realName()));
 			else
-				tmp=__tr2qs("%1 is %2").arg(m_szName).arg(szMask);
+				tmp=__tr2qs("%1 is %2").tqarg(m_szName).tqarg(szMask);
 			
-			tmp.replace('&',"&amp;");
-			tmp.replace('<',"&lt;");
-			tmp.replace('>',"&gt;");
+			tmp.tqreplace('&',"&amp;");
+			tmp.tqreplace('<',"&lt;");
+			tmp.tqreplace('>',"&gt;");
 			
 			txt += tmp;
 			
@@ -183,25 +183,25 @@ QString KviQuery::getInfoLabelTipText()
 			{
 				txt+="<tr><td>";
 				if(e->hasHops())
-					txt+=__tr2qs("%1 is using irc server: %2 (%3 hops)").arg(m_szName).arg(e->server()).arg(e->hops());
+					txt+=__tr2qs("%1 is using irc server: %2 (%3 hops)").tqarg(m_szName).tqarg(e->server()).tqarg(e->hops());
 				else
-					txt+=__tr2qs("%1 is using irc server: %2").arg(m_szName).arg(e->server());
+					txt+=__tr2qs("%1 is using irc server: %2").tqarg(m_szName).tqarg(e->server());
 				txt+="</td></tr>";
 			}
 			
 			if(e->isAway())
 			{
 				txt+="<tr><td>";
-				txt+=__tr2qs("%1 is probably away").arg(m_szName);
+				txt+=__tr2qs("%1 is probably away").tqarg(m_szName);
 				txt+="</td></tr>";
 			}
 			
 			txt+="<tr><td>";
-			tmp=__tr2qs("Common channels with %1: %2").arg(m_szName).arg(szChans);
+			tmp=__tr2qs("Common channels with %1: %2").tqarg(m_szName).tqarg(szChans);
 			
-			tmp.replace('&',"&amp;");
-			tmp.replace('<',"&lt;");
-			tmp.replace('>',"&gt;");
+			tmp.tqreplace('&',"&amp;");
+			tmp.tqreplace('<',"&lt;");
+			tmp.tqreplace('>',"&gt;");
 			
 			txt+=tmp;
 			txt +="</td></tr>";	
@@ -216,15 +216,15 @@ QString KviQuery::getInfoLabelTipText()
 	return txt;
 }
 
-QString KviQuery::getInfoLabelText()
+TQString KviQuery::getInfoLabelText()
 {
-	QString tmp;
+	TQString tmp;
 	if(KVI_OPTION_BOOL(KviOption_boolShowExtendedInfoInQueryLabel))
 	{
-		KviIrcUserEntry * e = connection()->userDataBase()->find(m_szName);
+		KviIrcUserEntry * e = connection()->userDataBase()->tqfind(m_szName);
 		if(e)
 		{
-			QString szMask;
+			TQString szMask;
 			if(console()->connection())
 			{
 				if(e->hasUser()) 
@@ -237,19 +237,19 @@ QString KviQuery::getInfoLabelText()
 				else 
 					szMask+="*";
 				if(e->hasRealName())
-					tmp=__tr2qs("Query with %1!%2 (%3)").arg(m_szName).arg(szMask).arg(KviMircCntrl::stripControlBytes(e->realName()));
+					tmp=__tr2qs("Query with %1!%2 (%3)").tqarg(m_szName).tqarg(szMask).tqarg(KviMircCntrl::stripControlBytes(e->realName()));
 				else
-					tmp=__tr2qs("Query with %1!%2").arg(m_szName).arg(szMask);
+					tmp=__tr2qs("Query with %1!%2").tqarg(m_szName).tqarg(szMask);
 				if(e->hasServer())
-					tmp+=__tr2qs(", using server %1").arg(e->server());
+					tmp+=__tr2qs(", using server %1").tqarg(e->server());
 				if(e->hasHops())
-					tmp+=__tr2qs(" (%1 hops)").arg(e->hops());
+					tmp+=__tr2qs(" (%1 hops)").tqarg(e->hops());
 				if(e->isAway())
 					tmp+=__tr2qs(", probably away");
 				tmp+="\n";
-				QString szChans;
+				TQString szChans;
 				connection()->getCommonChannels(m_szName,szChans,0);
-				tmp+=__tr2qs("Common channels: %2").arg(szChans);
+				tmp+=__tr2qs("Common channels: %2").tqarg(szChans);
 			} else {
 				tmp=__tr2qs("[Dead Query]");
 			}
@@ -259,7 +259,7 @@ QString KviQuery::getInfoLabelText()
 }
 void KviQuery::slotDndEvents(const char *file)
 {	
-	KVS_TRIGGER_EVENT_1(KviEvent_OnQueryFileDropped,this,QString(file));
+	KVS_TRIGGER_EVENT_1(KviEvent_OnQueryFileDropped,this,TQString(file));
 }
 
 void KviQuery::triggerCreationEvents()
@@ -268,7 +268,7 @@ void KviQuery::triggerCreationEvents()
 	KVS_TRIGGER_EVENT_0(KviEvent_OnQueryWindowCreated,this);
 }
 
-void KviQuery::getBaseLogFileName(QString &buffer)
+void KviQuery::getBaseLogFileName(TQString &buffer)
 {
 	if(console()->connection())
 	{
@@ -311,24 +311,24 @@ void KviQuery::loadProperties(KviConfig *cfg)
 	showListView(cfg->readBoolEntry("UserListViewVisible",false));
 }
 
-void KviQuery::notifyTargetChange(const QString &oldNick,const QString &oldUser,const QString &oldHost,const QString &nick,const QString &user,const QString &host)
+void KviQuery::notifyTargetChange(const TQString &oldNick,const TQString &oldUser,const TQString &oldHost,const TQString &nick,const TQString &user,const TQString &host)
 {
-	QString oldN = oldNick.isEmpty() ? QString("*") : oldNick;
-	QString oldU = oldUser.isEmpty() ? QString("*") : oldUser;
-	QString oldH = oldHost.isEmpty() ? QString("*") : oldHost;
-	output(KVI_OUT_QUERYTRACE,
+	TQString oldN = oldNick.isEmpty() ? TQString("*") : oldNick;
+	TQString oldU = oldUser.isEmpty() ? TQString("*") : oldUser;
+	TQString oldH = oldHost.isEmpty() ? TQString("*") : oldHost;
+	output(KVI_OUT_TQUERYTRACE,
 		__tr2qs("The target of this query has changed from \r!n\r%Q\r [%Q@\r!h\r%Q\r] to \r!n\r%Q\r [%Q@\r!h\r%Q\r]"),
 		&oldN,&oldU,&oldH,&nick,&user,&host);
 	updateLabelText();
 }
 
 
-void KviQuery::userAction(const QString &nick,const QString &user,const QString &host,unsigned int uActionType)
+void KviQuery::userAction(const TQString &nick,const TQString &user,const TQString &host,unsigned int uActionType)
 {
 	int iTemperature = kvi_getUserActionTemperature(uActionType);
 	if(KVI_OPTION_BOOL(KviOption_boolEnableQueryTracing))
 	{
-		QString oldUser,oldHost;
+		TQString oldUser,oldHost;
 		if(!m_pUserListView->userActionVerifyMask(nick,user,host,iTemperature,oldUser,oldHost))
 			notifyTargetChange(nick,oldUser,oldHost,nick,user,host);
 	} else {
@@ -338,7 +338,7 @@ void KviQuery::userAction(const QString &nick,const QString &user,const QString
 }
 
 
-void KviQuery::userAction(const QString &nick,unsigned int uActionType)
+void KviQuery::userAction(const TQString &nick,unsigned int uActionType)
 {
 	int iTemperature = kvi_getUserActionTemperature(uActionType);
 	m_pUserListView->userAction(nick,iTemperature);
@@ -350,7 +350,7 @@ void KviQuery::userAction(KviIrcMask *user,unsigned int uActionType)
 	int iTemperature = kvi_getUserActionTemperature(uActionType);
 	if(KVI_OPTION_BOOL(KviOption_boolEnableQueryTracing))
 	{
-		QString oldUser,oldHost;
+		TQString oldUser,oldHost;
 		if(!m_pUserListView->userActionVerifyMask(user->nick(),user->user(),user->host(),iTemperature,oldUser,oldHost))
 			notifyTargetChange(user->nick(),oldUser,oldHost,user->nick(),user->user(),user->host());
 	} else {
@@ -360,7 +360,7 @@ void KviQuery::userAction(KviIrcMask *user,unsigned int uActionType)
 }
 
 
-KviUserListEntry * KviQuery::setTarget(const QString &nick,const QString &user,const QString &host)
+KviUserListEntry * KviQuery::setTarget(const TQString &nick,const TQString &user,const TQString &host)
 {
 	KviUserListEntry * e = m_pUserListView->join(nick,user,host);
 	if((!e->globalData()->avatar()) && (!user.isEmpty()) && (user != "*"))
@@ -371,7 +371,7 @@ KviUserListEntry * KviQuery::setTarget(const QString &nick,const QString &user,c
 
 	if(KVI_OPTION_BOOL(KviOption_boolEnableQueryTracing))
 	{
-		QString szChans;
+		TQString szChans;
 		int iChans = m_pConsole->connection()->getCommonChannels(nick,szChans);
 		notifyCommonChannels(nick,user,host,iChans,szChans);
 	}
@@ -381,15 +381,15 @@ KviUserListEntry * KviQuery::setTarget(const QString &nick,const QString &user,c
 	return e;	
 }
 
-void KviQuery::notifyCommonChannels(const QString &nick,const QString &user,const QString &host,int iChans,const QString &szChans)
+void KviQuery::notifyCommonChannels(const TQString &nick,const TQString &user,const TQString &host,int iChans,const TQString &szChans)
 {
-	static QString star("*");
+	static TQString star("*");
 	if(iChans > 0)
 	{
-		output(KVI_OUT_QUERYTRACE,__tr2qs("Common channels for \r!n\r%Q\r [%Q@\r!h\r%Q\r]: %Q"),
+		output(KVI_OUT_TQUERYTRACE,__tr2qs("Common channels for \r!n\r%Q\r [%Q@\r!h\r%Q\r]: %Q"),
 			&nick,user.isEmpty() ? &star : &user,host.isEmpty() ? &star : &host,&szChans);
 	} else {
-		output(KVI_OUT_QUERYTRACE,__tr2qs("No common channels for \r!n\r%Q\r [%Q@\r!h\r%Q\r]"),
+		output(KVI_OUT_TQUERYTRACE,__tr2qs("No common channels for \r!n\r%Q\r [%Q@\r!h\r%Q\r]"),
 			&nick,user.isEmpty() ? &star : &user,host.isEmpty() ? &star : &host);
 	}
 	updateLabelText();
@@ -400,11 +400,11 @@ void KviQuery::notifyCommonChannels(const QString &nick,const QString &user,cons
 
 /*void KviQuery::updateTargets()
 {
-	QString szName;
+	TQString szName;
 
 	if(targetCount() > 0)
 	{
-		KviPointerHashTableIterator<QString,KviUserListEntry> it(*(m_pUserListView->entryDict()));
+		KviPointerHashTableIterator<TQString,KviUserListEntry> it(*(m_pUserListView->entryDict()));
 		if(it.current())szName = it.currentKey();
 	}
 
@@ -417,15 +417,15 @@ void KviQuery::notifyCommonChannels(const QString &nick,const QString &user,cons
 
 void KviQuery::fillCaptionBuffers()
 {
-	static QString begin("<nobr><font color=\"");
-	static QString boldbegin("\"><b>");
-	static QString endofbold("</b></font> <font color=\"");
-	static QString endoffont("\">");
-	static QString end("</font></nobr>");
+	static TQString begin("<nobr><font color=\"");
+	static TQString boldbegin("\"><b>");
+	static TQString endofbold("</b></font> <font color=\"");
+	static TQString endoffont("\">");
+	static TQString end("</font></nobr>");
 
 	if(!console()->connection())
 	{
-		QString dead = __tr2qs("[Dead query]");
+		TQString dead = __tr2qs("[Dead query]");
 
 		m_szPlainTextCaption = windowName();
 		m_szPlainTextCaption += " : ";
@@ -454,14 +454,14 @@ void KviQuery::fillCaptionBuffers()
 		return;
 	}
 
-	QString szNickOnServer = QChar('[');
+	TQString szNickOnServer = TQChar('[');
 	szNickOnServer += connection()->currentNickName();
 	szNickOnServer += __tr2qs(" on ");
 	szNickOnServer += connection()->currentServerName();
-	szNickOnServer += QChar(']');
+	szNickOnServer += TQChar(']');
 
 	m_szPlainTextCaption = windowName();
-	m_szPlainTextCaption += QChar(' ');
+	m_szPlainTextCaption += TQChar(' ');
 	m_szPlainTextCaption += szNickOnServer;
 
 	m_szHtmlActiveCaption = begin;
@@ -485,7 +485,7 @@ void KviQuery::fillCaptionBuffers()
 	m_szHtmlInactiveCaption += end;
 }
 
-bool KviQuery::nickChange(const QString &oldNick,const QString &newNick)
+bool KviQuery::nickChange(const TQString &oldNick,const TQString &newNick)
 {
 	bool bRet = m_pUserListView->nickChange(oldNick,newNick);
 	if(!bRet)return false; // ugh!! ?
@@ -514,7 +514,7 @@ void KviQuery::toggleListView()
 
 void KviQuery::setDeadQuery()
 {
-	m_iFlags |= KVI_QUERY_FLAG_DEAD;
+	m_iFlags |= KVI_TQUERY_FLAG_DEAD;
 
 	m_pUserListView->enableUpdates(false);
 	m_pUserListView->partAll();
@@ -522,7 +522,7 @@ void KviQuery::setDeadQuery()
 	m_pUserListView->setUserDataBase(0);
 	connection()->unregisterQuery(this);
 	context()->registerDeadQuery(this);
-	setType(KVI_WINDOW_TYPE_DEADQUERY);
+	setType(KVI_WINDOW_TYPE_DEADTQUERY);
 
 	updateIcon();
 	updateCaption();
@@ -531,9 +531,9 @@ void KviQuery::setDeadQuery()
 
 void KviQuery::setAliveQuery()
 {
-	m_iFlags &= ~KVI_QUERY_FLAG_DEAD;
+	m_iFlags &= ~KVI_TQUERY_FLAG_DEAD;
 	m_pUserListView->setUserDataBase(connection()->userDataBase());
-	setType(KVI_WINDOW_TYPE_QUERY);
+	setType(KVI_WINDOW_TYPE_TQUERY);
 	context()->unregisterDeadQuery(this);
 	connection()->registerQuery(this);
 	// Update log file name
@@ -547,31 +547,31 @@ void KviQuery::applyOptions()
 {
 	m_pUserListView->applyOptions();
 	updateLabelText();
-	// this applies options for IrcView and Input and forces the window to relayout
+	// this applies options for IrcView and Input and forces the window to retqlayout
 	KviWindow::applyOptions();
 }
 
-QPixmap * KviQuery::myIconPtr()
+TQPixmap * KviQuery::myIconPtr()
 {
-	return g_pIconManager->getSmallIcon(isDeadQuery() ? KVI_SMALLICON_DEADQUERY : KVI_SMALLICON_QUERY);
+	return g_pIconManager->getSmallIcon(isDeadQuery() ? KVI_SMALLICON_DEADTQUERY : KVI_SMALLICON_TQUERY);
 }
 
-void KviQuery::resizeEvent(QResizeEvent *e)
+void KviQuery::resizeEvent(TQResizeEvent *e)
 {
 	int hght = m_pInput->heightHint();
-	int hght2 = m_pButtonBox->sizeHint().height();
+	int hght2 = m_pButtonBox->tqsizeHint().height();
 	m_pButtonBox->setGeometry(0,0,width(),hght2);
 	m_pSplitter->setGeometry(0,hght2,width(),height() - (hght + hght2));
 	m_pInput->setGeometry(0,height() - hght,width(),hght);
 }
 
-QSize KviQuery::sizeHint() const
+TQSize KviQuery::tqsizeHint() const
 {
-	QSize ret(m_pSplitter->sizeHint().width(),m_pIrcView->sizeHint().height() + m_pInput->heightHint());
+	TQSize ret(m_pSplitter->tqsizeHint().width(),m_pIrcView->tqsizeHint().height() + m_pInput->heightHint());
 	return ret;
 }
 
-void KviQuery::ownMessage(const QString &buffer)
+void KviQuery::ownMessage(const TQString &buffer)
 {
 	if(!connection())
 	{
@@ -579,8 +579,8 @@ void KviQuery::ownMessage(const QString &buffer)
 		return;
 	}
 	
-	KviQCString szName = connection()->encodeText(windowName());
-	KviQCString szData = encodeText(buffer);
+	KviTQCString szName = connection()->encodeText(windowName());
+	KviTQCString szData = encodeText(buffer);
 
 	const char * d = szData.data();
 	if(!d)return;
@@ -599,20 +599,20 @@ void KviQuery::ownMessage(const QString &buffer)
 					case KviCryptEngine::Encrypted:
 						if(!connection()->sendFmtData("PRIVMSG %s :%s",szName.data(),encrypted.ptr()))return;
 						m_pConsole->outputPrivmsg(this,KVI_OUT_OWNPRIVMSGCRYPTED,
-							QString::null,QString::null,QString::null,buffer,KviConsole::NoNotifications);
+							TQString(),TQString(),TQString(),buffer,KviConsole::NoNotifications);
 					break;
 					case KviCryptEngine::Encoded:
 					{
 						if(!connection()->sendFmtData("PRIVMSG %s :%s",szName.data(),encrypted.ptr()))return;
 						// ugly ,but we must redecode here
-						QString szRedecoded = decodeText(encrypted.ptr());
+						TQString szRedecoded = decodeText(encrypted.ptr());
 						m_pConsole->outputPrivmsg(this,KVI_OUT_OWNPRIVMSG,
-							QString::null,QString::null,QString::null,szRedecoded,KviConsole::NoNotifications);
+							TQString(),TQString(),TQString(),szRedecoded,KviConsole::NoNotifications);
 					}
 					break;
 					default: // also case KviCryptEngine::EncryptError
 					{
-						QString szEngineError = cryptSessionInfo()->pEngine->lastError();
+						TQString szEngineError = cryptSessionInfo()->pEngine->lastError();
 						output(KVI_OUT_SYSTEMERROR,
 							__tr2qs("The crypto engine was unable to encrypt the current message (%Q): %s, no data sent to the server"),
 							&buffer,&szEngineError);
@@ -623,9 +623,9 @@ void KviQuery::ownMessage(const QString &buffer)
 				return;
 			} else {
 				d++; //eat the escape code
-				QString tmp = buffer.right(buffer.length() - 1);
+				TQString tmp = buffer.right(buffer.length() - 1);
 				if(!connection()->sendFmtData("PRIVMSG %s :%s",szName.data(),d))return;
-				m_pConsole->outputPrivmsg(this,KVI_OUT_OWNPRIVMSG,QString::null,QString::null,QString::null,tmp,KviConsole::NoNotifications);
+				m_pConsole->outputPrivmsg(this,KVI_OUT_OWNPRIVMSG,TQString(),TQString(),TQString(),tmp,KviConsole::NoNotifications);
 				userAction(connection()->currentNickName(),KVI_USERACTION_PRIVMSG);
 				return;
 			}
@@ -634,23 +634,23 @@ void KviQuery::ownMessage(const QString &buffer)
 #endif
 
 	if(!connection()->sendFmtData("PRIVMSG %s :%s",szName.data(),d))return;
-	m_pConsole->outputPrivmsg(this,KVI_OUT_OWNPRIVMSG,QString::null,QString::null,QString::null,buffer,KviConsole::NoNotifications);
+	m_pConsole->outputPrivmsg(this,KVI_OUT_OWNPRIVMSG,TQString(),TQString(),TQString(),buffer,KviConsole::NoNotifications);
 	userAction(connection()->currentNickName(),KVI_USERACTION_PRIVMSG);
 }
 
-void KviQuery::ownAction(const QString &buffer)
+void KviQuery::ownAction(const TQString &buffer)
 {
 	if(!connection())
 	{
 		outputNoFmt(KVI_OUT_SYSTEMWARNING,__tr2qs("This query has no active targets, no message sent"));
 	} else {
-		KviQCString szBuffer = encodeText(buffer);
+		KviTQCString szBuffer = encodeText(buffer);
 		if(!szBuffer.data())return;
-		KviQCString sz = connection()->encodeText(windowName());
+		KviTQCString sz = connection()->encodeText(windowName());
 		if(sz.isEmpty())return;
 		if(!connection()->sendFmtData("PRIVMSG %s :%cACTION %s%c",
 			sz.data(),0x01,szBuffer.data(),0x01))return;
-		if(KVS_TRIGGER_EVENT_1_HALTED(KviEvent_OnMeAction,this,QString(szBuffer.data())))return;
+		if(KVS_TRIGGER_EVENT_1_HALTED(KviEvent_OnMeAction,this,TQString(szBuffer.data())))return;
 		output(KVI_OUT_ACTION,"\r!nc\r%Q\r %Q",&(connection()->currentNickName()),&buffer);
 		m_pUserListView->userAction(connection()->currentNickName(),KVI_USERACTION_ACTION);
 	}