From ad1fc5fc8eadb9b63e8767e57ac41cbac84f7eb7 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 16 Dec 2011 09:57:30 -0600 Subject: Revert "Rename a number of old tq methods that are no longer tq specific" This reverts commit 9d6927a7d6a543332f828bffedf65eecf6774c6d. --- src/progs/pickit2_bootloader/base/pickit2_bootloader.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/progs/pickit2_bootloader') diff --git a/src/progs/pickit2_bootloader/base/pickit2_bootloader.cpp b/src/progs/pickit2_bootloader/base/pickit2_bootloader.cpp index d080481..7620a9b 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; @@ -50,7 +50,7 @@ bool Pickit2Bootloader::Hardware::write(Pic::MemoryRangeType type, const Device: if ( i>=0x1000 && i<0x3FF0 ) continue; if ( data[i]==device().mask(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()); -- cgit v1.2.1