From ad1fc5fc8eadb9b63e8767e57ac41cbac84f7eb7 Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
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/base/pickit.cpp       |  6 +++---
 src/progs/pickit2/base/pickit2.cpp      | 12 ++++++------
 src/progs/pickit2/base/pickit2_prog.cpp |  2 +-
 src/progs/pickit2/base/pickit_prog.cpp  |  8 ++++----
 4 files changed, 14 insertions(+), 14 deletions(-)

(limited to 'src/progs/pickit2')

diff --git a/src/progs/pickit2/base/pickit.cpp b/src/progs/pickit2/base/pickit.cpp
index e6284e1..3344ef8 100644
--- a/src/progs/pickit2/base/pickit.cpp
+++ b/src/progs/pickit2/base/pickit.cpp
@@ -52,14 +52,14 @@ bool Pickit::USBPort::command(const char *s)
 
 bool Pickit::USBPort::command(const Array &cmd)
 {
-  log(Log::DebugLevel::Extra, TQString("send command: \"%1\"").arg(cmd.pretty()));
+  log(Log::DebugLevel::Extra, TQString("send command: \"%1\"").tqarg(cmd.pretty()));
   return write(writeEndPoint(), (const char *)cmd._data.data(), cmd.length());
 }
 
 bool Pickit::USBPort::receive(Pickit::Array &array)
 {
   if ( !read(readEndPoint(), (char *)array._data.data(), array.length()) ) return false;
-  log(Log::DebugLevel::Max, TQString("received: \"%1\"").arg(array.pretty()));
+  log(Log::DebugLevel::Max, TQString("received: \"%1\"").tqarg(array.pretty()));
   return true;
 }
 
@@ -80,7 +80,7 @@ bool Pickit::USBPort::getMode(VersionData &version, ::Programmer::Mode &mode)
 
 bool Pickit::USBPort::receiveWords(uint nbBytesWord, uint nbRead, TQValueVector<uint> &words, uint offset)
 {
-  log(Log::DebugLevel::Max, TQString("receive words nbBytesWord=%1 nbRead=%2 offset=%3").arg(nbBytesWord).arg(nbRead).arg(offset));
+  log(Log::DebugLevel::Max, TQString("receive words nbBytesWord=%1 nbRead=%2 offset=%3").tqarg(nbBytesWord).tqarg(nbRead).tqarg(offset));
   Array a = array();
   TQMemArray<uchar> data(nbRead*a.length());
   uint l = 0;
diff --git a/src/progs/pickit2/base/pickit2.cpp b/src/progs/pickit2/base/pickit2.cpp
index 4c06eb9..6a010ff 100644
--- a/src/progs/pickit2/base/pickit2.cpp
+++ b/src/progs/pickit2/base/pickit2.cpp
@@ -50,9 +50,9 @@ bool Pickit2::USBPort::readFirmwareCodeMemory(Device::Array &data, const Device:
       data[index]= read[5 + 2*k] & 0xFF | (read[6 + 2*k] << 8);
       if ( vdata && index>=0x1000 && index<0x3FF0 && data[index]!=(*vdata)[index] ) {
         log(Log::LineType::Error, i18n("Firmware memory does not match hex file (at address 0x%2: reading 0x%3 and expecting 0x%4).")
-                    .arg(TQString(toHex(index/2, device->nbCharsAddress())))
-                    .arg(TQString(toHex(data[index], device->nbCharsWord(Pic::MemoryRangeType::Code))))
-                    .arg(TQString(toHex((*vdata)[index], device->nbCharsWord(Pic::MemoryRangeType::Code)))));
+                    .tqarg(TQString(toHex(index/2, device->nbCharsAddress())))
+                    .tqarg(TQString(toHex(data[index], device->nbCharsWord(Pic::MemoryRangeType::Code))))
+                    .tqarg(TQString(toHex((*vdata)[index], device->nbCharsWord(Pic::MemoryRangeType::Code)))));
          return false;
       }
     }
