summaryrefslogtreecommitdiffstats
path: root/src/progs/bootloader/base
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/bootloader/base
parentb79a2c28534cf09987eeeba3077fff9236df182a (diff)
downloadpiklab-0aaa8e3f.tar.gz
piklab-0aaa8e3f.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/bootloader/base')
-rw-r--r--src/progs/bootloader/base/bootloader.h2
-rw-r--r--src/progs/bootloader/base/bootloader_prog.h1
2 files changed, 2 insertions, 1 deletions
diff --git a/src/progs/bootloader/base/bootloader.h b/src/progs/bootloader/base/bootloader.h
index 08a0730..8f358a4 100644
--- a/src/progs/bootloader/base/bootloader.h
+++ b/src/progs/bootloader/base/bootloader.h
@@ -17,7 +17,7 @@ namespace Bootloader
class Hardware : public ::Programmer::PicHardware
{
public:
- Hardware(::Programmer::Base &base, Port::Base *port) : ::Programmer::PicHardware(base, port, QString::null) {}
+ Hardware(::Programmer::Base &base, Port::Base *port) : ::Programmer::PicHardware(base, port, TQString()) {}
virtual bool write(Pic::MemoryRangeType type, const Device::Array &data) = 0;
virtual bool read(Pic::MemoryRangeType type, Device::Array &data, const ::Programmer::VerifyData *vdata) = 0;
virtual bool internalConnectHardware() = 0;
diff --git a/src/progs/bootloader/base/bootloader_prog.h b/src/progs/bootloader/base/bootloader_prog.h
index 7b9749e..52e1b0d 100644
--- a/src/progs/bootloader/base/bootloader_prog.h
+++ b/src/progs/bootloader/base/bootloader_prog.h
@@ -18,6 +18,7 @@ namespace Bootloader
class ProgrammerBase : public Programmer::PicBase
{
Q_OBJECT
+ TQ_OBJECT
public:
ProgrammerBase(const Programmer::Group &group, const Pic::Data *data, const char *name);