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

9 files changed, 82 insertions, 75 deletions

diff --git a/src/tools/gputils/gputils.cpp b/src/tools/gputils/gputils.cpp
index 3219598..ba30f2c 100644
--- a/src/tools/gputils/gputils.cpp
+++ b/src/tools/gputils/gputils.cpp
@@ -9,7 +9,7 @@
  ***************************************************************************/
 #include "gputils.h"
 
-#include <qregexp.h>
+#include <tqregexp.h>
 
 #include "gputils_compile.h"
 #include "gputils_config.h"
@@ -18,7 +18,7 @@
 #include "gputils_generator.h"
 
 //----------------------------------------------------------------------------
-QString GPUtils::Base::baseExecutable(bool, Tool::OutputExecutableType) const
+TQString GPUtils::Base::baseExecutable(bool, Tool::OutputExecutableType) const
 {
   switch (_category.type()) {
     case Tool::Category::Assembler: return "gpasm";
@@ -26,18 +26,18 @@ QString GPUtils::Base::baseExecutable(bool, Tool::OutputExecutableType) const
     case Tool::Category::Librarian: return "gplib";
     default: break;
   }
-  return QString::null;
+  return TQString();
 }
 
-bool GPUtils::Base::checkExecutableResult(bool withWine, QStringList &lines) const
+bool GPUtils::Base::checkExecutableResult(bool withWine, TQStringList &lines) const
 {
   return ( lines.count()>0 && lines[0].startsWith(baseExecutable(withWine, Tool::OutputExecutableType::Coff)) );
 }
 
 //----------------------------------------------------------------------------
-QString GPUtils::Group::informationText() const
+TQString GPUtils::Group::informationText() const
 {
-  return i18n("<a href=\"%1\">GPUtils</a> is an open-source assembler and linker suite.<br>").arg("http://gputils.sourceforge.net");
+  return i18n("<a href=\"%1\">GPUtils</a> is an open-source assembler and linker suite.<br>").tqarg("http://gputils.sourceforge.net");
 }
 
 Tool::Group::BaseData GPUtils::Group::baseFactory(Tool::Category category) const
