summaryrefslogtreecommitdiffstats
path: root/src/progs/icd1/base/icd1.h
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.h
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.h')
-rw-r--r--src/progs/icd1/base/icd1.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/progs/icd1/base/icd1.h b/src/progs/icd1/base/icd1.h
index d1ae1d0..4026c8e 100644
--- a/src/progs/icd1/base/icd1.h
+++ b/src/progs/icd1/base/icd1.h
@@ -20,7 +20,7 @@ namespace Icd1
class Hardware : public Icd::Hardware
{
public:
- Hardware(::Programmer::Base &base, const QString &portDevice);
+ Hardware(::Programmer::Base &base, const TQString &portDevice);
SerialPort *port() { return static_cast<SerialPort *>(_port); }
// initialization
virtual bool uploadFirmware(const Pic::Memory &memory);
@@ -46,8 +46,8 @@ public:
virtual BitValue getProgramCounter();
private:
- virtual bool internalConnect(const QString &mode);
- virtual QString receivedData() const { return _rx; }
+ virtual bool internalConnect(const TQString &mode);
+ virtual TQString receivedData() const { return _rx; }
bool sendCommand(uint cmd, BitValue *res = 0, uint timeout = Port::Serial::DEFAULT_TIMEOUT);
bool readBlockCommand(uint nbBytes);
bool gotoMemory(Pic::MemoryRangeType type, uint offset);