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/base/prog_specific.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'src/progs/base/prog_specific.h') diff --git a/src/progs/base/prog_specific.h b/src/progs/base/prog_specific.h index 1703bcb..732726e 100644 --- a/src/progs/base/prog_specific.h +++ b/src/progs/base/prog_specific.h @@ -9,7 +9,7 @@ #ifndef PROG_SPECIFIC_H #define PROG_SPECIFIC_H -#include +#include #include "common/global/log.h" #include "common/port/port_base.h" @@ -38,18 +38,18 @@ protected: class Hardware : public Log::Base { public: - Hardware(::Programmer::Base &base, Port::Base *port, const QString &name); + Hardware(::Programmer::Base &base, Port::Base *port, const TQString &name); virtual ~Hardware(); Port::Description portDescription() const { return _port->description(); } - QString name() const { return _name; } + TQString name() const { return _name; } bool connectHardware(); - bool rawWrite(const QString &data); - bool rawRead(uint size, QString &data); + bool rawWrite(const TQString &data); + bool rawRead(uint size, TQString &data); void disconnectHardware(); protected: Port::Base *_port; - QString _name; + TQString _name; ::Programmer::Base &_base; virtual bool internalConnectHardware() = 0; -- cgit v1.2.1