TQt4 port piklab

This enables compilation under both Qt3 and Qt4


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/piklab@1238822 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

12 files changed, 58 insertions, 56 deletions

diff --git a/src/progs/direct/base/direct.cpp b/src/progs/direct/base/direct.cpp
index fc53cf3..c0d7de6 100644
--- a/src/progs/direct/base/direct.cpp
+++ b/src/progs/direct/base/direct.cpp
@@ -47,7 +47,7 @@ namespace Direct
 class SerialPort : public Port::Serial
 {
 public:
-  SerialPort(const QString &device, Log::Base &base)
+  SerialPort(const TQString &device, Log::Base &base)
     : Serial(device, NeedBreak, base) {}
 
   bool open() {
@@ -83,7 +83,7 @@ void Direct::Hardware::setPin(PinType type, bool on)
   int pin = _data.pins[type];
   if ( isGroundPin(pin) ) return;
   uint p = (pin<0 ? -pin : pin)-1;
-  //log(Log::DebugLevel::Extra, QString("Hardware::setPin %1 %2: %3 %4").arg(PIN_DATA[type].label).arg(pin).arg(on).arg(_data.clockDelay));
+  //log(Log::DebugLevel::Extra, TQString("Hardware::setPin %1 %2: %3 %4").tqarg(PIN_DATA[type].label).tqarg(pin).tqarg(on).tqarg(_data.clockDelay));
   _port->setPinOn(p, on, (pin<0 ? Port::NegativeLogic : Port::PositiveLogic));
   if ( type==Clock ) Port::usleep(_data.clockDelay);
 }
@@ -95,7 +95,7 @@ bool Direct::Hardware::readBit()
   uint p = (pin<0 ? -pin : pin)-1;
   bool on;
   _port->readPin(p, (pin<0 ? Port::NegativeLogic : Port::PositiveLogic), on);
-  //log(Log::DebugLevel::Extra, QString("Hardware::read DataIn %2: %3").arg(pin).arg(on));
+  //log(Log::DebugLevel::Extra, TQString("Hardware::read DataIn %2: %3").tqarg(pin).tqarg(on));
   return on;
 }
 
@@ -104,10 +104,10 @@ uint Direct::Hardware::nbPins(Port::IODir dir) const
   return _port->pinData(dir).count();
 }
 
-QString Direct::Hardware::pinLabelForIndex(Port::IODir dir, uint i) const
+TQString Direct::Hardware::pinLabelForIndex(Port::IODir dir, uint i) const
 {
   Port::PinData pd = _port->pinData(dir)[i];
-  return QString("%1 (%2)").arg(pd.pin+1).arg(pd.label);
+  return TQString("%1 (%2)").tqarg(pd.pin+1).tqarg(pd.label);
 }
 
 Port::IODir Direct::Hardware::ioTypeForPin(int pin) const
@@ -126,7 +126,7 @@ uint Direct::Hardware::pinForIndex(Port::IODir dir, uint i) const
 
 uint Direct::Hardware::indexForPin(Port::IODir dir, int pin) const
 {
-  QValueVector<Port::PinData> v = _port->pinData(dir);
+  TQValueVector<Port::PinData> v = _port->pinData(dir);
   Q_ASSERT( pin!=0 );
   uint p = (pin<0 ? -pin : pin)-1;
   for (uint i=0; i<uint(v.count()); i++)
@@ -151,11 +151,11 @@ bool Direct::operator !=(const HData &d1, const HData &d2)
 }
 
 //-----------------------------------------------------------------------------
-Direct::SerialHardware::SerialHardware(::Programmer::Base &base, const QString &portDevice, const HardwareData &data)
+Direct::SerialHardware::SerialHardware(::Programmer::Base &base, const TQString &portDevice, const HardwareData &data)
   : Hardware(base, new SerialPort(portDevice, base), data)
 {}
 
-Direct::ParallelHardware::ParallelHardware(::Programmer::Base &base, const QString &portDevice, const HardwareData &data)
+Direct::ParallelHardware::ParallelHardware(::Programmer::Base &base, const TQString &portDevice, const HardwareData &data)
   : Hardware(base, new Port::Parallel(portDevice, base), data)
 {}
 
