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, 28 insertions, 26 deletions

diff --git a/src/tools/mpc/gui/mpc_ui.h b/src/tools/mpc/gui/mpc_ui.h
index 2fc51f9..38c0e7b 100644
--- a/src/tools/mpc/gui/mpc_ui.h
+++ b/src/tools/mpc/gui/mpc_ui.h
@@ -18,6 +18,7 @@ namespace MPC
 class ConfigWidget : public ToolConfigWidget
 {
 Q_OBJECT
+  TQ_OBJECT
 public:
   ConfigWidget(Project *project);
   virtual void initEntries() {}
diff --git a/src/tools/mpc/mpc.cpp b/src/tools/mpc/mpc.cpp
index 88f9ec2..8abb74e 100644
--- a/src/tools/mpc/mpc.cpp
+++ b/src/tools/mpc/mpc.cpp
@@ -8,7 +8,7 @@
  ***************************************************************************/
 #include "mpc.h"
 
-#include <qregexp.h>
+#include <tqregexp.h>
 
 #include "mpc_compile.h"
 #include "mpc_config.h"
@@ -17,10 +17,10 @@
 #include "devices/base/device_group.h"
 
 //----------------------------------------------------------------------------
-QValueList<const Device::Data *> MPC::Group::getSupportedDevices(const QString &) const
+TQValueList<const Device::Data *> MPC::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 Device::Data *data = Device::lister().data(devices[i]);
     Pic::Architecture arch = static_cast<const Pic::Data *>(data)->architecture();
@@ -45,9 +45,9 @@ Compile::Config *MPC::Group::configFactory(::Project *project) const
   return new Config(project);
 }
 
-QString MPC::Group::informationText() const
+TQString MPC::Group::informationText() const
 {
-  return i18n("<a href=\"%1\">MPC Compiler</a> is a C compiler distributed by Byte Craft.").arg("http://www.bytecraft.com/mpccaps.html");
+  return i18n("<a href=\"%1\">MPC Compiler</a> is a C compiler distributed by Byte Craft.").tqarg("http://www.bytecraft.com/mpccaps.html");
 }
 
 Tool::Group::BaseData MPC::Group::baseFactory(Tool::Category category) const
diff --git a/src/tools/mpc/mpc.h b/src/tools/mpc/mpc.h
index a378307..754221a 100644
--- a/src/tools/mpc/mpc.h
+++ b/src/tools/mpc/mpc.h
@@ -18,26 +18,26 @@ namespace MPC
 class Base : public Tool::Base
 {
 public:
-  virtual QString baseExecutable(bool, Tool::OutputExecutableType) const { return "mpcw"; }
+  virtual TQString baseExecutable(bool, Tool::OutputExecutableType) const { return "mpcw"; }
   virtual bool checkExecutable() const { return false; }
-  virtual QStringList checkExecutableOptions(bool) const { return QStringList(); }
-  virtual bool checkExecutableResult(bool, QStringList &) const { return true; }
+  virtual TQStringList checkExecutableOptions(bool) const { return TQStringList(); }
+  virtual bool checkExecutableResult(bool, TQStringList &) const { return true; }
 };
 
 //----------------------------------------------------------------------------
 class Group : public Tool::Group
 {
 public:
-  virtual QString name() const { return "mpcw"; }
-  virtual QString label() const { return i18n("MPC Compiler"); }
-  virtual QString informationText() const;
+  virtual TQString name() const { return "mpcw"; }
+  virtual TQString label() const { return i18n("MPC 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/mpc/mpc_compile.cpp b/src/tools/mpc/mpc_compile.cpp
index 69ee994..8c39e3c 100644
--- a/src/tools/mpc/mpc_compile.cpp
+++ b/src/tools/mpc/mpc_compile.cpp
@@ -13,22 +13,22 @@
 #include "devices/list/device_list.h"
 #include "devices/pic/base/pic.h"
 
-QStringList MPC::CompileFile::genericArguments(const Compile::Config &) const
+TQStringList MPC::CompileFile::genericArguments(const Compile::Config &) const
 {
-  QStringList args;
+  TQStringList args;
   args += "%I";
   return args;
 }
 
-void MPC::CompileFile::logStderrLine(const QString &)
+void MPC::CompileFile::logStderrLine(const TQString &)
 {
   // ignore output
 }
 
-void MPC::CompileFile::parseLine(const QString &line)
+void MPC::CompileFile::parseLine(const TQString &line)
 {
   if ( parseErrorLine(line, Compile::ParseErrorData("(\\w+)\\s+(.*)\\s+(\\d+):\\d+:(.*)", 2, 3, 4, 1)) ) return;
-  doLog(Log::LineType::Normal, line, QString::null, 0); // unrecognized
+  doLog(Log::LineType::Normal, line, TQString(), 0); // unrecognized
 }
 
 void MPC::CompileFile::done(int code)
@@ -37,15 +37,15 @@ void MPC::CompileFile::done(int code)
   PURL::Url url = PURL::Url(directory(), inputFilepath(0)).toExtension("err");
   Log::StringView sview;
   PURL::File file(url, sview);
-  if ( !file.openForRead() ) doLog(Log::LineType::Error, i18n("Could not find error file (%1).").arg(url.pretty()), QString::null, 0);
+  if ( !file.openForRead() ) doLog(Log::LineType::Error, i18n("Could not find error file (%1).").tqarg(url.pretty()), TQString(), 0);
   else {
-    QStringList lines = file.readLines();
+    TQStringList lines = file.readLines();
     for (uint i=0; i<lines.count(); i++) parseLine(lines[i]);
   }
   Compile::Process::done(code);
 }
 
-QString MPC::CompileFile::outputFiles() const
+TQString MPC::CompileFile::outputFiles() const
 {
   return "PURL::Lst PURL::Hex PURL::Cod err";
 }
diff --git a/src/tools/mpc/mpc_compile.h b/src/tools/mpc/mpc_compile.h
index a699734..5744f1b 100644
--- a/src/tools/mpc/mpc_compile.h
+++ b/src/tools/mpc/mpc_compile.h
@@ -17,17 +17,18 @@ namespace MPC
 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;
 
 protected slots:
   virtual void done(int code);
 
 private:
-  void parseLine(const QString &line);
+  void parseLine(const TQString &line);
 };
 
 } // namespace