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

diff --git a/src/devices/base/generic_device.h b/src/devices/base/generic_device.h
index e3cbec9..73f9b15 100644
--- a/src/devices/base/generic_device.h
+++ b/src/devices/base/generic_device.h
@@ -9,7 +9,7 @@
 #ifndef GENERIC_DEVICE_H
 #define GENERIC_DEVICE_H
 
-#include <qstringlist.h>
+#include <tqstringlist.h>
 
 #include "common/common/misc.h"
 #include "common/common/bitvalue.h"
@@ -19,9 +19,9 @@
 namespace Device
 {
 //----------------------------------------------------------------------------
-BEGIN_DECLARE_ENUM(Status)
+BEGIN_DECLARE_ENUM(tqStatus)
   InProduction = 0, Future, NotRecommended, EOL, Unknown, Mature
-END_DECLARE_ENUM_STD(Status)
+END_DECLARE_ENUM_STD(tqStatus)
 
 BEGIN_DECLARE_ENUM(MemoryTechnology)
   Flash = 0, Eprom, Rom, Romless
@@ -31,7 +31,7 @@ class RangeBox {
 public:
   struct Value { double x, yMin, yMax; };
   Value start, end;
-  QString osc, mode, special;
+  TQString osc, mode, special;
   double yMin() const { return qMin(start.yMin, end.yMin); }
   double yMax() const { return qMax(start.yMax, end.yMax); }
 };
@@ -48,7 +48,7 @@ class FrequencyRange {
 public:
   OperatingCondition operatingCondition;
   Special special;
-  QValueVector<RangeBox> vdds;
+  TQValueVector<RangeBox> vdds;
   double vddMin() const;
   double vddMax() const;
 };
@@ -62,15 +62,15 @@ public:
 class Package
 {
 public:
-  QValueVector<uint> types;
-  QValueVector<QString> pins;
+  TQValueVector<uint> types;
+  TQValueVector<TQString> pins;
 
 public:
   enum Shape { Bar, Square };
   enum { MAX_NB = 9 };
   struct TypeData {
     const char *name, *label;
-    Shape shape;
+    Shape tqshape;
     uint nbPins[MAX_NB];
   };
   static const TypeData TYPE_DATA[];
@@ -79,8 +79,8 @@ public:
 class Documents
 {
 public:
-  QString webpage, datasheet, progsheet;
-  QStringList erratas;
+  TQString webpage, datasheet, progsheet;
+  TQStringList erratas;
 };
 
 //----------------------------------------------------------------------------
@@ -108,7 +108,7 @@ public:
   bool operator !=(const Array &array) const { return _data!=array._data; }
 
 private:
-  QMemArray<BitValue> _data;
+  TQMemArray<BitValue> _data;
 };
 
 //----------------------------------------------------------------------------
@@ -118,15 +118,15 @@ public:
   Data(RegistersData *rdata) : _group(0), _registersData(rdata) {}
   virtual ~Data();
   const GroupBase &group() const { return *_group; }
-  virtual QString name() const { return _name; }
-  virtual QString fname(Special) const { return _name; }
-  virtual QString listViewGroup() const = 0;
-  Status status() const { return _status; }
+  virtual TQString name() const { return _name; }
+  virtual TQString fname(Special) const { return _name; }
+  virtual TQString listViewGroup() const = 0;
+  tqStatus status() const { return _status; }
   const Documents &documents() const { return _documents; }
-  const QStringList &alternatives() const { return _alternatives; }
+  const TQStringList &alternatives() const { return _alternatives; }
   MemoryTechnology memoryTechnology() const { return _memoryTechnology; }
   virtual bool matchId(BitValue rawId, IdData &idata) const = 0;
-  const QValueVector<FrequencyRange> &frequencyRanges() const { return _frequencyRanges; }
+  const TQValueVector<FrequencyRange> &frequencyRanges() const { return _frequencyRanges; }
   double vddMin() const;
   double vddMax() const;
   virtual uint nbBitsAddress() const = 0;
@@ -134,37 +134,37 @@ public:
   uint nbCharsAddress() const { return nbBitsAddress()/4 + (nbBitsAddress()%4 ? 1 : 0); }
   virtual bool canWriteCalibration() const = 0; // #### REMOVE ME
   const RegistersData *registersData() const { return _registersData; }
-  const QValueVector<Package> &packages() const { return _packages; }
+  const TQValueVector<Package> &packages() const { return _packages; }
 
 protected:
   const GroupBase *_group;
-  QString _name;
+  TQString _name;
   Documents _documents;
-  QStringList _alternatives;
-  Status _status;
-  QValueVector<FrequencyRange> _frequencyRanges;
+  TQStringList _alternatives;
+  tqStatus _status;
+  TQValueVector<FrequencyRange> _frequencyRanges;
   MemoryTechnology _memoryTechnology;
   RegistersData *_registersData;
-  QValueVector<Package> _packages;
+  TQValueVector<Package> _packages;
 
   friend class XmlToDataBase;
   friend class GroupBase;
-  friend QDataStream &operator <<(QDataStream &s, const Data &data);
-  friend QDataStream &operator >>(QDataStream &s, Data &data);
+  friend TQDataStream &operator <<(TQDataStream &s, const Data &data);
+  friend TQDataStream &operator >>(TQDataStream &s, Data &data);
 };
 
-QDataStream &operator <<(QDataStream &s, const RangeBox::Value &rbv);
-QDataStream &operator >>(QDataStream &s, RangeBox::Value &rbv);
-QDataStream &operator <<(QDataStream &s, const RangeBox &rb);
-QDataStream &operator >>(QDataStream &s, RangeBox &rb);
-QDataStream &operator <<(QDataStream &s, const FrequencyRange &frange);
-QDataStream &operator >>(QDataStream &s, FrequencyRange &frange);
-QDataStream &operator <<(QDataStream &s, const Package &package);
-QDataStream &operator >>(QDataStream &s, Package &package);
-QDataStream &operator <<(QDataStream &s, const Documents &documents);
-QDataStream &operator >>(QDataStream &s, Documents &documents);
-QDataStream &operator <<(QDataStream &s, const Data &data);
-QDataStream &operator >>(QDataStream &s, Data &data);
+TQDataStream &operator <<(TQDataStream &s, const RangeBox::Value &rbv);
+TQDataStream &operator >>(TQDataStream &s, RangeBox::Value &rbv);
+TQDataStream &operator <<(TQDataStream &s, const RangeBox &rb);
+TQDataStream &operator >>(TQDataStream &s, RangeBox &rb);
+TQDataStream &operator <<(TQDataStream &s, const FrequencyRange &frange);
+TQDataStream &operator >>(TQDataStream &s, FrequencyRange &frange);
+TQDataStream &operator <<(TQDataStream &s, const Package &package);
+TQDataStream &operator >>(TQDataStream &s, Package &package);
+TQDataStream &operator <<(TQDataStream &s, const Documents &documents);
+TQDataStream &operator >>(TQDataStream &s, Documents &documents);
+TQDataStream &operator <<(TQDataStream &s, const Data &data);
+TQDataStream &operator >>(TQDataStream &s, Data &data);
 
 } // namespace