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

3 files changed, 16 insertions, 16 deletions

diff --git a/src/progs/base/generic_debug.cpp b/src/progs/base/generic_debug.cpp
index 46c6597..f96ca2f 100644
--- a/src/progs/base/generic_debug.cpp
+++ b/src/progs/base/generic_debug.cpp
@@ -53,7 +53,7 @@ bool Debugger::Base::init()
 bool Debugger::Base::update()
 {
   if ( !updateState() ) return false;
-  if ( _programmer.state()==::Programmer::Halted ) return _deviceSpecific->updatetqStatus();
+  if ( _programmer.state()==::Programmer::Halted ) return _deviceSpecific->updateStatus();
   return true;
 }
 
@@ -76,7 +76,7 @@ bool Debugger::Base::halt()
   if ( !softHalt(success) ) return false;
   if ( !success ) return hardHalt();
   if ( !update() ) return false;
-  log(Log::LineType::Information, TQString("Halted at %1").tqarg(toHexLabel(pc(), _programmer.device()->nbCharsAddress())));
+  log(Log::LineType::Information, TQString("Halted at %1").arg(toHexLabel(pc(), _programmer.device()->nbCharsAddress())));
   _programmer.setState(::Programmer::Halted);
   return true;
 }
diff --git a/src/progs/base/generic_debug.h b/src/progs/base/generic_debug.h
index 48f9e60..5486ad1 100644
--- a/src/progs/base/generic_debug.h
+++ b/src/progs/base/generic_debug.h
@@ -44,7 +44,7 @@ public:
   Register::TypeData pcTypeData() const;
   virtual bool readRegister(const Register::TypeData &data, BitValue &value) = 0;
   virtual bool writeRegister(const Register::TypeData &data, BitValue value) = 0;
-  virtual bool updatePorttqStatus(uint index, TQMap<uint, Device::PortBitData> &bits) = 0;
+  virtual bool updatePortStatus(uint index, TQMap<uint, Device::PortBitData> &bits) = 0;
 
 protected:
   Programmer::Base &_programmer;
@@ -68,7 +68,7 @@ class DeviceSpecific : public Log::Base
 {
 public:
   DeviceSpecific(Debugger::Base &base) : Log::Base(base), _base(base) {}
-  virtual bool updatetqStatus() = 0;
+  virtual bool updateStatus() = 0;
   virtual TQString statusString() const = 0;
 
 protected:
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);