diff options
Diffstat (limited to 'src/progs/direct/base/direct.cpp')
-rw-r--r-- | src/progs/direct/base/direct.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/progs/direct/base/direct.cpp b/src/progs/direct/base/direct.cpp index fc53cf3..c0d7de6 100644 --- a/src/progs/direct/base/direct.cpp +++ b/src/progs/direct/base/direct.cpp @@ -47,7 +47,7 @@ namespace Direct class SerialPort : public Port::Serial { public: - SerialPort(const QString &device, Log::Base &base) + SerialPort(const TQString &device, Log::Base &base) : Serial(device, NeedBreak, base) {} bool open() { @@ -83,7 +83,7 @@ void Direct::Hardware::setPin(PinType type, bool on) int pin = _data.pins[type]; if ( isGroundPin(pin) ) return; uint p = (pin<0 ? -pin : pin)-1; - //log(Log::DebugLevel::Extra, QString("Hardware::setPin %1 %2: %3 %4").arg(PIN_DATA[type].label).arg(pin).arg(on).arg(_data.clockDelay)); + //log(Log::DebugLevel::Extra, TQString("Hardware::setPin %1 %2: %3 %4").tqarg(PIN_DATA[type].label).tqarg(pin).tqarg(on).tqarg(_data.clockDelay)); _port->setPinOn(p, on, (pin<0 ? Port::NegativeLogic : Port::PositiveLogic)); if ( type==Clock ) Port::usleep(_data.clockDelay); } @@ -95,7 +95,7 @@ bool Direct::Hardware::readBit() uint p = (pin<0 ? -pin : pin)-1; bool on; _port->readPin(p, (pin<0 ? Port::NegativeLogic : Port::PositiveLogic), on); - //log(Log::DebugLevel::Extra, QString("Hardware::read DataIn %2: %3").arg(pin).arg(on)); + //log(Log::DebugLevel::Extra, TQString("Hardware::read DataIn %2: %3").tqarg(pin).tqarg(on)); return on; } @@ -104,10 +104,10 @@ uint Direct::Hardware::nbPins(Port::IODir dir) const return _port->pinData(dir).count(); } -QString Direct::Hardware::pinLabelForIndex(Port::IODir dir, uint i) const +TQString Direct::Hardware::pinLabelForIndex(Port::IODir dir, uint i) const { Port::PinData pd = _port->pinData(dir)[i]; - return QString("%1 (%2)").arg(pd.pin+1).arg(pd.label); + return TQString("%1 (%2)").tqarg(pd.pin+1).tqarg(pd.label); } Port::IODir Direct::Hardware::ioTypeForPin(int pin) const @@ -126,7 +126,7 @@ uint Direct::Hardware::pinForIndex(Port::IODir dir, uint i) const uint Direct::Hardware::indexForPin(Port::IODir dir, int pin) const { - QValueVector<Port::PinData> v = _port->pinData(dir); + TQValueVector<Port::PinData> v = _port->pinData(dir); Q_ASSERT( pin!=0 ); uint p = (pin<0 ? -pin : pin)-1; for (uint i=0; i<uint(v.count()); i++) @@ -151,11 +151,11 @@ bool Direct::operator !=(const HData &d1, const HData &d2) } //----------------------------------------------------------------------------- -Direct::SerialHardware::SerialHardware(::Programmer::Base &base, const QString &portDevice, const HardwareData &data) +Direct::SerialHardware::SerialHardware(::Programmer::Base &base, const TQString &portDevice, const HardwareData &data) : Hardware(base, new SerialPort(portDevice, base), data) {} -Direct::ParallelHardware::ParallelHardware(::Programmer::Base &base, const QString &portDevice, const HardwareData &data) +Direct::ParallelHardware::ParallelHardware(::Programmer::Base &base, const TQString &portDevice, const HardwareData &data) : Hardware(base, new Port::Parallel(portDevice, base), data) {} @@ -375,7 +375,7 @@ int Direct::Hardware::timing_test() for (long j=0; j<loop; ++j) { int d = 0x2AAA ; - d &= 0x3FFF ; // mask unused msb + d &= 0x3FFF ; // tqmask unused msb d <<= 1; // insert start bit for (uint x = 0; x<16; x++) { |