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

6 files changed, 26 insertions, 24 deletions

diff --git a/src/tools/jal/gui/jal_ui.h b/src/tools/jal/gui/jal_ui.h
index aa6957e..d87d3e2 100644
--- a/src/tools/jal/gui/jal_ui.h
+++ b/src/tools/jal/gui/jal_ui.h
@@ -18,6 +18,7 @@ namespace JAL
 class ConfigWidget : public ToolConfigWidget
 {
 Q_OBJECT
+  TQ_OBJECT
 public:
   ConfigWidget(Project *project);
   virtual void initEntries() {}
diff --git a/src/tools/jal/jal.cpp b/src/tools/jal/jal.cpp
index 009ea21..11e503d 100644
--- a/src/tools/jal/jal.cpp
+++ b/src/tools/jal/jal.cpp
@@ -16,19 +16,19 @@
 #include "jal_generator.h"
 
 //----------------------------------------------------------------------------
-bool JAL::Base::checkExecutableResult(bool, QStringList &lines) const
+bool JAL::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 JAL::Group::informationText() const
+TQString JAL::Group::informationText() const
 {
-  return i18n("<a href=\"%1\">JAL</a> is a high-level language for PIC microcontrollers.").arg("http://jal.sourceforge.net");
+  return i18n("<a href=\"%1\">JAL</a> is a high-level language for PIC microcontrollers.").tqarg("http://jal.sourceforge.net");
 }
 
 Tool::Group::BaseData JAL::Group::baseFactory(Tool::Category category) const
@@ -44,9 +44,9 @@ const char * const SUPPORTED_DEVICES[] = {
   0
 };
 
-QValueList<const Device::Data *> JAL::Group::getSupportedDevices(const QString &) const
+TQValueList<const Device::Data *> JAL::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/jal/jal.h b/src/tools/jal/jal.h
index 0c0d790..3aa3cae 100644
--- a/src/tools/jal/jal.h
+++ b/src/tools/jal/jal.h
@@ -17,20 +17,20 @@ namespace JAL
 class Base : public Tool::Base
 {
 public:
-  virtual QString baseExecutable(bool, Tool::OutputExecutableType) const { return "jal"; }
+  virtual TQString baseExecutable(bool, Tool::OutputExecutableType) const { return "jal"; }
 
 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 "jal"; }
-  virtual QString label() const { return i18n("JAL"); }
-  virtual QString informationText() const;
+  virtual TQString name() const { return "jal"; }
+  virtual TQString label() const { return i18n("JAL"); }
+  virtual TQString informationText() const;
   virtual Tool::Category checkDevicesCategory() const { return Tool::Category::Nb_Types; }
   virtual Tool::ExecutableType preferedExecutableType() const { return Tool::ExecutableType::Unix; }
   virtual Tool::CompileType compileType() const { return Tool::AllFiles; }
@@ -38,7 +38,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/jal/jal_compile.cpp b/src/tools/jal/jal_compile.cpp
index 4d62e68..aa7d42f 100644
--- a/src/tools/jal/jal_compile.cpp
+++ b/src/tools/jal/jal_compile.cpp
@@ -8,19 +8,19 @@
  ***************************************************************************/
 #include "jal_compile.h"
 
-void JAL::CompileFile::logStderrLine(const QString &line)
+void JAL::CompileFile::logStderrLine(const TQString &line)
 {
-  if ( line.contains('\r') ) return; // what are those lines ?
+  if ( line.tqcontains('\r') ) return; // what are those lines ?
   // #### TODO
-  doLog(Log::LineType::Normal, line, QString::null, 0); // unrecognized
+  doLog(Log::LineType::Normal, line, TQString(), 0); // unrecognized
 }
 
-QStringList JAL::CompileFile::genericArguments(const Compile::Config &) const
+TQStringList JAL::CompileFile::genericArguments(const Compile::Config &) const
 {
   return "%I";
 }
 
-QString JAL::CompileFile::outputFiles() const
+TQString JAL::CompileFile::outputFiles() const
 {
   return "PURL::AsmGPAsm PURL::Hex";
 }
diff --git a/src/tools/jal/jal_compile.h b/src/tools/jal/jal_compile.h
index e63f603..c3fae70 100644
--- a/src/tools/jal/jal_compile.h
+++ b/src/tools/jal/jal_compile.h
@@ -17,11 +17,12 @@ namespace JAL
 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
diff --git a/src/tools/jal/jal_generator.cpp b/src/tools/jal/jal_generator.cpp
index 6aa9b08..ce76846 100644
--- a/src/tools/jal/jal_generator.cpp
+++ b/src/tools/jal/jal_generator.cpp
@@ -28,7 +28,7 @@ SourceLine::List JAL::SourceGenerator::sourceFileContent(PURL::ToolType, const D
 {
   SourceLine::List lines;
   lines.appendTitle(i18n("main code"));
-  lines.appendNotIndentedCode(QString::null, "<< " + i18n("insert code") + " >>");
+  lines.appendNotIndentedCode(TQString(), "<< " + i18n("insert code") + " >>");
   lines.appendNotIndentedCode("forever loop", i18n("loop forever"));
   lines.appendNotIndentedCode("end loop");
   return lines;