From 0aaa8e3fc8f8a1481333b564f0922277c8d8ad59 Mon Sep 17 00:00:00 2001
From: tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>
Date: Thu, 30 Jun 2011 00:15:53 +0000
Subject: 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
---
 src/tools/sdcc/sdcc_compile.cpp | 32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

(limited to 'src/tools/sdcc/sdcc_compile.cpp')

diff --git a/src/tools/sdcc/sdcc_compile.cpp b/src/tools/sdcc/sdcc_compile.cpp
index a3c072f..1c2e04d 100644
--- a/src/tools/sdcc/sdcc_compile.cpp
+++ b/src/tools/sdcc/sdcc_compile.cpp
@@ -14,19 +14,19 @@
 #include "sdcc_generator.h"
 
 //-----------------------------------------------------------------------------
-QString SDCC::Process::familyName() const
+TQString SDCC::Process::familyName() const
 {
   return FAMILY_DATA[family(_data.device)].name;
 }
 
-QString SDCC::Process::deviceName() const
+TQString SDCC::Process::deviceName() const
 {
   return toDeviceName(_data.device);
 }
 
-QStringList SDCC::Process::genericArguments(const Compile::Config &) const
+TQStringList SDCC::Process::genericArguments(const Compile::Config &) const
 {
-  QStringList args;
+  TQStringList args;
   args += "-m%FAMILY";
   args += "-%DEVICE";
   args += "-V"; // verbose
@@ -34,12 +34,12 @@ QStringList SDCC::Process::genericArguments(const Compile::Config &) const
   return args;
 }
 
-QString SDCC::Process::outputFiles() const
+TQString SDCC::Process::outputFiles() const
 {
   return "PURL::Object PURL::AsmGPAsm adb p d PURL::Lst";
 }
 
-void SDCC::Process::logStderrLine(const QString &line)
+void SDCC::Process::logStderrLine(const TQString &line)
 {
   if ( parseErrorLine(line, Compile::ParseErrorData("([^:]*):([0-9]+):(error|warning|message):(.+)", 1, 2, 4, 3)) ) return;
   if ( parseErrorLine(line, Compile::ParseErrorData("([^:]*):([0-9]+):(\\w+)\\s*\\[[0-9]+\\](.+)", 1, 2, 4, 3)) ) return;
@@ -47,33 +47,33 @@ void SDCC::Process::logStderrLine(const QString &line)
   if ( parseErrorLine(line, Compile::ParseErrorData("([^:]*):([0-9]+):(.+)", 1, 2, 3, Log::LineType::Warning)) ) return;
   if ( parseErrorLine(line, Compile::ParseErrorData("([^:]*):([^:]+):([0-9]+):(.+)", 2, 3, 4, Log::LineType::Warning)) ) return;
   if ( parseErrorLine(line, Compile::ParseErrorData("([^:]+):(.+)", -1, -1, 2, 1, Log::LineType::Warning)) ) return;
-  doLog(filterType(line), line, QString::null, 0);
+  doLog(filterType(line), line, TQString(), 0);
 }
 
 //-----------------------------------------------------------------------------
-QStringList SDCC::CompileStandaloneFile::genericArguments(const Compile::Config &config) const
+TQStringList SDCC::CompileStandaloneFile::genericArguments(const Compile::Config &config) const
 {
-  QStringList args = Process::genericArguments(config);
+  TQStringList args = Process::genericArguments(config);
   args += config.includeDirs(Tool::Category::Compiler, "-I");
   args += config.customOptions(Tool::Category::Compiler);
   args += "-Wl-o%O";
   args += "-Wl-m"; // output map file
   HexBuffer::Format format = config.hexFormat();
   if( format!=HexBuffer::Nb_Formats )
-    args += QString("-Wl-a") + HexBuffer::FORMATS[format];
+    args += TQString("-Wl-a") + HexBuffer::FORMATS[format];
   args += "%I";
   return args;
 }
 
-QString SDCC::CompileStandaloneFile::outputFiles() const
+TQString SDCC::CompileStandaloneFile::outputFiles() const
 {
   return Process::outputFiles() + " PURL::Map PURL::Hex PURL::Cod rst sym mem lnk";
 }
 
 //-----------------------------------------------------------------------------
-QStringList SDCC::CompileProjectFile::genericArguments(const Compile::Config &config) const
+TQStringList SDCC::CompileProjectFile::genericArguments(const Compile::Config &config) const
 {
-  QStringList args = Process::genericArguments(config);
+  TQStringList args = Process::genericArguments(config);
   args += config.includeDirs(Tool::Category::Compiler, "-I");
   args += config.customOptions(Tool::Category::Compiler);
   args += "-c"; // compile only
@@ -82,9 +82,9 @@ QStringList SDCC::CompileProjectFile::genericArguments(const Compile::Config &co
 }
 
 //-----------------------------------------------------------------------------
-QStringList SDCC::LinkProjectFile::genericArguments(const Compile::Config &config) const
+TQStringList SDCC::LinkProjectFile::genericArguments(const Compile::Config &config) const
 {
-  QStringList args = Process::genericArguments(config);
+  TQStringList args = Process::genericArguments(config);
   args += "-Wl-c"; // create coff file
   args += "-Wl-m"; // output map file
   args += "$LKR(-Wl-s%LKR)";
@@ -97,7 +97,7 @@ QStringList SDCC::LinkProjectFile::genericArguments(const Compile::Config &confi
   return args;
 }
 
-QString SDCC::LinkProjectFile::outputFiles() const
+TQString SDCC::LinkProjectFile::outputFiles() const
 {
   return Process::outputFiles() + " PURL::Lkr PURL::Hex PURL::Cod PURL::Coff PURL::Map";
 }
-- 
cgit v1.2.3