diff options
Diffstat (limited to 'src/progs/pickit2/base/pickit2.cpp')
| -rw-r--r-- | src/progs/pickit2/base/pickit2.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/progs/pickit2/base/pickit2.cpp b/src/progs/pickit2/base/pickit2.cpp index 6458fa2..6a010ff 100644 --- a/src/progs/pickit2/base/pickit2.cpp +++ b/src/progs/pickit2/base/pickit2.cpp @@ -43,16 +43,16 @@ bool Pickit2::USBPort::readFirmwareCodeMemory(Device::Array &data, const Device: uint nb = end - start + 1; Pickit::Array cmd = createCommand(1, 2*nb, 2*i); if ( !command(cmd) ) return false; - QValueVector<uint> read; + TQValueVector<uint> read; if ( !receiveWords(1, 1, read) ) return false; for (uint k=0; k<nb; k++) { uint index = i + start + k; 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(QString(toHex(index/2, device->nbCharsAddress()))) - .arg(QString(toHex(data[index], device->nbCharsWord(Pic::MemoryRangeType::Code)))) - .arg(QString(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, QString("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, QString("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, QString(" 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); @@ -313,7 +313,7 @@ bool Pickit2::P18F::doRead(Pic::MemoryRangeType type, Device::Array &data, const { USBPort &port = static_cast<USBPort &>(hardware().port()); data.resize(device().nbWords(type)); - QValueVector<uint> words; + TQValueVector<uint> words; switch (type.type()) { case Pic::MemoryRangeType::DeviceId: case Pic::MemoryRangeType::UserId: |