rename the following methods:

tqparent parent
tqmask mask


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/piklab@1246260 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

1 files changed, 11 insertions, 11 deletions

diff --git a/src/devices/pic/base/pic_config.h b/src/devices/pic/base/pic_config.h
index 6e13210..77a5be8 100644
--- a/src/devices/pic/base/pic_config.h
+++ b/src/devices/pic/base/pic_config.h
@@ -48,7 +48,7 @@ public:
   public:
     TQString name;
     TQStringList ignoredCNames;
-    BitValue wtqmask, ptqmask, ctqmask; // write, protected, and checksum bits masks
+    BitValue wmask, pmask, cmask; // write, protected, and checksum bits masks
     BitValue bvalue;              // blank value
     TQValueVector<Mask> masks; // ordered from lower to higher
     BitValue usedMask() const;
@@ -59,12 +59,12 @@ public:
   TQValueVector<Word> _words;
   const Protection &protection() const { return _protection; }
 
-  const Value *findValue(const TQString &tqmask, const TQString &value) const;
-  const Mask *findMask(const TQString &tqmask, uint *wordIndex = 0) const;
-  static bool hasMaskName(const TQString &tqmask);
-  static TQString maskLabel(const TQString &tqmask);
-  bool checkValueName(const TQString &tqmask, const TQString &name) const;
-  static TQString valueLabel(const TQString &tqmask, const TQString &name);
+  const Value *findValue(const TQString &mask, const TQString &value) const;
+  const Mask *findMask(const TQString &mask, uint *wordIndex = 0) const;
+  static bool hasMaskName(const TQString &mask);
+  static TQString maskLabel(const TQString &mask);
+  bool checkValueName(const TQString &mask, const TQString &name) const;
+  static TQString valueLabel(const TQString &mask, const TQString &name);
 
 private:
   class MapData {
@@ -74,7 +74,7 @@ private:
     int index, block;
   };
   static TQMap<TQString, MapData> &masks();
-  static TQMap<TQString, MapData> *_masks; // tqmask name -> index in DATA
+  static TQMap<TQString, MapData> *_masks; // mask name -> index in DATA
 
   struct NameData {
     const char *name, *label;
@@ -82,7 +82,7 @@ private:
   enum Type { Fixed, ValueDouble, ValueUInt, Ratio, MemoryRange, Toggle, Pin, Pins };
   class Data {
   public:
-    const NameData tqmask;
+    const NameData mask;
     Type type;
     const NameData values[50];
   };
@@ -95,8 +95,8 @@ private:
 
 TQDataStream &operator <<(TQDataStream &s, const Config::Value &value);
 TQDataStream &operator >>(TQDataStream &s, Config::Value &value);
-TQDataStream &operator <<(TQDataStream &s, const Config::Mask &tqmask);
-TQDataStream &operator >>(TQDataStream &s, Config::Mask &tqmask);
+TQDataStream &operator <<(TQDataStream &s, const Config::Mask &mask);
+TQDataStream &operator >>(TQDataStream &s, Config::Mask &mask);
 TQDataStream &operator <<(TQDataStream &s, const Config::Word &word);
 TQDataStream &operator >>(TQDataStream &s, Config::Word &word);
 TQDataStream &operator <<(TQDataStream &s, const Config &config);