From ad1fc5fc8eadb9b63e8767e57ac41cbac84f7eb7 Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Fri, 16 Dec 2011 09:57:30 -0600
Subject: Revert "Rename a number of old tq methods that are no longer tq
 specific"

This reverts commit 9d6927a7d6a543332f828bffedf65eecf6774c6d.
---
 src/piklab-coff/main.cpp | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

(limited to 'src/piklab-coff')

diff --git a/src/piklab-coff/main.cpp b/src/piklab-coff/main.cpp
index dff1b68..9e865e7 100644
--- a/src/piklab-coff/main.cpp
+++ b/src/piklab-coff/main.cpp
@@ -95,11 +95,11 @@ TQString CLI::Main::prettySymbol(const Coff::Symbol &sym)
   for (uint i=0; i<uint(sym.auxSymbols().count()); i++) saux += prettyAuxSymbol(*sym.auxSymbols()[i]);
   TQString s = (sym.auxSymbols().count()!=0 ? " aux=[" + saux.join(" ") + "]" : TQString());
   TQStringList slist;
-  if ( sym.sectionType()!=Coff::SymbolSectionType::Nb_Types ) slist += TQString("sectionType=\"%1\"").arg(sym.sectionType().label());
-  if ( sym.symbolClass()!=Coff::SymbolClass::Nb_Types ) slist += TQString("class=\"%1\"").arg(sym.symbolClass().label());
+  if ( sym.sectionType()!=Coff::SymbolSectionType::Nb_Types ) slist += TQString("sectionType=\"%1\"").tqarg(sym.sectionType().label());
+  if ( sym.symbolClass()!=Coff::SymbolClass::Nb_Types ) slist += TQString("class=\"%1\"").tqarg(sym.symbolClass().label());
   if ( sym.type()!=Coff::SymbolType::Nb_Types ) {
-    slist += TQString("type=\"%1\"").arg(sym.type().label());
-    if ( sym.derivedType()!=Coff::SymbolDerivedType::Nb_Types ) slist += TQString("/\"%1\"").arg(sym.derivedType().label());
+    slist += TQString("type=\"%1\"").tqarg(sym.type().label());
+    if ( sym.derivedType()!=Coff::SymbolDerivedType::Nb_Types ) slist += TQString("/\"%1\"").tqarg(sym.derivedType().label());
   }
   return slist.join(" ") + s;
 }
@@ -165,8 +165,8 @@ CLI::ExitCode CLI::Main::executeCommandObject(const TQString &command, Log::KeyL
     for (uint i=0; i<coff.nbSections(); i++) {
       const Coff::Section *s = coff.Coff::Object::section(i);
       keys.append(s->name(), i18n("type=\"%1\" address=%2 size=%3 flags=%4")
-        .arg(s->type()==Coff::SectionType::Nb_Types ? "?" : s->type().label())
-        .arg(toHexLabel(s->address(), nbCharsAddress)).arg(toHexLabel(s->size(), nbCharsAddress)).arg(toHexLabel(s->flags(), 8)));
+        .tqarg(s->type()==Coff::SectionType::Nb_Types ? "?" : s->type().label())
+        .tqarg(toHexLabel(s->address(), nbCharsAddress)).tqarg(toHexLabel(s->size(), nbCharsAddress)).tqarg(toHexLabel(s->flags(), 8)));
     }
     return OK;
   }
@@ -180,13 +180,13 @@ CLI::ExitCode CLI::Main::executeCommandObject(const TQString &command, Log::KeyL
       for (uint k=0; k<uint(s->lines().count()); k++) {
         if (first) {
           first = false;
-          keys.append(i18n("section \"%1\":").arg(s->name()), TQString());
+          keys.append(i18n("section \"%1\":").tqarg(s->name()), TQString());
         }
         const Coff::CodeLine *cl = s->lines()[k];
         TQString key = cl->filename() + ":"  + TQString::number(cl->line());
         if ( !cl->address().isValid() ) {
           const Coff::Symbol &sym = *cl->symbol();
-          keys.append(key, i18n("symbol \"%1\"").arg(sym.name()) + prettySymbol(sym));
+          keys.append(key, i18n("symbol \"%1\"").tqarg(sym.name()) + prettySymbol(sym));
         } else keys.append(key, toHexLabel(cl->address(), nbCharsAddress));
       }
     }
@@ -235,10 +235,10 @@ CLI::ExitCode CLI::Main::executeSetCommand(const TQString &property, const TQStr
     }
     TQString s = value.upper();
     _device = Device::lister().data(s);
-    if ( _device==0 ) return errorExit(i18n("Unknown device \"%1\".").arg(s), ARG_ERROR);
+    if ( _device==0 ) return errorExit(i18n("Unknown device \"%1\".").tqarg(s), ARG_ERROR);
     return OK;
   }
-  return errorExit(i18n("Unknown property \"%1\".").arg(property), ARG_ERROR);
+  return errorExit(i18n("Unknown property \"%1\".").tqarg(property), ARG_ERROR);
 }
 
 TQString CLI::Main::executeGetCommand(const TQString &property)
@@ -247,7 +247,7 @@ TQString CLI::Main::executeGetCommand(const TQString &property)
     if ( _device==0 ) return i18n("<not set>");
     return _device->name();
   }
-  log(Log::LineType::SoftError, i18n("Unknown property \"%1\".").arg(property));
+  log(Log::LineType::SoftError, i18n("Unknown property \"%1\".").tqarg(property));
   return TQString();
 }
 
-- 
cgit v1.2.1