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/bootloader | |
| 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/bootloader')
| -rw-r--r-- | src/progs/bootloader/base/bootloader.h | 2 | ||||
| -rw-r--r-- | src/progs/bootloader/base/bootloader_prog.h | 1 | ||||
| -rw-r--r-- | src/progs/bootloader/gui/bootloader_ui.h | 4 |
3 files changed, 4 insertions, 3 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); diff --git a/src/progs/bootloader/gui/bootloader_ui.h b/src/progs/bootloader/gui/bootloader_ui.h index 386c412..0d6737a 100644 --- a/src/progs/bootloader/gui/bootloader_ui.h +++ b/src/progs/bootloader/gui/bootloader_ui.h @@ -9,7 +9,7 @@ #ifndef BOOTLOADER_UI_H #define BOOTLOADER_UI_H -#include <qcheckbox.h> +#include <tqcheckbox.h> #include "progs/gui/prog_group_ui.h" #include "progs/gui/prog_config_widget.h" @@ -22,7 +22,7 @@ class GroupUI : public ::Programmer::GroupUI { public: virtual bool hasAdvancedDialog() const { return false; } - virtual ::Programmer::AdvancedDialog *createAdvancedDialog(::Programmer::Base &, QWidget *) const { return 0; } + virtual ::Programmer::AdvancedDialog *createAdvancedDialog(::Programmer::Base &, TQWidget *) const { return 0; } }; } // namespace |