@@ -51,22 +51,22 @@ PURL::Directory GPUtils::Group::autodetectDirectory(Compile::DirectoryType type,
 {
   switch (type.type()) {
     case Compile::DirectoryType::LinkerScript: {
-      QString exec = execDir.path() + base(Tool::Category::Linker)->baseExecutable(withWine, Tool::OutputExecutableType::Coff);
+      TQString exec = execDir.path() + base(Tool::Category::Linker)->baseExecutable(withWine, Tool::OutputExecutableType::Coff);
       ::Process::StringOutput process;
       process.setup(exec, "-h", withWine);
       if ( ::Process::runSynchronously(process, ::Process::Start, 1000)!=::Process::Exited ) return PURL::Directory();
-      QString s = process.sout() + process.serr();
-      QRegExp re(".*Default linker script path ([^\\n]*)\\n.*");
+      TQString s = process.sout() + process.serr();
+      TQRegExp re(".*Default linker script path ([^\\n]*)\\n.*");
       if ( !re.exactMatch(s) ) return PURL::Directory();
       return PURL::Directory(re.cap(1));
     }
     case Compile::DirectoryType::Header: {
-      QString exec = execDir.path() + base(Tool::Category::Assembler)->baseExecutable(withWine, Tool::OutputExecutableType::Coff);
+      TQString exec = execDir.path() + base(Tool::Category::Assembler)->baseExecutable(withWine, Tool::OutputExecutableType::Coff);
       ::Process::StringOutput process;
       process.setup(exec, "-h", withWine);
       if ( ::Process::runSynchronously(process, ::Process::Start, 1000)!=::Process::Exited ) return PURL::Directory();
-      QString s = process.sout() + process.serr();
-      QRegExp re(".*Default header file path ([^\\n]*)\\n.*");
+      TQString s = process.sout() + process.serr();
+      TQRegExp re(".*Default header file path ([^\\n]*)\\n.*");
       if ( !re.exactMatch(s) ) return PURL::Directory();
       return PURL::Directory(re.cap(1));
     }
diff --git a/src/tools/gputils/gputils.h b/src/tools/gputils/gputils.h
index b8bcded..844bbde 100644
--- a/src/tools/gputils/gputils.h
+++ b/src/tools/gputils/gputils.h
@@ -18,22 +18,22 @@ namespace GPUtils
 class Base : public Tool::Base
 {
 public:
-  virtual QString baseExecutable(bool withWine, Tool::OutputExecutableType type) const;
+  virtual TQString baseExecutable(bool withWine, Tool::OutputExecutableType type) const;
 
 private:
-  virtual QStringList checkExecutableOptions(bool) const { return "-v"; }
-  virtual bool checkExecutableResult(bool withWine, QStringList &lines) const;
+  virtual TQStringList checkExecutableOptions(bool) const { return "-v"; }
+  virtual bool checkExecutableResult(bool withWine, TQStringList &lines) const;
 };
 
 //----------------------------------------------------------------------------
 class Group : public Tool::Group
 {
 public:
-  virtual QString name() const { return "gputils"; }
-  virtual QString label() const { return i18n("GPUtils"); }
-  virtual QString informationText() const;
+  virtual TQString name() const { return "gputils"; }
+  virtual TQString label() const { return i18n("GPUtils"); }
+  virtual TQString informationText() const;
   virtual Tool::Category checkDevicesCategory() const { return Tool::Category::Assembler; }
-  virtual QStringList checkDevicesOptions(uint) const { return "-l"; }
+  virtual TQStringList checkDevicesOptions(uint) const { return "-l"; }
   virtual PURL::Directory autodetectDirectory(Compile::DirectoryType type, const PURL::Directory &execDir, bool withWine) const;
   virtual bool hasDirectory(Compile::DirectoryType type) const { return type==Compile::DirectoryType::Header || type==Compile::DirectoryType::LinkerScript; }
   virtual PURL::FileType linkerScriptType() const { return PURL::Lkr; }
@@ -43,7 +43,7 @@ public:
 
 protected:
   virtual BaseData baseFactory(Tool::Category c) const;
-  virtual QValueList<const Device::Data *> getSupportedDevices(const QString &s) const { return GPUtils::getSupportedDevices(s); }
+  virtual TQValueList<const Device::Data *> getSupportedDevices(const TQString &s) const { return GPUtils::getSupportedDevices(s); }
   virtual Compile::Process *processFactory(const Compile::Data &data) const;
   virtual Compile::Config *configFactory(::Project *project) const;
   virtual Tool::SourceGenerator *sourceGeneratorFactory() const;
diff --git a/src/tools/gputils/gputils_compile.cpp b/src/tools/gputils/gputils_compile.cpp
index c59828c..cbe2309 100644
--- a/src/tools/gputils/gputils_compile.cpp
+++ b/src/tools/gputils/gputils_compile.cpp
@@ -15,68 +15,68 @@
 #include "coff/base/disassembler.h"
 
 //-----------------------------------------------------------------------------
-QString GPUtils::Process::deviceName() const
+TQString GPUtils::Process::deviceName() const
 {
   return toDeviceName(_data.device);
 }
 
 //-----------------------------------------------------------------------------
-void GPUtils::AssembleFile::logStderrLine(const QString &line)
+void GPUtils::AssembleFile::logStderrLine(const TQString &line)
 {
   if ( parseErrorLine(line, Compile::ParseErrorData("([^:]*):([0-9]+):(.+)\\[[0-9]+\\](.+)", 1, 2, 4, 3)) ) return;
   if ( parseErrorLine(line, Compile::ParseErrorData("([^:]*):([^:]+):([0-9]+):(.+)", 2, 3, 4, Log::LineType::Warning)) ) return;
-  doLog(Log::LineType::Normal, line, QString::null, 0); // unrecognized
+  doLog(Log::LineType::Normal, line, TQString(), 0); // unrecognized
 }
 
 //-----------------------------------------------------------------------------
-QStringList GPUtils::AssembleStandaloneFile::genericArguments(const Compile::Config &config) const
+TQStringList GPUtils::AssembleStandaloneFile::genericArguments(const Compile::Config &config) const
 {
-  QStringList args;
+  TQStringList args;
   args += "-L"; // force list
   args += "-o%O";
   uint wl = static_cast<const Config &>(config).gpasmWarningLevel();
-  if ( wl!=Config::Nb_WarningLevels ) args += "-w" + QString::number(wl);
+  if ( wl!=Config::Nb_WarningLevels ) args += "-w" + TQString::number(wl);
   args += config.includeDirs(Tool::Category::Assembler, "-I");
   args += "$NO_AUTO_DEVICE(-p%DEVICE)";
   HexBuffer::Format format = config.hexFormat();
-  if( format!=HexBuffer::Nb_Formats ) args += QString("-a") + HexBuffer::FORMATS[format];
+  if( format!=HexBuffer::Nb_Formats ) args += TQString("-a") + HexBuffer::FORMATS[format];
   args += config.customOptions(Tool::Category::Assembler);
   args += "%I";
   return args;
 }
 
-QString GPUtils::AssembleStandaloneFile::outputFiles() const
+TQString GPUtils::AssembleStandaloneFile::outputFiles() const
 {
   return "PURL::Lst PURL::Cod PURL::Hex";
 }
 
 //-----------------------------------------------------------------------------
-QStringList GPUtils::AssembleProjectFile::genericArguments(const Compile::Config &config) const
+TQStringList GPUtils::AssembleProjectFile::genericArguments(const Compile::Config &config) const
 {
-  QStringList args;
+  TQStringList args;
   args += "-c"; // relocatable code
   args += config.includeDirs(Tool::Category::Assembler, "-I");
   if ( !_data.items[0].generated ) args += "-p%DEVICE";
   uint wl = static_cast<const Config &>(config).gpasmWarningLevel() ;
-  if( wl!=Config::Nb_WarningLevels ) args += "-w" + QString::number(wl);
+  if( wl!=Config::Nb_WarningLevels ) args += "-w" + TQString::number(wl);
   args += config.customOptions(Tool::Category::Assembler);
   args += "%I";
   return args;
 }
 
-QString GPUtils::AssembleProjectFile::outputFiles() const
+TQString GPUtils::AssembleProjectFile::outputFiles() const
 {
   return "PURL::Object PURL::Lst";
 }
 
 //-----------------------------------------------------------------------------
-QStringList GPUtils::LinkProject::genericArguments(const Compile::Config &config) const
+TQStringList GPUtils::LinkProject::genericArguments(const Compile::Config &config) const
 {
-  QStringList args;
+  TQStringList args;
   args += "-o%O";
   args += "-c"; // create coff file
   HexBuffer::Format f = config.hexFormat();
-  if ( f!=HexBuffer::Nb_Formats ) args += QString("-a") + HexBuffer::FORMATS[f];
+  if ( f!=HexBuffer::Nb_Formats ) args += TQString("-a") + HexBuffer::FORMATS[f];
   args += "-m";  // with map
   args += config.includeDirs(Tool::Category::Linker, "-I");
   args += "$LKR(-s%LKR)";
@@ -86,15 +86,15 @@ QStringList GPUtils::LinkProject::genericArguments(const Compile::Config &config
   return args;
 }
 
-QString GPUtils::LinkProject::outputFiles() const
+TQString GPUtils::LinkProject::outputFiles() const
 {
   return "PURL::Lkr PURL::Map PURL::Lst PURL::Cod PURL::Coff PURL::Hex";
 }
 
 //-----------------------------------------------------------------------------
-QStringList GPUtils::LibraryProject::genericArguments(const Compile::Config &config) const
+TQStringList GPUtils::LibraryProject::genericArguments(const Compile::Config &config) const
 {
-  QStringList args;
+  TQStringList args;
   args += "-c"; // create archive
   args += "%O";
   args += config.customOptions(Tool::Category::Librarian);
@@ -103,7 +103,7 @@ QStringList GPUtils::LibraryProject::genericArguments(const Compile::Config &con
   return args;
 }
 
-QString GPUtils::LibraryProject::outputFiles() const
+TQString GPUtils::LibraryProject::outputFiles() const
 {
   return "PURL::Library";
 }
diff --git a/src/tools/gputils/gputils_compile.h b/src/tools/gputils/gputils_compile.h
index a6a09c9..97706b1 100644
--- a/src/tools/gputils/gputils_compile.h
+++ b/src/tools/gputils/gputils_compile.h
@@ -17,8 +17,9 @@ namespace GPUtils
 class Process : public Compile::Process
 {
 Q_OBJECT
+  TQ_OBJECT
 private:
-  virtual QString deviceName() const;
+  virtual TQString deviceName() const;
   virtual bool hasLinkerScript() const { return ( _data.linkType==Compile::Icd2Linking || Compile::Process::hasLinkerScript() ); }
 };
 
@@ -26,46 +27,51 @@ private:
 class AssembleFile : public Process
 {
 Q_OBJECT
+  TQ_OBJECT
 private:
-  virtual void logStderrLine(const QString &line);
+  virtual void logStderrLine(const TQString &line);
 };
 
 //-----------------------------------------------------------------------------
 class AssembleStandaloneFile : public AssembleFile
 {
 Q_OBJECT
+  TQ_OBJECT
 private:
-  virtual QString outputFiles() const;
-  virtual QStringList genericArguments(const Compile::Config &config) const;
+  virtual TQString outputFiles() const;
+  virtual TQStringList genericArguments(const Compile::Config &config) const;
 };
 
 //-----------------------------------------------------------------------------
 class AssembleProjectFile : public AssembleFile
 {
 Q_OBJECT
+  TQ_OBJECT
 private:
-  virtual QString outputFiles() const;
-  virtual QStringList genericArguments(const Compile::Config &config) const;
+  virtual TQString outputFiles() const;
+  virtual TQStringList genericArguments(const Compile::Config &config) const;
 };
 
 //-----------------------------------------------------------------------------
 class LinkProject : public Process
 {
 Q_OBJECT
+  TQ_OBJECT
 private:
-  virtual QString outputFiles() const;
-  virtual QStringList genericArguments(const Compile::Config &config) const;
-  virtual void logStderrLine(const QString &line) { doLog(filterType(line), line, QString::null, 0); }
+  virtual TQString outputFiles() const;
+  virtual TQStringList genericArguments(const Compile::Config &config) const;
+  virtual void logStderrLine(const TQString &line) { doLog(filterType(line), line, TQString(), 0); }
 };
 
 //-----------------------------------------------------------------------------
 class LibraryProject : public Process
 {
 Q_OBJECT
+  TQ_OBJECT
 private:
-  virtual QString outputFiles() const;
-  virtual QStringList genericArguments(const Compile::Config &config) const;
-  virtual void logStderrLine(const QString &line) { doLog(filterType(line), line, QString::null, 0); }
+  virtual TQString outputFiles() const;
+  virtual TQStringList genericArguments(const Compile::Config &config) const;
+  virtual void logStderrLine(const TQString &line) { doLog(filterType(line), line, TQString(), 0); }
 };
 
 } // namespace
diff --git a/src/tools/gputils/gputils_config.cpp b/src/tools/gputils/gputils_config.cpp
index 8f7bca2..7a264e6 100644
--- a/src/tools/gputils/gputils_config.cpp
+++ b/src/tools/gputils/gputils_config.cpp
@@ -15,5 +15,5 @@ const char * const GPUtils::Config::WARNING_LEVEL_LABELS[Nb_WarningLevels] = {
 
 uint GPUtils::Config::gpasmWarningLevel() const
 {
-  return QMIN(warningLevel(Tool::Category::Assembler), uint(Nb_WarningLevels));
+  return TQMIN(warningLevel(Tool::Category::Assembler), uint(Nb_WarningLevels));
 }
diff --git a/src/tools/gputils/gputils_generator.cpp b/src/tools/gputils/gputils_generator.cpp
index 3bcebac..7fd9a1f 100644
--- a/src/tools/gputils/gputils_generator.cpp
+++ b/src/tools/gputils/gputils_generator.cpp
@@ -13,12 +13,12 @@
 #include "devices/list/device_list.h"
 
 //----------------------------------------------------------------------------
-QValueList<const Device::Data *> GPUtils::getSupportedDevices(const QString &s)
+TQValueList<const Device::Data *> GPUtils::getSupportedDevices(const TQString &s)
 {
-  QStringList devices = QStringList::split(' ', s.simplifyWhiteSpace().upper());
-  QValueList<const Device::Data *> list;
+  TQStringList devices = TQStringList::split(' ', s.simplifyWhiteSpace().upper());
+  TQValueList<const Device::Data *> list;
   for (uint i=0; i<devices.count(); i++) {
-    QString name = devices[i];
+    TQString name = devices[i];
     if ( devices[i].startsWith("P1") ) name = name.mid(1);
     const Device::Data *data = Device::lister().data(name);
     if (data) list.append(data);
@@ -49,7 +49,7 @@ SourceLine::List GPUtils::SourceGenerator::sourceFileContent(PURL::ToolType, con
     lines.appendTitle(i18n("relocatable code"));
     lines.appendNotIndentedCode("PROG CODE");
     lines.appendNotIndentedCode("start");
-    lines.appendIndentedCode(QString::null, "<< " + i18n("insert code") + " >>");
+    lines.appendIndentedCode(TQString(), "<< " + i18n("insert code") + " >>");
     lines.appendIndentedCode("goto    $", i18n("loop forever"));
     lines.appendEmpty();
     lines.appendNotIndentedCode("END");
@@ -77,8 +77,8 @@ SourceLine::List GPUtils::SourceGenerator::sourceFileContent(PURL::ToolType, con
     if ( !hasShared ) {
       for (uint i=1; i<rdata.nbBanks; i++) {
         uint address = first + i*rdata.nbBytesPerBank();
-        lines.appendNotIndentedCode(QString("INT_VAR%1 UDATA ").arg(i) + toHexLabel(address, rdata.nbCharsAddress()), i18n("variables used for context saving"));
-        lines.appendNotIndentedCode(QString("w_saved%1     RES 1").arg(i), i18n("variable used for context saving"));
+        lines.appendNotIndentedCode(TQString("INT_VAR%1 UDATA ").tqarg(i) + toHexLabel(address, rdata.nbCharsAddress()), i18n("variables used for context saving"));
+        lines.appendNotIndentedCode(TQString("w_saved%1     RES 1").tqarg(i), i18n("variable used for context saving"));
       }
     }
     lines.appendEmpty();
@@ -106,7 +106,7 @@ SourceLine::List GPUtils::SourceGenerator::sourceFileContent(PURL::ToolType, con
       lines.appendIndentedCode("movwf   pclath_saved");
       lines.appendIndentedCode("clrf    PCLATH");
     }
-    lines.appendIndentedCode(QString::null, "<< " + i18n("insert interrupt code") + " >>");
+    lines.appendIndentedCode(TQString(), "<< " + i18n("insert interrupt code") + " >>");
     if (needPCLATH) {
       lines.appendIndentedCode("movf    pclath_saved,w", i18n("restore context"));
       lines.appendIndentedCode("movwf   PCLATH");
@@ -118,7 +118,7 @@ SourceLine::List GPUtils::SourceGenerator::sourceFileContent(PURL::ToolType, con
     lines.appendIndentedCode("retfie");
     lines.appendEmpty();
     lines.appendNotIndentedCode("start");
-    lines.appendIndentedCode(QString::null, "<< " + i18n("insert main code") + " >>");
+    lines.appendIndentedCode(TQString(), "<< " + i18n("insert main code") + " >>");
     lines.appendIndentedCode("goto    $", i18n("loop forever"));
     lines.appendEmpty();
     lines.appendNotIndentedCode("END");
@@ -173,30 +173,30 @@ SourceLine::List GPUtils::SourceGenerator::sourceFileContent(PURL::ToolType, con
     lines.appendIndentedCode("goto    peripheral_isr", i18n("go to start of peripheral interrupt code"));
     lines.appendEmpty();
     lines.appendNotIndentedCode("start:");
-    lines.appendIndentedCode(QString::null, "<< " + i18n("insert main code") + " >>");
+    lines.appendIndentedCode(TQString(), "<< " + i18n("insert main code") + " >>");
     lines.appendIndentedCode("goto    $", i18n("loop forever"));
     lines.appendEmpty();
     lines.appendTitle(i18n("INT pin interrupt service routine"));
     lines.appendNotIndentedCode("int_pin_isr:");
-    lines.appendIndentedCode(QString::null, "<< " + i18n("insert INT pin interrupt code") + " >>");
+    lines.appendIndentedCode(TQString(), "<< " + i18n("insert INT pin interrupt code") + " >>");
     lines.appendIndentedCode("POP");
     lines.appendIndentedCode("retfie");
     lines.appendEmpty();
     lines.appendTitle(i18n("TIMER0 interrupt service routine"));
     lines.appendNotIndentedCode("timer0_isr:");
-    lines.appendIndentedCode(QString::null, "<< " + i18n("insert TIMER0 interrupt code") + " >>");
+    lines.appendIndentedCode(TQString(), "<< " + i18n("insert TIMER0 interrupt code") + " >>");
     lines.appendIndentedCode("POP");
     lines.appendIndentedCode("retfie");
     lines.appendEmpty();
     lines.appendTitle(i18n("T0CKI interrupt service routine"));
     lines.appendNotIndentedCode("t0cki_isr:");
-    lines.appendIndentedCode(QString::null, "<< " + i18n("insert T0CKI interrupt code") + " >>");
+    lines.appendIndentedCode(TQString(), "<< " + i18n("insert T0CKI interrupt code") + " >>");
     lines.appendIndentedCode("POP");
     lines.appendIndentedCode("retfie");
     lines.appendEmpty();
     lines.appendTitle(i18n("peripheral interrupt service routine"));
     lines.appendNotIndentedCode("peripheral_isr:");
-    lines.appendIndentedCode(QString::null, "<< " + i18n("insert peripheral interrupt code") + " >>");
+    lines.appendIndentedCode(TQString(), "<< " + i18n("insert peripheral interrupt code") + " >>");
     lines.appendIndentedCode("POP");
     lines.appendIndentedCode("retfie");
     lines.appendEmpty();
@@ -229,7 +229,7 @@ SourceLine::List GPUtils::SourceGenerator::sourceFileContent(PURL::ToolType, con
     lines.appendIndentedCode("movff   STATUS,status_saved", i18n("save context"));
     lines.appendIndentedCode("movff   WREG,w_saved");
     lines.appendIndentedCode("movff   BSR,bsr_saved");
-    lines.appendIndentedCode(QString::null, "<< " + i18n("insert low priority interrupt code") + " >>");
+    lines.appendIndentedCode(TQString(), "<< " + i18n("insert low priority interrupt code") + " >>");
     lines.appendIndentedCode("movff   bsr_saved,BSR", i18n("restore context"));
     lines.appendIndentedCode("movff   w_saved,WREG");
     lines.appendIndentedCode("movff   status_saved,STATUS");
@@ -237,11 +237,11 @@ SourceLine::List GPUtils::SourceGenerator::sourceFileContent(PURL::ToolType, con
     lines.appendEmpty();
     lines.appendTitle(i18n("high priority interrupt service routine"));
     lines.appendNotIndentedCode("high_interrupt:");
-    lines.appendIndentedCode(QString::null, "<< " + i18n("insert high priority interrupt code") + " >>");
+    lines.appendIndentedCode(TQString(), "<< " + i18n("insert high priority interrupt code") + " >>");
     lines.appendIndentedCode("retfie  FAST");
     lines.appendEmpty();
     lines.appendNotIndentedCode("start:");
-    lines.appendIndentedCode(QString::null, "<< " + i18n("insert main code") + " >>");
+    lines.appendIndentedCode(TQString(), "<< " + i18n("insert main code") + " >>");
     lines.appendIndentedCode("goto    $", i18n("loop forever"));
     lines.appendEmpty();
     lines.appendNotIndentedCode("END");
diff --git a/src/tools/gputils/gputils_generator.h b/src/tools/gputils/gputils_generator.h
index 38da66d..9f2e7ac 100644
--- a/src/tools/gputils/gputils_generator.h
+++ b/src/tools/gputils/gputils_generator.h
@@ -14,7 +14,7 @@
 namespace GPUtils
 {
 
-extern QValueList<const Device::Data *> getSupportedDevices(const QString &s);
+extern TQValueList<const Device::Data *> getSupportedDevices(const TQString &s);
 
 class SourceGenerator : public Tool::SourceGenerator
 {
diff --git a/src/tools/gputils/gui/gputils_ui.cpp b/src/tools/gputils/gui/gputils_ui.cpp
index 35cdce8..bab898e 100644
--- a/src/tools/gputils/gui/gputils_ui.cpp
+++ b/src/tools/gputils/gui/gputils_ui.cpp
@@ -9,7 +9,7 @@
  ***************************************************************************/
 #include "gputils_ui.h"
 
-#include <qlabel.h>
+#include <tqlabel.h>
 #include "tools/gputils/gputils_config.h"
 
 //----------------------------------------------------------------------------
@@ -21,10 +21,10 @@ void GPUtils::ConfigWidget::initEntries()
 {
   if ( _category==Tool::Category::Assembler ) {
     uint row = container()->numRows();
-    QLabel *label = new QLabel(i18n("Warning level:"), container());
+    TQLabel *label = new TQLabel(i18n("Warning level:"), container());
     container()->addWidget(label, row,row, 0,0);
-    _gpasmWarning = new QComboBox(container());
-    connect(_gpasmWarning, SIGNAL(activated(int)), SIGNAL(changed()));
+    _gpasmWarning = new TQComboBox(container());
+    connect(_gpasmWarning, TQT_SIGNAL(activated(int)), TQT_SIGNAL(changed()));
     for (uint i=0; i<GPUtils::Config::Nb_WarningLevels; i++)
       _gpasmWarning->insertItem(i18n(GPUtils::Config::WARNING_LEVEL_LABELS[i]));
     _gpasmWarning->insertItem(i18n("as in LIST directive"));
diff --git a/src/tools/gputils/gui/gputils_ui.h b/src/tools/gputils/gui/gputils_ui.h
index 8d6daea..70b88ff 100644
--- a/src/tools/gputils/gui/gputils_ui.h
+++ b/src/tools/gputils/gui/gputils_ui.h
@@ -19,12 +19,13 @@ namespace GPUtils
 class ConfigWidget : public ToolConfigWidget
 {
 Q_OBJECT
+  TQ_OBJECT
 public:
   ConfigWidget(Project *project);
   virtual void initEntries();
 
 protected:
-  QComboBox *_gpasmWarning;
+  TQComboBox *_gpasmWarning;
   virtual void loadConfig(const Compile::Config &config);
   virtual void saveConfig(Compile::Config &config) const;
 };