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

diff --git a/src/tools/base/tool_group.cpp b/src/tools/base/tool_group.cpp
index fb347ce..ac5c75e 100644
--- a/src/tools/base/tool_group.cpp
+++ b/src/tools/base/tool_group.cpp
@@ -58,9 +58,9 @@ PURL::Directory Tool::Group::autodetectDirectory(Compile::DirectoryType, const P
   return PURL::Directory();
 }
 
-QString Tool::Group::defaultLinkerScriptFilename(Compile::LinkType type, const QString &device) const
+TQString Tool::Group::defaultLinkerScriptFilename(Compile::LinkType type, const TQString &device) const
 {
-  QString basename = device.lower();
+  TQString basename = device.lower();
   if ( type==Compile::Icd2Linking ) basename += 'i';
   return basename + '.' + PURL::extension(PURL::Lkr);
 }
@@ -73,7 +73,7 @@ bool Tool::Group::hasCustomLinkerScript(const ::Project *project) const
 PURL::Url Tool::Group::linkerScript(const ::Project *project, Compile::LinkType type) const
 {
   if ( hasCustomLinkerScript(project) ) return project->customLinkerScript();
-  QString filename = defaultLinkerScriptFilename(type, Compile::Config::device(project));
+  TQString filename = defaultLinkerScriptFilename(type, Compile::Config::device(project));
   return PURL::Url(Compile::Config::directory(*this, Compile::DirectoryType::LinkerScript), filename);
 }
 
@@ -81,12 +81,12 @@ PURL::Url Tool::Group::linkerScript(const ::Project *project, Compile::LinkType
 {
   ::Process::LineOutput *process = new ::Process::LineOutput;
   Tool::Category cat = checkDevicesCategory();
-  QString exec = base(cat)->baseExecutable(withWine, Compile::Config::outputExecutableType(*this));
+  TQString exec = base(cat)->baseExecutable(withWine, Compile::Config::outputExecutableType(*this));
   process->setup(dir.path() + exec, checkDevicesOptions(i), withWine);
   return process;
 }
 
-bool Tool::Group::checkExecutable(Tool::Category category, QStringList &lines)
+bool Tool::Group::checkExecutable(Tool::Category category, TQStringList &lines)
 {
   PURL::Directory dir = Compile::Config::directory(*this, Compile::DirectoryType::Executable);
   bool withWine = Compile::Config::withWine(*this);
@@ -102,32 +102,32 @@ void Tool::Group::initSupported()
 {
   _checkDevicesError = false;
   Tool::Category cat = checkDevicesCategory();
-  QValueList<const Device::Data *> list;
-  if ( cat==Tool::Category::Nb_Types ) list = getSupportedDevices(QString::null);
+  TQValueList<const Device::Data *> list;
+  if ( cat==Tool::Category::Nb_Types ) list = getSupportedDevices(TQString());
   else {
     PURL::Directory dir = Compile::Config::directory(*this, Compile::DirectoryType::Executable);
     for (uint i=0; i<nbCheckDevices(); i++) {
-      QStringList lines;
+      TQStringList lines;
       ::Process::LineOutput *process = checkDevicesProcess(i, dir, Compile::Config::withWine(*this));
       ::Process::State state = ::Process::runSynchronously(*process, ::Process::Start, 10000);
       if ( state==::Process::Exited ) {
-        QStringList lines = process->sout() + process->serr();
+        TQStringList lines = process->sout() + process->serr();
         list += getSupportedDevices(lines.join("\n"));
       } else _checkDevicesError = true;
       delete process;
     }
   }
-  QValueList<const Device::Data *>::const_iterator it;
+  TQValueList<const Device::Data *>::const_iterator it;
   for (it=list.begin(); it!=list.end(); ++it) addDevice((*it)->name(), *it, ::Group::Support::Tested);
 }
 
-bool Tool::Group::check(const QString &device, Log::Generic *log) const
+bool Tool::Group::check(const TQString &device, Log::Generic *log) const
 {
   const_cast<Tool::Group *>(this)->checkInitSupported();
   if ( hasCheckDevicesError() )
-    return (log ? log->askContinue(i18n("There were errors detecting supported devices for the selected toolchain (%1). Please check the toolchain configuration. Continue anyway?").arg(label())) : false);
+    return (log ? log->askContinue(i18n("There were errors detecting supported devices for the selected toolchain (%1). Please check the toolchain configuration. Continue anyway?").tqarg(label())) : false);
   if ( !device.isEmpty() && device!=Device::AUTO_DATA.name && !isSupported(device) )
-    return (log ? log->askContinue(i18n("The selected toolchain (%1) does not support device %2. Continue anyway?").arg(label()).arg(device)) : false);
+    return (log ? log->askContinue(i18n("The selected toolchain (%1) does not support device %2. Continue anyway?").tqarg(label()).tqarg(device)) : false);
   return true;
 }