diff options
author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-08-10 22:19:39 +0000 |
---|---|---|
committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-08-10 22:19:39 +0000 |
commit | f7ceb2957839027e8027a9a4c0dfff730cb9b704 (patch) | |
tree | d1d583f11612d149bc0718c80779df4653699dbb /src/common/port/serial.cpp | |
parent | d98fea1f859d23e1b1220a65d7a8eda3b757fd08 (diff) | |
download | piklab-f7ceb2957839027e8027a9a4c0dfff730cb9b704.tar.gz piklab-f7ceb2957839027e8027a9a4c0dfff730cb9b704.zip |
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
Diffstat (limited to 'src/common/port/serial.cpp')
-rw-r--r-- | src/common/port/serial.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
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; |