summaryrefslogtreecommitdiffstats
path: root/src/devices/mem24/prog
diff options
context:
space:
mode:
Diffstat (limited to 'src/devices/mem24/prog')
-rw-r--r--src/devices/mem24/prog/mem24_prog.cpp8
-rw-r--r--src/devices/mem24/prog/mem24_prog.h2
2 files changed, 5 insertions, 5 deletions
diff --git a/src/devices/mem24/prog/mem24_prog.cpp b/src/devices/mem24/prog/mem24_prog.cpp
index 4c4b201..338c217 100644
--- a/src/devices/mem24/prog/mem24_prog.cpp
+++ b/src/devices/mem24/prog/mem24_prog.cpp
@@ -32,15 +32,15 @@ bool Programmer::Mem24DeviceSpecific::write(const Device::Array &data)
bool Programmer::Mem24DeviceSpecific::verifyByte(uint index, BitValue d, const VerifyData &vdata)
{
BitValue v = static_cast<const Mem24::Memory &>(vdata.memory).byte(index);
- v = v.maskWith(0xFF);
- d = d.maskWith(0xFF);
+ v = v.tqmaskWith(0xFF);
+ d = d.tqmaskWith(0xFF);
if ( v==d ) return true;
Address address = index;
if ( vdata.actions & BlankCheckVerify )
log(Log::LineType::Error, i18n("Device memory is not blank (at address %1: reading %2 and expecting %3).")
- .arg(toHexLabel(address, device().nbCharsAddress())).arg(toHexLabel(d, 2)).arg(toHexLabel(v, 2)));
+ .tqarg(toHexLabel(address, device().nbCharsAddress())).tqarg(toHexLabel(d, 2)).tqarg(toHexLabel(v, 2)));
else log(Log::LineType::Error, i18n("Device memory doesn't match hex file (at address %1: reading %2 and expecting %3).")
- .arg(toHexLabel(address, device().nbCharsAddress())).arg(toHexLabel(d, 2)).arg(toHexLabel(v, 2)));
+ .tqarg(toHexLabel(address, device().nbCharsAddress())).tqarg(toHexLabel(d, 2)).tqarg(toHexLabel(v, 2)));
return false;
}
diff --git a/src/devices/mem24/prog/mem24_prog.h b/src/devices/mem24/prog/mem24_prog.h
index 86948c2..b2d699f 100644
--- a/src/devices/mem24/prog/mem24_prog.h
+++ b/src/devices/mem24/prog/mem24_prog.h
@@ -34,7 +34,7 @@ protected:
class Mem24Hardware : public Hardware
{
public:
- Mem24Hardware(::Programmer::Base &base, Port::Base *port, const QString &name) : Hardware(base, port, name) {}
+ Mem24Hardware(::Programmer::Base &base, Port::Base *port, const TQString &name) : Hardware(base, port, name) {}
const Mem24::Data &device() const { return static_cast<const Mem24::Data &>(*_base.device()); }
};