summaryrefslogtreecommitdiffstats
path: root/src/progs/gpsim
diff options
context:
space:
mode:
Diffstat (limited to 'src/progs/gpsim')
-rw-r--r--src/progs/gpsim/base/gpsim.cpp4
-rw-r--r--src/progs/gpsim/base/gpsim_debug.cpp22
-rw-r--r--src/progs/gpsim/base/gpsim_debug.h2
-rw-r--r--src/progs/gpsim/gui/gpsim_group_ui.cpp6
-rw-r--r--src/progs/gpsim/gui/gpsim_group_ui.h2
5 files changed, 18 insertions, 18 deletions
diff --git a/src/progs/gpsim/base/gpsim.cpp b/src/progs/gpsim/base/gpsim.cpp
index 4352162..6803686 100644
--- a/src/progs/gpsim/base/gpsim.cpp
+++ b/src/progs/gpsim/base/gpsim.cpp
@@ -138,7 +138,7 @@ void GPSim::Hardware::internalDisconnectHardware()
bool GPSim::Hardware::execute(const TQString &command, bool synchronous, TQStringList *output)
{
- log(Log::DebugLevel::Normal, TQString("command: %1").tqarg(command));
+ log(Log::DebugLevel::Normal, TQString("command: %1").arg(command));
if (output) output->clear();
if ( !_manager->sendCommand(command, synchronous) ) return false;
if (output) *output = _manager->process().sout();
@@ -147,7 +147,7 @@ bool GPSim::Hardware::execute(const TQString &command, bool synchronous, TQStrin
bool GPSim::Hardware::signal(uint n, bool synchronous, TQStringList *output)
{
- log(Log::DebugLevel::Normal, TQString("signal: %1").tqarg(n));
+ log(Log::DebugLevel::Normal, TQString("signal: %1").arg(n));
if (output) output->clear();
if ( !_manager->sendSignal(n, synchronous) ) return false;
if (output) *output = _manager->process().sout();
diff --git a/src/progs/gpsim/base/gpsim_debug.cpp b/src/progs/gpsim/base/gpsim_debug.cpp
index eca9841..f6c2541 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\"").tqarg(w));
+ log(Log::LineType::Error, i18n("Error reading register \"%1\"").arg(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\"").tqarg(name));
+ log(Log::LineType::Error, i18n("Error reading register \"%1\"").arg(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]").tqarg(name), value);
+ return getRegister(TQString("ramData[$%1]").arg(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").tqarg(name).tqarg(toHexLabel(value, rdata.nbChars()));
+ TQString s = TQString("%1 = %2").arg(name).arg(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]").tqarg(toHex(address, rdata.nbCharsAddress()));
+ TQString s = TQString("ramData[$%1]").arg(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::updatePorttqStatus(uint index, TQMap<uint, Device::PortBitData> &bits)
+bool GPSim::Debugger::updatePortStatus(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::updatePorttqStatus(uint index, TQMap<uint, Device::PortBit
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").tqarg(name));
+ log(Log::LineType::Error, i18n("Error reading state of IO bit: %1").arg(name));
return false;
}
switch (value[0].latin1()) {
@@ -218,24 +218,24 @@ bool GPSim::Debugger::updatePorttqStatus(uint index, TQMap<uint, Device::PortBit
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)").tqarg(name).tqarg(value));
+ log(Log::LineType::Warning, i18n("Unknown state for IO bit: %1 (%2)").arg(name).arg(value));
break;
}
if ( !findRegExp(lines, pattern, "Driving", value) || value.length()!=1 ) {
- log(Log::LineType::Error, i18n("Error reading driving state of IO bit: %1").tqarg(name));
+ log(Log::LineType::Error, i18n("Error reading driving state of IO bit: %1").arg(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").tqarg(name));
+ log(Log::LineType::Error, i18n("Error reading driving state of IO bit: %1").arg(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").tqarg(name));
+ log(Log::LineType::Error, i18n("Error reading driven state of IO bit: %1").arg(name));
return false;
}
bits[i].drivenState = (value[0]=='0' ? Device::IoLow : Device::IoHigh);
diff --git a/src/progs/gpsim/base/gpsim_debug.h b/src/progs/gpsim/base/gpsim_debug.h
index 7c258d9..920bc9a 100644
--- a/src/progs/gpsim/base/gpsim_debug.h
+++ b/src/progs/gpsim/base/gpsim_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 updatePorttqStatus(uint index, TQMap<uint, Device::PortBitData> &bits);
+ virtual bool updatePortStatus(uint index, TQMap<uint, Device::PortBitData> &bits);
private:
uint _nbBreakpoints;
diff --git a/src/progs/gpsim/gui/gpsim_group_ui.cpp b/src/progs/gpsim/gui/gpsim_group_ui.cpp
index 931ffaf..aa404c3 100644
--- a/src/progs/gpsim/gui/gpsim_group_ui.cpp
+++ b/src/progs/gpsim/gui/gpsim_group_ui.cpp
@@ -23,16 +23,16 @@ GPSim::ConfigWidget::ConfigWidget(const ::Programmer::Group &group, TQWidget *pa
_status = new TQLabel(this);
addWidget(_status, row,row, 1,1);
- TQTimer::singleShot(0, this, TQT_SLOT(updatetqStatus()));
+ TQTimer::singleShot(0, this, TQT_SLOT(updateStatus()));
}
-void GPSim::ConfigWidget::updatetqStatus()
+void GPSim::ConfigWidget::updateStatus()
{
VersionData version;
ProcessManager manager(0);
if ( !manager.start() ) _status->setText(i18n("Could not start \"gpsim\""));
else if ( !manager.getVersion(version) || !version.isValid() ) _status->setText(i18n("Could not detect \"gpsim\" version"));
- else _status->setText(i18n("Found version \"%1\"").tqarg(version.pretty()));
+ else _status->setText(i18n("Found version \"%1\"").arg(version.pretty()));
}
//----------------------------------------------------------------------------
diff --git a/src/progs/gpsim/gui/gpsim_group_ui.h b/src/progs/gpsim/gui/gpsim_group_ui.h
index 1978574..26c69cc 100644
--- a/src/progs/gpsim/gui/gpsim_group_ui.h
+++ b/src/progs/gpsim/gui/gpsim_group_ui.h
@@ -23,7 +23,7 @@ public:
ConfigWidget(const ::Programmer::Group &group, TQWidget *parent);
private slots:
- void updatetqStatus();
+ void updateStatus();
private:
TQLabel *_status;
generated by cgit v1.2.1 (git 2.18.0) at 2024-12-16 02:30:18 +0000