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

diff --git a/src/kvirc/kvs/kvi_kvs_treenode_expression.cpp b/src/kvirc/kvs/kvi_kvs_treenode_expression.cpp
index ae3ec45..837ef84 100644
--- a/src/kvirc/kvs/kvi_kvs_treenode_expression.cpp
+++ b/src/kvirc/kvs/kvi_kvs_treenode_expression.cpp
@@ -29,7 +29,7 @@
 
 #include <math.h>
 
-KviKvsTreeNodeExpression::KviKvsTreeNodeExpression(const QChar * pLocation)
+KviKvsTreeNodeExpression::KviKvsTreeNodeExpression(const TQChar * pLocation)
 : KviKvsTreeNodeData(pLocation)
 {
 	m_pParentExpression = 0;
@@ -40,7 +40,7 @@ KviKvsTreeNodeExpression::~KviKvsTreeNodeExpression()
 }
 
 
-void KviKvsTreeNodeExpression::contextDescription(QString &szBuffer)
+void KviKvsTreeNodeExpression::contextDescription(TQString &szBuffer)
 {
 	szBuffer = "Expression Evaluation";
 }
@@ -77,11 +77,11 @@ void KviKvsTreeNodeExpression::setRight(KviKvsTreeNodeExpression *)
 	debug("KviKvsTreeNodeExpression::setRight() : should never end up here!");
 }
 
-KviKvsTreeNodeExpression * KviKvsTreeNodeExpression::parentWithPrecedenceLowerThan(int iPrec)
+KviKvsTreeNodeExpression * KviKvsTreeNodeExpression::tqparentWithPrecedenceLowerThan(int iPrec)
 {
 	if(precedence() > iPrec)return this;
-	if(!parentExpression())return 0;
-	return parentExpression()->parentWithPrecedenceLowerThan(iPrec);
+	if(!tqparentExpression())return 0;
+	return tqparentExpression()->tqparentWithPrecedenceLowerThan(iPrec);
 }
 
 int KviKvsTreeNodeExpression::firstBinaryOperator()
@@ -93,7 +93,7 @@ int KviKvsTreeNodeExpression::firstBinaryOperator()
 ///////////////////////////////////////////////////////////////////////////////
 
 
-KviKvsTreeNodeExpressionVariableOperand::KviKvsTreeNodeExpressionVariableOperand(const QChar * pLocation,KviKvsTreeNodeData * pData)
+KviKvsTreeNodeExpressionVariableOperand::KviKvsTreeNodeExpressionVariableOperand(const TQChar * pLocation,KviKvsTreeNodeData * pData)
 : KviKvsTreeNodeExpression(pLocation)
 {
 	m_pData = pData;
@@ -105,7 +105,7 @@ KviKvsTreeNodeExpressionVariableOperand::~KviKvsTreeNodeExpressionVariableOperan
 	delete m_pData;
 }
 
-void KviKvsTreeNodeExpressionVariableOperand::contextDescription(QString &szBuffer)
+void KviKvsTreeNodeExpressionVariableOperand::contextDescription(TQString &szBuffer)
 {
 	szBuffer = "Expression Variable Operand Evaluation";
 }
