Revert "Rename a number of old tq methods that are no longer tq specific"

This reverts commit 9d6927a7d6a543332f828bffedf65eecf6774c6d.

1 files changed, 13 insertions, 13 deletions

diff --git a/src/piklab-prog/cmdline.cpp b/src/piklab-prog/cmdline.cpp
index 2f206a2..beb309a 100644
--- a/src/piklab-prog/cmdline.cpp
+++ b/src/piklab-prog/cmdline.cpp
@@ -112,7 +112,7 @@ CLI::ExitCode CLI::Main::deviceList()
     log(Log::LineType::Normal, i18n("Supported devices:"));
     devices = Programmer::lister().supportedDevices();
   } else {
-    log(Log::LineType::Normal, i18n("Supported devices for \"%1\":").arg(_progGroup->label()));
+    log(Log::LineType::Normal, i18n("Supported devices for \"%1\":").tqarg(_progGroup->label()));
     devices = _progGroup->supportedDevices();
   }
   qHeapSort(devices);
@@ -124,7 +124,7 @@ CLI::ExitCode CLI::Main::deviceList()
 
 CLI::ExitCode CLI::Main::portList()
 {
-  if (_progGroup) log(Log::LineType::Normal, i18n("Detected ports supported by \"%1\":").arg(_progGroup->label()));
+  if (_progGroup) log(Log::LineType::Normal, i18n("Detected ports supported by \"%1\":").tqarg(_progGroup->label()));
   else log(Log::LineType::Normal, i18n("Detected ports:"));
   FOR_EACH(PortType, type) {
     if ( _progGroup && !_progGroup->isPortSupported(type) ) continue;
@@ -146,7 +146,7 @@ CLI::ExitCode CLI::Main::portList()
 CLI::ExitCode CLI::Main::rangeList()
 {
   log(Log::LineType::Normal, i18n("Memory ranges for PIC/dsPIC devices:"));
-  FOR_EACH(Pic::MemoryRangeType, type) log(Log::LineType::Normal, TQString(" %1").arg(type.key()));
+  FOR_EACH(Pic::MemoryRangeType, type) log(Log::LineType::Normal, TQString(" %1").tqarg(type.key()));
   return OK;
 }
 
@@ -170,9 +170,9 @@ CLI::ExitCode CLI::Main::prepareCommand(const TQString &command)
         TQStringList errors, warnings;
         Device::Memory::WarningTypes warningTypes;
         if ( !_memory->load(file.stream(), errors, warningTypes, warnings) )
-          return errorExit(i18n("Could not load hex file \"%1\".").arg(errors[0]), FILE_ERROR);
+          return errorExit(i18n("Could not load hex file \"%1\".").tqarg(errors[0]), FILE_ERROR);
         if ( warningTypes!=Device::Memory::NoWarning )
-          log(Log::LineType::Warning, i18n("Hex file seems incompatible with device \"%1\".").arg(warnings.join(" ")));
+          log(Log::LineType::Warning, i18n("Hex file seems incompatible with device \"%1\".").tqarg(warnings.join(" ")));
       }
     } else if ( properties & OutputHex ) {
       if ( !_force && _hexUrl.exists() ) return errorExit(i18n("Output hex filename already exists."), FILE_ERROR);
@@ -299,7 +299,7 @@ CLI::ExitCode CLI::Main::executeCommand(const TQString &command)
     PURL::File file(_hexUrl, *_view);
     if ( !file.openForWrite() ) return FILE_ERROR;
     if ( !_memory->save(file.stream(), _format) )
-      return errorExit(i18n("Error while writing file \"%1\".").arg(_hexUrl.pretty()), FILE_ERROR);
+      return errorExit(i18n("Error while writing file \"%1\".").tqarg(_hexUrl.pretty()), FILE_ERROR);
     return OK;
   }
   if ( command=="erase" ) {
@@ -328,13 +328,13 @@ CLI::ExitCode CLI::Main::checkProgrammer()
   if ( _progGroup->isSoftware() && _progGroup->supportedDevices().isEmpty() )
     return errorExit(i18n("Please check installation of selected software debugger."), NOT_SUPPORTED_ERROR);
   if ( _device && !_progGroup->isSupported(_device->name()) )
-    return errorExit(i18n("The selected device \"%1\" is not supported by the selected programmer.").arg(_device->name()), NOT_SUPPORTED_ERROR);
+    return errorExit(i18n("The selected device \"%1\" is not supported by the selected programmer.").tqarg(_device->name()), NOT_SUPPORTED_ERROR);
   if ( !_hardware.isEmpty() ) {
     ::Hardware::Config *config = _progGroup->hardwareConfig();
     Port::Description pd = static_cast<Programmer::CliManager *>(Programmer::manager)->portDescription();
     bool ok = (config==0 || config->hardwareNames(pd.type).contains(_hardware));
     delete config;
-    if ( !ok ) return errorExit(i18n("The selected programmer does not supported the specified hardware configuration (\"%1\").").arg(_hardware), NOT_SUPPORTED_ERROR);
+    if ( !ok ) return errorExit(i18n("The selected programmer does not supported the specified hardware configuration (\"%1\").").tqarg(_hardware), NOT_SUPPORTED_ERROR);
   }
   return OK;
 }
@@ -346,7 +346,7 @@ CLI::ExitCode CLI::Main::executeSetCommand(const TQString &property, const TQStr
     if ( value.isEmpty() ) return OK;
     _progGroup = Programmer::lister().group(value.lower());
     if (_progGroup) return checkProgrammer();
-    return errorExit(i18n("Unknown programmer \"%1\".").arg(value.lower()), ARG_ERROR);
+    return errorExit(i18n("Unknown programmer \"%1\".").tqarg(value.lower()), ARG_ERROR);
   }
   if ( property=="hardware" ) { _hardware = value;  return OK; }
   if ( property=="device" || property=="processor" ) {
@@ -357,7 +357,7 @@ CLI::ExitCode CLI::Main::executeSetCommand(const TQString &property, const TQStr
     TQString s = value.upper();
     _device = Device::lister().data(s);
     Debugger::manager->updateDevice();
-    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);
     Debugger::manager->init();
     return checkProgrammer();
   }
@@ -372,7 +372,7 @@ CLI::ExitCode CLI::Main::executeSetCommand(const TQString &property, const TQStr
         _format = HexBuffer::Format(i);
         return OK;
       }
-    return errorExit(i18n("Unknown hex file format \"%1\".").arg(s), ARG_ERROR);
+    return errorExit(i18n("Unknown hex file format \"%1\".").tqarg(s), ARG_ERROR);
   }
   if ( property=="port" ) { _port = value; return OK; }
   if ( property=="firmware-dir" ) { _firmwareDir = value; return OK; }
@@ -390,7 +390,7 @@ CLI::ExitCode CLI::Main::executeSetCommand(const TQString &property, const TQStr
     if ( _device && !Debugger::manager->init() ) return 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)
@@ -438,7 +438,7 @@ TQString CLI::Main::executeGetCommand(const TQString &property)
     if ( !_coffUrl.isEmpty() ) return _coffUrl.pretty();
     return i18n("<not set>");
   }
-  log(Log::LineType::SoftError, i18n("Unknown property \"%1\"").arg(property));
+  log(Log::LineType::SoftError, i18n("Unknown property \"%1\"").tqarg(property));
   return TQString();
 }