@@ -375,7 +375,7 @@ int Direct::Hardware::timing_test()
         for (long j=0; j<loop; ++j)
         {
             int d = 0x2AAA ;
-            d &= 0x3FFF ;               // mask unused msb
+            d &= 0x3FFF ;               // tqmask unused msb
             d <<= 1;                // insert start bit
 
             for (uint x = 0; x<16; x++) {
diff --git a/src/progs/direct/base/direct.h b/src/progs/direct/base/direct.h
index 6a890b0..a3b9e09 100644
--- a/src/progs/direct/base/direct.h
+++ b/src/progs/direct/base/direct.h
@@ -48,7 +48,7 @@ public:
   void setWrite() { setPin(DataRW, false); }
 
   uint nbPins(Port::IODir dir) const;
-  QString pinLabelForIndex(Port::IODir dir, uint i) const;
+  TQString pinLabelForIndex(Port::IODir dir, uint i) const;
   Port::IODir ioTypeForPin(int pin) const;
   uint pinForIndex(Port::IODir dir, uint i) const;
   uint indexForPin(Port::IODir dir, int pin) const;
@@ -76,13 +76,13 @@ extern bool operator !=(const HData &d1, const HData &d2);
 class SerialHardware : public Hardware
 {
 public:
-  SerialHardware(::Programmer::Base &base, const QString &portDevice, const HardwareData &data);
+  SerialHardware(::Programmer::Base &base, const TQString &portDevice, const HardwareData &data);
 };
 
 class ParallelHardware : public Hardware
 {
 public:
-  ParallelHardware(::Programmer::Base &base, const QString &portDevice, const HardwareData &data);
+  ParallelHardware(::Programmer::Base &base, const TQString &portDevice, const HardwareData &data);
 };
 
 } // namespace
diff --git a/src/progs/direct/base/direct_16.cpp b/src/progs/direct/base/direct_16.cpp
index 124b35e..a9e33e1 100644
--- a/src/progs/direct/base/direct_16.cpp
+++ b/src/progs/direct/base/direct_16.cpp
@@ -56,7 +56,7 @@ BitValue Direct::pic16::get_word()
         hardware().setPin(Clock, High);
         Port::usleep(1+_clockDelay);
         if ( hardware().readBit() ) ind |= 0x8000;
-        else ind = ind.maskWith(0x7FFF);
+        else ind = ind.tqmaskWith(0x7FFF);
         ind >>= 1;
         hardware().setPin(Clock, Low);
         Port::usleep(1+_clockDelay);
@@ -87,10 +87,10 @@ bool Direct::pic16::doRead(Pic::MemoryRangeType type, Device::Array &data, const
     const Device::Array wdata = static_cast<const Pic::Memory &>(vdata->memory).arrayForWriting(type);
     if (only) nbWords = findNonMaskEnd(type, wdata)+1;
   }
-  BitValue mask = device().mask(type);
+  BitValue tqmask = device().tqmask(type);
   for (uint i = 0; i<nbWords; i++) {
-    if ( !only || data[i]!=mask || type!=Pic::MemoryRangeType::Code ) {
-      data[i] = readWord(type).maskWith(mask);
+    if ( !only || data[i]!=tqmask || type!=Pic::MemoryRangeType::Code ) {
+      data[i] = readWord(type).tqmaskWith(tqmask);
       if ( vdata && !hardware().verifyWord(i, data[i], type, *vdata) ) return false;
     }
     incrementPC(1);
@@ -105,7 +105,7 @@ bool Direct::pic16::doWrite(Pic::MemoryRangeType type, const Device::Array &data
   gotoMemory(type);
   for (uint i = 0; i<data.count(); ) {
     if ( !writeWords(type, data, i, force) ) {
-      log(Log::LineType::Error, i18n("Error programming %1 at %2.").arg(type.label()).arg(toHexLabel(i, 8)));
+      log(Log::LineType::Error, i18n("Error programming %1 at %2.").tqarg(type.label()).tqarg(toHexLabel(i, 8)));
       return false;
     }
   }
@@ -117,7 +117,7 @@ bool Direct::pic16::skipMaskWords(Pic::MemoryRangeType type, const Device::Array
   if (force) return false;
   uint nb = (type==Pic::MemoryRangeType::Code ? nbWordsCodeProg() : 1);
   for (uint k=0; k<nb; k++)
-    if ( data[i+k]!=device().mask(type) ) return false;
+    if ( data[i+k]!=device().tqmask(type) ) return false;
   incrementPC(nb);
   i += nb;
   return true;
@@ -134,7 +134,7 @@ bool Direct::pic16::writeWords(Pic::MemoryRangeType type, const Device::Array &d
     }
   }
   startProg(type);
-  QString cmd = QString("w%1").arg(waitProgTime(type));
+  TQString cmd = TQString("w%1").tqarg(waitProgTime(type));
   pulseEngine(cmd.latin1());
   endProg(type);
   return true;
diff --git a/src/progs/direct/base/direct_16.h b/src/progs/direct/base/direct_16.h
index 683083e..beb6c43 100644
--- a/src/progs/direct/base/direct_16.h
+++ b/src/progs/direct/base/direct_16.h
@@ -20,7 +20,7 @@ class pic16 : public Pic8DeviceSpecific
 public:
   pic16(::Programmer::Base &base) : Pic8DeviceSpecific(base) {}
   virtual BitValue get_word();
-  virtual BitValue get_byte() { return get_word().maskWith(0xFF); }
+  virtual BitValue get_byte() { return get_word().tqmaskWith(0xFF); }
   virtual void send_word(BitValue word);
   virtual void send_bits(BitValue d, uint nbBits);
   virtual void send_cmd(BitValue d) { send_bits(d, 6); }
diff --git a/src/progs/direct/base/direct_18F.cpp b/src/progs/direct/base/direct_18F.cpp
index 9860e63..75112c2 100644
--- a/src/progs/direct/base/direct_18F.cpp
+++ b/src/progs/direct/base/direct_18F.cpp
@@ -17,21 +17,21 @@ bool Direct::P18F::skipMaskWords(Pic::MemoryRangeType type, const Device::Array
 {
   if (forceProgram) return false;
   for (uint k=0; k<nb; k++)
-    if ( data[i+k]!=device().mask(type) ) return false;
+    if ( data[i+k]!=device().tqmask(type) ) return false;
   i += nb;
   return true;
 }
 
 void Direct::P18F::program(Type type)
 {
-  QString cmd;
+  TQString cmd;
   switch (type) {
     case Code:
-      cmd = QString("d,C,c,C,c,C,c,Cw%1cw%2X0000,").arg(programHighTime(Code)).arg(programLowTime());
+      cmd = TQString("d,C,c,C,c,C,c,Cw%1cw%2X0000,").tqarg(programHighTime(Code)).tqarg(programLowTime());
       break;
     case Erase:
       pulseEngine("k0,X0000,"); // NOP
-      cmd = QString("k0;w%1;w%2;X0000").arg(programHighTime(type)).arg(programLowTime());
+      cmd = TQString("k0;w%1;w%2;X0000").tqarg(programHighTime(type)).tqarg(programLowTime());
       break;
     case Eeprom:
       for (;;) {
@@ -41,7 +41,7 @@ void Direct::P18F::program(Type type)
         BitValue b = get_byte();
         if ( !b.bit(1) ) break; // WR bit clear
       }
-      cmd = QString("w%1").arg(programLowTime());
+      cmd = TQString("w%1").tqarg(programLowTime());
       break;
   }
   pulseEngine(cmd);
@@ -82,7 +82,7 @@ bool Direct::P18F::doRead(Pic::MemoryRangeType type, Device::Array &data, const
       nbWords = findNonMaskEnd(type, wdata)+1;
     }
   }
-  BitValue mask = device().mask(type);
+  BitValue tqmask = device().tqmask(type);
   //qDebug("read %s %i", Pic::MEMORY_RANGE_TYPE_DATA[type].label, device().nbWords(type));
   //pulseEngine("w300000"); // what for ?
   directAccess(type);
@@ -91,7 +91,7 @@ bool Direct::P18F::doRead(Pic::MemoryRangeType type, Device::Array &data, const
       for (uint i = 0; i<data.count(); i++) {
         setPointer(type, i);
         pulseEngine("k0,X80A6,k0,X50A8,k0,X6EF5,k0,X0000");
-        data[i] = pulseEngine("r").maskWith(mask);
+        data[i] = pulseEngine("r").tqmaskWith(tqmask);
         if ( vdata && !hardware().verifyWord(offset+i, data[i], type, *vdata) ) return false;
       }
       _base.progressMonitor().addTaskProgress(data.count());
@@ -100,7 +100,7 @@ bool Direct::P18F::doRead(Pic::MemoryRangeType type, Device::Array &data, const
       setPointer(type, offset);
       //pulseEngine("w1000"); ??
       for (uint i=0; i<nbWords; i++) {
-        data[i] = pulseEngine("R").maskWith(mask);
+        data[i] = pulseEngine("R").tqmaskWith(tqmask);
         if ( vdata && !hardware().verifyWord(offset+i, data[i], type, *vdata) ) return false;
       }
       _base.progressMonitor().addTaskProgress(data.count());
@@ -111,7 +111,7 @@ bool Direct::P18F::doRead(Pic::MemoryRangeType type, Device::Array &data, const
       setPointer(type, 0);
       for (uint i = 0; i<data.count(); i+=2) {
         BitValue w = pulseEngine("R");
-        data[i] = w.maskWith(mask);
+        data[i] = w.tqmaskWith(tqmask);
         if ( vdata && !hardware().verifyWord(offset+i, data[i], type, *vdata) ) return false;
         data[i+1] = w >> 8;
         if ( vdata && !hardware().verifyWord(offset+i+1, data[i+1], type, *vdata) ) return false;
@@ -234,7 +234,7 @@ void Direct::P18F1220::program(Type type)
 {
   if ( type==Eeprom ) {
     pulseEngine("k0,X0000,"); // NOP
-    QString cmd = QString("k0;w%1;w%2;X0000").arg(programHighTime(type)).arg(programLowTime());
+    TQString cmd = TQString("k0;w%1;w%2;X0000").tqarg(programHighTime(type)).tqarg(programLowTime());
     pulseEngine(cmd);
   } else P18F::program(type);
 }
@@ -249,7 +249,7 @@ void Direct::P18F242::configureSinglePanel()
 //-----------------------------------------------------------------------------
 bool Direct::P18F2539::doErase(bool)
 {
-  // apparently there is no chip erase...
+  // aptqparently there is no chip erase...
   return ( doEraseRange(Pic::MemoryRangeType::Code) && doEraseRange(Pic::MemoryRangeType::Eeprom) );
 }
 
diff --git a/src/progs/direct/base/direct_data.h b/src/progs/direct/base/direct_data.h
index 0b84084..f1291bb 100644
--- a/src/progs/direct/base/direct_data.h
+++ b/src/progs/direct/base/direct_data.h
@@ -14,7 +14,7 @@ namespace Direct
 
 struct Data {
 };
-extern const Data &data(const QString &device);
+extern const Data &data(const TQString &device);
 
 } // namespace
 
diff --git a/src/progs/direct/base/direct_mem24.cpp b/src/progs/direct/base/direct_mem24.cpp
index a719add..98b5f9a 100644
--- a/src/progs/direct/base/direct_mem24.cpp
+++ b/src/progs/direct/base/direct_mem24.cpp
@@ -8,7 +8,7 @@
  ***************************************************************************/
 #include "direct_mem24.h"
 
-#include <qdatetime.h>
+#include <tqdatetime.h>
 
 #include "common/global/global.h"
 #include "common/common/misc.h"
@@ -68,18 +68,18 @@ uint Direct::Mem24DeviceSpecific::controlByte(uint address, Operation operation)
 
 bool Direct::Mem24DeviceSpecific::setAddress(uint address)
 {
-  log(Log::DebugLevel::Extra, QString("set address %1").arg(toHexLabel(address, nbChars(NumberBase::Hex, address))));
+  log(Log::DebugLevel::Extra, TQString("set address %1").tqarg(toHexLabel(address, nbChars(NumberBase::Hex, address))));
   if ( !start() ) return false;
   uint bsize = device().nbBytes() / device().nbBlocks();
   uint block = address / bsize;
-  log(Log::DebugLevel::Extra, QString("  in block #%1/%2").arg(block).arg(device().nbBlocks()));
+  log(Log::DebugLevel::Extra, TQString("  in block #%1/%2").tqarg(block).tqarg(device().nbBlocks()));
   uint cbyte = controlByte(address, Write);
-  log(Log::DebugLevel::Max, QString("  control byte is %1").arg(toHexLabel(cbyte, 2)));
+  log(Log::DebugLevel::Max, TQString("  control byte is %1").tqarg(toHexLabel(cbyte, 2)));
   if ( !writeByteAck(cbyte) ) return false;
   uint nb = nbBytes(bsize-1);
   for (int i=nb-1; i>=0; i--) {
     uint add = (address >> 8*i) & 0xFF;
-    log(Log::DebugLevel::Max, QString("  byte #%1: %2").arg(i).arg(toHexLabel(add, 2)));
+    log(Log::DebugLevel::Max, TQString("  byte #%1: %2").tqarg(i).tqarg(toHexLabel(add, 2)));
     if ( !writeByteAck(add) ) return false;
   }
   return true;
@@ -103,11 +103,11 @@ bool Direct::Mem24DeviceSpecific::doRead(Device::Array &data, const ::Programmer
 
 bool Direct::Mem24DeviceSpecific::doWrite(const Device::Array &data)
 {
-  QTime time;
+  TQTime time;
   // page by page (page_size==1: byte by byte)
   uint nbPages = device().nbBytes() / device().nbBytesPage();
   for (uint i=0; i<nbPages; i++) {
-    log(Log::DebugLevel::Extra, QString("write page #%1/%2").arg(i).arg(nbPages));
+    log(Log::DebugLevel::Extra, TQString("write page #%1/%2").tqarg(i).tqarg(nbPages));
     uint address = i * device().nbBytesPage();
     // write bytes
     if ( !setAddress(address) ) return false;
@@ -122,7 +122,7 @@ bool Direct::Mem24DeviceSpecific::doWrite(const Device::Array &data)
       if ( !writeByte(controlByte(address, Write), acked) ) return false;
       if (acked) break;
       if ( time.elapsed()>200 ) { // 200 ms timeout
-        log(Log::LineType::Error, i18n("Timeout writing at address %1").arg(toHexLabel(address, nbChars(device().nbBytes()))));
+        log(Log::LineType::Error, i18n("Timeout writing at address %1").tqarg(toHexLabel(address, nbChars(device().nbBytes()))));
         return false;
       }
     }
diff --git a/src/progs/direct/base/direct_pic.cpp b/src/progs/direct/base/direct_pic.cpp
index 30e4722..c6316e9 100644
--- a/src/progs/direct/base/direct_pic.cpp
+++ b/src/progs/direct/base/direct_pic.cpp
@@ -17,10 +17,10 @@ Direct::PulseEngine::PulseEngine(::Programmer::Base &base)
   _clockDelay = 0;
 }
 
-BitValue Direct::PulseEngine::pulseEngine(const QString &cmd, BitValue value)
+BitValue Direct::PulseEngine::pulseEngine(const TQString &cmd, BitValue value)
 {
-  _pbase.log(Log::DebugLevel::Extra, QString("pulse engine: %1").arg(cmd));
-  QByteArray a = toAscii(cmd);
+  _pbase.log(Log::DebugLevel::Extra, TQString("pulse engine: %1").tqarg(cmd));
+  TQByteArray a = toAscii(cmd);
   BitValue res = 0;
   for (const char *ptr=a.data(); (ptr-a.data())<int(a.count()); ++ptr)
     if ( !pulse(ptr, value, res) ) qFatal("pulse engine: invalid command '%c'", *ptr);
@@ -75,7 +75,7 @@ bool Direct::PulseEngine::pulse(const char * &cmd, BitValue, BitValue &)
       uint n = 0;
       for(; *(cmd+1) && isdigit((int)*(cmd+1)); ++cmd)
         n = (n * 10) + *(cmd+1) - '0';
-      _pbase.log(Log::DebugLevel::Max, "WAIT " + QString::number(n) + " micro-sec.");
+      _pbase.log(Log::DebugLevel::Max, "WAIT " + TQString::number(n) + " micro-sec.");
       Port::usleep(n);
       break;
     }
@@ -177,7 +177,7 @@ bool Direct::Pic8DeviceSpecific::pulse(const char *&cmd, BitValue value, BitValu
       uint n = 0;
       for(; *(cmd+1) && isdigit((int)*(cmd+1)); ++cmd)
         n = (n * 10) + *(cmd+1) - '0';
-      log(Log::DebugLevel::Max, "SEND cmd " + QString::number(n));
+      log(Log::DebugLevel::Max, "SEND cmd " + TQString::number(n));
       send_cmd(n);
       break;
     }
diff --git a/src/progs/direct/base/direct_pic.h b/src/progs/direct/base/direct_pic.h
index 39cd97c..2092f05 100644
--- a/src/progs/direct/base/direct_pic.h
+++ b/src/progs/direct/base/direct_pic.h
@@ -20,7 +20,7 @@ class PulseEngine
 public:
   PulseEngine(::Programmer::Base &base);
   virtual ~PulseEngine() {}
-  BitValue pulseEngine(const QString &command, BitValue value = 0);
+  BitValue pulseEngine(const TQString &command, BitValue value = 0);
 
 protected:
   ::Programmer::Base &_pbase;
diff --git a/src/progs/direct/base/direct_prog.h b/src/progs/direct/base/direct_prog.h
index 34ca0b7..cdfb907 100644
--- a/src/progs/direct/base/direct_prog.h
+++ b/src/progs/direct/base/direct_prog.h
@@ -17,13 +17,14 @@
 
 namespace Direct
 {
-  extern bool isSupported(const QString &device);
+  extern bool isSupported(const TQString &device);
   class Hardware;
 
 //----------------------------------------------------------------------------
 class PicBase : public ::Programmer::PicBase
 {
 Q_OBJECT
+  TQ_OBJECT
 public:
   PicBase(const ::Programmer::Group &group, const Pic::Data *data)
     : ::Programmer::PicBase(group, data, "pic_direct_programmer") {}
@@ -36,6 +37,7 @@ private:
 class Mem24Base : public ::Programmer::Mem24Base
 {
 Q_OBJECT
+  TQ_OBJECT
 public:
   Mem24Base(const ::Programmer::Group &group, const Mem24::Data *data)
     : ::Programmer::Mem24Base(group, data, "mem24_direct_programmer") {}
@@ -55,8 +57,8 @@ protected:
 class DGroup : public Group
 {
 public:
-  virtual QString name() const { return "direct"; }
-  virtual QString label() const { return i18n("Direct Programmer"); }
+  virtual TQString name() const { return "direct"; }
+  virtual TQString label() const { return i18n("Direct Programmer"); }
   virtual ::Hardware::Config *hardwareConfig() const;
   virtual ::Programmer::Properties properties() const { return ::Programmer::Programmer | ::Programmer::CanReadMemory | ::Programmer::HasConnectedState; }
   virtual ::Programmer::TargetPowerMode targetPowerMode() const { return ::Programmer::TargetExternallyPowered; }
diff --git a/src/progs/direct/base/direct_prog_config.cpp b/src/progs/direct/base/direct_prog_config.cpp
index ffce899..86794db 100644
--- a/src/progs/direct/base/direct_prog_config.cpp
+++ b/src/progs/direct/base/direct_prog_config.cpp
@@ -113,15 +113,15 @@ bool Direct::HardwareData::isEqual(const ::Hardware::Data &cdata) const
 }
 
 //-----------------------------------------------------------------------------
-QStringList Direct::Config::standardHardwareNames(PortType type) const
+TQStringList Direct::Config::standardHardwareNames(PortType type) const
 {
-  QStringList names;
+  TQStringList names;
   for (uint i=0; STANDARD_HARDWARE_DATA[i].info.name; i++)
     if ( STANDARD_HARDWARE_DATA[i].data.portType==type ) names += STANDARD_HARDWARE_DATA[i].info.name;
   return names;
 }
 
-const Hardware::DataInfo *Direct::Config::standardHardwareDataInfo(const QString &name) const
+const Hardware::DataInfo *Direct::Config::standardHardwareDataInfo(const TQString &name) const
 {
   for (uint i=0; STANDARD_HARDWARE_DATA[i].info.name; i++) {
     const ConstStandardHardwareData &csdata = STANDARD_HARDWARE_DATA[i];
@@ -130,7 +130,7 @@ const Hardware::DataInfo *Direct::Config::standardHardwareDataInfo(const QString
   return 0;
 }
 
-Hardware::Data *Direct::Config::standardHardwareData(const QString &name) const
+Hardware::Data *Direct::Config::standardHardwareData(const TQString &name) const
 {
   for (uint i=0; STANDARD_HARDWARE_DATA[i].info.name; i++) {
     const ConstStandardHardwareData &csdata = STANDARD_HARDWARE_DATA[i];
diff --git a/src/progs/direct/base/direct_prog_config.h b/src/progs/direct/base/direct_prog_config.h
index 151b141..7dd0b40 100644
--- a/src/progs/direct/base/direct_prog_config.h
+++ b/src/progs/direct/base/direct_prog_config.h
@@ -31,9 +31,9 @@ public:
   Config() : ::Hardware::Config("direct_programmer") {}
 
 protected:
-  virtual QStringList standardHardwareNames(PortType type) const;
-  virtual const ::Hardware::DataInfo *standardHardwareDataInfo(const QString &name) const;
-  virtual ::Hardware::Data *standardHardwareData(const QString &name) const;
+  virtual TQStringList standardHardwareNames(PortType type) const;
+  virtual const ::Hardware::DataInfo *standardHardwareDataInfo(const TQString &name) const;
+  virtual ::Hardware::Data *standardHardwareData(const TQString &name) const;
   virtual ::Hardware::Data *createHardwareData() const { return new HardwareData; }
 };