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

diff --git a/src/progs/icd2/base/icd2.h b/src/progs/icd2/base/icd2.h
index 1c9c1b9..8200f1b 100644
--- a/src/progs/icd2/base/icd2.h
+++ b/src/progs/icd2/base/icd2.h
@@ -21,12 +21,12 @@ namespace Icd2
   class TestData {
   public:
     TestData();
-    TestData(const QString &rx);
+    TestData(const TQString &rx);
     enum VoltageType { TargetVdd = 0, ModuleVpp, MclrGround, MclrVdd, MclrVpp,
                        Nb_VoltageTypes };
     bool pass() const;
-    QString result(VoltageType type) const;
-    QString pretty(VoltageType type) const;
+    TQString result(VoltageType type) const;
+    TQString pretty(VoltageType type) const;
     static const char * const VOLTAGE_LABELS[Nb_VoltageTypes];
 
   private:
@@ -39,7 +39,7 @@ class Hardware : public Icd::Hardware
 {
 public:
   Hardware(::Programmer::Base &base, Port::Base *port) : Icd::Hardware(base, port) {}
-  bool command(const QString &command, uint responseSize);
+  bool command(const TQString &command, uint responseSize);
 
 // initialization
   virtual bool uploadFirmware(const Pic::Memory &memory);
@@ -72,7 +72,7 @@ public:
   virtual BitValue getProgramCounter();
 
 protected:
-  virtual QString receivedData() const { return _rx.mid(5, _rx.length()-8); }
+  virtual TQString receivedData() const { return _rx.mid(5, _rx.length()-8); }
 
 private:
   struct VoltageTypeData {
@@ -82,8 +82,8 @@ private:
   static const VoltageTypeData VOLTAGE_TYPE_DATA[Pic::Nb_VoltageTypes];
   static const char * const WRITE_MODE_VALUES[Pic::Nb_WriteModes];
 
-  bool sendCommand(const QString &command);
-  bool receiveResponse(const QString &command, uint responseSize, bool poll);
+  bool sendCommand(const TQString &command);
+  bool receiveResponse(const TQString &command, uint responseSize, bool poll);
   bool readBlock(uint nbBytesWord, uint nbWords, Device::Array &data);
   bool writeBlock(uint nbBytesWord, const Device::Array &data, uint wordOffset, uint nbWords);
   const char *readCommand(Pic::MemoryRangeType type) const;