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, 12 insertions, 12 deletions

diff --git a/src/tools/gputils/gputils.cpp b/src/tools/gputils/gputils.cpp
index 3219598..ba30f2c 100644
--- a/src/tools/gputils/gputils.cpp
+++ b/src/tools/gputils/gputils.cpp
@@ -9,7 +9,7 @@
  ***************************************************************************/
 #include "gputils.h"
 
-#include <qregexp.h>
+#include <tqregexp.h>
 
 #include "gputils_compile.h"
 #include "gputils_config.h"
@@ -18,7 +18,7 @@
 #include "gputils_generator.h"
 
 //----------------------------------------------------------------------------
-QString GPUtils::Base::baseExecutable(bool, Tool::OutputExecutableType) const
+TQString GPUtils::Base::baseExecutable(bool, Tool::OutputExecutableType) const
 {
   switch (_category.type()) {
     case Tool::Category::Assembler: return "gpasm";
@@ -26,18 +26,18 @@ QString GPUtils::Base::baseExecutable(bool, Tool::OutputExecutableType) const
     case Tool::Category::Librarian: return "gplib";
     default: break;
   }
-  return QString::null;
+  return TQString();
 }
 
-bool GPUtils::Base::checkExecutableResult(bool withWine, QStringList &lines) const
+bool GPUtils::Base::checkExecutableResult(bool withWine, TQStringList &lines) const
 {
   return ( lines.count()>0 && lines[0].startsWith(baseExecutable(withWine, Tool::OutputExecutableType::Coff)) );
 }
 
 //----------------------------------------------------------------------------
-QString GPUtils::Group::informationText() const
+TQString GPUtils::Group::informationText() const
 {
-  return i18n("<a href=\"%1\">GPUtils</a> is an open-source assembler and linker suite.<br>").arg("http://gputils.sourceforge.net");
+  return i18n("<a href=\"%1\">GPUtils</a> is an open-source assembler and linker suite.<br>").tqarg("http://gputils.sourceforge.net");
 }
 
 Tool::Group::BaseData GPUtils::Group::baseFactory(Tool::Category category) const
@@ -51,22 +51,22 @@ PURL::Directory GPUtils::Group::autodetectDirectory(Compile::DirectoryType type,
 {
   switch (type.type()) {
     case Compile::DirectoryType::LinkerScript: {
-      QString exec = execDir.path() + base(Tool::Category::Linker)->baseExecutable(withWine, Tool::OutputExecutableType::Coff);
+      TQString exec = execDir.path() + base(Tool::Category::Linker)->baseExecutable(withWine, Tool::OutputExecutableType::Coff);
       ::Process::StringOutput process;
       process.setup(exec, "-h", withWine);
       if ( ::Process::runSynchronously(process, ::Process::Start, 1000)!=::Process::Exited ) return PURL::Directory();
-      QString s = process.sout() + process.serr();
-      QRegExp re(".*Default linker script path ([^\\n]*)\\n.*");
+      TQString s = process.sout() + process.serr();
+      TQRegExp re(".*Default linker script path ([^\\n]*)\\n.*");
       if ( !re.exactMatch(s) ) return PURL::Directory();
       return PURL::Directory(re.cap(1));
     }
     case Compile::DirectoryType::Header: {
-      QString exec = execDir.path() + base(Tool::Category::Assembler)->baseExecutable(withWine, Tool::OutputExecutableType::Coff);
+      TQString exec = execDir.path() + base(Tool::Category::Assembler)->baseExecutable(withWine, Tool::OutputExecutableType::Coff);
       ::Process::StringOutput process;
       process.setup(exec, "-h", withWine);
       if ( ::Process::runSynchronously(process, ::Process::Start, 1000)!=::Process::Exited ) return PURL::Directory();
-      QString s = process.sout() + process.serr();
-      QRegExp re(".*Default header file path ([^\\n]*)\\n.*");
+      TQString s = process.sout() + process.serr();
+      TQRegExp re(".*Default header file path ([^\\n]*)\\n.*");
       if ( !re.exactMatch(s) ) return PURL::Directory();
       return PURL::Directory(re.cap(1));
     }