summaryrefslogtreecommitdiffstats
path: root/src/progs/icd1/base/icd1_serial.cpp
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-06-30 00:15:53 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-06-30 00:15:53 +0000
commit0aaa8e3fc8f8a1481333b564f0922277c8d8ad59 (patch)
treeb95c0ca86c4876dd139af376b9f4afd8917cf0cd /src/progs/icd1/base/icd1_serial.cpp
parentb79a2c28534cf09987eeeba3077fff9236df182a (diff)
downloadpiklab-0aaa8e3fc8f8a1481333b564f0922277c8d8ad59.tar.gz
piklab-0aaa8e3fc8f8a1481333b564f0922277c8d8ad59.zip
TQt4 port piklab
This enables compilation under both Qt3 and Qt4 git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/piklab@1238822 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'src/progs/icd1/base/icd1_serial.cpp')
-rw-r--r--src/progs/icd1/base/icd1_serial.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/progs/icd1/base/icd1_serial.cpp b/src/progs/icd1/base/icd1_serial.cpp
index a506fdb..8d40697 100644
--- a/src/progs/icd1/base/icd1_serial.cpp
+++ b/src/progs/icd1/base/icd1_serial.cpp
@@ -9,13 +9,13 @@
***************************************************************************/
#include "icd1_serial.h"
-#include <qdatetime.h>
+#include <tqdatetime.h>
#include "common/global/global.h"
#include "common/common/misc.h"
#include "common/common/number.h"
//-----------------------------------------------------------------------------
-Icd1::SerialPort::SerialPort(const QString &device, Log::Base &log)
+Icd1::SerialPort::SerialPort(const TQString &device, Log::Base &log)
: Port::Serial(device, NeedDrain | NeedFlush, log)
{}
@@ -41,7 +41,7 @@ bool Icd1::SerialPort::reset()
bool Icd1::SerialPort::synchronize()
{
if ( !setPinOn(RTS, false, Port::PositiveLogic) ) return false;
- QTime time;
+ TQTime time;
time.start();
for (;;) {
bool bit;
@@ -60,8 +60,8 @@ bool Icd1::SerialPort::sendCommand(uint cmd)
Q_ASSERT( cmd<=0xFFFF );
synchronize();
char c[7] = "$XXXX\r";
- QString cs = toHex(cmd, 4);
- log(Log::DebugLevel::Extra, QString("Send command: %1").arg(toPrintable(cs, PrintAlphaNum)));
+ TQString cs = toHex(cmd, 4);
+ log(Log::DebugLevel::Extra, TQString("Send command: %1").tqarg(toPrintable(cs, PrintAlphaNum)));
c[1] = cs[0].latin1();
c[2] = cs[1].latin1();
c[3] = cs[2].latin1();