diff options
author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-12-16 09:57:30 -0600 |
---|---|---|
committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-12-16 09:57:30 -0600 |
commit | ad1fc5fc8eadb9b63e8767e57ac41cbac84f7eb7 (patch) | |
tree | c47273eb6595f763c282d33fb89affe1f8866120 /src/progs/sdcdb/base | |
parent | 9d6927a7d6a543332f828bffedf65eecf6774c6d (diff) | |
download | piklab-ad1fc5fc8eadb9b63e8767e57ac41cbac84f7eb7.tar.gz piklab-ad1fc5fc8eadb9b63e8767e57ac41cbac84f7eb7.zip |
Revert "Rename a number of old tq methods that are no longer tq specific"
This reverts commit 9d6927a7d6a543332f828bffedf65eecf6774c6d.
Diffstat (limited to 'src/progs/sdcdb/base')
-rw-r--r-- | src/progs/sdcdb/base/sdcdb_debug.cpp | 20 | ||||
-rw-r--r-- | src/progs/sdcdb/base/sdcdb_debug.h | 2 |
2 files changed, 11 insertions, 11 deletions
diff --git a/src/progs/sdcdb/base/sdcdb_debug.cpp b/src/progs/sdcdb/base/sdcdb_debug.cpp index 3a7aa9f..d8d4ad4 100644 --- a/src/progs/sdcdb/base/sdcdb_debug.cpp +++ b/src/progs/sdcdb/base/sdcdb_debug.cpp @@ -125,7 +125,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::Error, i18n("Error reading register \"%1\"").arg(name)); + log(Log::Error, i18n("Error reading register \"%1\"").tqarg(name)); return false; } value = fromHex(r.cap(1), 0); @@ -137,7 +137,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) @@ -161,14 +161,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); } @@ -194,7 +194,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; @@ -203,7 +203,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::Error, i18n("Error reading state of IO bit: %1").arg(name)); + log(Log::Error, i18n("Error reading state of IO bit: %1").tqarg(name)); return false; } switch (value[0].latin1()) { @@ -217,24 +217,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::Warning, i18n("Unknown state for IO bit: %1 (%2)").arg(name).arg(value)); + log(Log::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::Error, i18n("Error reading driving state of IO bit: %1").arg(name)); + log(Log::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::Error, i18n("Error reading driving state of IO bit: %1").arg(name)); + log(Log::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::Error, i18n("Error reading driven state of IO bit: %1").arg(name)); + log(Log::Error, i18n("Error reading driven state of IO bit: %1").tqarg(name)); return false; } bits[i].drivenState = (value[0]=='0' ? Device::IoLow : Device::IoHigh); diff --git a/src/progs/sdcdb/base/sdcdb_debug.h b/src/progs/sdcdb/base/sdcdb_debug.h index 18f3e85..e1f109b 100644 --- a/src/progs/sdcdb/base/sdcdb_debug.h +++ b/src/progs/sdcdb/base/sdcdb_debug.h @@ -45,7 +45,7 @@ public: virtual bool setBreakpoints(const TQValueList<Address> &list); virtual bool readRegister(const Register::TypeData &data, BitValue &value); virtual bool writeRegister(const Register::TypeData &data, BitValue value); - virtual bool updatePortStatus(uint index, TQMap<uint, Device::PortBitData> &bits); + virtual bool updatePorttqStatus(uint index, TQMap<uint, Device::PortBitData> &bits); private: uint _nbBreakpoints; |