From 84c989c19db5daab602a67f47ca0f5fd7a2b53d2 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Mon, 19 Dec 2011 12:01:04 -0600 Subject: Remove additional unneeded tq method conversions --- kommander/widget/kommanderwidget.cpp | 44 ++++++++++++++++++------------------ 1 file changed, 22 insertions(+), 22 deletions(-) (limited to 'kommander/widget/kommanderwidget.cpp') diff --git a/kommander/widget/kommanderwidget.cpp b/kommander/widget/kommanderwidget.cpp index 533e8b9e..182f7faf 100644 --- a/kommander/widget/kommanderwidget.cpp +++ b/kommander/widget/kommanderwidget.cpp @@ -131,7 +131,7 @@ TQString KommanderWidget::evalAssociatedText(const TQString& a_text) p.setWidget(this); p.setString(a_text); if (!p.setString(a_text) || !p.parse()) - printError(i18n("Line %1: %2.\n").tqarg(p.errorLine()+1).tqarg(p.errorMessage())); + printError(i18n("Line %1: %2.\n").arg(p.errorLine()+1).arg(p.errorMessage())); return TQString(); } /* Old macro-only parser is implemented below */ @@ -241,7 +241,7 @@ TQString KommanderWidget::evalAssociatedText(const TQString& a_text) } else { - printError(i18n("Unknown special: \'%1\'.").tqarg(identifier)); + printError(i18n("Unknown special: \'%1\'.").arg(identifier)); return TQString(); } } @@ -271,13 +271,13 @@ TQString KommanderWidget::DCOPQuery(const TQStringList& a_query) } if (!ok) { - printError(i18n("Unmatched parenthesis in DCOP call \'%1\'.").tqarg(a_query[2])); + printError(i18n("Unmatched parenthesis in DCOP call \'%1\'.").arg(a_query[2])); return TQString(); } const TQStringList argTypes = parseArgs(pTypes, ok); if (!ok || argTypes.count() != a_query.count() - 3) { - printError(i18n("Incorrect arguments in DCOP call \'%1\'.").tqarg(a_query[2])); + printError(i18n("Incorrect arguments in DCOP call \'%1\'.").arg(a_query[2])); return TQString(); } @@ -338,7 +338,7 @@ TQString KommanderWidget::DCOPQuery(const TQStringList& a_query) } else if(replyType != "void") { - printError(i18n("DCOP return type %1 is not yet implemented.").tqarg(replyType.data())); + printError(i18n("DCOP return type %1 is not yet implemented.").arg(replyType.data())); } return TQString(); @@ -392,7 +392,7 @@ TQString KommanderWidget::runDialog(const TQString& a_dialog, const TQString& a_ return TQString(); } TQString cmd = TQString("kmdr-executor %1 %2 _PARENTPID=%3 _PARENTDCOPID=kmdr-executor-%4") - .tqarg(pFileName).tqarg(a_params).tqarg(getpid()).tqarg(getpid()); + .arg(pFileName).arg(a_params).arg(getpid()).arg(getpid()); return execCommand(cmd); } @@ -405,8 +405,8 @@ void KommanderWidget::printError(const TQString& a_error) const KDialogBase::Yes, KDialogBase::No, 0, 0, true, false, i18n("Continue"), i18n("Continue && Ignore Next Errors"), i18n("Stop")); switch (KMessageBox::createKMessageBox(dialog, TQMessageBox::Warning, - i18n("Error in widget %1:

%2").tqarg(TQString(m_thisObject->name())) - .tqarg(a_error), TQStringList(), TQString(), 0, 0)) + i18n("Error in widget %1:

%2").arg(TQString(m_thisObject->name())) + .arg(a_error), TQStringList(), TQString(), 0, 0)) { case KDialogBase::No: showErrors = false; @@ -424,7 +424,7 @@ void KommanderWidget::printError(const TQString& a_error) const } else { - kdError() << i18n("Error in widget %1:\n %2\n").tqarg(m_thisObject->name()).tqarg(a_error); + kdError() << i18n("Error in widget %1:\n %2\n").arg(m_thisObject->name()).arg(a_error); } } @@ -579,7 +579,7 @@ TQStringList KommanderWidget::parseFunction(const TQString& group, const TQStrin TQString arg = parseBrackets(s, from, ok); if (!ok) { - printError(i18n("Unmatched parenthesis after \'%1\'.").tqarg(function)); + printError(i18n("Unmatched parenthesis after \'%1\'.").arg(function)); return TQString(); } const TQStringList args = parseArgs(arg, ok); @@ -588,23 +588,23 @@ TQStringList KommanderWidget::parseFunction(const TQString& group, const TQStrin bool extraArg = gname == Group::DCOP; if (!ok) - printError(i18n("Unmatched quotes in argument of \'%1\'.").tqarg(function)); + printError(i18n("Unmatched quotes in argument of \'%1\'.").arg(function)); else if (gname == -1) - printError(i18n("Unknown function group: \'%1\'.").tqarg(group)); + printError(i18n("Unknown function group: \'%1\'.").arg(group)); else if (fname == -1 && !extraArg) - printError(i18n("Unknown function: \'%1\' in group '%2'.").tqarg(function).tqarg(group)); + printError(i18n("Unknown function: \'%1\' in group '%2'.").arg(function).arg(group)); else if (fname == -1 && extraArg) - printError(i18n("Unknown widget function: \'%1\'.").tqarg(function)); + printError(i18n("Unknown widget function: \'%1\'.").arg(function)); else if ((int)args.count() + extraArg < SpecialInformation::minArg(gname, fname)) printError(i18n("Not enough arguments for \'%1\' (%2 instead of %3).

" "Correct syntax is: %4") - .tqarg(function).tqarg(args.count() + extraArg).tqarg(SpecialInformation::minArg(gname, fname)) - .tqarg(SpecialInformation::prototype(gname, fname, SpecialFunction::ShowArgumentNames))); + .arg(function).arg(args.count() + extraArg).arg(SpecialInformation::minArg(gname, fname)) + .arg(SpecialInformation::prototype(gname, fname, SpecialFunction::ShowArgumentNames))); else if ((int)args.count() + extraArg > SpecialInformation::maxArg(gname, fname)) printError(i18n("Too many arguments for \'%1\' (%2 instead of %3).

" "Correct syntax is: %4") - .tqarg(function).tqarg(args.count() + extraArg).tqarg(SpecialInformation::maxArg(gname, fname)) - .tqarg(SpecialInformation::prototype(gname, fname, SpecialFunction::ShowArgumentNames))); + .arg(function).arg(args.count() + extraArg).arg(SpecialInformation::maxArg(gname, fname)) + .arg(SpecialInformation::prototype(gname, fname, SpecialFunction::ShowArgumentNames))); else success = true; ok = success; @@ -627,7 +627,7 @@ int KommanderWidget::parseBlockBoundary(const TQString& s, int from, const TQStr TQString KommanderWidget::substituteVariable(TQString text, TQString variable, TQString value) const { - TQString var = TQString("@%1").tqarg(variable); + TQString var = TQString("@%1").arg(variable); TQString newtext; int newpos, pos = 0; while (true) @@ -692,7 +692,7 @@ TQString KommanderWidget::handleDCOP(const int function, const TQStringList& arg break; case DCOP::type: return current->className(); - case DCOP::tqchildren: + case DCOP::children: { TQStringList matching; TQObjectList* widgets = current->queryList(TQWIDGET_OBJECT_NAME_STRING, 0, false, args.count() == 0 || args[0] != "false"); @@ -707,12 +707,12 @@ TQString KommanderWidget::handleDCOP(const int function, const TQStringList& arg bool KommanderWidget::isFunctionSupported(int f) { - return f == DCOP::setEnabled || f == DCOP::setVisible || f == DCOP::tqchildren || f == DCOP::type; + return f == DCOP::setEnabled || f == DCOP::setVisible || f == DCOP::children || f == DCOP::type; } bool KommanderWidget::isCommonFunction(int f) { - return f == DCOP::setEnabled || f == DCOP::setVisible || f == DCOP::tqchildren || f == DCOP::type; + return f == DCOP::setEnabled || f == DCOP::setVisible || f == DCOP::children || f == DCOP::type; } ParserData* KommanderWidget::internalParserData() const -- cgit v1.2.1