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

This reverts commit 9d6927a7d6a543332f828bffedf65eecf6774c6d.

1 files changed, 11 insertions, 11 deletions

diff --git a/src/progs/gpsim/base/gpsim_debug.cpp b/src/progs/gpsim/base/gpsim_debug.cpp
index f6c2541..eca9841 100644
--- a/src/progs/gpsim/base/gpsim_debug.cpp
+++ b/src/progs/gpsim/base/gpsim_debug.cpp
@@ -104,7 +104,7 @@ bool GPSim::Debugger::readWreg(BitValue &value)
   TQString w = (_coff->symbol("_WREG") ? "_WREG" : "W");
   TQString s;
   if ( !findRegExp(lines, "^\\s*[0-9A-Fa-f]+\\s+(\\w+)\\s*=\\s*([0-9A-Fa-f]+)", w, s) ) {
-    log(Log::LineType::Error, i18n("Error reading register \"%1\"").arg(w));
+    log(Log::LineType::Error, i18n("Error reading register \"%1\"").tqarg(w));
     return false;
   }
   value = fromHex(s, 0);
@@ -126,7 +126,7 @@ bool GPSim::Debugger::getRegister(const TQString &name, BitValue &value)
   for (; i<uint(lines.count()); i++)
     if ( r.exactMatch(lines[i]) ) break;
   if ( i==uint(lines.count()) ) {
-    log(Log::LineType::Error, i18n("Error reading register \"%1\"").arg(name));
+    log(Log::LineType::Error, i18n("Error reading register \"%1\"").tqarg(name));
     return false;
   }
   value = fromHex(r.cap(1), 0);
@@ -138,7 +138,7 @@ bool GPSim::Debugger::getRegister(Address address, BitValue &value)
   const Pic::RegistersData &rdata = device()->registersData();
   TQString name = toHex(address, rdata.nbCharsAddress());
   if ( hardware()->version()<VersionData(0, 22, 0) ) return getRegister("0x" + name, value);
-  return getRegister(TQString("ramData[$%1]").arg(name), value);
+  return getRegister(TQString("ramData[$%1]").tqarg(name), value);
 }
 
 bool GPSim::Debugger::readRegister(const Register::TypeData &data, BitValue &value)
@@ -162,14 +162,14 @@ bool GPSim::Debugger::setRegister(const TQString &name, BitValue value)
     return true;
   }
   const Pic::RegistersData &rdata = device()->registersData();
-  TQString s = TQString("%1 = %2").arg(name).arg(toHexLabel(value, rdata.nbChars()));
+  TQString s = TQString("%1 = %2").tqarg(name).tqarg(toHexLabel(value, rdata.nbChars()));
   return hardware()->execute(s, true);
 }
 
 bool GPSim::Debugger::setRegister(Address address, BitValue value)
 {
   const Pic::RegistersData &rdata = device()->registersData();
-  TQString s = TQString("ramData[$%1]").arg(toHex(address, rdata.nbCharsAddress()));
+  TQString s = TQString("ramData[$%1]").tqarg(toHex(address, rdata.nbCharsAddress()));
   return setRegister(s, value);
 }
 
@@ -195,7 +195,7 @@ bool GPSim::Debugger::writeWreg(BitValue value)
   return setRegister("W", value);
 }
 
-bool GPSim::Debugger::updatePortStatus(uint index, TQMap<uint, Device::PortBitData> &bits)
+bool GPSim::Debugger::updatePorttqStatus(uint index, TQMap<uint, Device::PortBitData> &bits)
 {
   for (uint i=0; i<Device::MAX_NB_PORT_BITS; i++) {
     if ( !device()->registersData().hasPortBit(index, i) ) continue;
@@ -204,7 +204,7 @@ bool GPSim::Debugger::updatePortStatus(uint index, TQMap<uint, Device::PortBitDa
     if ( !hardware()->execute("symbol " + name, true, &lines) ) return false;
     TQString pattern = "^(\\w+)=([^\\s])+\\s*", value;
     if ( !findRegExp(lines, pattern, "bitState", value) || value.length()!=1 ) {
-      log(Log::LineType::Error, i18n("Error reading state of IO bit: %1").arg(name));
+      log(Log::LineType::Error, i18n("Error reading state of IO bit: %1").tqarg(name));
       return false;
     }
     switch (value[0].latin1()) {
@@ -218,24 +218,24 @@ bool GPSim::Debugger::updatePortStatus(uint index, TQMap<uint, Device::PortBitDa
       case 'X': bits[i].state = Device::Unknown; break;
       default:
         bits[i].state = Device::Unknown;
-        log(Log::LineType::Warning, i18n("Unknown state for IO bit: %1 (%2)").arg(name).arg(value));
+        log(Log::LineType::Warning, i18n("Unknown state for IO bit: %1 (%2)").tqarg(name).tqarg(value));
         break;
     }
     if ( !findRegExp(lines, pattern, "Driving", value) || value.length()!=1 ) {
-      log(Log::LineType::Error, i18n("Error reading driving state of IO bit: %1").arg(name));
+      log(Log::LineType::Error, i18n("Error reading driving state of IO bit: %1").tqarg(name));
       return false;
     }
     bits[i].driving = ( value[0]=='1' );
     if (bits[i].driving) {
       if ( !findRegExp(lines, pattern, "drivingState", value) || value.length()!=1 ) {
-        log(Log::LineType::Error, i18n("Error reading driving state of IO bit: %1").arg(name));
+        log(Log::LineType::Error, i18n("Error reading driving state of IO bit: %1").tqarg(name));
         return false;
       }
       bits[i].drivingState = (value[0]=='0' ? Device::IoLow : Device::IoHigh);
       bits[i].drivenState = Device::IoUnknown;
     } else {
       if ( !findRegExp(lines, pattern, "drivenState", value) || value.length()!=1 ) {
-        log(Log::LineType::Error, i18n("Error reading driven state of IO bit: %1").arg(name));
+        log(Log::LineType::Error, i18n("Error reading driven state of IO bit: %1").tqarg(name));
         return false;
       }
       bits[i].drivenState = (value[0]=='0' ? Device::IoLow : Device::IoHigh);