From 0a80cfd57d271dd44221467efb426675fa470356 Mon Sep 17 00:00:00 2001 From: tpearson Date: Tue, 28 Jun 2011 18:31:12 +0000 Subject: 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 --- src/kvirc/kvs/kvi_kvs_treenode_operation.cpp | 172 +++++++++++++-------------- 1 file changed, 86 insertions(+), 86 deletions(-) (limited to 'src/kvirc/kvs/kvi_kvs_treenode_operation.cpp') diff --git a/src/kvirc/kvs/kvi_kvs_treenode_operation.cpp b/src/kvirc/kvs/kvi_kvs_treenode_operation.cpp index 179d50e..e8c50b9 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_operation.cpp +++ b/src/kvirc/kvs/kvi_kvs_treenode_operation.cpp @@ -29,12 +29,12 @@ #include "kvi_kvs_runtimecontext.h" #include "kvi_locale.h" -#include +#include #include -KviKvsTreeNodeOperation::KviKvsTreeNodeOperation(const QChar * pLocation) +KviKvsTreeNodeOperation::KviKvsTreeNodeOperation(const TQChar * pLocation) : KviKvsTreeNodeInstruction(pLocation) { //m_pTargetData = 0; no need to set it @@ -51,7 +51,7 @@ void KviKvsTreeNodeOperation::setTargetVariableReference(KviKvsTreeNodeData * r) m_pTargetData->setParent(this); } -void KviKvsTreeNodeOperation::contextDescription(QString &szBuffer) +void KviKvsTreeNodeOperation::contextDescription(TQString &szBuffer) { szBuffer = "Operation"; } @@ -59,7 +59,7 @@ void KviKvsTreeNodeOperation::contextDescription(QString &szBuffer) void KviKvsTreeNodeOperation::dump(const char * prefix) { debug("%s Operation",prefix); - QString tmp = prefix; + TQString tmp = prefix; tmp.append(" "); m_pTargetData->dump(tmp.utf8().data()); } @@ -68,7 +68,7 @@ void KviKvsTreeNodeOperation::dump(const char * prefix) -KviKvsTreeNodeOperationAssignment::KviKvsTreeNodeOperationAssignment(const QChar * pLocation,KviKvsTreeNodeData * pRightSide) +KviKvsTreeNodeOperationAssignment::KviKvsTreeNodeOperationAssignment(const TQChar * pLocation,KviKvsTreeNodeData * pRightSide) : KviKvsTreeNodeOperation(pLocation) { m_pRightSide = pRightSide; @@ -80,7 +80,7 @@ KviKvsTreeNodeOperationAssignment::~KviKvsTreeNodeOperationAssignment() delete m_pRightSide; } -void KviKvsTreeNodeOperationAssignment::contextDescription(QString &szBuffer) +void KviKvsTreeNodeOperationAssignment::contextDescription(TQString &szBuffer) { szBuffer = "Assignment"; } @@ -89,7 +89,7 @@ void KviKvsTreeNodeOperationAssignment::contextDescription(QString &szBuffer) void KviKvsTreeNodeOperationAssignment::dump(const char * prefix) { debug("%s OperationAssignment",prefix); - QString tmp = prefix; + TQString tmp = prefix; tmp.append(" "); m_pTargetData->dump(tmp.utf8().data()); m_pRightSide->dump(tmp.utf8().data()); @@ -113,7 +113,7 @@ bool KviKvsTreeNodeOperationAssignment::execute(KviKvsRunTimeContext * c) -KviKvsTreeNodeOperationDecrement::KviKvsTreeNodeOperationDecrement(const QChar * pLocation) +KviKvsTreeNodeOperationDecrement::KviKvsTreeNodeOperationDecrement(const TQChar * pLocation) : KviKvsTreeNodeOperation(pLocation) { } @@ -122,7 +122,7 @@ KviKvsTreeNodeOperationDecrement::~KviKvsTreeNodeOperationDecrement() { } -void KviKvsTreeNodeOperationDecrement::contextDescription(QString &szBuffer) +void KviKvsTreeNodeOperationDecrement::contextDescription(TQString &szBuffer) { #ifdef COMPILE_NEW_KVS szBuffer = "Operator \"--\""; @@ -134,7 +134,7 @@ void KviKvsTreeNodeOperationDecrement::dump(const char * prefix) { #ifdef COMPILE_NEW_KVS debug("%s OperationDecrement",prefix); - QString tmp = prefix; + TQString tmp = prefix; tmp.append(" "); m_pTargetData->dump(tmp.utf8().data()); #endif @@ -176,7 +176,7 @@ bool KviKvsTreeNodeOperationDecrement::execute(KviKvsRunTimeContext * c) -KviKvsTreeNodeOperationIncrement::KviKvsTreeNodeOperationIncrement(const QChar * pLocation) +KviKvsTreeNodeOperationIncrement::KviKvsTreeNodeOperationIncrement(const TQChar * pLocation) : KviKvsTreeNodeOperation(pLocation) { } @@ -185,7 +185,7 @@ KviKvsTreeNodeOperationIncrement::~KviKvsTreeNodeOperationIncrement() { } -void KviKvsTreeNodeOperationIncrement::contextDescription(QString &szBuffer) +void KviKvsTreeNodeOperationIncrement::contextDescription(TQString &szBuffer) { #ifdef COMPILE_NEW_KVS szBuffer = "Operator \"++\""; @@ -197,7 +197,7 @@ void KviKvsTreeNodeOperationIncrement::dump(const char * prefix) { #ifdef COMPILE_NEW_KVS debug("%s OperationIncrement",prefix); - QString tmp = prefix; + TQString tmp = prefix; tmp.append(" "); m_pTargetData->dump(tmp.utf8().data()); #endif @@ -235,7 +235,7 @@ bool KviKvsTreeNodeOperationIncrement::execute(KviKvsRunTimeContext * c) -KviKvsTreeNodeOperationSelfAnd::KviKvsTreeNodeOperationSelfAnd(const QChar * pLocation,KviKvsTreeNodeData * pRightSide) +KviKvsTreeNodeOperationSelfAnd::KviKvsTreeNodeOperationSelfAnd(const TQChar * pLocation,KviKvsTreeNodeData * pRightSide) : KviKvsTreeNodeOperation(pLocation) { #ifdef COMPILE_NEW_KVS @@ -251,7 +251,7 @@ KviKvsTreeNodeOperationSelfAnd::~KviKvsTreeNodeOperationSelfAnd() #endif } -void KviKvsTreeNodeOperationSelfAnd::contextDescription(QString &szBuffer) +void KviKvsTreeNodeOperationSelfAnd::contextDescription(TQString &szBuffer) { #ifdef COMPILE_NEW_KVS szBuffer = "Operator \"&=\""; @@ -263,7 +263,7 @@ void KviKvsTreeNodeOperationSelfAnd::dump(const char * prefix) { #ifdef COMPILE_NEW_KVS debug("%s OperationSelfAnd",prefix); - QString tmp = prefix; + TQString tmp = prefix; tmp.append(" "); m_pTargetData->dump(tmp.utf8().data()); m_pRightSide->dump(tmp.utf8().data()); @@ -305,7 +305,7 @@ bool KviKvsTreeNodeOperationSelfAnd::execute(KviKvsRunTimeContext * c) -KviKvsTreeNodeOperationSelfDivision::KviKvsTreeNodeOperationSelfDivision(const QChar * pLocation,KviKvsTreeNodeData * pRightSide) +KviKvsTreeNodeOperationSelfDivision::KviKvsTreeNodeOperationSelfDivision(const TQChar * pLocation,KviKvsTreeNodeData * pRightSide) : KviKvsTreeNodeOperation(pLocation) { #ifdef COMPILE_NEW_KVS @@ -321,7 +321,7 @@ KviKvsTreeNodeOperationSelfDivision::~KviKvsTreeNodeOperationSelfDivision() #endif } -void KviKvsTreeNodeOperationSelfDivision::contextDescription(QString &szBuffer) +void KviKvsTreeNodeOperationSelfDivision::contextDescription(TQString &szBuffer) { #ifdef COMPILE_NEW_KVS szBuffer = "Operator \"/=\""; @@ -333,7 +333,7 @@ void KviKvsTreeNodeOperationSelfDivision::dump(const char * prefix) { #ifdef COMPILE_NEW_KVS debug("%s OperationSelfDivision",prefix); - QString tmp = prefix; + TQString tmp = prefix; tmp.append(" "); m_pTargetData->dump(tmp.utf8().data()); m_pRightSide->dump(tmp.utf8().data()); @@ -399,7 +399,7 @@ bool KviKvsTreeNodeOperationSelfDivision::execute(KviKvsRunTimeContext * c) return true; } -KviKvsTreeNodeOperationSelfModulus::KviKvsTreeNodeOperationSelfModulus(const QChar * pLocation,KviKvsTreeNodeData * pRightSide) +KviKvsTreeNodeOperationSelfModulus::KviKvsTreeNodeOperationSelfModulus(const TQChar * pLocation,KviKvsTreeNodeData * pRightSide) : KviKvsTreeNodeOperation(pLocation) { #ifdef COMPILE_NEW_KVS @@ -415,7 +415,7 @@ KviKvsTreeNodeOperationSelfModulus::~KviKvsTreeNodeOperationSelfModulus() #endif } -void KviKvsTreeNodeOperationSelfModulus::contextDescription(QString &szBuffer) +void KviKvsTreeNodeOperationSelfModulus::contextDescription(TQString &szBuffer) { #ifdef COMPILE_NEW_KVS szBuffer = "Operator \"Self Modulo\""; @@ -427,7 +427,7 @@ void KviKvsTreeNodeOperationSelfModulus::dump(const char * prefix) { #ifdef COMPILE_NEW_KVS debug("%s OperationSelfModulus",prefix); - QString tmp = prefix; + TQString tmp = prefix; tmp.append(" "); m_pTargetData->dump(tmp.utf8().data()); m_pRightSide->dump(tmp.utf8().data()); @@ -494,7 +494,7 @@ bool KviKvsTreeNodeOperationSelfModulus::execute(KviKvsRunTimeContext * c) -KviKvsTreeNodeOperationSelfMultiplication::KviKvsTreeNodeOperationSelfMultiplication(const QChar * pLocation,KviKvsTreeNodeData * pRightSide) +KviKvsTreeNodeOperationSelfMultiplication::KviKvsTreeNodeOperationSelfMultiplication(const TQChar * pLocation,KviKvsTreeNodeData * pRightSide) : KviKvsTreeNodeOperation(pLocation) { #ifdef COMPILE_NEW_KVS @@ -510,7 +510,7 @@ KviKvsTreeNodeOperationSelfMultiplication::~KviKvsTreeNodeOperationSelfMultiplic #endif } -void KviKvsTreeNodeOperationSelfMultiplication::contextDescription(QString &szBuffer) +void KviKvsTreeNodeOperationSelfMultiplication::contextDescription(TQString &szBuffer) { #ifdef COMPILE_NEW_KVS szBuffer = "Operator \"*=\""; @@ -522,7 +522,7 @@ void KviKvsTreeNodeOperationSelfMultiplication::dump(const char * prefix) { #ifdef COMPILE_NEW_KVS debug("%s OperationSelfMultiplication",prefix); - QString tmp = prefix; + TQString tmp = prefix; tmp.append(" "); m_pTargetData->dump(tmp.utf8().data()); m_pRightSide->dump(tmp.utf8().data()); @@ -573,7 +573,7 @@ bool KviKvsTreeNodeOperationSelfMultiplication::execute(KviKvsRunTimeContext * c -KviKvsTreeNodeOperationSelfOr::KviKvsTreeNodeOperationSelfOr(const QChar * pLocation,KviKvsTreeNodeData * pRightSide) +KviKvsTreeNodeOperationSelfOr::KviKvsTreeNodeOperationSelfOr(const TQChar * pLocation,KviKvsTreeNodeData * pRightSide) : KviKvsTreeNodeOperation(pLocation) { #ifdef COMPILE_NEW_KVS @@ -589,7 +589,7 @@ KviKvsTreeNodeOperationSelfOr::~KviKvsTreeNodeOperationSelfOr() #endif } -void KviKvsTreeNodeOperationSelfOr::contextDescription(QString &szBuffer) +void KviKvsTreeNodeOperationSelfOr::contextDescription(TQString &szBuffer) { #ifdef COMPILE_NEW_KVS szBuffer = "Operator \"|=\""; @@ -601,7 +601,7 @@ void KviKvsTreeNodeOperationSelfOr::dump(const char * prefix) { #ifdef COMPILE_NEW_KVS debug("%s OperationSelfOr",prefix); - QString tmp = prefix; + TQString tmp = prefix; tmp.append(" "); m_pTargetData->dump(tmp.utf8().data()); m_pRightSide->dump(tmp.utf8().data()); @@ -643,7 +643,7 @@ bool KviKvsTreeNodeOperationSelfOr::execute(KviKvsRunTimeContext * c) -KviKvsTreeNodeOperationSelfShl::KviKvsTreeNodeOperationSelfShl(const QChar * pLocation,KviKvsTreeNodeData * pRightSide) +KviKvsTreeNodeOperationSelfShl::KviKvsTreeNodeOperationSelfShl(const TQChar * pLocation,KviKvsTreeNodeData * pRightSide) : KviKvsTreeNodeOperation(pLocation) { #ifdef COMPILE_NEW_KVS @@ -659,7 +659,7 @@ KviKvsTreeNodeOperationSelfShl::~KviKvsTreeNodeOperationSelfShl() #endif } -void KviKvsTreeNodeOperationSelfShl::contextDescription(QString &szBuffer) +void KviKvsTreeNodeOperationSelfShl::contextDescription(TQString &szBuffer) { #ifdef COMPILE_NEW_KVS szBuffer = "Operator \"<<=\""; @@ -671,7 +671,7 @@ void KviKvsTreeNodeOperationSelfShl::dump(const char * prefix) { #ifdef COMPILE_NEW_KVS debug("%s OperationSelfShl",prefix); - QString tmp = prefix; + TQString tmp = prefix; tmp.append(" "); m_pTargetData->dump(tmp.utf8().data()); m_pRightSide->dump(tmp.utf8().data()); @@ -715,7 +715,7 @@ bool KviKvsTreeNodeOperationSelfShl::execute(KviKvsRunTimeContext * c) -KviKvsTreeNodeOperationSelfShr::KviKvsTreeNodeOperationSelfShr(const QChar * pLocation,KviKvsTreeNodeData * pRightSide) +KviKvsTreeNodeOperationSelfShr::KviKvsTreeNodeOperationSelfShr(const TQChar * pLocation,KviKvsTreeNodeData * pRightSide) : KviKvsTreeNodeOperation(pLocation) { #ifdef COMPILE_NEW_KVS @@ -731,7 +731,7 @@ KviKvsTreeNodeOperationSelfShr::~KviKvsTreeNodeOperationSelfShr() #endif } -void KviKvsTreeNodeOperationSelfShr::contextDescription(QString &szBuffer) +void KviKvsTreeNodeOperationSelfShr::contextDescription(TQString &szBuffer) { #ifdef COMPILE_NEW_KVS szBuffer = "Operator \">>=\""; @@ -743,7 +743,7 @@ void KviKvsTreeNodeOperationSelfShr::dump(const char * prefix) { #ifdef COMPILE_NEW_KVS debug("%s OperationSelfShr",prefix); - QString tmp = prefix; + TQString tmp = prefix; tmp.append(" "); m_pTargetData->dump(tmp.utf8().data()); m_pRightSide->dump(tmp.utf8().data()); @@ -793,7 +793,7 @@ bool KviKvsTreeNodeOperationSelfShr::execute(KviKvsRunTimeContext * c) -KviKvsTreeNodeOperationSelfSubtraction::KviKvsTreeNodeOperationSelfSubtraction(const QChar * pLocation,KviKvsTreeNodeData * pRightSide) +KviKvsTreeNodeOperationSelfSubtraction::KviKvsTreeNodeOperationSelfSubtraction(const TQChar * pLocation,KviKvsTreeNodeData * pRightSide) : KviKvsTreeNodeOperation(pLocation) { #ifdef COMPILE_NEW_KVS @@ -809,7 +809,7 @@ KviKvsTreeNodeOperationSelfSubtraction::~KviKvsTreeNodeOperationSelfSubtraction( #endif } -void KviKvsTreeNodeOperationSelfSubtraction::contextDescription(QString &szBuffer) +void KviKvsTreeNodeOperationSelfSubtraction::contextDescription(TQString &szBuffer) { #ifdef COMPILE_NEW_KVS szBuffer = "Operator \"-=\""; @@ -821,7 +821,7 @@ void KviKvsTreeNodeOperationSelfSubtraction::dump(const char * prefix) { #ifdef COMPILE_NEW_KVS debug("%s OperationSelfSubtraction",prefix); - QString tmp = prefix; + TQString tmp = prefix; tmp.append(" "); m_pTargetData->dump(tmp.utf8().data()); m_pRightSide->dump(tmp.utf8().data()); @@ -876,7 +876,7 @@ bool KviKvsTreeNodeOperationSelfSubtraction::execute(KviKvsRunTimeContext * c) -KviKvsTreeNodeOperationSelfSum::KviKvsTreeNodeOperationSelfSum(const QChar * pLocation,KviKvsTreeNodeData * pRightSide) +KviKvsTreeNodeOperationSelfSum::KviKvsTreeNodeOperationSelfSum(const TQChar * pLocation,KviKvsTreeNodeData * pRightSide) : KviKvsTreeNodeOperation(pLocation) { #ifdef COMPILE_NEW_KVS @@ -892,7 +892,7 @@ KviKvsTreeNodeOperationSelfSum::~KviKvsTreeNodeOperationSelfSum() #endif } -void KviKvsTreeNodeOperationSelfSum::contextDescription(QString &szBuffer) +void KviKvsTreeNodeOperationSelfSum::contextDescription(TQString &szBuffer) { #ifdef COMPILE_NEW_KVS szBuffer = "Operator \"+=\""; @@ -904,7 +904,7 @@ void KviKvsTreeNodeOperationSelfSum::dump(const char * prefix) { #ifdef COMPILE_NEW_KVS debug("%s OperationSelfSum",prefix); - QString tmp = prefix; + TQString tmp = prefix; tmp.append(" "); m_pTargetData->dump(tmp.utf8().data()); m_pRightSide->dump(tmp.utf8().data()); @@ -961,7 +961,7 @@ bool KviKvsTreeNodeOperationSelfSum::execute(KviKvsRunTimeContext * c) -KviKvsTreeNodeOperationSelfXor::KviKvsTreeNodeOperationSelfXor(const QChar * pLocation,KviKvsTreeNodeData * pRightSide) +KviKvsTreeNodeOperationSelfXor::KviKvsTreeNodeOperationSelfXor(const TQChar * pLocation,KviKvsTreeNodeData * pRightSide) : KviKvsTreeNodeOperation(pLocation) { #ifdef COMPILE_NEW_KVS @@ -977,7 +977,7 @@ KviKvsTreeNodeOperationSelfXor::~KviKvsTreeNodeOperationSelfXor() #endif } -void KviKvsTreeNodeOperationSelfXor::contextDescription(QString &szBuffer) +void KviKvsTreeNodeOperationSelfXor::contextDescription(TQString &szBuffer) { #ifdef COMPILE_NEW_KVS szBuffer = "Operator \"^=\""; @@ -989,7 +989,7 @@ void KviKvsTreeNodeOperationSelfXor::dump(const char * prefix) { #ifdef COMPILE_NEW_KVS debug("%s OperationSelfXor",prefix); - QString tmp = prefix; + TQString tmp = prefix; tmp.append(" "); m_pTargetData->dump(tmp.utf8().data()); m_pRightSide->dump(tmp.utf8().data()); @@ -1035,7 +1035,7 @@ bool KviKvsTreeNodeOperationSelfXor::execute(KviKvsRunTimeContext * c) -KviKvsTreeNodeOperationStringAppend::KviKvsTreeNodeOperationStringAppend(const QChar * pLocation,KviKvsTreeNodeData * pRightSide) +KviKvsTreeNodeOperationStringAppend::KviKvsTreeNodeOperationStringAppend(const TQChar * pLocation,KviKvsTreeNodeData * pRightSide) : KviKvsTreeNodeOperation(pLocation) { m_pRightSide = pRightSide; @@ -1047,7 +1047,7 @@ KviKvsTreeNodeOperationStringAppend::~KviKvsTreeNodeOperationStringAppend() delete m_pRightSide; } -void KviKvsTreeNodeOperationStringAppend::contextDescription(QString &szBuffer) +void KviKvsTreeNodeOperationStringAppend::contextDescription(TQString &szBuffer) { szBuffer = "Operator \"<<\""; } @@ -1056,7 +1056,7 @@ void KviKvsTreeNodeOperationStringAppend::contextDescription(QString &szBuffer) void KviKvsTreeNodeOperationStringAppend::dump(const char * prefix) { debug("%s OperationStringAppend",prefix); - QString tmp = prefix; + TQString tmp = prefix; tmp.append(" "); m_pTargetData->dump(tmp.utf8().data()); m_pRightSide->dump(tmp.utf8().data()); @@ -1069,7 +1069,7 @@ bool KviKvsTreeNodeOperationStringAppend::execute(KviKvsRunTimeContext * c) KviKvsRWEvaluationResult * target = m_pTargetData->evaluateReadWrite(c); if(!target)return false; - QString sz1; + TQString sz1; target->result()->asString(sz1); v.appendAsString(sz1); target->result()->setString(sz1); @@ -1082,7 +1082,7 @@ bool KviKvsTreeNodeOperationStringAppend::execute(KviKvsRunTimeContext * c) -KviKvsTreeNodeOperationArrayAppend::KviKvsTreeNodeOperationArrayAppend(const QChar * pLocation,KviKvsTreeNodeData * pRightSide) +KviKvsTreeNodeOperationArrayAppend::KviKvsTreeNodeOperationArrayAppend(const TQChar * pLocation,KviKvsTreeNodeData * pRightSide) : KviKvsTreeNodeOperation(pLocation) { m_pRightSide = pRightSide; @@ -1094,7 +1094,7 @@ KviKvsTreeNodeOperationArrayAppend::~KviKvsTreeNodeOperationArrayAppend() delete m_pRightSide; } -void KviKvsTreeNodeOperationArrayAppend::contextDescription(QString &szBuffer) +void KviKvsTreeNodeOperationArrayAppend::contextDescription(TQString &szBuffer) { szBuffer = "Operator \"<+\""; } @@ -1103,7 +1103,7 @@ void KviKvsTreeNodeOperationArrayAppend::contextDescription(QString &szBuffer) void KviKvsTreeNodeOperationArrayAppend::dump(const char * prefix) { debug("%s OperationArrayAppend",prefix); - QString tmp = prefix; + TQString tmp = prefix; tmp.append(" "); m_pTargetData->dump(tmp.utf8().data()); m_pRightSide->dump(tmp.utf8().data()); @@ -1165,7 +1165,7 @@ bool KviKvsTreeNodeOperationArrayAppend::execute(KviKvsRunTimeContext * c) -KviKvsTreeNodeOperationStringAppendWithComma::KviKvsTreeNodeOperationStringAppendWithComma(const QChar * pLocation,KviKvsTreeNodeData * pRightSide) +KviKvsTreeNodeOperationStringAppendWithComma::KviKvsTreeNodeOperationStringAppendWithComma(const TQChar * pLocation,KviKvsTreeNodeData * pRightSide) : KviKvsTreeNodeOperation(pLocation) { #ifdef COMPILE_NEW_KVS @@ -1181,7 +1181,7 @@ KviKvsTreeNodeOperationStringAppendWithComma::~KviKvsTreeNodeOperationStringAppe #endif } -void KviKvsTreeNodeOperationStringAppendWithComma::contextDescription(QString &szBuffer) +void KviKvsTreeNodeOperationStringAppendWithComma::contextDescription(TQString &szBuffer) { #ifdef COMPILE_NEW_KVS szBuffer = "Operator \"<,\""; @@ -1193,7 +1193,7 @@ void KviKvsTreeNodeOperationStringAppendWithComma::dump(const char * prefix) { #ifdef COMPILE_NEW_KVS debug("%s OperationStringAppendWithComma",prefix); - QString tmp = prefix; + TQString tmp = prefix; tmp.append(" "); m_pTargetData->dump(tmp.utf8().data()); m_pRightSide->dump(tmp.utf8().data()); @@ -1208,15 +1208,15 @@ bool KviKvsTreeNodeOperationStringAppendWithComma::execute(KviKvsRunTimeContext KviKvsRWEvaluationResult * target = m_pTargetData->evaluateReadWrite(c); if(!target)return false; - QString sz1; + TQString sz1; target->result()->asString(sz1); if(sz1.isEmpty()) { v.asString(sz1); } else { - QString sz2; + TQString sz2; v.asString(sz2); - sz1 += QChar(','); + sz1 += TQChar(','); sz1 += sz2; } target->result()->setString(sz1); @@ -1230,7 +1230,7 @@ bool KviKvsTreeNodeOperationStringAppendWithComma::execute(KviKvsRunTimeContext -KviKvsTreeNodeOperationStringAppendWithSpace::KviKvsTreeNodeOperationStringAppendWithSpace(const QChar * pLocation,KviKvsTreeNodeData * pRightSide) +KviKvsTreeNodeOperationStringAppendWithSpace::KviKvsTreeNodeOperationStringAppendWithSpace(const TQChar * pLocation,KviKvsTreeNodeData * pRightSide) : KviKvsTreeNodeOperation(pLocation) { #ifdef COMPILE_NEW_KVS @@ -1246,7 +1246,7 @@ KviKvsTreeNodeOperationStringAppendWithSpace::~KviKvsTreeNodeOperationStringAppe #endif } -void KviKvsTreeNodeOperationStringAppendWithSpace::contextDescription(QString &szBuffer) +void KviKvsTreeNodeOperationStringAppendWithSpace::contextDescription(TQString &szBuffer) { #ifdef COMPILE_NEW_KVS szBuffer = "Operator \"<+\""; @@ -1258,7 +1258,7 @@ void KviKvsTreeNodeOperationStringAppendWithSpace::dump(const char * prefix) { #ifdef COMPILE_NEW_KVS debug("%s OperationStringAppendWithSpace",prefix); - QString tmp = prefix; + TQString tmp = prefix; tmp.append(" "); m_pTargetData->dump(tmp.utf8().data()); m_pRightSide->dump(tmp.utf8().data()); @@ -1273,15 +1273,15 @@ bool KviKvsTreeNodeOperationStringAppendWithSpace::execute(KviKvsRunTimeContext KviKvsRWEvaluationResult * target = m_pTargetData->evaluateReadWrite(c); if(!target)return false; - QString sz1; + TQString sz1; target->result()->asString(sz1); if(sz1.isEmpty()) { v.asString(sz1); } else { - QString sz2; + TQString sz2; v.asString(sz2); - sz1 += QChar(' '); + sz1 += TQChar(' '); sz1 += sz2; } target->result()->setString(sz1); @@ -1298,7 +1298,7 @@ bool KviKvsTreeNodeOperationStringAppendWithSpace::execute(KviKvsRunTimeContext -KviKvsTreeNodeOperationStringTransliteration::KviKvsTreeNodeOperationStringTransliteration(const QChar * pLocation,KviKvsTreeNodeData * pLeft,KviKvsTreeNodeData * pRight,KviKvsTreeNodeData * pFlags) +KviKvsTreeNodeOperationStringTransliteration::KviKvsTreeNodeOperationStringTransliteration(const TQChar * pLocation,KviKvsTreeNodeData * pLeft,KviKvsTreeNodeData * pRight,KviKvsTreeNodeData * pFlags) : KviKvsTreeNodeOperation(pLocation) { #ifdef COMPILE_NEW_KVS @@ -1321,7 +1321,7 @@ KviKvsTreeNodeOperationStringTransliteration::~KviKvsTreeNodeOperationStringTran } -void KviKvsTreeNodeOperationStringTransliteration::contextDescription(QString &szBuffer) +void KviKvsTreeNodeOperationStringTransliteration::contextDescription(TQString &szBuffer) { #ifdef COMPILE_NEW_KVS szBuffer = "Binding Operator tr///"; @@ -1333,7 +1333,7 @@ void KviKvsTreeNodeOperationStringTransliteration::dump(const char * prefix) { #ifdef COMPILE_NEW_KVS debug("%s OperationStringTransliteration",prefix); - QString tmp = prefix; + TQString tmp = prefix; tmp.append(" "); m_pLeft->dump(tmp.utf8().data()); m_pRight->dump(tmp.utf8().data()); @@ -1355,15 +1355,15 @@ bool KviKvsTreeNodeOperationStringTransliteration::execute(KviKvsRunTimeContext KviKvsRWEvaluationResult * target = m_pTargetData->evaluateReadWrite(c); if(!target)return false; - QString szL,szR,szF; + TQString szL,szR,szF; vl.asString(szL); vr.asString(szR); //vf.asString(szF); - QString sz1; + TQString sz1; target->result()->asString(sz1); - KviQString::transliterate(sz1,szL,szR); + KviTQString::transliterate(sz1,szL,szR); target->result()->setString(sz1); delete target; #endif @@ -1379,7 +1379,7 @@ bool KviKvsTreeNodeOperationStringTransliteration::execute(KviKvsRunTimeContext -KviKvsTreeNodeOperationStringSubstitution::KviKvsTreeNodeOperationStringSubstitution(const QChar * pLocation,KviKvsTreeNodeData * pLeft,KviKvsTreeNodeData * pRight,KviKvsTreeNodeData * pFlags) +KviKvsTreeNodeOperationStringSubstitution::KviKvsTreeNodeOperationStringSubstitution(const TQChar * pLocation,KviKvsTreeNodeData * pLeft,KviKvsTreeNodeData * pRight,KviKvsTreeNodeData * pFlags) : KviKvsTreeNodeOperation(pLocation) { #ifdef COMPILE_NEW_KVS @@ -1402,7 +1402,7 @@ KviKvsTreeNodeOperationStringSubstitution::~KviKvsTreeNodeOperationStringSubstit } -void KviKvsTreeNodeOperationStringSubstitution::contextDescription(QString &szBuffer) +void KviKvsTreeNodeOperationStringSubstitution::contextDescription(TQString &szBuffer) { #ifdef COMPILE_NEW_KVS szBuffer = "Binding Operator s///"; @@ -1414,7 +1414,7 @@ void KviKvsTreeNodeOperationStringSubstitution::dump(const char * prefix) { #ifdef COMPILE_NEW_KVS debug("%s OperationStringSubstitution",prefix); - QString tmp = prefix; + TQString tmp = prefix; tmp.append(" "); m_pLeft->dump(tmp.utf8().data()); m_pRight->dump(tmp.utf8().data()); @@ -1434,19 +1434,19 @@ bool KviKvsTreeNodeOperationStringSubstitution::execute(KviKvsRunTimeContext * c KviKvsRWEvaluationResult * target = m_pTargetData->evaluateReadWrite(c); if(!target)return false; - QString szL,szR,szF; + TQString szL,szR,szF; vl.asString(szL); vr.asString(szR); vf.asString(szF); - QString str; + TQString str; target->result()->asString(str); - bool bGlobal = szF.find('g',false) != -1; + bool bGlobal = szF.tqfind('g',false) != -1; - QRegExp re(szL,szF.find('i',false) == -1,szF.find('w',false) != -1); - re.setMinimal(szF.find('m',false) != -1); // greedy or minimal ? + TQRegExp re(szL,szF.tqfind('i',false) == -1,szF.tqfind('w',false) != -1); + re.setMinimal(szF.tqfind('m',false) != -1); // greedy or minimal ? int idx = 0; @@ -1464,24 +1464,24 @@ bool KviKvsTreeNodeOperationStringSubstitution::execute(KviKvsRunTimeContext * c } str.remove(idx,len); - QString szReplaced; - const QChar * p2 = KviQString::nullTerminatedArray(szR); - const QChar * begin = p2; - while(p2->unicode()) + TQString szReplaced; + const TQChar * p2 = KviTQString::nullTerminatedArray(szR); + const TQChar * begin = p2; + while(p2->tqunicode()) { - if(p2->unicode() == '\\') + if(p2->tqunicode() == '\\') { p2++; - if(p2->unicode() >= '0' && p2->unicode() <= '9') + if(p2->tqunicode() >= '0' && p2->tqunicode() <= '9') { - szReplaced.append(QString(begin,(p2 - begin) - 1)); - szReplaced.append(re.cap(p2->unicode() - '0')); + szReplaced.append(TQString(begin,(p2 - begin) - 1)); + szReplaced.append(re.cap(p2->tqunicode() - '0')); p2++; begin = p2; - } else if(p2->unicode())p2++; + } else if(p2->tqunicode())p2++; } else p2++; } - if(begin != p2)szReplaced.append(QString(begin,p2 - begin)); + if(begin != p2)szReplaced.append(TQString(begin,p2 - begin)); str.insert(idx,szReplaced); idx += szReplaced.length(); -- cgit v1.2.3