From 87a016680e3677da3993f333561e79eb0cead7d5 Mon Sep 17 00:00:00 2001 From: tpearson Date: Wed, 29 Jun 2011 16:05:55 +0000 Subject: TQt4 port ktechlab This enables compilation under both Qt3 and Qt4 git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/ktechlab@1238801 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- src/electronics/port.h | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'src/electronics/port.h') diff --git a/src/electronics/port.h b/src/electronics/port.h index 53182bc..d51cf5d 100644 --- a/src/electronics/port.h +++ b/src/electronics/port.h @@ -11,7 +11,7 @@ #ifndef PORT_H #define PORT_H -#include +#include #include @@ -36,7 +36,7 @@ class Port * This function just returns the combination of the lists for * SerialPort::ports and ParallelPort::ports. */ - static QStringList ports( unsigned probeResult ); + static TQStringList ports( unsigned probeResult ); }; @@ -70,17 +70,17 @@ class SerialPort : public Port void setPinState( Pin pin, bool state ); bool pinState( Pin pin ); - static ProbeResult probe( const QString & port ); + static ProbeResult probe( const TQString & port ); /** * @see Port::ports */ - static QStringList ports( unsigned probeResult ); + static TQStringList ports( unsigned probeResult ); /** * Opens the given port. * @return if the port could be opened. * @param baudRate The baud rate as defined in bits/termios.h */ - bool openPort( const QString & port, speed_t baudRate ); + bool openPort( const TQString & port, speed_t baudRate ); /** * Closes any currently open port. */ @@ -120,7 +120,7 @@ class ParallelPort : public Port DATA_PINS = PIN02 | PIN03 | PIN04 | PIN05 | PIN06 | PIN07 | PIN08 | PIN09, - // Status Register + // tqStatus Register // Offset: Base + 1 // Read only PIN15 = 1 << 11, // Error @@ -146,7 +146,7 @@ class ParallelPort : public Port enum Register { Data = 0, - Status = 1, + tqStatus = 1, Control = 2, }; @@ -166,7 +166,7 @@ class ParallelPort : public Port * Opens the given port. * @return if the port could be opened. */ - bool openPort( const QString & port ); + bool openPort( const TQString & port ); /** * Closes any currently open port. */ @@ -220,11 +220,11 @@ class ParallelPort : public Port void setControlDirection( int pins, Direction dir ); //END Changing pin directions - static ProbeResult probe( const QString & port ); + static ProbeResult probe( const TQString & port ); /** * @see Port::ports */ - static QStringList ports( unsigned probeResult ); + static TQStringList ports( unsigned probeResult ); protected: /** -- cgit v1.2.1