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/pic30/pic30.cpp b/src/tools/pic30/pic30.cpp
index 45b9270..e846719 100644
--- a/src/tools/pic30/pic30.cpp
+++ b/src/tools/pic30/pic30.cpp
@@ -17,9 +17,9 @@
 #include "pic30_generator.h"
 
 //----------------------------------------------------------------------------
-QString PIC30::Base::baseExecutable(bool, Tool::OutputExecutableType type) const
+TQString PIC30::Base::baseExecutable(bool, Tool::OutputExecutableType type) const
 {
-  QString s = "pic30-";
+  TQString s = "pic30-";
   if ( type==Tool::OutputExecutableType::Coff ) s += "coff";
   else s += "elf";
   s += "-";
@@ -32,16 +32,16 @@ QString PIC30::Base::baseExecutable(bool, Tool::OutputExecutableType type) const
     case Tool::Category::Nb_Types:  break;
   }
   Q_ASSERT(false);
-  return QString::null;
+  return TQString();
 }
 
-QStringList PIC30::Base::checkExecutableOptions(bool) const
+TQStringList PIC30::Base::checkExecutableOptions(bool) const
 {
   if ( _category!=Tool::Category::BinToHex ) return "--version";
-  return QStringList();
+  return TQStringList();
 }
 
-bool PIC30::Base::checkExecutableResult(bool, QStringList &lines) const
+bool PIC30::Base::checkExecutableResult(bool, TQStringList &lines) const
 {
   if ( lines.count()==0 ) return false;
   lines[0] = lines[0].stripWhiteSpace();
@@ -49,7 +49,7 @@ bool PIC30::Base::checkExecutableResult(bool, QStringList &lines) const
     case Tool::Category::Compiler:  return lines[0].startsWith("pic30");
     case Tool::Category::Assembler: return lines[0].startsWith("GNU assembler");
     case Tool::Category::Linker:    return lines[0].startsWith("GNU ld");
-    case Tool::Category::BinToHex:  return lines.join(" ").contains("Microchip ");
+    case Tool::Category::BinToHex:  return lines.join(" ").tqcontains("Microchip ");
     case Tool::Category::Librarian: return lines[0].startsWith("GNU ar");
     case Tool::Category::Nb_Types:  break;
   }
@@ -58,9 +58,9 @@ bool PIC30::Base::checkExecutableResult(bool, QStringList &lines) const
 }
 
 //----------------------------------------------------------------------------
-QString PIC30::Group::informationText() const
+TQString PIC30::Group::informationText() const
 {
-  return i18n("The <a href=\"%1\">PIC30 ToolChain</a> is a toolsuite for 16-bit PICs available from Microchip. Most of it is available under the GNU Public License.").arg("http://microchip.com/stellent/idcplg?IdcService=SS_GET_PAGE&nodeId=1406&dDocName=en010065&part=SW006012");
+  return i18n("The <a href=\"%1\">PIC30 ToolChain</a> is a toolsuite for 16-bit PICs available from Microchip. Most of it is available under the GNU Public License.").tqarg("http://microchip.com/stellent/idcplg?IdcService=SS_GET_PAGE&nodeId=1406&dDocName=en010065&part=SW006012");
 }
 
 Tool::Group::BaseData PIC30::Group::baseFactory(Tool::Category category) const
@@ -71,10 +71,10 @@ Tool::Group::BaseData PIC30::Group::baseFactory(Tool::Category category) const
   return BaseData();
 }
 
-QValueList<const Device::Data *> PIC30::Group::getSupportedDevices(const QString &) const
+TQValueList<const Device::Data *> PIC30::Group::getSupportedDevices(const TQString &) const
 {
-  QValueList<const Device::Data *> list;
-  QValueVector<QString> devices = Device::lister().group("pic")->supportedDevices();
+  TQValueList<const Device::Data *> list;
+  TQValueVector<TQString> devices = Device::lister().group("pic")->supportedDevices();
   for (uint i=0; i<devices.count(); i++) {
     const Device::Data *data = Device::lister().data(devices[i]);
     if ( static_cast<const Pic::Data *>(data)->is16bitFamily() ) list.append(data);