1 files changed, 5 insertions, 5 deletions
diff --git a/src/devices/base/generic_device.h b/src/devices/base/generic_device.h
index 73f9b15..373601c 100644
--- a/src/devices/base/generic_device.h
+++ b/src/devices/base/generic_device.h
@@ -19,9 +19,9 @@
 namespace Device
 {
 //----------------------------------------------------------------------------
-BEGIN_DECLARE_ENUM(tqStatus)
+BEGIN_DECLARE_ENUM(Status)
   InProduction = 0, Future, NotRecommended, EOL, Unknown, Mature
-END_DECLARE_ENUM_STD(tqStatus)
+END_DECLARE_ENUM_STD(Status)
 
 BEGIN_DECLARE_ENUM(MemoryTechnology)
   Flash = 0, Eprom, Rom, Romless
@@ -70,7 +70,7 @@ public:
   enum { MAX_NB = 9 };
   struct TypeData {
     const char *name, *label;
-    Shape tqshape;
+    Shape shape;
     uint nbPins[MAX_NB];
   };
   static const TypeData TYPE_DATA[];
@@ -121,7 +121,7 @@ public:
   virtual TQString name() const { return _name; }
   virtual TQString fname(Special) const { return _name; }
   virtual TQString listViewGroup() const = 0;
-  tqStatus status() const { return _status; }
+  Status status() const { return _status; }
   const Documents &documents() const { return _documents; }
   const TQStringList &alternatives() const { return _alternatives; }
   MemoryTechnology memoryTechnology() const { return _memoryTechnology; }
@@ -141,7 +141,7 @@ protected:
   TQString _name;
   Documents _documents;
   TQStringList _alternatives;
-  tqStatus _status;
+  Status _status;
   TQValueVector<FrequencyRange> _frequencyRanges;
   MemoryTechnology _memoryTechnology;
   RegistersData *_registersData;