@@ -113,7 +113,7 @@ void KviKvsTreeNodeExpressionVariableOperand::contextDescription(QString &szBuff
 void KviKvsTreeNodeExpressionVariableOperand::dump(const char * prefix)
 {
 	debug("%s ExpressionVariableOperand",prefix);
-	QString tmp = prefix;
+	TQString tmp = prefix;
 	tmp.append("  ");
 	m_pData->dump(tmp.utf8().data());
 }
@@ -126,7 +126,7 @@ bool KviKvsTreeNodeExpressionVariableOperand::evaluateReadOnly(KviKvsRunTimeCont
 
 ///////////////////////////////////////////////////////////////////////////////
 
-KviKvsTreeNodeExpressionConstantOperand::KviKvsTreeNodeExpressionConstantOperand(const QChar * pLocation,KviKvsVariant * pConstant)
+KviKvsTreeNodeExpressionConstantOperand::KviKvsTreeNodeExpressionConstantOperand(const TQChar * pLocation,KviKvsVariant * pConstant)
 : KviKvsTreeNodeExpression(pLocation)
 {
 #ifdef COMPILE_NEW_KVS
@@ -141,7 +141,7 @@ KviKvsTreeNodeExpressionConstantOperand::~KviKvsTreeNodeExpressionConstantOperan
 #endif
 }
 
-void KviKvsTreeNodeExpressionConstantOperand::contextDescription(QString &szBuffer)
+void KviKvsTreeNodeExpressionConstantOperand::contextDescription(TQString &szBuffer)
 {
 #ifdef COMPILE_NEW_KVS
 	szBuffer = "Expression Constant Operand Evaluation";
@@ -153,7 +153,7 @@ void KviKvsTreeNodeExpressionConstantOperand::dump(const char * prefix)
 {
 #ifdef COMPILE_NEW_KVS
 	debug("%s ExpressionConstantOperand",prefix);
-	QString tmp = prefix;
+	TQString tmp = prefix;
 	tmp.append("  ");
 	m_pConstant->dump(tmp.utf8().data());
 #endif
@@ -170,7 +170,7 @@ bool KviKvsTreeNodeExpressionConstantOperand::evaluateReadOnly(KviKvsRunTimeCont
 ///////////////////////////////////////////////////////////////////////////////
 
 
-KviKvsTreeNodeExpressionOperator::KviKvsTreeNodeExpressionOperator(const QChar * pLocation)
+KviKvsTreeNodeExpressionOperator::KviKvsTreeNodeExpressionOperator(const TQChar * pLocation)
 : KviKvsTreeNodeExpression(pLocation)
 {
 }
@@ -179,7 +179,7 @@ KviKvsTreeNodeExpressionOperator::~KviKvsTreeNodeExpressionOperator()
 {
 }
 
-void KviKvsTreeNodeExpressionOperator::contextDescription(QString &szBuffer)
+void KviKvsTreeNodeExpressionOperator::contextDescription(TQString &szBuffer)
 {
 #ifdef COMPILE_NEW_KVS
 	szBuffer = "Expression Operator Evaluation";
@@ -199,7 +199,7 @@ void KviKvsTreeNodeExpressionOperator::dump(const char * prefix)
 ///////////////////////////////////////////////////////////////////////////////
 
 
-KviKvsTreeNodeExpressionUnaryOperator::KviKvsTreeNodeExpressionUnaryOperator(const QChar * pLocation,KviKvsTreeNodeExpression * pData)
+KviKvsTreeNodeExpressionUnaryOperator::KviKvsTreeNodeExpressionUnaryOperator(const TQChar * pLocation,KviKvsTreeNodeExpression * pData)
 : KviKvsTreeNodeExpressionOperator(pLocation)
 {
 #ifdef COMPILE_NEW_KVS
@@ -216,7 +216,7 @@ KviKvsTreeNodeExpressionUnaryOperator::~KviKvsTreeNodeExpressionUnaryOperator()
 #endif
 }
 
-void KviKvsTreeNodeExpressionUnaryOperator::contextDescription(QString &szBuffer)
+void KviKvsTreeNodeExpressionUnaryOperator::contextDescription(TQString &szBuffer)
 {
 #ifdef COMPILE_NEW_KVS
 	szBuffer = "Expression Unary Operator Evaluation";
@@ -230,7 +230,7 @@ void KviKvsTreeNodeExpressionUnaryOperator::dump(const char * prefix)
 {
 #ifdef COMPILE_NEW_KVS
 	debug("%s ExpressionUnaryOperator",prefix);
-	QString tmp = prefix;
+	TQString tmp = prefix;
 	tmp.append("  ");
 	m_pData->dump(tmp.utf8().data());
 #endif
@@ -254,7 +254,7 @@ bool KviKvsTreeNodeExpressionUnaryOperator::evaluateOperand(KviKvsRunTimeContext
 ///////////////////////////////////////////////////////////////////////////////
 
 
-KviKvsTreeNodeExpressionUnaryOperatorNegate::KviKvsTreeNodeExpressionUnaryOperatorNegate(const QChar * pLocation,KviKvsTreeNodeExpression * pData)
+KviKvsTreeNodeExpressionUnaryOperatorNegate::KviKvsTreeNodeExpressionUnaryOperatorNegate(const TQChar * pLocation,KviKvsTreeNodeExpression * pData)
 : KviKvsTreeNodeExpressionUnaryOperator(pLocation,pData)
 {
 }
@@ -264,7 +264,7 @@ KviKvsTreeNodeExpressionUnaryOperatorNegate::~KviKvsTreeNodeExpressionUnaryOpera
 }
 
 
-void KviKvsTreeNodeExpressionUnaryOperatorNegate::contextDescription(QString &szBuffer)
+void KviKvsTreeNodeExpressionUnaryOperatorNegate::contextDescription(TQString &szBuffer)
 {
 #ifdef COMPILE_NEW_KVS
 	szBuffer = "Expression Unary Operator Negate";
@@ -276,7 +276,7 @@ void KviKvsTreeNodeExpressionUnaryOperatorNegate::dump(const char * prefix)
 {
 #ifdef COMPILE_NEW_KVS
 	debug("%s ExpressionUnaryOperatorNegate",prefix);
-	QString tmp = prefix;
+	TQString tmp = prefix;
 	tmp.append("  ");
 	m_pData->dump(tmp.utf8().data());
 #endif
@@ -301,7 +301,7 @@ bool KviKvsTreeNodeExpressionUnaryOperatorNegate::evaluateReadOnly(KviKvsRunTime
 ///////////////////////////////////////////////////////////////////////////////
 
 
-KviKvsTreeNodeExpressionUnaryOperatorBitwiseNot::KviKvsTreeNodeExpressionUnaryOperatorBitwiseNot(const QChar * pLocation,KviKvsTreeNodeExpression * pData)
+KviKvsTreeNodeExpressionUnaryOperatorBitwiseNot::KviKvsTreeNodeExpressionUnaryOperatorBitwiseNot(const TQChar * pLocation,KviKvsTreeNodeExpression * pData)
 : KviKvsTreeNodeExpressionUnaryOperator(pLocation,pData)
 {
 }
@@ -310,7 +310,7 @@ KviKvsTreeNodeExpressionUnaryOperatorBitwiseNot::~KviKvsTreeNodeExpressionUnaryO
 {
 }
 
-void KviKvsTreeNodeExpressionUnaryOperatorBitwiseNot::contextDescription(QString &szBuffer)
+void KviKvsTreeNodeExpressionUnaryOperatorBitwiseNot::contextDescription(TQString &szBuffer)
 {
 #ifdef COMPILE_NEW_KVS
 	szBuffer = "Expression Unary Operator Bitwise Not";
@@ -321,7 +321,7 @@ void KviKvsTreeNodeExpressionUnaryOperatorBitwiseNot::dump(const char * prefix)
 {
 #ifdef COMPILE_NEW_KVS
 	debug("%s ExpressionUnaryOperatorBitwiseNot",prefix);
-	QString tmp = prefix;
+	TQString tmp = prefix;
 	tmp.append("  ");
 	m_pData->dump(tmp.utf8().data());
 #endif
@@ -346,7 +346,7 @@ bool KviKvsTreeNodeExpressionUnaryOperatorBitwiseNot::evaluateReadOnly(KviKvsRun
 ///////////////////////////////////////////////////////////////////////////////
 
 
-KviKvsTreeNodeExpressionUnaryOperatorLogicalNot::KviKvsTreeNodeExpressionUnaryOperatorLogicalNot(const QChar * pLocation,KviKvsTreeNodeExpression * pData)
+KviKvsTreeNodeExpressionUnaryOperatorLogicalNot::KviKvsTreeNodeExpressionUnaryOperatorLogicalNot(const TQChar * pLocation,KviKvsTreeNodeExpression * pData)
 : KviKvsTreeNodeExpressionUnaryOperator(pLocation,pData)
 {
 }
@@ -355,7 +355,7 @@ KviKvsTreeNodeExpressionUnaryOperatorLogicalNot::~KviKvsTreeNodeExpressionUnaryO
 {
 }
 
-void KviKvsTreeNodeExpressionUnaryOperatorLogicalNot::contextDescription(QString &szBuffer)
+void KviKvsTreeNodeExpressionUnaryOperatorLogicalNot::contextDescription(TQString &szBuffer)
 {
 #ifdef COMPILE_NEW_KVS
 	szBuffer = "Expression Unary Operator Logical Not";
@@ -366,7 +366,7 @@ void KviKvsTreeNodeExpressionUnaryOperatorLogicalNot::dump(const char * prefix)
 {
 #ifdef COMPILE_NEW_KVS
 	debug("%s ExpressionUnaryOperatorLogicalNot",prefix);
-	QString tmp = prefix;
+	TQString tmp = prefix;
 	tmp.append("  ");
 	m_pData->dump(tmp.utf8().data());
 #endif
@@ -393,7 +393,7 @@ bool KviKvsTreeNodeExpressionUnaryOperatorLogicalNot::evaluateReadOnly(KviKvsRun
 ///////////////////////////////////////////////////////////////////////////////
 
 
-KviKvsTreeNodeExpressionBinaryOperator::KviKvsTreeNodeExpressionBinaryOperator(const QChar * pLocation)
+KviKvsTreeNodeExpressionBinaryOperator::KviKvsTreeNodeExpressionBinaryOperator(const TQChar * pLocation)
 : KviKvsTreeNodeExpressionOperator(pLocation)
 {
 	m_pLeft = 0;
@@ -457,13 +457,13 @@ void KviKvsTreeNodeExpressionBinaryOperator::setRight(KviKvsTreeNodeExpression *
 
 void KviKvsTreeNodeExpressionBinaryOperator::dumpOperands(const char * prefix)
 {
-	QString tmp = prefix;
+	TQString tmp = prefix;
 	tmp.append("  ");
 	if(m_pLeft)m_pLeft->dump(tmp.utf8().data());
 	if(m_pRight)m_pRight->dump(tmp.utf8().data());
 }
 
-void KviKvsTreeNodeExpressionBinaryOperator::contextDescription(QString &szBuffer)
+void KviKvsTreeNodeExpressionBinaryOperator::contextDescription(TQString &szBuffer)
 {
 	szBuffer = "Expression Binary Operator";
 }
@@ -478,11 +478,11 @@ void KviKvsTreeNodeExpressionBinaryOperator::dump(const char * prefix)
 
 
 #define PREIMPLEMENT_BINARY_OPERATOR(__name,__stringname,__contextdescription,__precedence) \
-	__name::__name(const QChar * pLocation) \
+	__name::__name(const TQChar * pLocation) \
 	: KviKvsTreeNodeExpressionBinaryOperator(pLocation){} \
 	__name::~__name(){} \
 	void __name::dump(const char * prefix){ debug("%s " __stringname,prefix); dumpOperands(prefix); } \
-	void __name::contextDescription(QString &szBuffer){ szBuffer = __contextdescription; } \
+	void __name::contextDescription(TQString &szBuffer){ szBuffer = __contextdescription; } \
 	int __name::precedence(){ return __precedence; };
 
 PREIMPLEMENT_BINARY_OPERATOR(KviKvsTreeNodeExpressionBinaryOperatorSum,"ExpressionBinaryOperatorSum","Expression Binary Operator \"+\"",PREC_OP_SUM)
@@ -726,7 +726,7 @@ bool KviKvsTreeNodeExpressionBinaryOperatorGreaterThan::evaluateReadOnly(KviKvsR
 	return true;
 }
 
-PREIMPLEMENT_BINARY_OPERATOR(KviKvsTreeNodeExpressionBinaryOperatorLowerOrEqualTo,"ExpressionBinaryOperatorLowerOrEqualTo","Expression Binary Operator \"<=\"",PREC_OP_LOWEROREQUALTO)
+PREIMPLEMENT_BINARY_OPERATOR(KviKvsTreeNodeExpressionBinaryOperatorLowerOrEqualTo,"ExpressionBinaryOperatorLowerOrEqualTo","Expression Binary Operator \"<=\"",PREC_OP_LOWERORETQUALTO)
 
 bool KviKvsTreeNodeExpressionBinaryOperatorLowerOrEqualTo::evaluateReadOnly(KviKvsRunTimeContext * c,KviKvsVariant * pBuffer)
 {
@@ -738,7 +738,7 @@ bool KviKvsTreeNodeExpressionBinaryOperatorLowerOrEqualTo::evaluateReadOnly(KviK
 	return true;
 }
 
-PREIMPLEMENT_BINARY_OPERATOR(KviKvsTreeNodeExpressionBinaryOperatorGreaterOrEqualTo,"ExpressionBinaryOperatorGreaterOrEqualTo","Expression Binary Operator \">=\"",PREC_OP_GREATEROREQUALTO)
+PREIMPLEMENT_BINARY_OPERATOR(KviKvsTreeNodeExpressionBinaryOperatorGreaterOrEqualTo,"ExpressionBinaryOperatorGreaterOrEqualTo","Expression Binary Operator \">=\"",PREC_OP_GREATERORETQUALTO)
 
 bool KviKvsTreeNodeExpressionBinaryOperatorGreaterOrEqualTo::evaluateReadOnly(KviKvsRunTimeContext * c,KviKvsVariant * pBuffer)
 {
@@ -763,7 +763,7 @@ bool KviKvsTreeNodeExpressionBinaryOperatorEqualTo::evaluateReadOnly(KviKvsRunTi
 }
 
 
-PREIMPLEMENT_BINARY_OPERATOR(KviKvsTreeNodeExpressionBinaryOperatorNotEqualTo,"ExpressionBinaryOperatorNotEqualTo","Expression Binary Operator \"!=\"",PREC_OP_NOTEQUALTO)
+PREIMPLEMENT_BINARY_OPERATOR(KviKvsTreeNodeExpressionBinaryOperatorNotEqualTo,"ExpressionBinaryOperatorNotEqualTo","Expression Binary Operator \"!=\"",PREC_OP_NOTETQUALTO)
 
 bool KviKvsTreeNodeExpressionBinaryOperatorNotEqualTo::evaluateReadOnly(KviKvsRunTimeContext * c,KviKvsVariant * pBuffer)
 {