diff options
author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-12-19 11:40:25 -0600 |
---|---|---|
committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-12-19 11:40:25 -0600 |
commit | 4374b9aebc67cce74e5c1099d5f4ad1749b05fc6 (patch) | |
tree | 8f99491ad0bd6e9632a912f07acdccebd2af9127 /src/progs/picdem_bootloader | |
parent | 9d9fe02a944fe0719c2475739411727a729251ad (diff) | |
download | piklab-4374b9aebc67cce74e5c1099d5f4ad1749b05fc6.tar.gz piklab-4374b9aebc67cce74e5c1099d5f4ad1749b05fc6.zip |
Remove additional unneeded tq method conversions
Diffstat (limited to 'src/progs/picdem_bootloader')
-rw-r--r-- | src/progs/picdem_bootloader/base/picdem_bootloader.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/progs/picdem_bootloader/base/picdem_bootloader.cpp b/src/progs/picdem_bootloader/base/picdem_bootloader.cpp index 347ec52..1e06537 100644 --- a/src/progs/picdem_bootloader/base/picdem_bootloader.cpp +++ b/src/progs/picdem_bootloader/base/picdem_bootloader.cpp @@ -42,13 +42,13 @@ bool PicdemBootloader::Port::receive(uint nb, TQMemArray<uchar> &data) { data.resize(nb); if ( !read(0x81, (char *)data.data(), nb) ) return false; - log(Log::DebugLevel::Max, TQString("received: \"%1\"").tqarg(toPrintable(data, PrintEscapeAll))); + log(Log::DebugLevel::Max, TQString("received: \"%1\"").arg(toPrintable(data, PrintEscapeAll))); return true; } bool PicdemBootloader::Port::send(const TQMemArray<uchar> &cmd) { - log(Log::DebugLevel::Extra, TQString("send: \"%1\"").tqarg(toPrintable(cmd, PrintEscapeAll))); + log(Log::DebugLevel::Extra, TQString("send: \"%1\"").arg(toPrintable(cmd, PrintEscapeAll))); return write(0x01, (const char *)cmd.data(), cmd.count()); } @@ -81,7 +81,7 @@ bool PicdemBootloader::Hardware::internalConnectHardware() cmd.fill(0); if ( !port().sendAndReceive(cmd, 4) ) return false; VersionData version(cmd[3], cmd[2], 0); - log(Log::LineType::Information, i18n("Bootloader version %1 detected").tqarg(version.pretty())); + log(Log::LineType::Information, i18n("Bootloader version %1 detected").arg(version.pretty())); if ( version.majorNum()!=1 ) { log(Log::LineType::Error, i18n("Only bootloader version 1.x is supported")); return false; @@ -108,7 +108,7 @@ bool PicdemBootloader::Hardware::write(Pic::MemoryRangeType type, const Device:: if ( i>=0x400 ) 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.").tqarg(toHexLabel(address, device().nbCharsAddress()))); + log(Log::LineType::Warning, " " + i18n("Code is present in bootloader reserved area (at address %1). It will be ignored.").arg(toHexLabel(address, device().nbCharsAddress()))); break; } } @@ -157,9 +157,9 @@ bool PicdemBootloader::Hardware::read(Pic::MemoryRangeType type, Device::Array & if ( nbBytesWord==2 ) data[index] |= (cmd[5 + k+1] << 8); if ( vdata && index>=0x0800 && data[index]!=varray[index] ) { log(Log::LineType::Error, i18n("Device memory does not match hex file (at address 0x%2: reading 0x%3 and expecting 0x%4).") - .tqarg(TQString(toHex(index/2, device().nbCharsAddress()))) - .tqarg(TQString(toHex(data[index], device().nbCharsWord(type)))) - .tqarg(TQString(toHex(varray[index], device().nbCharsWord(type))))); + .arg(TQString(toHex(index/2, device().nbCharsAddress()))) + .arg(TQString(toHex(data[index], device().nbCharsWord(type)))) + .arg(TQString(toHex(varray[index], device().nbCharsWord(type))))); return false; } } |