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, 27 insertions, 25 deletions

diff --git a/src/tools/jalv2/gui/jalv2_ui.h b/src/tools/jalv2/gui/jalv2_ui.h
index 93085c1..4944860 100644
--- a/src/tools/jalv2/gui/jalv2_ui.h
+++ b/src/tools/jalv2/gui/jalv2_ui.h
@@ -18,6 +18,7 @@ namespace JALV2
 class ConfigWidget : public ToolConfigWidget
 {
 Q_OBJECT
+  TQ_OBJECT
 public:
   ConfigWidget(Project *project);
   virtual void initEntries();
diff --git a/src/tools/jalv2/jalv2.cpp b/src/tools/jalv2/jalv2.cpp
index 1d910b8..8ea6d1e 100644
--- a/src/tools/jalv2/jalv2.cpp
+++ b/src/tools/jalv2/jalv2.cpp
@@ -16,19 +16,19 @@
 #include "tools/jal/jal_generator.h"
 
 //----------------------------------------------------------------------------
-bool JALV2::Base::checkExecutableResult(bool, QStringList &lines) const
+bool JALV2::Base::checkExecutableResult(bool, TQStringList &lines) const
 {
-  QStringList tmp;
+  TQStringList tmp;
   for (uint i=0; i<lines.count(); i++)
-    if ( !lines[i].contains('\r') ) tmp += lines[i]; // ??
+    if ( !lines[i].tqcontains('\r') ) tmp += lines[i]; // ??
   lines = tmp;
   return ( lines.count()>0 && lines[0].startsWith("jal") );
 }
 
 //----------------------------------------------------------------------------
-QString JALV2::Group::informationText() const
+TQString JALV2::Group::informationText() const
 {
-  return i18n("<a href=\"%1\">JAL V2</a> is a new compiler for the high-level language JAL.").arg("http://www.casadeyork.com/jalv2");
+  return i18n("<a href=\"%1\">JAL V2</a> is a new compiler for the high-level language JAL.").tqarg("http://www.casadeyork.com/jalv2");
 }
 
 Tool::Group::BaseData JALV2::Group::baseFactory(Tool::Category category) const
@@ -49,9 +49,9 @@ const char * const SUPPORTED_DEVICES[] = {
   0
 };
 
-QValueList<const Device::Data *> JALV2::Group::getSupportedDevices(const QString &) const
+TQValueList<const Device::Data *> JALV2::Group::getSupportedDevices(const TQString &) const
 {
-  QValueList<const Device::Data *> list;
+  TQValueList<const Device::Data *> list;
   for (uint i=0; SUPPORTED_DEVICES[i]; i++) {
     const Device::Data *data = Device::lister().data(SUPPORTED_DEVICES[i]);
     Q_ASSERT(data);
diff --git a/src/tools/jalv2/jalv2.h b/src/tools/jalv2/jalv2.h
index 80c3d02..3f1348c 100644
--- a/src/tools/jalv2/jalv2.h
+++ b/src/tools/jalv2/jalv2.h
@@ -17,20 +17,20 @@ namespace JALV2
 class Base : public Tool::Base
 {
 public:
-  virtual QString baseExecutable(bool, Tool::OutputExecutableType) const { return "jalv2"; }
+  virtual TQString baseExecutable(bool, Tool::OutputExecutableType) const { return "jalv2"; }
 
 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 "jalv2"; }
-  virtual QString label() const { return i18n("JAL V2"); }
-  virtual QString informationText() const;
+  virtual TQString name() const { return "jalv2"; }
+  virtual TQString label() const { return i18n("JAL V2"); }
+  virtual TQString informationText() const;
   virtual bool hasDirectory(Compile::DirectoryType type) const { return type==Compile::DirectoryType::Header; }
   virtual Tool::Category checkDevicesCategory() const { return Tool::Category::Nb_Types; }
   virtual Tool::ExecutableType preferedExecutableType() const { return Tool::ExecutableType::Unix; }
@@ -39,7 +39,7 @@ public:
 
 private:
   virtual BaseData baseFactory(Tool::Category c) const;
-  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 Tool::SourceGenerator *sourceGeneratorFactory() const;
diff --git a/src/tools/jalv2/jalv2_compile.cpp b/src/tools/jalv2/jalv2_compile.cpp
index 0b1e7f5..73274aa 100644
--- a/src/tools/jalv2/jalv2_compile.cpp
+++ b/src/tools/jalv2/jalv2_compile.cpp
@@ -12,11 +12,11 @@
 #include "common/common/misc.h"
 #include "tools/list/compile_config.h"
 
-QStringList JALV2::CompileFile::genericArguments(const Compile::Config &config) const
+TQStringList JALV2::CompileFile::genericArguments(const Compile::Config &config) const
 {
-  QStringList args;
-  QStringList includes = config.includeDirs(Tool::Category::Compiler, QString::null, QString::null, ";");
-  QString s = (includes.isEmpty() ? QString::null : includes[0]);
+  TQStringList args;
+  TQStringList includes = config.includeDirs(Tool::Category::Compiler, TQString(), TQString(), ";");
+  TQString s = (includes.isEmpty() ? TQString() : includes[0]);
   PURL::Directory dir = Compile::Config::directory(group(), Compile::DirectoryType::Header).path();
   if ( !dir.isEmpty() ) {
     if ( !s.isEmpty() ) s += ";";
@@ -30,14 +30,14 @@ QStringList JALV2::CompileFile::genericArguments(const Compile::Config &config)
   return args;
 }
 
-void JALV2::CompileFile::logStderrLine(const QString &line)
+void JALV2::CompileFile::logStderrLine(const TQString &line)
 {
   if ( parseErrorLine(line, Compile::ParseErrorData("([^:]*):([0-9]+):\\s*(warning)(.+)", 1, 2, 4, 3)) ) return;
   if ( parseErrorLine(line, Compile::ParseErrorData("([^:]*):([0-9]+):\\s*(.+)", 1, 2, 3, Log::LineType::Error)) ) return;
-  doLog(Log::LineType::Normal, line, QString::null, 0); // unrecognized
+  doLog(Log::LineType::Normal, line, TQString(), 0); // unrecognized
 }
 
-QString JALV2::CompileFile::outputFiles() const
+TQString JALV2::CompileFile::outputFiles() const
 {
   return "PURL::AsmGPAsm PURL::Hex";
 }
diff --git a/src/tools/jalv2/jalv2_compile.h b/src/tools/jalv2/jalv2_compile.h
index de0257d..d145c4b 100644
--- a/src/tools/jalv2/jalv2_compile.h
+++ b/src/tools/jalv2/jalv2_compile.h
@@ -16,11 +16,12 @@ namespace JALV2
 class CompileFile : public Compile::Process
 {
 Q_OBJECT
+  TQ_OBJECT
 protected:
-  virtual QString deviceName() const { return _data.device; }
-  virtual void logStderrLine(const QString &line);
-  virtual QStringList genericArguments(const Compile::Config &config) const;
-  virtual QString outputFiles() const;
+  virtual TQString deviceName() const { return _data.device; }
+  virtual void logStderrLine(const TQString &line);
+  virtual TQStringList genericArguments(const Compile::Config &config) const;
+  virtual TQString outputFiles() const;
 };
 
 } // namespace