From 9d6927a7d6a543332f828bffedf65eecf6774c6d Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Thu, 15 Dec 2011 15:33:27 -0600
Subject: Rename a number of old tq methods that are no longer tq specific

---
 src/progs/base/generic_prog.cpp | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

(limited to 'src/progs/base/generic_prog.cpp')

diff --git a/src/progs/base/generic_prog.cpp b/src/progs/base/generic_prog.cpp
index e7e6e2e..a3e3770 100644
--- a/src/progs/base/generic_prog.cpp
+++ b/src/progs/base/generic_prog.cpp
@@ -72,13 +72,13 @@ bool Programmer::Base::simpleConnectHardware()
   if (_device) {
     TQString label = _group.label();
     if ( group().isSoftware() )
-      log(Log::LineType::Information, i18n("Connecting %1 with device %2...").tqarg(label).tqarg(_device->name()));
+      log(Log::LineType::Information, i18n("Connecting %1 with device %2...").arg(label).arg(_device->name()));
     else {
       if ( !_hardware->name().isEmpty() ) label += "[" + _hardware->name() + "]";
       Port::Description pd = _hardware->portDescription();
       TQString s = pd.type.label();
       if (pd.type.data().withDevice) s += " (" + pd.device + ")";
-      log(Log::LineType::Information, i18n("Connecting %1 on %2 with device %3...").tqarg(label).tqarg(s).tqarg(_device->name()));
+      log(Log::LineType::Information, i18n("Connecting %1 on %2 with device %3...").arg(label).arg(s).arg(_device->name()));
     }
   }
   return _hardware->connectHardware();
@@ -98,7 +98,7 @@ bool Programmer::Base::connectHardware()
     if ( !checkFirmwareVersion() ) return false;
     if ( !setTargetPowerOn(false) ) return false;
     if ( !setTarget() ) return false;
-    log(Log::LineType::Information, i18n("  Set target self powered: %1").tqarg(_targetSelfPowered ? "true" : "false"));
+    log(Log::LineType::Information, i18n("  Set target self powered: %1").arg(_targetSelfPowered ? "true" : "false"));
     if ( !setTargetPowerOn(!_targetSelfPowered) ) return false;
     if ( !internalSetupHardware() ) return false;
     if ( !readVoltages() ) return false;
@@ -133,30 +133,30 @@ bool Programmer::Base::checkFirmwareVersion()
 {
   if ( _mode==BootloadMode ) log(Log::LineType::Information, i18n("Programmer is in bootload mode."));
   if ( !_firmwareVersion.isValid() ) return true;
-  log(Log::LineType::Information, i18n("Firmware version is %1").tqarg(_firmwareVersion.pretty()));
+  log(Log::LineType::Information, i18n("Firmware version is %1").arg(_firmwareVersion.pretty()));
   VersionData vd = _firmwareVersion.toWithoutDot();
   VersionData tmp = firmwareVersion(FirmwareVersionType::Max);
   if ( tmp.isValid() && tmp.toWithoutDot()<vd ) {
     VersionData mplab = mplabVersion(FirmwareVersionType::Max);
-    TQString s = (mplab.isValid() ? " " + i18n("MPLAB %1").tqarg(mplab.prettyWithoutDot()) : TQString());
+    TQString s = (mplab.isValid() ? " " + i18n("MPLAB %1").arg(mplab.prettyWithoutDot()) : TQString());
     log(Log::LineType::Warning, i18n("The firmware version (%1) is higher than the version tested with piklab (%2%3).\n"
-                                     "You may experience problems.").tqarg(_firmwareVersion.pretty()).tqarg(tmp.pretty()).tqarg(s));
+                                     "You may experience problems.").arg(_firmwareVersion.pretty()).arg(tmp.pretty()).arg(s));
     return true;
   }
   tmp = firmwareVersion(FirmwareVersionType::Min);
   if ( tmp.isValid() && vd<tmp.toWithoutDot() ) {
     VersionData mplab = mplabVersion(FirmwareVersionType::Min);
-    TQString s = (mplab.isValid() ? " " + i18n("MPLAB %1").tqarg(mplab.prettyWithoutDot()) : TQString());
+    TQString s = (mplab.isValid() ? " " + i18n("MPLAB %1").arg(mplab.prettyWithoutDot()) : TQString());
     log(Log::LineType::Warning, i18n("The firmware version (%1) is lower than the version tested with piklab (%2%3).\n"
-                                     "You may experience problems.").tqarg(_firmwareVersion.pretty()).tqarg(tmp.pretty()).tqarg(s));
+                                     "You may experience problems.").arg(_firmwareVersion.pretty()).arg(tmp.pretty()).arg(s));
     return true;
   }
   tmp = firmwareVersion(FirmwareVersionType::Recommended);
   if ( tmp.isValid() && vd<tmp.toWithoutDot() ) {
     VersionData mplab = mplabVersion(FirmwareVersionType::Recommended);
-    TQString s = (mplab.isValid() ? " " + i18n("MPLAB %1").tqarg(mplab.prettyWithoutDot()) : TQString());
+    TQString s = (mplab.isValid() ? " " + i18n("MPLAB %1").arg(mplab.prettyWithoutDot()) : TQString());
     log(Log::LineType::Warning, i18n("The firmware version (%1) is lower than the recommended version (%2%3).\n"
-                                     "It is recommended to upgrade the firmware.").tqarg(_firmwareVersion.pretty()).tqarg(tmp.pretty()).tqarg(s));
+                                     "It is recommended to upgrade the firmware.").arg(_firmwareVersion.pretty()).arg(tmp.pretty()).arg(s));
     return true;
   }
   return true;
@@ -243,11 +243,11 @@ void Programmer::Base::endProgramming()
 bool Programmer::Base::uploadFirmware(const PURL::Url &url)
 {
   _progressMonitor.clear();
-  log(Log::DebugLevel::Normal, TQString("  Firmware file: %1").tqarg(url.pretty()));
+  log(Log::DebugLevel::Normal, TQString("  Firmware file: %1").arg(url.pretty()));
   Log::StringView sview;
   PURL::File file(url, sview);
   if ( !file.openForRead() ) {
-    log(Log::LineType::Error, i18n("Could not open firmware file \"%1\".").tqarg(url.pretty()));
+    log(Log::LineType::Error, i18n("Could not open firmware file \"%1\".").arg(url.pretty()));
     return false;
   }
   bool ok  = doUploadFirmware(file);
-- 
cgit v1.2.1