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

diff --git a/src/kvirc/kvs/kvi_kvs_parser.cpp b/src/kvirc/kvs/kvi_kvs_parser.cpp
index 37e462c..3d439fd 100644
--- a/src/kvirc/kvs/kvi_kvs_parser.cpp
+++ b/src/kvirc/kvs/kvi_kvs_parser.cpp
@@ -68,7 +68,7 @@ void KviKvsParser::init()
 	{ \
 		KviKvsSpecialCommandParsingRoutine * r = new KviKvsSpecialCommandParsingRoutine; \
 		r->proc = KVI_PTR2MEMBER(KviKvsParser::__parsingRoutine); \
-		pKern->registerSpecialCommandParsingRoutine(QString(__cntrlCmdName),r); \
+		pKern->registerSpecialCommandParsingRoutine(TQString(__cntrlCmdName),r); \
 	}
 
 	_REG_CNTRL_CMD("if",parseSpecialCommandIf);
@@ -87,24 +87,24 @@ void KviKvsParser::init()
 #undef _REG_CNTRL_CMD
 }
 
-void KviKvsParser::report(bool bError,const QChar * pLocation,const QString &szMsgFmt,kvi_va_list va)
+void KviKvsParser::report(bool bError,const TQChar * pLocation,const TQString &szMsgFmt,kvi_va_list va)
 {
-	QString szMsg;
-	KviQString::vsprintf(szMsg,szMsgFmt,va);
+	TQString szMsg;
+	KviTQString::vsprintf(szMsg,szMsgFmt,va);
 
-	KviPointerList<QString> * pCodeListing = 0;
-	QString szLocation;
+	KviPointerList<TQString> * pCodeListing = 0;
+	TQString szLocation;
 
 	if(pLocation)
 	{
-		pCodeListing = new KviPointerList<QString>;
+		pCodeListing = new KviPointerList<TQString>;
 		pCodeListing->setAutoDelete(true);
 
 		int iLine,iCol;
 
 		KviKvsReport::findLineColAndListing(m_pBuffer,pLocation,iLine,iCol,pCodeListing);
 		
-		KviQString::sprintf(szLocation,__tr2qs("line %d, near character %d"),iLine,iCol);
+		KviTQString::sprintf(szLocation,__tr2qs("line %d, near character %d"),iLine,iCol);
 	} else {
 		szLocation = __tr2qs("beginning of input");
 	}
@@ -115,17 +115,17 @@ void KviKvsParser::report(bool bError,const QChar * pLocation,const QString &szM
 	KviKvsReport::report(&rep,m_pWindow);
 }
 
-void KviKvsParser::errorBadChar(const QChar * pLocation,char cExpected,const char * szCommandName)
+void KviKvsParser::errorBadChar(const TQChar * pLocation,char cExpected,const char * szCommandName)
 {
-	if(pLocation->unicode())
-		error(pLocation,__tr2qs("Found character '%q' (unicode 0x%x) where '%c' was expected: see \"/help %s\" for the command syntax"),
-			pLocation,pLocation->unicode(),cExpected,szCommandName);
+	if(pLocation->tqunicode())
+		error(pLocation,__tr2qs("Found character '%q' (tqunicode 0x%x) where '%c' was expected: see \"/help %s\" for the command syntax"),
+			pLocation,pLocation->tqunicode(),cExpected,szCommandName);
 	else
 		error(pLocation,__tr2qs("Found end of input where character '%c' was expected: see \"/help %s\" for the command syntax"),
 			cExpected,szCommandName);
 }
 
-void KviKvsParser::error(const QChar * pLocation,const QString &szMsgFmt,...)
+void KviKvsParser::error(const TQChar * pLocation,const TQString &szMsgFmt,...)
 {
 	m_bError = true;
 
@@ -135,7 +135,7 @@ void KviKvsParser::error(const QChar * pLocation,const QString &szMsgFmt,...)
 	kvi_va_end(va);
 }
 
-void KviKvsParser::warning(const QChar * pLocation,const QString &szMsgFmt,...)
+void KviKvsParser::warning(const TQChar * pLocation,const TQString &szMsgFmt,...)
 {
 	kvi_va_list va;
 	kvi_va_start_by_reference(va,szMsgFmt);
@@ -143,7 +143,7 @@ void KviKvsParser::warning(const QChar * pLocation,const QString &szMsgFmt,...)
 	kvi_va_end(va);
 }
 
-KviKvsTreeNodeInstruction * KviKvsParser::parse(const QChar * pBuffer,int iFlags)
+KviKvsTreeNodeInstruction * KviKvsParser::parse(const TQChar * pBuffer,int iFlags)
 {
 	m_iFlags = iFlags;
 
@@ -161,7 +161,7 @@ KviKvsTreeNodeInstruction * KviKvsParser::parse(const QChar * pBuffer,int iFlags
 	return parseInstructionList();
 }
 
-KviKvsTreeNodeInstruction * KviKvsParser::parseAsExpression(const QChar * pBuffer,int iFlags)
+KviKvsTreeNodeInstruction * KviKvsParser::parseAsExpression(const TQChar * pBuffer,int iFlags)
 {
 	m_iFlags = iFlags;
 
@@ -182,7 +182,7 @@ KviKvsTreeNodeInstruction * KviKvsParser::parseAsExpression(const QChar * pBuffe
 	return new KviKvsTreeNodeExpressionReturn(pBuffer,expr);
 }
 
-KviKvsTreeNodeInstruction * KviKvsParser::parseAsParameter(const QChar * pBuffer,int iFlags)
+KviKvsTreeNodeInstruction * KviKvsParser::parseAsParameter(const TQChar * pBuffer,int iFlags)
 {
 	m_iFlags = iFlags;
 
@@ -428,10 +428,10 @@ KviKvsTreeNodeInstruction * KviKvsParser::parseAsParameter(const QChar * pBuffer
 		[/example]
 		The line above is an example of syntax specification. All the commands
 		are described by such syntax lines. [cmd]join[/cmd] is the command and it stands exactly
-		for the literal string "join" typed in a script. <channel> is in angular parenthesis
+		for the literal string "join" typed in a script. <channel> is in angular tqparenthesis
 		and rappresents a mandatory parameter: you must substitute a real channel name in its place
 		otherwise the command will fail and KVIrc will probably complain too.
-		[password] is still a parameter but the square parentheses indicate that it is
+		[password] is still a parameter but the square tqparentheses indicate that it is
 		optional: if you specify it, then it will be interpreted as the channel password,
 		if you don't then no password will be used.
 		[note]
@@ -701,7 +701,7 @@ KviKvsTreeNodeInstruction * KviKvsParser::parseAsParameter(const QChar * pBuffer
 		The function [fnc]$str.len[/fnc] accepts a single parameter and returns the
 		length in characters of the parameter string. The returned value is always
 		a string: in this case it can be also interpreted as a number.[br]
-		When passing an empty list you can avoid the parenthesis.
+		When passing an empty list you can avoid the tqparenthesis.
 		(And you have found the "simple" functions shown above).
 		So the followind two calls are equal:[br]
 		[example]
@@ -719,7 +719,7 @@ KviKvsTreeNodeInstruction * KviKvsParser::parseAsParameter(const QChar * pBuffer
 		[/example]
 		If you want to place a literal '(' or ')' in the function parameters
 		you must escape it.
-		A special case for when you want to use 'matching' parentheses:
+		A special case for when you want to use 'matching' tqparentheses:
 		an opened '(' corresponds to a closed ')'.
 		In this case you can omit the 'escape' character.[br]
 		[example]
@@ -1349,7 +1349,7 @@ KviKvsTreeNodeInstruction * KviKvsParser::parseAsParameter(const QChar * pBuffer
 		so the callback code is empty, but if you continue reading we will soon fill it.
 		[/p]
 
-		[big]A typical addon layout[/big]
+		[big]A typical addon tqlayout[/big]
 		[p]
 		As stated above, the addons are usually shipped in a compressed archive.
 		Once uncompressed, the archive will expand into a small directory tree
@@ -1400,7 +1400,7 @@ KviKvsTreeNodeInstruction * KviKvsParser::parseAsParameter(const QChar * pBuffer
 		[/p]
 		[p]
 		The entries in [b]bold[/b] are directories while the other are files.
-		Please note that this is a general layout for a huge and rather complex
+		Please note that this is a general tqlayout for a huge and rather complex
 		addon: you might not need all of these directories. Remember: the minimal
 		addon has only an install.kvs file. Anyway, a really cool addon
 		will probably have all of them and maybe some more.
@@ -1496,7 +1496,7 @@ KviKvsTreeNodeInstruction * KviKvsParser::parseAsParameter(const QChar * pBuffer
 		[p]
 		It is a good idea to start on the KVIrc web site. There are surely
 		several addons to look at. Pick one that seems simple and analyze its
-		layout and code (wow... the free software!). It will be easier to do than it was to explain it :D
+		tqlayout and code (wow... the free software!). It will be easier to do than it was to explain it :D
 		[/p]
 		[p]
 		Have fun! :)
@@ -2402,7 +2402,7 @@ KviKvsTreeNodeData * KviKvsParser::parseParameterPercentOrDollar()
 		if(!KVSP_curCharIsLetter && (KVSP_curCharUnicode != ':'))
 		{
 			// be flexible : allow an "alone" '%' char
-			return new KviKvsTreeNodeConstantData(KVSP_curCharPointer - 1,new KviKvsVariant(QString("%")));
+			return new KviKvsTreeNodeConstantData(KVSP_curCharPointer - 1,new KviKvsVariant(TQString("%")));
 		}
 		// this is surely a variable or function
 		KVSP_backChar;
@@ -2412,7 +2412,7 @@ KviKvsTreeNodeData * KviKvsParser::parseParameterPercentOrDollar()
 		if(!KVSP_curCharIsFunctionStart)
 		{
 			// be flexible : allow an "alone" '$' char
-			return new KviKvsTreeNodeConstantData(KVSP_curCharPointer - 1,new KviKvsVariant(QString("$")));
+			return new KviKvsTreeNodeConstantData(KVSP_curCharPointer - 1,new KviKvsVariant(TQString("$")));
 		}
 		// this is surely a variable or function
 		KVSP_backChar;
@@ -2428,7 +2428,7 @@ KviKvsTreeNodeData * KviKvsParser::parsePercentOrDollar(bool bInObjScope)
 	KVSP_ASSERT((KVSP_curCharUnicode == '%') || (KVSP_curCharUnicode == '$') || (KVSP_curCharUnicode == '@'));
 
 	KviKvsTreeNodeData * r;
-	const QChar * pBegin;
+	const TQChar * pBegin;
 
 	if(KVSP_curCharUnicode == '%')
 	{
@@ -2440,8 +2440,8 @@ KviKvsTreeNodeData * KviKvsParser::parsePercentOrDollar(bool bInObjScope)
 		if(!r)return 0;
 	} else {
 		// this is @
-		static QString szStrayAtRoutineName("@");
-		static QString szMightBeStrayAtOrThisRoutineName("@?");
+		static TQString szStrayAtRoutineName("@");
+		static TQString szMightBeStrayAtOrThisRoutineName("@?");
 		
 		pBegin = KVSP_curCharPointer;
 		
@@ -2458,7 +2458,7 @@ KviKvsTreeNodeData * KviKvsParser::parsePercentOrDollar(bool bInObjScope)
 			return r;
 		}
 		// we're not in object scope and cur char is either $ or %
-		// check for the common syntax $0!$1@$2 seen in hostmasks
+		// check for the common syntax $0!$1@$2 seen in hosttqmasks
 		// @$<digit> is non valid anyway
 		if(KVSP_curCharUnicode == '$')
 		{
@@ -2631,7 +2631,7 @@ KviKvsTreeNodeVariable * KviKvsParser::parsePercent(bool bInObjScope)
 {
 	KVSP_ASSERT(KVSP_curCharUnicode == '%');
 
-	const QChar * pBegin = KVSP_curCharPointer;
+	const TQChar * pBegin = KVSP_curCharPointer;
 
 	KVSP_skipChar;
 
@@ -2651,11 +2651,11 @@ KviKvsTreeNodeVariable * KviKvsParser::parsePercent(bool bInObjScope)
 		return 0;
 	}
 
-	const QChar * pIdBegin = KVSP_curCharPointer;
+	const TQChar * pIdBegin = KVSP_curCharPointer;
 
 	while((KVSP_curCharIsLetterOrNumber) || (KVSP_curCharUnicode == '_') || (KVSP_curCharUnicode == '.'))KVSP_skipChar;
 
-	QString szIdentifier(pIdBegin,KVSP_curCharPointer - pIdBegin);
+	TQString szIdentifier(pIdBegin,KVSP_curCharPointer - pIdBegin);
 
 //#warning "ADD A KviKvsTreeNodeBuiltinCleanupVariablesCommand on this KviKvsParser object"
 //#warning "KviKvsParser will append it to the script"
@@ -2675,13 +2675,13 @@ KviKvsTreeNodeVariable * KviKvsParser::parsePercent(bool bInObjScope)
 	
 	if(m_pGlobals)
 	{
-		if(m_pGlobals->find(szIdentifier))return new KviKvsTreeNodeGlobalVariable(pBegin,szIdentifier);
+		if(m_pGlobals->tqfind(szIdentifier))return new KviKvsTreeNodeGlobalVariable(pBegin,szIdentifier);
 	}
 
 	if(m_iFlags & AssumeLocals)
 		return new KviKvsTreeNodeLocalVariable(pBegin,szIdentifier);
 
-	if(pIdBegin->category() & QChar::Letter_Uppercase)
+	if(pIdBegin->category() & TQChar::Letter_Uppercase)
 	{
 		//if(m_iFlags & Pedantic)
 		//	warning(pIdBegin,__tr2qs("Declaring global variables with an uppercase letter is deprecated. Global variables should be declared with 'global'"));
@@ -2724,7 +2724,7 @@ KviKvsTreeNodeInstruction * KviKvsParser::parseInstruction()
 				return parseCommand();
 			} else {
 				// what the heck is this ?
-				error(KVSP_curCharPointer,__tr2qs("Found character '%q' (unicode %x) where an instruction was expected"),KVSP_curCharPointer,KVSP_curCharUnicode);
+				error(KVSP_curCharPointer,__tr2qs("Found character '%q' (tqunicode %x) where an instruction was expected"),KVSP_curCharPointer,KVSP_curCharUnicode);
 				return 0;
 			}
 		break;
@@ -2741,7 +2741,7 @@ KviKvsTreeNodeInstruction * KviKvsParser::parseInstructionBlock()
 
 	KVSP_skipChar;
 
-	const QChar * pBegin = KVSP_curCharPointer;
+	const TQChar * pBegin = KVSP_curCharPointer;
 
 	KviKvsTreeNodeInstructionBlock * b = new KviKvsTreeNodeInstructionBlock(pBegin - 1);
 
@@ -2804,7 +2804,7 @@ KviKvsTreeNodeSwitchList * KviKvsParser::parseCommandSwitchList()
 
 	while(KVSP_curCharUnicode == '-')
 	{
-		const QChar * pBegin = KVSP_curCharPointer;
+		const TQChar * pBegin = KVSP_curCharPointer;
 		KVSP_skipChar;
 		
 		bool bLong = false;
@@ -2839,7 +2839,7 @@ KviKvsTreeNodeSwitchList * KviKvsParser::parseCommandSwitchList()
 	
 				if(KVSP_curCharUnicode == 0)
 				{
-					error(KVSP_curCharPointer,__tr2qs("Unexpected character '%q' (unicode %x) after a switch dash"),KVSP_curCharPointer,KVSP_curCharUnicode);
+					error(KVSP_curCharPointer,__tr2qs("Unexpected character '%q' (tqunicode %x) after a switch dash"),KVSP_curCharPointer,KVSP_curCharUnicode);
 				} else {
 					error(KVSP_curCharPointer,__tr2qs("Unexpected end of script after a switch dash"));
 				}
@@ -2847,12 +2847,12 @@ KviKvsTreeNodeSwitchList * KviKvsParser::parseCommandSwitchList()
 			}
 		}
 
-		const QChar * pSw = KVSP_curCharPointer;
+		const TQChar * pSw = KVSP_curCharPointer;
 
 		KVSP_skipChar;
 		while((KVSP_curCharIsLetterOrNumber) || (KVSP_curCharUnicode == '-'))KVSP_skipChar;
 
-		const QChar * pSwEnd = KVSP_curCharPointer;
+		const TQChar * pSwEnd = KVSP_curCharPointer;
 
 		skipSpaces();
 
@@ -2871,21 +2871,21 @@ KviKvsTreeNodeSwitchList * KviKvsParser::parseCommandSwitchList()
 					return 0;
 				} else {
 					// assume empty string
-					p = new KviKvsTreeNodeConstantData(KVSP_curCharPointer,new KviKvsVariant(QString("")));
+					p = new KviKvsTreeNodeConstantData(KVSP_curCharPointer,new KviKvsVariant(TQString("")));
 				}
 			}
 
 			skipSpaces();
 
 			if(bLong)
-				sw->addLong(QString(pSw,pSwEnd - pSw),p);
+				sw->addLong(TQString(pSw,pSwEnd - pSw),p);
 			else
-				sw->addShort(pSw->lower().unicode(),p);
+				sw->addShort(pSw->lower().tqunicode(),p);
 		} else {
 			if(bLong)
-				sw->addLong(QString(pSw,pSwEnd - pSw),new KviKvsTreeNodeConstantData(KVSP_curCharPointer,new KviKvsVariant(true))); // empty param
+				sw->addLong(TQString(pSw,pSwEnd - pSw),new KviKvsTreeNodeConstantData(KVSP_curCharPointer,new KviKvsVariant(true))); // empty param
 			else
-				sw->addShort(pSw->lower().unicode(),new KviKvsTreeNodeConstantData(KVSP_curCharPointer,new KviKvsVariant(true))); // empty param
+				sw->addShort(pSw->lower().tqunicode(),new KviKvsTreeNodeConstantData(KVSP_curCharPointer,new KviKvsVariant(true))); // empty param
 		}
 	}
 
@@ -2932,9 +2932,9 @@ KviKvsTreeNodeDataList * KviKvsParser::parseCommandParameterList()
 }
 
 
-KviPointerList<QString> * KviKvsParser::parseCommaSeparatedParameterListNoTree()
+KviPointerList<TQString> * KviKvsParser::parseCommaSeparatedParameterListNoTree()
 {
-	KviPointerList<QString> * l = new KviPointerList<QString>;
+	KviPointerList<TQString> * l = new KviPointerList<TQString>;
 	l->setAutoDelete(true);
 
 	KVSP_skipChar;
@@ -2967,7 +2967,7 @@ KviPointerList<QString> * KviKvsParser::parseCommaSeparatedParameterListNoTree()
 			default:
 			{
 				// anything else is a parameter
-				const QChar *pBegin = KVSP_curCharPointer;
+				const TQChar *pBegin = KVSP_curCharPointer;
 				KviKvsTreeNodeData * p = parseCommaSeparatedParameter();
 				if(!p)
 				{
@@ -2976,7 +2976,7 @@ KviPointerList<QString> * KviKvsParser::parseCommaSeparatedParameterListNoTree()
 					return 0;
 				}
 				delete p;
-				QString * s = new QString(pBegin,KVSP_curCharPointer - pBegin);
+				TQString * s = new TQString(pBegin,KVSP_curCharPointer - pBegin);
 				s->stripWhiteSpace();
 				l->append(s);
 				
@@ -3066,10 +3066,10 @@ KviKvsTreeNodeDataList * KviKvsParser::parseCommaSeparatedParameterList()
 #define LITERAL_PARAM_PARSING_FUNCTION_BEGIN(__funcname) \
 KviKvsTreeNodeConstantData * KviKvsParser::__funcname() \
 { \
-	QString szValue; \
+	TQString szValue; \
 \
- 	const QChar * pStart = KVSP_curCharPointer; \
-	const QChar * pBegin = KVSP_curCharPointer; \
+ 	const TQChar * pStart = KVSP_curCharPointer; \
+	const TQChar * pBegin = KVSP_curCharPointer; \
 	int iLen = 0; \
 	int iNestedTerminators = 0; \
  \
@@ -3095,7 +3095,7 @@ KviKvsTreeNodeConstantData * KviKvsParser::__funcname() \
 					iNestedTerminators--; \
 					iLen++; \
 				} else { \
-					if(iLen > 0)szValue.append(QString(pBegin,iLen)); \
+					if(iLen > 0)szValue.append(TQString(pBegin,iLen)); \
 					{ \
 						bool bOk; \
 						kvs_int_t iVal = szValue.toLong(&bOk); \
@@ -3108,11 +3108,11 @@ KviKvsTreeNodeConstantData * KviKvsParser::__funcname() \
 			break;
 
 #define LITERAL_PARAM_PARSING_FUNCTION_GENERIC_END \
-				if(iLen > 0) szValue.append(QString(pBegin,iLen)); \
+				if(iLen > 0) szValue.append(TQString(pBegin,iLen)); \
 				return new KviKvsTreeNodeConstantData(pBegin,new KviKvsVariant(szValue)); \
 			break; \
 			case '\\': \
-				if(iLen > 0)szValue.append(QString(pBegin,iLen)); \
+				if(iLen > 0)szValue.append(TQString(pBegin,iLen)); \
 				KVSP_skipChar; \
 				switch(KVSP_curCharUnicode) \
 				{ \
@@ -3129,19 +3129,19 @@ KviKvsTreeNodeConstantData * KviKvsParser::__funcname() \
 					case 'r': \
 						KVSP_skipChar; \
 						pBegin = KVSP_curCharPointer; \
-						szValue.append(QChar('\r')); \
+						szValue.append(TQChar('\r')); \
 						iLen = 0; \
 					break; \
 					case 'n': \
 						KVSP_skipChar; \
 						pBegin = KVSP_curCharPointer; \
-						szValue.append(QChar('\n')); \
+						szValue.append(TQChar('\n')); \
 						iLen = 0; \
 					break; \
 					case 't': \
 						KVSP_skipChar; \
 						pBegin = KVSP_curCharPointer; \
-						szValue.append(QChar('\t')); \
+						szValue.append(TQChar('\t')); \
 						iLen = 0; \
 					break; \
 					default: \
@@ -3264,7 +3264,7 @@ KviKvsTreeNodeData * KviKvsParser::parseArrayIndex()
 	KviPointerList<KviKvsTreeNodeData> * l = new KviPointerList<KviKvsTreeNodeData>();
 	l->setAutoDelete(true);
 
-	const QChar * pBegin = KVSP_curCharPointer;
+	const TQChar * pBegin = KVSP_curCharPointer;
 
 	//KVSP_skipChar;
 
@@ -3300,7 +3300,7 @@ KviKvsTreeNodeData * KviKvsParser::parseArrayIndex()
 							error(KVSP_curCharPointer,__tr2qs("Unexpected end of line in array index (missing ']' character or unescaped newline)"));
 						break;
 						default:
-							error(KVSP_curCharPointer,__tr2qs("Unexpected character '%q' (unicode %x) in array index: it should be already terminated"),KVSP_curCharPointer,KVSP_curCharUnicode);
+							error(KVSP_curCharPointer,__tr2qs("Unexpected character '%q' (tqunicode %x) in array index: it should be already terminated"),KVSP_curCharPointer,KVSP_curCharUnicode);
 						break;
 					}
 					return 0;
@@ -3373,7 +3373,7 @@ KviKvsTreeNodeData * KviKvsParser::parseHashKey()
 	KviPointerList<KviKvsTreeNodeData> * l = new KviPointerList<KviKvsTreeNodeData>();
 	l->setAutoDelete(true);
 
-	const QChar * pBegin = KVSP_curCharPointer;
+	const TQChar * pBegin = KVSP_curCharPointer;
 
 	//KVSP_skipChar;
 
@@ -3400,7 +3400,7 @@ KviKvsTreeNodeData * KviKvsParser::parseHashKey()
 				if(KVSP_curCharUnicode != '}')
 				{
 					// separate by single spaces
-					l->append(new KviKvsTreeNodeConstantData(KVSP_curCharPointer,new KviKvsVariant(QString(" "))));
+					l->append(new KviKvsTreeNodeConstantData(KVSP_curCharPointer,new KviKvsVariant(TQString(" "))));
 				} else {
 					goto end_of_the_hash_key;
 				}
@@ -3481,7 +3481,7 @@ KviKvsTreeNodeData * KviKvsParser::parseCommaSeparatedParameter()
 	KviPointerList<KviKvsTreeNodeData> * l = new KviPointerList<KviKvsTreeNodeData>;
 	l->setAutoDelete(true);
 
-	const QChar * pBegin = KVSP_curCharPointer;
+	const TQChar * pBegin = KVSP_curCharPointer;
 
 	for(;;)
 	{
@@ -3516,7 +3516,7 @@ KviKvsTreeNodeData * KviKvsParser::parseCommaSeparatedParameter()
 				if((KVSP_curCharUnicode != ')') && (KVSP_curCharUnicode != ','))
 				{
 					// separate by single spaces
-					l->append(new KviKvsTreeNodeConstantData(KVSP_curCharPointer,new KviKvsVariant(QString(" "))));
+					l->append(new KviKvsTreeNodeConstantData(KVSP_curCharPointer,new KviKvsVariant(TQString(" "))));
 				} else {
 					goto end_of_function_parameter;
 				}
@@ -3568,7 +3568,7 @@ KviKvsTreeNodeData * KviKvsParser::parseSingleParameterInParenthesis()
 	KviPointerList<KviKvsTreeNodeData> * l = new KviPointerList<KviKvsTreeNodeData>;
 	l->setAutoDelete(true);
 
-	const QChar * pBegin = KVSP_curCharPointer;
+	const TQChar * pBegin = KVSP_curCharPointer;
 
 	for(;;)
 	{
@@ -3606,7 +3606,7 @@ KviKvsTreeNodeData * KviKvsParser::parseSingleParameterInParenthesis()
 				if((KVSP_curCharUnicode != ')') && (KVSP_curCharUnicode != ','))
 				{
 					// separate by single spaces
-					l->append(new KviKvsTreeNodeConstantData(KVSP_curCharPointer,new KviKvsVariant(QString(" "))));
+					l->append(new KviKvsTreeNodeConstantData(KVSP_curCharPointer,new KviKvsVariant(TQString(" "))));
 				} else {
 					goto end_of_function_parameter;
 				}
@@ -3659,7 +3659,7 @@ KviKvsTreeNodeData * KviKvsParser::parseStringParameter()
 	KviPointerList<KviKvsTreeNodeData> * l = new KviPointerList<KviKvsTreeNodeData>();
 	l->setAutoDelete(true);
 
-	const QChar * pBegin = KVSP_curCharPointer;
+	const TQChar * pBegin = KVSP_curCharPointer;
 
 	KVSP_skipChar;
 
@@ -3728,7 +3728,7 @@ end_of_the_string:
 		} else {
 			// no parameters at all.. return straight empty string (no need to cast)
 			delete l;
-			return new KviKvsTreeNodeConstantData(pBegin,new KviKvsVariant(new QString()));
+			return new KviKvsTreeNodeConstantData(pBegin,new KviKvsVariant(new TQString()));
 		}
 	}
 	// never reached
@@ -3742,7 +3742,7 @@ KviKvsTreeNodeData * KviKvsParser::parseCommandParameter(bool bPreferNumeric)
 
 	bool bGotLiteral = false;
 
-	const QChar * pBegin = KVSP_curCharPointer;
+	const TQChar * pBegin = KVSP_curCharPointer;
 
 	for(;;)
 	{