diff options
| author | Timothy Pearson <[email protected]> | 2011-12-16 09:57:14 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2011-12-16 09:57:14 -0600 |
| commit | c1ef065782051db96cdfd32cf55be6408c2a9d22 (patch) | |
| tree | 0bc3705b597f8c98b2b9992d22ab9620df50b877 /src/electronics/port.cpp | |
| parent | bab171b2a7d7f36e2d5dd510df80fc8cb4a6b06f (diff) | |
| download | ktechlab-c1ef065782051db96cdfd32cf55be6408c2a9d22.tar.gz ktechlab-c1ef065782051db96cdfd32cf55be6408c2a9d22.zip | |
Revert "Rename a number of old tq methods that are no longer tq specific"
This reverts commit bab171b2a7d7f36e2d5dd510df80fc8cb4a6b06f.
Diffstat (limited to 'src/electronics/port.cpp')
| -rw-r--r-- | src/electronics/port.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/electronics/port.cpp b/src/electronics/port.cpp index 8a92402..ec74bfc 100644 --- a/src/electronics/port.cpp +++ b/src/electronics/port.cpp @@ -207,28 +207,28 @@ TQStringList SerialPort::ports( unsigned probeResult ) for ( int i = 0; i < 8; ++i ) { - TQString dev = TQString("/dev/ttyS%1").arg(i); + TQString dev = TQString("/dev/ttyS%1").tqarg(i); if ( probe(dev) & probeResult ) list << dev; } for ( unsigned i = 0; i < 8; ++i ) { - TQString dev = TQString("/dev/tts/%1").arg(i); + TQString dev = TQString("/dev/tts/%1").tqarg(i); if ( probe(dev) & probeResult ) list << dev; } for ( unsigned i = 0; i < 8; ++i ) { - TQString dev = TQString("/dev/ttyUSB%1").arg(i); + TQString dev = TQString("/dev/ttyUSB%1").tqarg(i); if ( probe(dev) & probeResult ) list << dev; } for ( unsigned i = 0; i < 8; ++i ) { - TQString dev = TQString("/dev/usb/tts/%1").arg(i); + TQString dev = TQString("/dev/usb/tts/%1").tqarg(i); if ( probe(dev) & probeResult ) list << dev; } @@ -277,7 +277,7 @@ void ParallelPort::reset() { m_file = -1; m_reg[Data] = 0; - m_reg[Status] = 0; + m_reg[tqStatus] = 0; m_reg[Control] = 0; m_outputPins = INPUT_MODE_BIT | IRTQ_MODE_BIT; m_inputPins = ALWAYS_INPUT_PINS | INPUT_MODE_BIT | IRTQ_MODE_BIT; @@ -309,7 +309,7 @@ int ParallelPort::pinState( int pins ) value |= ((readFromRegister( Data ) & ((pins & DATA_PINS) >> 0)) << 0); if ( pins & STATUS_PINS ) - value |= ((readFromRegister( Status ) & ((pins & STATUS_PINS) >> 8)) << 8); + value |= ((readFromRegister( tqStatus ) & ((pins & STATUS_PINS) >> 8)) << 8); if ( pins & CONTROL_PINS ) value |= ((readFromRegister( Control ) & ((pins & CONTROL_PINS) >> 16)) << 16); @@ -453,14 +453,14 @@ TQStringList ParallelPort::ports( unsigned probeResult ) for ( unsigned i = 0; i < 8; ++i ) { - TQString dev = TQString("/dev/parport%1").arg(i); + TQString dev = TQString("/dev/parport%1").tqarg(i); if ( probe(dev) & probeResult ) list << dev; } for ( unsigned i = 0; i < 8; ++i ) { - TQString dev = TQString("/dev/parports/%1").arg(i); + TQString dev = TQString("/dev/parports/%1").tqarg(i); if ( probe(dev) & probeResult ) list << dev; } |