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

5 files changed, 25 insertions, 23 deletions

diff --git a/src/tools/cc5x/cc5x.cpp b/src/tools/cc5x/cc5x.cpp
index 5b28397..65b7b98 100644
--- a/src/tools/cc5x/cc5x.cpp
+++ b/src/tools/cc5x/cc5x.cpp
@@ -8,7 +8,7 @@
  ***************************************************************************/
 #include "cc5x.h"
 
-#include <qregexp.h>
+#include <tqregexp.h>
 
 #include "cc5x_compile.h"
 #include "cc5x_config.h"
@@ -17,16 +17,16 @@
 #include "devices/base/device_group.h"
 
 //----------------------------------------------------------------------------
-bool CC5X::Base::checkExecutableResult(bool, QStringList &lines) const
+bool CC5X::Base::checkExecutableResult(bool, TQStringList &lines) const
 {
   return ( lines.count()>0 && lines[0].startsWith("CC5X") );
 }
 
 //----------------------------------------------------------------------------
-QValueList<const Device::Data *> CC5X::Group::getSupportedDevices(const QString &) const
+TQValueList<const Device::Data *> CC5X::Group::getSupportedDevices(const TQString &) const
 {
-  QValueList<const Device::Data *> list;
-  QValueVector<QString> devices = Device::lister().group("pic")->supportedDevices();
+  TQValueList<const Device::Data *> list;
+  TQValueVector<TQString> devices = Device::lister().group("pic")->supportedDevices();
   for (uint i=0; i<devices.count(); i++) {
     const Pic::Data *data = static_cast<const Pic::Data *>(Device::lister().data(devices[i]));
     if ( data->architecture()!=Pic::Architecture::P10X && data->architecture()!=Pic::Architecture::P16X ) continue;
@@ -50,9 +50,9 @@ Compile::Config *CC5X::Group::configFactory(::Project *project) const
   return new Config(project);
 }
 
-QString CC5X::Group::informationText() const
+TQString CC5X::Group::informationText() const
 {
-  return i18n("<a href=\"%1\">CC5X</a> is a C compiler distributed by B Knudsen Data.").arg("http://www.bknd.com/cc5x/index.shtml");
+  return i18n("<a href=\"%1\">CC5X</a> is a C compiler distributed by B Knudsen Data.").tqarg("http://www.bknd.com/cc5x/index.shtml");
 }
 
 Tool::Group::BaseData CC5X::Group::baseFactory(Tool::Category category) const
diff --git a/src/tools/cc5x/cc5x.h b/src/tools/cc5x/cc5x.h
index 054a9ef..85a25ba 100644
--- a/src/tools/cc5x/cc5x.h
+++ b/src/tools/cc5x/cc5x.h
@@ -18,27 +18,27 @@ namespace CC5X
 class Base : public Tool::Base
 {
 public:
-  virtual QString baseExecutable(bool, Tool::OutputExecutableType) const { return "cc5x"; }
+  virtual TQString baseExecutable(bool, Tool::OutputExecutableType) const { return "cc5x"; }
 
 private:
-  virtual QStringList checkExecutableOptions(bool) const { return QStringList(); }
-  virtual bool checkExecutableResult(bool withWine, QStringList &lines) const;
+  virtual TQStringList checkExecutableOptions(bool) const { return TQStringList(); }
+  virtual bool checkExecutableResult(bool withWine, TQStringList &lines) const;
 };
 
 //----------------------------------------------------------------------------
 class Group : public Tool::Group
 {
 public:
-  virtual QString name() const { return "cc5x"; }
-  virtual QString label() const { return i18n("CC5X Compiler"); }
-  virtual QString informationText() const;
+  virtual TQString name() const { return "cc5x"; }
+  virtual TQString label() const { return i18n("CC5X Compiler"); }
+  virtual TQString informationText() const;
   virtual Tool::Category checkDevicesCategory() const { return Tool::Category::Nb_Types; }
   virtual Tool::ExecutableType preferedExecutableType() const { return Tool::ExecutableType::Windows; }
   virtual Tool::CompileType compileType() const { return Tool::SingleFile; }
   virtual PURL::FileType implementationType(PURL::ToolType type) const { return (type==PURL::ToolType::Compiler ? PURL::CSource : PURL::Nb_FileTypes); }
 
 private:
-  virtual QValueList<const Device::Data *> getSupportedDevices(const QString &s) const;
+  virtual TQValueList<const Device::Data *> getSupportedDevices(const TQString &s) const;
   virtual Compile::Process *processFactory(const Compile::Data &data) const;
   virtual Compile::Config *configFactory(::Project *project) const;
   virtual BaseData baseFactory(Tool::Category) const;
diff --git a/src/tools/cc5x/cc5x_compile.cpp b/src/tools/cc5x/cc5x_compile.cpp
index 6956eb8..fb17755 100644
--- a/src/tools/cc5x/cc5x_compile.cpp
+++ b/src/tools/cc5x/cc5x_compile.cpp
@@ -10,9 +10,9 @@
 
 #include "cc5x_config.h"
 
-QStringList CC5X::CompileFile::genericArguments(const Compile::Config &config) const
+TQStringList CC5X::CompileFile::genericArguments(const Compile::Config &config) const
 {
-  QStringList args;
+  TQStringList args;
   args += "-a";   // produce asm file
   args += "-CC";  // produce cod c file
   args += "-L";   // produce list file
@@ -25,13 +25,13 @@ QStringList CC5X::CompileFile::genericArguments(const Compile::Config &config) c
   return args;
 }
 
-void CC5X::CompileFile::logStderrLine(const QString &line)
+void CC5X::CompileFile::logStderrLine(const TQString &line)
 {
   if ( parseErrorLine(line, Compile::ParseErrorData("(.*):([0-9]+):(.+)\\[([0-9]+)\\](.+)", 1, 2, 5, 3)) ) return;
-  doLog(Log::LineType::Normal, line, QString::null, 0); // unrecognized
+  doLog(Log::LineType::Normal, line, TQString(), 0); // unrecognized
 }
 
-QString CC5X::CompileFile::outputFiles() const
+TQString CC5X::CompileFile::outputFiles() const
 {
   return "PURL::Lst PURL::AsmGPAsm PURL::Hex PURL::Cod occ";
 }
diff --git a/src/tools/cc5x/cc5x_compile.h b/src/tools/cc5x/cc5x_compile.h
index f400380..e17bb6f 100644
--- a/src/tools/cc5x/cc5x_compile.h
+++ b/src/tools/cc5x/cc5x_compile.h
@@ -17,11 +17,12 @@ namespace CC5X
 class CompileFile : public Compile::Process
 {
 Q_OBJECT
+  TQ_OBJECT
 protected:
-  virtual QString deviceName() const { return QString::null; }
-  virtual QStringList genericArguments(const Compile::Config &config) const;
-  virtual void logStderrLine(const QString &line);
-  virtual QString outputFiles() const;
+  virtual TQString deviceName() const { return TQString(); }
+  virtual TQStringList genericArguments(const Compile::Config &config) const;
+  virtual void logStderrLine(const TQString &line);
+  virtual TQString outputFiles() const;
 };
 
 } // namespace
diff --git a/src/tools/cc5x/gui/cc5x_ui.h b/src/tools/cc5x/gui/cc5x_ui.h
index 7bf0a37..f234643 100644
--- a/src/tools/cc5x/gui/cc5x_ui.h
+++ b/src/tools/cc5x/gui/cc5x_ui.h
@@ -18,6 +18,7 @@ namespace CC5X
 class ConfigWidget : public ToolConfigWidget
 {
 Q_OBJECT
+  TQ_OBJECT
 public:
   ConfigWidget(Project *project);
   virtual void initEntries();