summaryrefslogtreecommitdiffstats
path: root/src/progs/pickit2_bootloader/base/pickit2_bootloader.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/progs/pickit2_bootloader/base/pickit2_bootloader.cpp')
-rw-r--r--src/progs/pickit2_bootloader/base/pickit2_bootloader.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/progs/pickit2_bootloader/base/pickit2_bootloader.cpp b/src/progs/pickit2_bootloader/base/pickit2_bootloader.cpp
index d080481..5a60a28 100644
--- a/src/progs/pickit2_bootloader/base/pickit2_bootloader.cpp
+++ b/src/progs/pickit2_bootloader/base/pickit2_bootloader.cpp
@@ -33,7 +33,7 @@ bool Pickit2Bootloader::Hardware::internalConnectHardware()
}
}
}
- log(Log::LineType::Information, i18n("Bootloader version %1 detected.").arg(version.pretty()));
+ log(Log::LineType::Information, i18n("Bootloader version %1 detected.").tqarg(version.pretty()));
if ( version.majorNum()!=2 ) {
log(Log::LineType::Error, i18n("Only bootloader version 2.x is supported."));
return false;
@@ -48,9 +48,9 @@ bool Pickit2Bootloader::Hardware::write(Pic::MemoryRangeType type, const Device:
// check that there is nothing in bootloader reserved area
for (uint i=0; i<data.count(); i++) {
if ( i>=0x1000 && i<0x3FF0 ) continue;
- if ( data[i]==device().mask(Pic::MemoryRangeType::Code) ) continue;
+ if ( data[i]==device().tqmask(Pic::MemoryRangeType::Code) ) continue;
uint address = device().addressIncrement(Pic::MemoryRangeType::Code) * i;
- log(Log::LineType::Warning, " " + i18n("Code is present in bootloader reserved area (at address %1). It will be ignored.").arg(toHexLabel(address, device().nbCharsAddress())));
+ log(Log::LineType::Warning, " " + i18n("Code is present in bootloader reserved area (at address %1). It will be ignored.").tqarg(toHexLabel(address, device().nbCharsAddress())));
break;
}
return port().writeFirmwareCodeMemory(data, _base.progressMonitor());