From 0aaa8e3fc8f8a1481333b564f0922277c8d8ad59 Mon Sep 17 00:00:00 2001 From: tpearson Date: Thu, 30 Jun 2011 00:15:53 +0000 Subject: 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 --- src/progs/icd2/base/icd2_prog.h | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'src/progs/icd2/base/icd2_prog.h') diff --git a/src/progs/icd2/base/icd2_prog.h b/src/progs/icd2/base/icd2_prog.h index e8be727..14df438 100644 --- a/src/progs/icd2/base/icd2_prog.h +++ b/src/progs/icd2/base/icd2_prog.h @@ -22,6 +22,7 @@ class Hardware; class ProgrammerBase : public Icd::ProgrammerBase { Q_OBJECT + TQ_OBJECT public: ProgrammerBase(const Programmer::Group &group, const Pic::Data *data, const char *name) : Icd::ProgrammerBase(group, data, name) {} @@ -48,6 +49,7 @@ private: class Programmer : public ProgrammerBase { Q_OBJECT + TQ_OBJECT public: Programmer(const ::Programmer::Group &group, const Pic::Data *data); }; @@ -56,7 +58,7 @@ public: class Group : public Icd::Group { public: - virtual QString xmlName() const { return "icd2"; } + virtual TQString xmlName() const { return "icd2"; } virtual ::Programmer::Properties properties() const; virtual ::Programmer::TargetPowerMode targetPowerMode() const { return ::Programmer::TargetPowerModeFromConfig; } virtual bool isPortSupported(PortType type) const { return ( type==PortType::Serial || type==PortType::USB ); } @@ -72,8 +74,8 @@ protected: class ProgrammerGroup : public Group { public: - virtual QString name() const { return "icd2"; } - virtual QString label() const { return i18n("ICD2 Programmer"); } + virtual TQString name() const { return "icd2"; } + virtual TQString label() const { return i18n("ICD2 Programmer"); } protected: virtual ::Programmer::Base *createBase(const Device::Data *data) const { return new Programmer(*this, static_cast(data)); } -- cgit v1.2.1