diff options
author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-06-30 00:15:53 +0000 |
---|---|---|
committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-06-30 00:15:53 +0000 |
commit | 0aaa8e3fc8f8a1481333b564f0922277c8d8ad59 (patch) | |
tree | b95c0ca86c4876dd139af376b9f4afd8917cf0cd /src/progs/icd2/base/icd2_usb.h | |
parent | b79a2c28534cf09987eeeba3077fff9236df182a (diff) | |
download | piklab-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/icd2/base/icd2_usb.h')
-rw-r--r-- | src/progs/icd2/base/icd2_usb.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/progs/icd2/base/icd2_usb.h b/src/progs/icd2/base/icd2_usb.h index c2677a6..30d9065 100644 --- a/src/progs/icd2/base/icd2_usb.h +++ b/src/progs/icd2/base/icd2_usb.h @@ -22,11 +22,11 @@ class USBPort : public Port::USB { public: USBPort(uint deviceId, Log::Base &log); - bool connectDevice(const QString &mode); - bool poll(uint size, QString &s); - bool poll(uint size, QMemArray<uchar> &data); + bool connectDevice(const TQString &mode); + bool poll(uint size, TQString &s); + bool poll(uint size, TQMemArray<uchar> &data); bool dataSend(const char *data, uint size); - bool dataReceive(uint size, QString &s); + bool dataReceive(uint size, TQString &s); private: uchar _seqnum; @@ -55,7 +55,7 @@ private: enum { ID_FIRMWARE = 0x8000, // ICD2 id before usb firmware is transmitted ID_CLIENT = 0x8001 // ICD2 id after firmware is transmitted }; - virtual bool internalConnect(const QString &mode); + virtual bool internalConnect(const TQString &mode); }; } // namespace |