From 84c989c19db5daab602a67f47ca0f5fd7a2b53d2 Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Mon, 19 Dec 2011 12:01:04 -0600
Subject: Remove additional unneeded tq method conversions

---
 kommander/widget/parser.cpp | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

(limited to 'kommander/widget/parser.cpp')

diff --git a/kommander/widget/parser.cpp b/kommander/widget/parser.cpp
index 848507bb..09841908 100644
--- a/kommander/widget/parser.cpp
+++ b/kommander/widget/parser.cpp
@@ -113,7 +113,7 @@ bool Parser::setString(const TQString& s)
     else                          // Bad character
     {
       insertNode(s.mid(start, 1), lines);
-      setError(i18n("Invalid character: '%1'").tqarg(s[start]), m_parts.count()-1);
+      setError(i18n("Invalid character: '%1'").arg(s[start]), m_parts.count()-1);
       return false;
     }
   }
@@ -220,7 +220,7 @@ ParseNode Parser::parseValue(Mode mode)
         return parseWidget(mode, value);
       }else if (mode == Execute)
       {
-        setError(i18n("'%1' (%2) is not a widget").tqarg(p.variableName()).tqarg(variable(p.variableName()).toString()));
+        setError(i18n("'%1' (%2) is not a widget").arg(p.variableName()).arg(variable(p.variableName()).toString()));
         return ParseNode();
       } else
       {
@@ -232,7 +232,7 @@ ParseNode Parser::parseValue(Mode mode)
     }
     else if (tryKeyword(LeftParenthesis, CheckOnly))
     {
-       setError(i18n("'%1' is not a function").tqarg(p.variableName()));
+       setError(i18n("'%1' is not a function").arg(p.variableName()));
        return ParseNode();
     }
     else
@@ -423,15 +423,15 @@ ParseNode Parser::parseFunction(Mode mode)
     tryKeyword(RightParenthesis);
   }
   if (f.minArgs() > params.count())
-    setError(i18n("in function '%1': %2").tqarg(name).tqarg(i18n("too few parameters")), pos);
+    setError(i18n("in function '%1': %2").arg(name).arg(i18n("too few parameters")), pos);
   else if (f.maxArgs() < params.count())
-    setError(i18n("in function '%1': %2").tqarg(name).tqarg(i18n("too many parameters")), pos);
+    setError(i18n("in function '%1': %2").arg(name).arg(i18n("too many parameters")), pos);
   else if (mode == Execute)
   {
     ParseNode p = f.execute(this, params);
     if (!p.isValid())
     {
-      setError(i18n("in function '%1': %2").tqarg(name).tqarg(p.errorMessage()), pos);
+      setError(i18n("in function '%1': %2").arg(name).arg(p.errorMessage()), pos);
       return ParseNode();
     }
     else
@@ -471,7 +471,7 @@ ParseNode Parser::parseWidget(Mode mode, const TQString &widgetName)
     ParseNode p = f.execute(this, params);
     if (!p.isValid())
     {
-      setError(i18n("in widget function '%1.%2': %3").tqarg(widget).tqarg(var).tqarg(p.errorMessage()), pos);
+      setError(i18n("in widget function '%1.%2': %3").arg(widget).arg(var).arg(p.errorMessage()), pos);
       return ParseNode();
     }
     else
@@ -514,12 +514,12 @@ ParseNode Parser::parseAssignment(Mode mode)
       m_start = m_start - 2;
       return parseWidget(mode); 
     } else
-      setError(i18n("'%1' is not a widget").tqarg(var));
+      setError(i18n("'%1' is not a widget").arg(var));
   }
   else if (tryKeyword(LeftParenthesis, CheckOnly))
-    setError(i18n("'%1' is not a function").tqarg(var));
+    setError(i18n("'%1' is not a function").arg(var));
   else 
-    setError(i18n("Unexpected symbol after variable '%1'").tqarg(var));
+    setError(i18n("Unexpected symbol after variable '%1'").arg(var));
 
   return ParseNode();
 }
@@ -738,9 +738,9 @@ bool Parser::tryKeyword(Keyword k, Mode mode)
   if (mode == Execute)
   {
     if (k == Dot)
-      setError(i18n("Expected '%1'<br><br>Possible cause of the error is having a variable with the same name as a widget").tqarg(m_data->keywordToString(k)));
+      setError(i18n("Expected '%1'<br><br>Possible cause of the error is having a variable with the same name as a widget").arg(m_data->keywordToString(k)));
     else
-     setError(i18n("Expected '%1'").tqarg(m_data->keywordToString(k)));
+     setError(i18n("Expected '%1'").arg(m_data->keywordToString(k)));
   }
   return false;
 }
-- 
cgit v1.2.1