@@ -111,7 +111,7 @@ bool Pickit2::USBPort::uploadFirmware(const Pic::Memory &memory, ProgressMonitor
 //-----------------------------------------------------------------------------
 bool Pickit2::Hardware::readVoltages(VoltagesData &voltages)
 {
-  log(Log::DebugLevel::Extra, TQString("readVoltages: Firmware is %1").arg(_base.firmwareVersion().pretty()));
+  log(Log::DebugLevel::Extra, TQString("readVoltages: Firmware is %1").tqarg(_base.firmwareVersion().pretty()));
   if ( _base.firmwareVersion()<VersionData(1, 20, 0) ) {
     log(Log::LineType::Warning, i18n("Cannot read voltages with this firmware version."));
     return true;
@@ -128,9 +128,9 @@ bool Pickit2::Hardware::readVoltages(VoltagesData &voltages)
 
 bool Pickit2::Hardware::setVddVpp(double vdd, double vpp)
 {
-  log(Log::DebugLevel::Extra, TQString("setVddVpp: Firmware is %1").arg(_base.firmwareVersion().pretty()));
+  log(Log::DebugLevel::Extra, TQString("setVddVpp: Firmware is %1").tqarg(_base.firmwareVersion().pretty()));
   if ( _base.firmwareVersion()<VersionData(1, 20, 0) ) return true;
-  log(Log::DebugLevel::Normal, TQString("  set Vdd = %1 V and Vpp = %2 V").arg(vdd).arg(vpp));
+  log(Log::DebugLevel::Normal, TQString("  set Vdd = %1 V and Vpp = %2 V").tqarg(vdd).tqarg(vpp));
   Array cmd;
   cmd[0] = 's';
   uint cvdd = uint(32.0 * vdd + 12.5);
diff --git a/src/progs/pickit2/base/pickit2_prog.cpp b/src/progs/pickit2/base/pickit2_prog.cpp
index 071f3b0..3e3a2bd 100644
--- a/src/progs/pickit2/base/pickit2_prog.cpp
+++ b/src/progs/pickit2/base/pickit2_prog.cpp
@@ -53,7 +53,7 @@ bool Pickit2::Base::doUploadFirmware(PURL::File &file)
   TQStringList errors, warnings;
   Pic::Memory::WarningTypes warningTypes;
   if ( !memory.load(file.stream(), errors, warningTypes, warnings) ) {
-    log(Log::LineType::Error, i18n("Could not read firmware hex file \"%1\" (%2).").arg(file.url().pretty()).arg(errors[0]));
+    log(Log::LineType::Error, i18n("Could not read firmware hex file \"%1\" (%2).").tqarg(file.url().pretty()).tqarg(errors[0]));
     return false;
   }
   if ( warningTypes!=Pic::Memory::NoWarning ) {
diff --git a/src/progs/pickit2/base/pickit_prog.cpp b/src/progs/pickit2/base/pickit_prog.cpp
index 39d13f8..f894906 100644
--- a/src/progs/pickit2/base/pickit_prog.cpp
+++ b/src/progs/pickit2/base/pickit_prog.cpp
@@ -28,22 +28,22 @@ bool Pickit::Base::readFirmwareVersion()
 
 bool Pickit::Base::regenerateOsccal(const PURL::Url &url)
 {
-  log(Log::DebugLevel::Normal, TQString("  Calibration firmware file: %1").arg(url.pretty()));
+  log(Log::DebugLevel::Normal, TQString("  Calibration firmware file: %1").tqarg(url.pretty()));
   Log::StringView sview;
   PURL::File file(url, sview);
   if ( !file.openForRead() ) {
-    log(Log::LineType::Error, i18n("Could not open firmware file \"%1\".").arg(url.pretty()));
+    log(Log::LineType::Error, i18n("Could not open firmware file \"%1\".").tqarg(url.pretty()));
     return false;
   }
   Pic::Memory memory(*device());
   TQStringList errors, warnings;
   Pic::Memory::WarningTypes warningTypes;
   if ( !memory.load(file.stream(), errors, warningTypes, warnings) ) {
-    log(Log::LineType::Error, i18n("Could not read calibration firmware file \"%1\" (%2).").arg(url.pretty()).arg(errors[0]));
+    log(Log::LineType::Error, i18n("Could not read calibration firmware file \"%1\" (%2).").tqarg(url.pretty()).tqarg(errors[0]));
     return false;
   }
   if ( warningTypes!=Pic::Memory::NoWarning ) {
-    log(Log::LineType::Error, i18n("Calibration firmware file seems incompatible with selected device %1.").arg(device()->name()));
+    log(Log::LineType::Error, i18n("Calibration firmware file seems incompatible with selected device %1.").tqarg(device()->name()));
     return false;
   }
   if ( !askContinue(i18n("This will overwrite the device code memory. Continue anyway?")) ) return false;
-- 
cgit v1.2.1