diff options
Diffstat (limited to 'src/progs/pickit2/base/pickit.cpp')
-rw-r--r-- | src/progs/pickit2/base/pickit.cpp | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/progs/pickit2/base/pickit.cpp b/src/progs/pickit2/base/pickit.cpp index 7da2d18..3344ef8 100644 --- a/src/progs/pickit2/base/pickit.cpp +++ b/src/progs/pickit2/base/pickit.cpp @@ -18,12 +18,12 @@ Pickit::Array::Array(uint length, uchar fillChar, PrintMode mode) _data.fill(fillChar); } -QString Pickit::Array::pretty() const +TQString Pickit::Array::pretty() const { int end = _data.count() - 1; for (; end>=0; end--) if ( _data[end]!=_fillChar ) break; - QString s; + TQString s; for (int i=0; i<=end; i++) s += toPrintable(_data[i], _mode); return s; } @@ -52,14 +52,14 @@ bool Pickit::USBPort::command(const char *s) bool Pickit::USBPort::command(const Array &cmd) { - log(Log::DebugLevel::Extra, QString("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, QString("received: \"%1\"").arg(array.pretty())); + log(Log::DebugLevel::Max, TQString("received: \"%1\"").tqarg(array.pretty())); return true; } @@ -78,11 +78,11 @@ bool Pickit::USBPort::getMode(VersionData &version, ::Programmer::Mode &mode) return true; } -bool Pickit::USBPort::receiveWords(uint nbBytesWord, uint nbRead, QValueVector<uint> &words, uint offset) +bool Pickit::USBPort::receiveWords(uint nbBytesWord, uint nbRead, TQValueVector<uint> &words, uint offset) { - log(Log::DebugLevel::Max, QString("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(); - QMemArray<uchar> data(nbRead*a.length()); + TQMemArray<uchar> data(nbRead*a.length()); uint l = 0; for (uint i=0; i<nbRead; i++) { if ( !receive(a) ) return false; @@ -101,7 +101,7 @@ bool Pickit::USBPort::receiveWords(uint nbBytesWord, uint nbRead, QValueVector<u //----------------------------------------------------------------------------- Pickit::Hardware::Hardware(::Programmer::Base &base, USBPort *port) - : ::Programmer::PicHardware(base, port, QString::null) + : ::Programmer::PicHardware(base, port, TQString()) {} bool Pickit::Hardware::internalConnectHardware() @@ -149,7 +149,7 @@ bool Pickit::Hardware::regenerateOsccal(BitValue &newValue) cmd[4] = 'r'; cmd[5] = 'p'; if ( !port().command(cmd) ) return false; - QValueVector<uint> words; + TQValueVector<uint> words; if ( !port().receiveWords(1, 1, words) ) return false; newValue = words[7] | 0x3400; return true; @@ -176,7 +176,7 @@ bool Pickit::BMDeviceSpecific::doRead(Pic::MemoryRangeType type, Device::Array & { data.resize(device().nbWords(type)); gotoMemory(type); - QValueVector<uint> words; + TQValueVector<uint> words; switch (type.type()) { case Pic::MemoryRangeType::Config: case Pic::MemoryRangeType::Code: |