summaryrefslogtreecommitdiffstats
path: root/src/kvirc/kvs/kvi_kvs_parser_specialcommands.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/kvirc/kvs/kvi_kvs_parser_specialcommands.cpp')
-rw-r--r--src/kvirc/kvs/kvi_kvs_parser_specialcommands.cpp184
1 files changed, 92 insertions, 92 deletions
diff --git a/src/kvirc/kvs/kvi_kvs_parser_specialcommands.cpp b/src/kvirc/kvs/kvi_kvs_parser_specialcommands.cpp
index 0dbc7816..0014743f 100644
--- a/src/kvirc/kvs/kvi_kvs_parser_specialcommands.cpp
+++ b/src/kvirc/kvs/kvi_kvs_parser_specialcommands.cpp
@@ -52,7 +52,7 @@ KviKvsTreeNodeCommand * KviKvsParser::parseSpecialCommandPerlBegin()
// perl.begin(context) <perl code> perl.end
//
- const QChar * pBegin = KVSP_curCharPointer;
+ const TQChar * pBegin = KVSP_curCharPointer;
skipSpaces();
KviKvsTreeNodeDataList * dl;
@@ -84,11 +84,11 @@ KviKvsTreeNodeCommand * KviKvsParser::parseSpecialCommandPerlBegin()
}
}
- const QChar * pPerlBegin = KVSP_curCharPointer;
+ const TQChar * pPerlBegin = KVSP_curCharPointer;
// now look for perl.end[terminator]
- static QString szPerlEnd("perl.end");
- const QChar * pPerlEnd;
+ static TQString szPerlEnd("perl.end");
+ const TQChar * pPerlEnd;
for(;;)
{
while(KVSP_curCharUnicode && (KVSP_curCharUnicode != 'p') && (KVSP_curCharUnicode != 'P'))
@@ -100,13 +100,13 @@ KviKvsTreeNodeCommand * KviKvsParser::parseSpecialCommandPerlBegin()
return 0;
}
pPerlEnd = KVSP_curCharPointer;
- if(KviQString::equalCIN(szPerlEnd,KVSP_curCharPointer,8))
+ if(KviTQString::equalCIN(szPerlEnd,KVSP_curCharPointer,8))
{
KVSP_skipNChars(8);
if(KVSP_curCharIsEndOfCommand || (KVSP_curCharUnicode == ' ') || (KVSP_curCharUnicode == '\t'))
{
// yeah!
- QString szPerl(pPerlBegin,pPerlEnd - pPerlBegin);
+ TQString szPerl(pPerlBegin,pPerlEnd - pPerlBegin);
dl->prependItem(new KviKvsTreeNodeConstantData(pPerlBegin,new KviKvsVariant(szPerl)));
while(!KVSP_curCharIsEndOfCommand)KVSP_skipChar;
if(!KVSP_curCharIsEndOfBuffer)KVSP_skipChar;
@@ -140,7 +140,7 @@ KviKvsTreeNodeCommand * KviKvsParser::parseSpecialCommandBreak()
If called outside an iteration loop , will act just like [cmd]halt[/cmd]
has been called but has no additional semantics for events.[br]
*/
- const QChar * pBegin = KVSP_curCharPointer; // FIXME: this is not accurate at all : it may be even the end of the cmd
+ const TQChar * pBegin = KVSP_curCharPointer; // FIXME: this is not accurate at all : it may be even the end of the cmd
skipSpaces();
if(!KVSP_curCharIsEndOfCommand)
{
@@ -183,7 +183,7 @@ KviKvsTreeNodeCommand * KviKvsParser::parseSpecialCommandUnset()
[/example]
*/
- const QChar * pCmdBegin = KVSP_curCharPointer;
+ const TQChar * pCmdBegin = KVSP_curCharPointer;
KviPointerList<KviKvsTreeNodeVariable> * pVarList = new KviPointerList<KviKvsTreeNodeVariable>;
pVarList->setAutoDelete(true);
@@ -207,7 +207,7 @@ KviKvsTreeNodeCommand * KviKvsParser::parseSpecialCommandUnset()
if(!KVSP_curCharIsEndOfCommand)
{
warning(KVSP_curCharPointer,__tr2qs("The 'unset' command needs a variable list"));
- error(KVSP_curCharPointer,__tr2qs("Found character %q (unicode %x) where a variable was expected"),KVSP_curCharPointer,KVSP_curCharUnicode);
+ error(KVSP_curCharPointer,__tr2qs("Found character %q (tqunicode %x) where a variable was expected"),KVSP_curCharPointer,KVSP_curCharUnicode);
return 0;
}
@@ -251,19 +251,19 @@ KviKvsTreeNodeCommand * KviKvsParser::parseSpecialCommandGlobal()
while(KVSP_curCharUnicode == '%')
{
KVSP_skipChar;
- const QChar * pBegin = KVSP_curCharPointer;
+ const TQChar * pBegin = KVSP_curCharPointer;
while((KVSP_curCharIsLetterOrNumber) || (KVSP_curCharUnicode == '_'))KVSP_skipChar;
- QString szIdentifier(pBegin,KVSP_curCharPointer - pBegin);
+ TQString szIdentifier(pBegin,KVSP_curCharPointer - pBegin);
if(!m_pGlobals)
{
- m_pGlobals = new KviPointerHashTable<QString,QString>(17,false);
+ m_pGlobals = new KviPointerHashTable<TQString,TQString>(17,false);
m_pGlobals->setAutoDelete(true);
}
- m_pGlobals->replace(szIdentifier,new QString());
+ m_pGlobals->tqreplace(szIdentifier,new TQString());
skipSpaces();
@@ -277,7 +277,7 @@ KviKvsTreeNodeCommand * KviKvsParser::parseSpecialCommandGlobal()
if(!KVSP_curCharIsEndOfCommand)
{
warning(KVSP_curCharPointer,__tr2qs("The 'global' command needs a variable list"));
- error(KVSP_curCharPointer,__tr2qs("Found character %q (unicode %x) where a variable was expected"),KVSP_curCharPointer,KVSP_curCharUnicode);
+ error(KVSP_curCharPointer,__tr2qs("Found character %q (tqunicode %x) where a variable was expected"),KVSP_curCharPointer,KVSP_curCharUnicode);
return 0;
}
@@ -329,10 +329,10 @@ KviKvsTreeNodeCommand * KviKvsParser::parseSpecialCommandClass()
that can be used to sign the parameters that the function expects;
it acts as a programmer reminder or comment and it has no other
meaning in KVIrc scripting. The <parameter reminder> respects the syntax
- of an expression, so it is terminated by a closed parenthesis.
+ of an expression, so it is terminated by a closed tqparenthesis.
It's rather dangerous to use this command inside an object
function handler: if the class definition <class> was already
- existing and it is a parent of the object's class, you might
+ existing and it is a tqparent of the object's class, you might
end up executing "inexisting" code.[br]
As a thumb rule, use this command only outside object function handlers.[br]
[br][br]
@@ -376,11 +376,11 @@ KviKvsTreeNodeCommand * KviKvsParser::parseSpecialCommandClass()
if(KVSP_curCharUnicode != '(')
{
- error(KVSP_curCharPointer,__tr2qs("Found character %q (unicode %x) where an open parenthesis was expected"),KVSP_curCharPointer,KVSP_curCharUnicode);
+ error(KVSP_curCharPointer,__tr2qs("Found character %q (tqunicode %x) where an open tqparenthesis was expected"),KVSP_curCharPointer,KVSP_curCharUnicode);
return 0;
}
- const QChar * pBegin = KVSP_curCharPointer;
+ const TQChar * pBegin = KVSP_curCharPointer;
KviKvsTreeNodeDataList * l = parseCommaSeparatedParameterList();
if(!l)return 0;
@@ -426,7 +426,7 @@ KviKvsTreeNodeCommand * KviKvsParser::parseSpecialCommandClass()
continue;
}
- const QChar * pLabelBegin = KVSP_curCharPointer;
+ const TQChar * pLabelBegin = KVSP_curCharPointer;
if(KVSP_curCharIsLetter)
{
@@ -443,12 +443,12 @@ KviKvsTreeNodeCommand * KviKvsParser::parseSpecialCommandClass()
if(KVSP_curCharPointer == pLabelBegin)
{
- error(KVSP_curCharPointer,__tr2qs("Found character %q (unicode %x) where a function name was expected"),KVSP_curCharPointer,KVSP_curCharUnicode);
+ error(KVSP_curCharPointer,__tr2qs("Found character %q (tqunicode %x) where a function name was expected"),KVSP_curCharPointer,KVSP_curCharUnicode);
delete pClass;
return 0;
}
- QString szLabel(pLabelBegin,KVSP_curCharPointer - pLabelBegin);
+ TQString szLabel(pLabelBegin,KVSP_curCharPointer - pLabelBegin);
unsigned int uHandlerFlags = 0;
@@ -471,11 +471,11 @@ KviKvsTreeNodeCommand * KviKvsParser::parseSpecialCommandClass()
if(KVSP_curCharPointer == pLabelBegin)
{
- error(KVSP_curCharPointer,__tr2qs("Found character %q (unicode %x) where a function name was expected"),KVSP_curCharPointer,KVSP_curCharUnicode);
+ error(KVSP_curCharPointer,__tr2qs("Found character %q (tqunicode %x) where a function name was expected"),KVSP_curCharPointer,KVSP_curCharUnicode);
delete pClass;
return 0;
}
- szLabel = QString(pLabelBegin,KVSP_curCharPointer - pLabelBegin);
+ szLabel = TQString(pLabelBegin,KVSP_curCharPointer - pLabelBegin);
}
}
@@ -498,11 +498,11 @@ KviKvsTreeNodeCommand * KviKvsParser::parseSpecialCommandClass()
if(KVSP_curCharPointer == pLabelBegin)
{
- error(KVSP_curCharPointer,__tr2qs("Found character %q (unicode %x) where a function name was expected"),KVSP_curCharPointer,KVSP_curCharUnicode);
+ error(KVSP_curCharPointer,__tr2qs("Found character %q (tqunicode %x) where a function name was expected"),KVSP_curCharPointer,KVSP_curCharUnicode);
delete pClass;
return 0;
}
- szLabel = QString(pLabelBegin,KVSP_curCharPointer - pLabelBegin);
+ szLabel = TQString(pLabelBegin,KVSP_curCharPointer - pLabelBegin);
}
}
@@ -560,10 +560,10 @@ KviKvsTreeNodeCommand * KviKvsParser::parseSpecialCommandClass()
}
delete pInstruction;
int iLen = KVSP_curCharPointer - pBegin;
- QString szInstruction;
+ TQString szInstruction;
if(iLen > 0)
{
- szInstruction = QString(pBegin,KVSP_curCharPointer - pBegin);
+ szInstruction = TQString(pBegin,KVSP_curCharPointer - pBegin);
KviCommandFormatter::bufferFromBlock(szInstruction);
}
@@ -627,12 +627,12 @@ KviKvsTreeNodeCommand * KviKvsParser::parseSpecialCommandWhile()
if(KVSP_curCharUnicode != '(')
{
- warning(KVSP_curCharPointer,__tr2qs("The while command needs an expression enclosed in parenthesis"));
- error(KVSP_curCharPointer,__tr2qs("Found character %q (unicode %x) where an open parenthesis was expected"),KVSP_curCharPointer,KVSP_curCharUnicode);
+ warning(KVSP_curCharPointer,__tr2qs("The while command needs an expression enclosed in tqparenthesis"));
+ error(KVSP_curCharPointer,__tr2qs("Found character %q (tqunicode %x) where an open tqparenthesis was expected"),KVSP_curCharPointer,KVSP_curCharUnicode);
return 0;
}
- const QChar * pBegin = KVSP_curCharPointer;
+ const TQChar * pBegin = KVSP_curCharPointer;
KVSP_skipChar;
@@ -714,7 +714,7 @@ KviKvsTreeNodeCommand * KviKvsParser::parseSpecialCommandDo()
[cmd]while[/cmd]
*/
- const QChar * pBegin = KVSP_curCharPointer;
+ const TQChar * pBegin = KVSP_curCharPointer;
KviKvsTreeNodeInstruction * i = parseInstruction();
if(!i)
@@ -740,7 +740,7 @@ KviKvsTreeNodeCommand * KviKvsParser::parseSpecialCommandDo()
if(KVSP_curCharIsEndOfBuffer)
error(KVSP_curCharPointer,__tr2qs("Unexpected end of command after the 'do' command block: expected 'while' keyword"));
else
- error(KVSP_curCharPointer,__tr2qs("Found character %q (unicode %x) where a 'while' keyword was expected"),KVSP_curCharPointer,KVSP_curCharUnicode);
+ error(KVSP_curCharPointer,__tr2qs("Found character %q (tqunicode %x) where a 'while' keyword was expected"),KVSP_curCharPointer,KVSP_curCharUnicode);
if(i)delete i;
return 0;
}
@@ -756,7 +756,7 @@ KviKvsTreeNodeCommand * KviKvsParser::parseSpecialCommandDo()
if(KVSP_curCharUnicode != '(')
{
- warning(KVSP_curCharPointer,__tr2qs("The 'while' block of the 'do' command needs an expression enclosed in parenthesis"));
+ warning(KVSP_curCharPointer,__tr2qs("The 'while' block of the 'do' command needs an expression enclosed in tqparenthesis"));
errorBadChar(KVSP_curCharPointer,'(',"do");
if(i)delete i;
return 0;
@@ -822,12 +822,12 @@ KviKvsTreeNodeCommand * KviKvsParser::parseSpecialCommandIf()
if(KVSP_curCharUnicode != '(')
{
- warning(KVSP_curCharPointer,__tr2qs("The 'if' command needs an expression enclosed in parenthesis"));
+ warning(KVSP_curCharPointer,__tr2qs("The 'if' command needs an expression enclosed in tqparenthesis"));
errorBadChar(KVSP_curCharPointer,'(',"if");
return 0;
}
- const QChar * pBegin = KVSP_curCharPointer;
+ const TQChar * pBegin = KVSP_curCharPointer;
KVSP_skipChar;
@@ -867,7 +867,7 @@ KviKvsTreeNodeCommand * KviKvsParser::parseSpecialCommandIf()
return 0;
}
- const QChar * pElse = KVSP_curCharPointer;
+ const TQChar * pElse = KVSP_curCharPointer;
if((KVSP_curCharUnicode != 'e') && (KVSP_curCharUnicode != 'E'))
return new KviKvsTreeNodeSpecialCommandIf(pBegin,e,i,0);
@@ -967,7 +967,7 @@ bool KviKvsParser::skipToEndOfForControlBlock()
return false;
break;
//case '\n':
- // that's ok.. it may have a parenthesis on the next line
+ // that's ok.. it may have a tqparenthesis on the next line
//KVSP_skipChar;
//break;
default:
@@ -1012,12 +1012,12 @@ KviKvsTreeNodeCommand * KviKvsParser::parseSpecialCommandFor()
if(KVSP_curCharUnicode != '(')
{
- warning(KVSP_curCharPointer,__tr2qs("The 'for' command needs an expression enclosed in parenthesis"));
+ warning(KVSP_curCharPointer,__tr2qs("The 'for' command needs an expression enclosed in tqparenthesis"));
errorBadChar(KVSP_curCharPointer,'(',"for");
return 0;
}
- const QChar * pForBegin = KVSP_curCharPointer;
+ const TQChar * pForBegin = KVSP_curCharPointer;
KVSP_skipChar;
@@ -1045,7 +1045,7 @@ KviKvsTreeNodeCommand * KviKvsParser::parseSpecialCommandFor()
// skip to the first non matching ')' that is not in a string
- const QChar * pBegin = KVSP_curCharPointer;
+ const TQChar * pBegin = KVSP_curCharPointer;
if(!skipToEndOfForControlBlock())
{
@@ -1061,10 +1061,10 @@ KviKvsTreeNodeCommand * KviKvsParser::parseSpecialCommandFor()
// HACK HACK HACK HACK HACK HACK HACK HACK HACK HACK HACK HACK
// KVSP_curCharPointer is const!
// we shouldn't be able to modify it
- QChar cSave = *(KVSP_curCharPointer);
+ TQChar cSave = *(KVSP_curCharPointer);
- QChar * pHack = (QChar *)KVSP_curCharPointer;
- *pHack = QChar('\n');
+ TQChar * pHack = (TQChar *)KVSP_curCharPointer;
+ *pHack = TQChar('\n');
KVSP_curCharPointer = pBegin;
@@ -1089,7 +1089,7 @@ KviKvsTreeNodeCommand * KviKvsParser::parseSpecialCommandFor()
if(KVSP_curCharUnicode != ')')
{
- error(KVSP_curCharPointer,__tr2qs("Found char %q (unicode %x) while looking for the terminating ')' in 'for' command"),KVSP_curCharPointer,KVSP_curCharUnicode);
+ error(KVSP_curCharPointer,__tr2qs("Found char %q (tqunicode %x) while looking for the terminating ')' in 'for' command"),KVSP_curCharPointer,KVSP_curCharUnicode);
if(i1)delete i1;
if(e)delete e;
if(i2)delete i2;
@@ -1178,12 +1178,12 @@ KviKvsTreeNodeCommand * KviKvsParser::parseSpecialCommandForeach()
if(KVSP_curCharUnicode != '(')
{
- warning(KVSP_curCharPointer,__tr2qs("The 'foreach' command needs an expression enclosed in parenthesis"));
+ warning(KVSP_curCharPointer,__tr2qs("The 'foreach' command needs an expression enclosed in tqparenthesis"));
errorBadChar(KVSP_curCharPointer,'(',"foreach");
return 0;
}
- const QChar * pForeachBegin = KVSP_curCharPointer;
+ const TQChar * pForeachBegin = KVSP_curCharPointer;
KVSP_skipChar;
@@ -1193,7 +1193,7 @@ KviKvsTreeNodeCommand * KviKvsParser::parseSpecialCommandForeach()
if((KVSP_curCharUnicode != '%') && (KVSP_curCharUnicode != '$') && (KVSP_curCharUnicode != '@'))
{
warning(KVSP_curCharPointer,__tr2qs("The 'foreach' command expects a writeable iteration variable as first parameter"));
- error(KVSP_curCharPointer,__tr2qs("Found character '%q' (unicode %x) where '%' or '$' was expected: see /help foreach for the command syntax"),KVSP_curCharPointer,KVSP_curCharUnicode);
+ error(KVSP_curCharPointer,__tr2qs("Found character '%q' (tqunicode %x) where '%' or '$' was expected: see /help foreach for the command syntax"),KVSP_curCharPointer,KVSP_curCharUnicode);
return 0;
}
@@ -1235,7 +1235,7 @@ KviKvsTreeNodeCommand * KviKvsParser::parseSpecialCommandForeach()
return 0;
}
- const QChar * pLoopBegin = KVSP_curCharPointer;
+ const TQChar * pLoopBegin = KVSP_curCharPointer;
KviKvsTreeNodeInstruction * loop = parseInstruction();
if(!loop)
@@ -1362,12 +1362,12 @@ KviKvsTreeNodeCommand * KviKvsParser::parseSpecialCommandSwitch()
if(KVSP_curCharUnicode != '(')
{
- warning(KVSP_curCharPointer,__tr2qs("The 'switch' command needs an expression enclosed in parenthesis"));
+ warning(KVSP_curCharPointer,__tr2qs("The 'switch' command needs an expression enclosed in tqparenthesis"));
errorBadChar(KVSP_curCharPointer,'(',"switch");
return 0;
}
- const QChar * pBegin = KVSP_curCharPointer;
+ const TQChar * pBegin = KVSP_curCharPointer;
KVSP_skipChar;
@@ -1407,7 +1407,7 @@ KviKvsTreeNodeCommand * KviKvsParser::parseSpecialCommandSwitch()
{
// look for a 'case','match','default' or 'regexpr' label
- const QChar * pLabelBegin = KVSP_curCharPointer;
+ const TQChar * pLabelBegin = KVSP_curCharPointer;
while(KVSP_curCharIsLetter)KVSP_skipChar;
if(KVSP_curCharIsEndOfBuffer)
@@ -1419,13 +1419,13 @@ KviKvsTreeNodeCommand * KviKvsParser::parseSpecialCommandSwitch()
if(KVSP_curCharPointer == pLabelBegin)
{
- error(KVSP_curCharPointer,__tr2qs("Found character %q (unicode %x) where a 'case','match','regexp','default' or 'break' label was expected"),KVSP_curCharPointer,KVSP_curCharUnicode);
+ error(KVSP_curCharPointer,__tr2qs("Found character %q (tqunicode %x) where a 'case','match','regexp','default' or 'break' label was expected"),KVSP_curCharPointer,KVSP_curCharUnicode);
delete pSwitch;
return 0;
}
- QString szLabel(pLabelBegin,KVSP_curCharPointer - pLabelBegin);
- QString szLabelLow = szLabel.lower();
+ TQString szLabel(pLabelBegin,KVSP_curCharPointer - pLabelBegin);
+ TQString szLabelLow = szLabel.lower();
bool bNeedParam = true;
@@ -1554,7 +1554,7 @@ KviKvsTreeNodeSpecialCommandDefpopupLabelPopup * KviKvsParser::parseSpecialComma
while(KVSP_curCharUnicode != '}')
{
// look for 'label', 'prologue', 'epilogue', 'popup', 'item', 'separator' or 'extpopup' label
- const QChar * pLabelBegin = KVSP_curCharPointer;
+ const TQChar * pLabelBegin = KVSP_curCharPointer;
while(KVSP_curCharIsLetter)KVSP_skipChar;
if(KVSP_curCharIsEndOfBuffer)
@@ -1566,17 +1566,17 @@ KviKvsTreeNodeSpecialCommandDefpopupLabelPopup * KviKvsParser::parseSpecialComma
if(KVSP_curCharPointer == pLabelBegin)
{
- error(KVSP_curCharPointer,__tr2qs("Found character %q (unicode %x) where a 'prologue','separator','label','popup','item','extpopup' or 'epilogue' label was expected"),KVSP_curCharPointer,KVSP_curCharUnicode);
+ error(KVSP_curCharPointer,__tr2qs("Found character %q (tqunicode %x) where a 'prologue','separator','label','popup','item','extpopup' or 'epilogue' label was expected"),KVSP_curCharPointer,KVSP_curCharUnicode);
delete pPopup;
return 0;
}
- QString szLabel(pLabelBegin,KVSP_curCharPointer - pLabelBegin);
- QString szLabelLow = szLabel.lower();
+ TQString szLabel(pLabelBegin,KVSP_curCharPointer - pLabelBegin);
+ TQString szLabelLow = szLabel.lower();
- KviPointerList<QString> * pParameters = 0;
+ KviPointerList<TQString> * pParameters = 0;
- QString szCondition;
+ TQString szCondition;
#define EXTRACT_POPUP_LABEL_PARAMETERS \
@@ -1603,7 +1603,7 @@ KviKvsTreeNodeSpecialCommandDefpopupLabelPopup * KviKvsParser::parseSpecialComma
} \
if(KVSP_curCharUnicode == '(') \
{ \
- const QChar * pBegin = KVSP_curCharPointer; \
+ const TQChar * pBegin = KVSP_curCharPointer; \
KVSP_skipChar; \
KviKvsTreeNodeExpression * pExpression = parseExpression(')'); \
if(!pExpression) \
@@ -1648,7 +1648,7 @@ KviKvsTreeNodeSpecialCommandDefpopupLabelPopup * KviKvsParser::parseSpecialComma
return 0;
}
}
- const QChar * pBegin = KVSP_curCharPointer;
+ const TQChar * pBegin = KVSP_curCharPointer;
KviKvsTreeNodeInstruction * pInstruction = parseInstruction();
if(pInstruction)
{
@@ -1672,10 +1672,10 @@ KviKvsTreeNodeSpecialCommandDefpopupLabelPopup * KviKvsParser::parseSpecialComma
int iLen = KVSP_curCharPointer - pBegin;
if(iLen > 0)
{
- QString szInstruction(pBegin,KVSP_curCharPointer - pBegin);
+ TQString szInstruction(pBegin,KVSP_curCharPointer - pBegin);
KviCommandFormatter::bufferFromBlock(szInstruction);
- QString * pItemName = pParameters ? pParameters->first() : 0;
- QString szItemName = pItemName ? *pItemName : QString::null;
+ TQString * pItemName = pParameters ? pParameters->first() : 0;
+ TQString szItemName = pItemName ? *pItemName : TQString();
if(bPrologue)
pPopup->addLabel(new KviKvsTreeNodeSpecialCommandDefpopupLabelPrologue(pLabelBegin,szInstruction,szItemName));
else
@@ -1688,7 +1688,7 @@ KviKvsTreeNodeSpecialCommandDefpopupLabelPopup * KviKvsParser::parseSpecialComma
/////////////////////////////////////////////////////////////////////////////////////////////////
EXTRACT_POPUP_LABEL_CONDITION
if(KVSP_curCharUnicode == ';')KVSP_skipChar;
- QString szItemName = "dummySeparator"; // <------- FIXME!
+ TQString szItemName = "dummySeparator"; // <------- FIXME!
pPopup->addLabel(new KviKvsTreeNodeSpecialCommandDefpopupLabelSeparator(pLabelBegin,szCondition,szItemName));
} else if(szLabelLow == "label")
@@ -1697,7 +1697,7 @@ KviKvsTreeNodeSpecialCommandDefpopupLabelPopup * KviKvsParser::parseSpecialComma
EXTRACT_POPUP_LABEL_PARAMETERS
EXTRACT_POPUP_LABEL_CONDITION
- QString * pText = pParameters->first();
+ TQString * pText = pParameters->first();
if(!pText)
{
error(pLabelBegin,__tr2qs("Unexpected empty <text> field in label parameters. See /help defpopup for the syntax"));
@@ -1705,10 +1705,10 @@ KviKvsTreeNodeSpecialCommandDefpopupLabelPopup * KviKvsParser::parseSpecialComma
delete pPopup;
return 0;
}
- QString * pIcon = pParameters->next();
+ TQString * pIcon = pParameters->next();
if(KVSP_curCharUnicode == ';')KVSP_skipChar;
- QString * pItemName = pParameters->next();
- pPopup->addLabel(new KviKvsTreeNodeSpecialCommandDefpopupLabelLabel(pLabelBegin,szCondition,*pText,pIcon ? *pIcon : QString::null,pItemName ? *pItemName : QString::null));
+ TQString * pItemName = pParameters->next();
+ pPopup->addLabel(new KviKvsTreeNodeSpecialCommandDefpopupLabelLabel(pLabelBegin,szCondition,*pText,pIcon ? *pIcon : TQString(),pItemName ? *pItemName : TQString()));
delete pParameters;
} else if(szLabelLow == "popup")
{
@@ -1716,7 +1716,7 @@ KviKvsTreeNodeSpecialCommandDefpopupLabelPopup * KviKvsParser::parseSpecialComma
EXTRACT_POPUP_LABEL_PARAMETERS
EXTRACT_POPUP_LABEL_CONDITION
- QString * pText = pParameters->first();
+ TQString * pText = pParameters->first();
if(!pText)
{
error(pLabelBegin,__tr2qs("Unexpected empty <text> field in extpopup parameters. See /help defpopup for the syntax"));
@@ -1724,8 +1724,8 @@ KviKvsTreeNodeSpecialCommandDefpopupLabelPopup * KviKvsParser::parseSpecialComma
delete pPopup;
return 0;
}
- QString * pIcon = pParameters->next();
- QString * pItemName = pParameters->next();
+ TQString * pIcon = pParameters->next();
+ TQString * pItemName = pParameters->next();
KviKvsTreeNodeSpecialCommandDefpopupLabelPopup * pSubPopup = parseSpecialCommandDefpopupLabelPopup();
if(!pSubPopup)
@@ -1737,7 +1737,7 @@ KviKvsTreeNodeSpecialCommandDefpopupLabelPopup * KviKvsParser::parseSpecialComma
pSubPopup->setCondition(szCondition);
pSubPopup->setText(*pText);
- pSubPopup->setItemName(pItemName ? *pItemName : QString::null);
+ pSubPopup->setItemName(pItemName ? *pItemName : TQString());
if(pIcon)pSubPopup->setIcon(*pIcon);
pPopup->addLabel(pSubPopup);
delete pParameters;
@@ -1747,7 +1747,7 @@ KviKvsTreeNodeSpecialCommandDefpopupLabelPopup * KviKvsParser::parseSpecialComma
EXTRACT_POPUP_LABEL_PARAMETERS
EXTRACT_POPUP_LABEL_CONDITION
- QString * pText = pParameters->first();
+ TQString * pText = pParameters->first();
if(!pText)
{
error(pLabelBegin,__tr2qs("Unexpected empty <text> field in extpopup parameters. See /help defpopup for the syntax"));
@@ -1755,10 +1755,10 @@ KviKvsTreeNodeSpecialCommandDefpopupLabelPopup * KviKvsParser::parseSpecialComma
delete pPopup;
return 0;
}
- QString * pIcon = pParameters->next();
- QString * pItemName = pParameters->next();
+ TQString * pIcon = pParameters->next();
+ TQString * pItemName = pParameters->next();
- const QChar * pBegin = KVSP_curCharPointer;
+ const TQChar * pBegin = KVSP_curCharPointer;
KviKvsTreeNodeInstruction * pInstruction = parseInstruction();
if(pInstruction)
{
@@ -1779,14 +1779,14 @@ KviKvsTreeNodeSpecialCommandDefpopupLabelPopup * KviKvsParser::parseSpecialComma
int iLen = KVSP_curCharPointer - pBegin;
if(iLen > 0)
{
- QString szInstruction(pBegin,KVSP_curCharPointer - pBegin);
+ TQString szInstruction(pBegin,KVSP_curCharPointer - pBegin);
KviCommandFormatter::bufferFromBlock(szInstruction);
- pPopup->addLabel(new KviKvsTreeNodeSpecialCommandDefpopupLabelItem(pLabelBegin,szCondition,*pText,pIcon ? *pIcon : QString::null,szInstruction,pItemName ? *pItemName : QString::null));
+ pPopup->addLabel(new KviKvsTreeNodeSpecialCommandDefpopupLabelItem(pLabelBegin,szCondition,*pText,pIcon ? *pIcon : TQString(),szInstruction,pItemName ? *pItemName : TQString()));
} else {
// zero length instruction, but still add the item
- QString szInstruction = "";
+ TQString szInstruction = "";
KviCommandFormatter::bufferFromBlock(szInstruction);
- pPopup->addLabel(new KviKvsTreeNodeSpecialCommandDefpopupLabelItem(pLabelBegin,szCondition,*pText,pIcon ? *pIcon : QString::null,szInstruction,pItemName ? *pItemName : QString::null));
+ pPopup->addLabel(new KviKvsTreeNodeSpecialCommandDefpopupLabelItem(pLabelBegin,szCondition,*pText,pIcon ? *pIcon : TQString(),szInstruction,pItemName ? *pItemName : TQString()));
}
delete pParameters;
} else if(szLabelLow == "extpopup")
@@ -1795,7 +1795,7 @@ KviKvsTreeNodeSpecialCommandDefpopupLabelPopup * KviKvsParser::parseSpecialComma
EXTRACT_POPUP_LABEL_PARAMETERS
EXTRACT_POPUP_LABEL_CONDITION
- QString * pText = pParameters->first();
+ TQString * pText = pParameters->first();
if(!pText)
{
error(pLabelBegin,__tr2qs("Unexpected empty <text> field in extpopup parameters. See /help defpopup for the syntax"));
@@ -1803,7 +1803,7 @@ KviKvsTreeNodeSpecialCommandDefpopupLabelPopup * KviKvsParser::parseSpecialComma
delete pPopup;
return 0;
}
- QString * pName = pParameters->next();
+ TQString * pName = pParameters->next();
if(!pName)
{
error(pLabelBegin,__tr2qs("Unexpected empty <name> field in extpopup parameters. See /help defpopup for the syntax"));
@@ -1811,10 +1811,10 @@ KviKvsTreeNodeSpecialCommandDefpopupLabelPopup * KviKvsParser::parseSpecialComma
delete pPopup;
return 0;
}
- QString * pIcon = pParameters->next();
- QString * pItemName = pParameters->next();
+ TQString * pIcon = pParameters->next();
+ TQString * pItemName = pParameters->next();
if(KVSP_curCharUnicode == ';')KVSP_skipChar;
- pPopup->addLabel(new KviKvsTreeNodeSpecialCommandDefpopupLabelExtpopup(pLabelBegin,szCondition,*pText,pIcon ? *pIcon : QString::null,*pName,pItemName ? *pItemName : QString::null));
+ pPopup->addLabel(new KviKvsTreeNodeSpecialCommandDefpopupLabelExtpopup(pLabelBegin,szCondition,*pText,pIcon ? *pIcon : TQString(),*pName,pItemName ? *pItemName : TQString()));
delete pParameters;
} else {
/////////////////////////////////////////////////////////////////////////////////////////////////
@@ -1928,12 +1928,12 @@ KviKvsTreeNodeCommand * KviKvsParser::parseSpecialCommandDefpopup()
if(KVSP_curCharUnicode != '(')
{
- warning(KVSP_curCharPointer,__tr2qs("The 'defpopup' command needs an expression enclosed in parenthesis"));
+ warning(KVSP_curCharPointer,__tr2qs("The 'defpopup' command needs an expression enclosed in tqparenthesis"));
errorBadChar(KVSP_curCharPointer,'(',"defpopup");
return 0;
}
- const QChar * pBegin = KVSP_curCharPointer;
+ const TQChar * pBegin = KVSP_curCharPointer;
KVSP_skipChar;
@@ -1968,15 +1968,15 @@ KviKvsTreeNodeCommand * KviKvsParser::parseSpecialCommandHelp()
skipSpaces();
- const QChar * pBegin = KVSP_curCharPointer;
+ const TQChar * pBegin = KVSP_curCharPointer;
while(!KVSP_curCharIsEndOfCommand)KVSP_skipChar;
if(!KVSP_curCharIsEndOfBuffer)KVSP_skipChar;
- QString tmp(pBegin,KVSP_curCharPointer - pBegin);
+ TQString tmp(pBegin,KVSP_curCharPointer - pBegin);
tmp.stripWhiteSpace();
- const QString szHelpName("help");
+ const TQString szHelpName("help");
KviKvsCoreSimpleCommandExecRoutine * r = KviKvsKernel::instance()->findCoreSimpleCommandExecRoutine(szHelpName);
if(!r)return 0; // <--- internal error!
generated by cgit v1.2.1 (git 2.18.0) at 2024-07-07 21:53:46 +0000