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

1 files changed, 39 insertions, 35 deletions

diff --git a/src/tools/list/compile_process.h b/src/tools/list/compile_process.h
index 4fe396e..dd5ce3b 100644
--- a/src/tools/list/compile_process.h
+++ b/src/tools/list/compile_process.h
@@ -22,8 +22,8 @@ namespace Compile
 {
   class Manager;
   enum FileAction { NoAction = 0, Show = 1, InProject = 2, Generated = 8, Included = 16 };
-  Q_DECLARE_FLAGS(FileActions, FileAction)
-  Q_DECLARE_OPERATORS_FOR_FLAGS(FileActions)
+  TQ_DECLARE_FLAGS(FileActions, FileAction)
+  TQ_DECLARE_OPERATORS_FOR_FLAGS(FileActions)
 
   class FileData {
   public:
@@ -31,7 +31,7 @@ namespace Compile
     FileData(const PURL::Url &u, FileActions a) : url(u), actions(a) {}
     PURL::Url url;
     FileActions actions;
-    class List : public QValueList<FileData> {
+    class List : public TQValueList<FileData> {
     public:
       List() {}
       List(const FileData &data) { append(data); }
@@ -47,14 +47,14 @@ namespace Compile
 
   class ParseErrorData {
   public:
-    ParseErrorData(const QString &p, int iFile, int iLine, int iMessage, Log::LineType dLineType)
+    ParseErrorData(const TQString &p, int iFile, int iLine, int iMessage, Log::LineType dLineType)
       : pattern(p), indexFile(iFile), indexLine(iLine), indexMessage(iMessage), indexLogType(-1),
         defaultLineType(dLineType) {}
-    ParseErrorData(const QString &p, int iFile, int iLine, int iMessage, uint iLogType,
+    ParseErrorData(const TQString &p, int iFile, int iLine, int iMessage, uint iLogType,
                    Log::LineType dLineType = Log::LineType::Error)
       : pattern(p), indexFile(iFile), indexLine(iLine), indexMessage(iMessage), indexLogType(iLogType),
         defaultLineType(dLineType) {}
-    QString pattern;
+    TQString pattern;
     int indexFile, indexLine, indexMessage, indexLogType;
     Log::LineType defaultLineType;
   };
@@ -63,10 +63,11 @@ namespace Compile
 class LogWidget : public Log::Widget
 {
   Q_OBJECT
+  TQ_OBJECT
 public:
-  LogWidget(QWidget *parent);
-  void appendLine(Log::LineType type, const QString &message, const QString &filepath, uint line);
-  void appendLine(Log::DebugLevel debug, const QString &message, const QString &filepath, uint line);
+  LogWidget(TQWidget *tqparent);
+  void appendLine(Log::LineType type, const TQString &message, const TQString &filepath, uint line);
+  void appendLine(Log::DebugLevel debug, const TQString &message, const TQString &filepath, uint line);
   virtual void clear();
 
 private slots:
@@ -76,17 +77,18 @@ private:
   class Data {
   public:
     Data() {}
-    Data(const QString &fp, uint l) : filepath(fp), line(l) {}
-    QString filepath;
+    Data(const TQString &fp, uint l) : filepath(fp), line(l) {}
+    TQString filepath;
     uint line;
   };
-  QMap<uint, Data> _map;
+  TQMap<uint, Data> _map;
 };
 
 //-----------------------------------------------------------------------------
-class BaseProcess : public QObject
+class BaseProcess : public TQObject
 {
 Q_OBJECT
+  TQ_OBJECT
 public:
   BaseProcess();
   virtual void init(const Data &data, Manager *manager);
@@ -102,15 +104,15 @@ protected:
   Manager *_manager;
   Data    _data;
   ::Process::LineSignal *_process;
-  QString _stdout, _stderr;
+  TQString _stdout, _stderr;
 
   const Tool::Group &group() const { return Main::toolGroup(); }
   PURL::Directory directory(uint i = 0) const;
   virtual void setupProcess() = 0;
 
 protected slots:
-  virtual void logStdoutLine(const QString &line) { logStderrLine(line); }
-  virtual void logStderrLine(const QString &line) = 0;
+  virtual void logStdoutLine(const TQString &line) { logStderrLine(line); }
+  virtual void logStderrLine(const TQString &line) = 0;
   virtual void done(int code);
   void timeout();
 };
@@ -119,48 +121,50 @@ protected slots:
 class Process : public BaseProcess
 {
 Q_OBJECT
+  TQ_OBJECT
 public:
   virtual ~Process();
   virtual void init(const Data &data, Manager *manager);
   virtual bool check() const;
   virtual FileData::List files(bool *ok) const;
-  virtual QStringList genericArguments(const Compile::Config &config) const = 0;
+  virtual TQStringList genericArguments(const Compile::Config &config) const = 0;
   void checkArguments() const;
 
 protected:
   Config  *_config;
 
   virtual PURL::Url url(PURL::FileType type = PURL::Nb_FileTypes, uint i = 0) const;
-  QString filepath(PURL::FileType type, uint i=0) const;
-  virtual QString outputFilepath() const;
-  virtual QString outputFiles() const = 0;
+  TQString filepath(PURL::FileType type, uint i=0) const;
+  virtual TQString outputFilepath() const;
+  virtual TQString outputFiles() const = 0;
   uint nbFiles() const { return _data.items.count(); }
-  virtual QString inputFilepath(uint i) const { return filepath(PURL::Nb_FileTypes, i); }
-  virtual QString deviceName() const = 0;
-  virtual QString familyName() const { return QString::null; }
-  virtual QString objectExtension() const { return QString::null; }
-  virtual QString libraryExtension() const { return "lib"; }
+  virtual TQString inputFilepath(uint i) const { return filepath(PURL::Nb_FileTypes, i); }
+  virtual TQString deviceName() const = 0;
+  virtual TQString familyName() const { return TQString(); }
+  virtual TQString objectExtension() const { return TQString(); }
+  virtual TQString libraryExtension() const { return "lib"; }
   virtual bool hasLinkerScript() const { return group().hasCustomLinkerScript(_data.project); }
   FileData fileData(PURL::FileType type, FileActions actions) const;
-  bool parseErrorLine(const QString &s, const ParseErrorData &data);
-  virtual Log::LineType filterType(const QString &type) const;
-  void doLog(const QString &type, const QString &message, const QString &surl, uint line);
-  void doLog(Log::LineType type, const QString &message, const QString &surl, uint line);
+  bool parseErrorLine(const TQString &s, const ParseErrorData &data);
+  virtual Log::LineType filterType(const TQString &type) const;
+  void doLog(const TQString &type, const TQString &message, const TQString &surl, uint line);
+  void doLog(Log::LineType type, const TQString &message, const TQString &surl, uint line);
   virtual void setupProcess();
-  QStringList arguments() const;
+  TQStringList arguments() const;
   const Tool::Base *tool() const { return group().base(_data.category); }
 
 private:
-  static bool checkIs(const QString &s, const QString &key);
-  static QString replaceIf(const QString &s, const QString &key, bool condition);
+  static bool checkIs(const TQString &s, const TQString &key);
+  static TQString replaceIf(const TQString &s, const TQString &key, bool condition);
 };
 
 //-----------------------------------------------------------------------------
 class CustomProcess : public BaseProcess
 {
 Q_OBJECT
+  TQ_OBJECT
 public:
-  CustomProcess(const QString &command) : _command(command) {}
+  CustomProcess(const TQString &command) : _command(command) {}
   virtual bool check() const { return true; }
   virtual FileData::List files(bool *ok) const { if (ok) *ok = true; return FileData::List(); }
 
@@ -168,10 +172,10 @@ protected:
   virtual void setupProcess();
 
 protected slots:
-  virtual void logStderrLine(const QString &line);
+  virtual void logStderrLine(const TQString &line);
 
 private:
-  QString _command;
+  TQString _command;
 };
 
 } // namespace