summaryrefslogtreecommitdiffstats
path: root/kommander/widget/kommanderfunctions.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'kommander/widget/kommanderfunctions.cpp')
-rw-r--r--kommander/widget/kommanderfunctions.cpp16
1 files changed, 8 insertions, 8 deletions
diff --git a/kommander/widget/kommanderfunctions.cpp b/kommander/widget/kommanderfunctions.cpp
index 701b5e01..6a2ce197 100644
--- a/kommander/widget/kommanderfunctions.cpp
+++ b/kommander/widget/kommanderfunctions.cpp
@@ -19,7 +19,7 @@
#include <tqfile.h>
#include <tqregexp.h>
-#include <tqtextstream.h>
+#include <textstream.h>
#include <dcopclient.h>
#include <kapplication.h>
@@ -145,9 +145,9 @@ TQString KommanderWidget::evalForEachBlock(const TQStringList& args, const TQStr
TQString var = args[0];
TQStringList loop = TQStringList::split("\n", args[1]);
TQString output;
- TQString block = substituteVariable(s.mid(start, f - start), TQString("%1_count").tqarg(var),
+ TQString block = substituteVariable(s.mid(start, f - start), TQString("%1_count").arg(var),
TQString::number(loop.count()));
- TQString varidx = TQString("%1_index").tqarg(var);
+ TQString varidx = TQString("%1_index").arg(var);
for (uint i=0; i<loop.count(); i++)
output += evalAssociatedText(substituteVariable(substituteVariable(block, varidx, TQString::number(i+1)),
var, loop[i]));
@@ -302,7 +302,7 @@ TQString KommanderWidget::evalArrayFunction(const TQString& function, const TQSt
const TQMap<TQString, ParseNode> map = parser.array(array);
TQString arraystring;
for (TQMap<TQString, ParseNode>::ConstIterator it = map.begin(); it != map.end(); ++it)
- arraystring += TQString("%1\t%2\n").tqarg(it.key()).tqarg(it.data().toString());
+ arraystring += TQString("%1\t%2\n").arg(it.key()).arg(it.data().toString());
return arraystring;
}
default:
@@ -317,7 +317,7 @@ TQString KommanderWidget::evalWidgetFunction(const TQString& identifier, const T
KommanderWidget* pWidget = parseWidget(identifier);
if (!pWidget)
{
- printError(i18n("Unknown widget: @%1.").tqarg(identifier));
+ printError(i18n("Unknown widget: @%1.").arg(identifier));
return TQString();
}
if (s[pos] == '.')
@@ -335,13 +335,13 @@ TQString KommanderWidget::evalWidgetFunction(const TQString& identifier, const T
}
else if (pWidget == this)
{
- printError(i18n("Infinite loop: @%1 called inside @%2.").tqarg(pWidget->widgetName())
- .tqarg(pWidget->widgetName()));
+ printError(i18n("Infinite loop: @%1 called inside @%2.").arg(pWidget->widgetName())
+ .arg(pWidget->widgetName()));
return TQString();
}
else if (!pWidget->hasAssociatedText())
{
- printError(i18n("Script for @%1 is empty.").tqarg(pWidget->widgetName()));
+ printError(i18n("Script for @%1 is empty.").arg(pWidget->widgetName()));
return TQString();
}
return pWidget->evalAssociatedText();