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

3 files changed, 10 insertions, 10 deletions

diff --git a/src/common/port/parallel.cpp b/src/common/port/parallel.cpp
index d92bc82..daa0c6a 100644
--- a/src/common/port/parallel.cpp
+++ b/src/common/port/parallel.cpp
@@ -203,8 +203,8 @@ bool Port::Parallel::setPinOn(uint pin, bool on, LogicType type)
   Q_ASSERT( PIN_DATA[pin].dir==Out );
   RequestType rtype = PIN_DATA[pin].rType;
   Q_ASSERT( rtype!=Nb_RequestTypes );
-  uchar tqmask = PIN_DATA[pin].tqmask;
-  uchar c = (XOR(type==NegativeLogic, on) ? _images[rtype] | tqmask : _images[rtype] &  ~tqmask);
+  uchar mask = PIN_DATA[pin].mask;
+  uchar c = (XOR(type==NegativeLogic, on) ? _images[rtype] | mask : _images[rtype] &  ~mask);
   int request = REQUEST_DATA[rtype].write;
   Q_ASSERT( request!=0 );
   if ( ioctl(_fd, request, &c)<0 ) {
@@ -232,7 +232,7 @@ bool Port::Parallel::readPin(uint pin, LogicType type, bool &value)
     return false;
   }
   _images[rtype] = c;
-  value = (type==NegativeLogic ? ~c : c ) & PIN_DATA[pin].tqmask;
+  value = (type==NegativeLogic ? ~c : c ) & PIN_DATA[pin].mask;
 #endif
   return true;
 }
diff --git a/src/common/port/parallel.h b/src/common/port/parallel.h
index 2dbfc71..08741e1 100644
--- a/src/common/port/parallel.h
+++ b/src/common/port/parallel.h
@@ -36,7 +36,7 @@ public:
   enum RequestType { Control = 0, tqStatus, Data, Nb_RequestTypes };
   struct PPinData {
     RequestType rType;
-    uchar       tqmask;
+    uchar       mask;
     IODir       dir;
     const char *label;
   };
diff --git a/src/common/port/serial.cpp b/src/common/port/serial.cpp
index 5942561..2db84b9 100644
--- a/src/common/port/serial.cpp
+++ b/src/common/port/serial.cpp
@@ -375,15 +375,15 @@ bool Port::Serial::internalReadPin(Pin pin, LogicType type, bool &value)
 #if defined(Q_OS_UNIX)
   int bits;
   if ( ioctl(_fd, TIOCMGET, &bits)<0 ) return false;
-  int tqmask = 0;
+  int mask = 0;
   switch (pin) {
-    case DCD: tqmask = TIOCM_CD;  break;
-    case RX : tqmask = TIOCM_SR;  break;
-    case DSR: tqmask = TIOCM_DSR; break;
-    case CTS: tqmask = TIOCM_CTS; break;
+    case DCD: mask = TIOCM_CD;  break;
+    case RX : mask = TIOCM_SR;  break;
+    case DSR: mask = TIOCM_DSR; break;
+    case CTS: mask = TIOCM_CTS; break;
     default:  Q_ASSERT(false); return false;
   }
-  value = ((type==NegativeLogic ? ~bits : bits) & tqmask);
+  value = ((type==NegativeLogic ? ~bits : bits) & mask);
   return true;
 #elif defined(Q_OS_WIN)
   DWORD status;