From 369d8455ac39aa9f5328b855bd5f456e3f384a63 Mon Sep 17 00:00:00 2001
From: Slávek Banko <slavek.banko@axis.cz>
Date: Sun, 7 Mar 2021 20:24:08 +0100
Subject: Added controlled conversions to char* instead of automatic ascii
 conversions. The definition of -UTQT_NO_ASCII_CAST is no longer needed.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit 70defe5e6d9498c5c6011eee50c4dc506abebd61)
---
 kommander/widget/functionlib.cpp | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

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

diff --git a/kommander/widget/functionlib.cpp b/kommander/widget/functionlib.cpp
index dca811e5..49e5f7b0 100644
--- a/kommander/widget/functionlib.cpp
+++ b/kommander/widget/functionlib.cpp
@@ -164,7 +164,7 @@ static ParseNode f_return(Parser* p, const ParameterList& params)
 static ParseNode f_stringRound(Parser*, const ParameterList& params)
 {
   TQString s;
-  s.sprintf("%."+params[1].toString()+"f", params[0].toDouble());
+  s.sprintf("%.*f", params[1].toInt(), params[0].toDouble());
   return s;
 }
 
@@ -172,7 +172,7 @@ static ParseNode f_stringRound(Parser*, const ParameterList& params)
 static ParseNode f_debug(Parser*, const ParameterList& params)
 {
   for (uint i=0; i<params.count(); i++)
-    std::cerr << params[i].toString();
+    std::cerr << params[i].toString().local8Bit();
   std::cerr << "\n";
   fflush(stderr);
   return ParseNode();
@@ -181,7 +181,7 @@ static ParseNode f_debug(Parser*, const ParameterList& params)
 static ParseNode f_echo(Parser*, const ParameterList& params)
 {
   for (uint i=0; i<params.count(); i++)
-    std::cout << params[i].toString();
+    std::cout << params[i].toString().local8Bit();
   fflush(stdout);
   return ParseNode();
 }
@@ -510,7 +510,7 @@ static ParseNode f_dialog(Parser* P, const ParameterList& params)
 
 static ParseNode f_i18n(Parser*, const ParameterList& params)
 {
-  return TDEGlobal::locale()->translate(params[0].toString()); 
+  return TDEGlobal::locale()->translate(params[0].toString().utf8());
 }
 
 static ParseNode f_env(Parser*, const ParameterList& params)
@@ -567,13 +567,11 @@ static ParseNode f_arrayToString(Parser* P, const ParameterList& params)
   TQStringList keys = P->array(name).keys();
   TQValueList<ParseNode> values = P->array(name).values();
   
-  TQStringList::Iterator it = keys.begin(); 
+  TQStringList::Iterator it = keys.begin();
   TQValueList<ParseNode>::Iterator itval = values.begin();
-  while (*it)
+  for (; it != keys.end(); ++it, ++itval)
   {
     array += TQString("%1\t%2\n").arg(*it).arg((*itval).toString());
-    ++it;
-    ++itval;
   }
   return array;
 }
-- 
cgit v1.2.3