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/pickit1/base | |
| 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/pickit1/base')
| -rw-r--r-- | src/progs/pickit1/base/pickit1.cpp | 4 | ||||
| -rw-r--r-- | src/progs/pickit1/base/pickit1_data.h | 4 | ||||
| -rw-r--r-- | src/progs/pickit1/base/pickit1_prog.h | 5 |
3 files changed, 7 insertions, 6 deletions
diff --git a/src/progs/pickit1/base/pickit1.cpp b/src/progs/pickit1/base/pickit1.cpp index c5ab021..55d98e4 100644 --- a/src/progs/pickit1/base/pickit1.cpp +++ b/src/progs/pickit1/base/pickit1.cpp @@ -37,8 +37,8 @@ bool Pickit1::Baseline::incrementPC(uint nb) // work around bugs in firmware Array cmd; uint high = (nb >> 8) & 0xFF; - log(Log::DebugLevel::Extra, QString("work around bug in firmware (nb_inc=%1 high=%2)") - .arg(toHexLabel(nb, 4)).arg(toHexLabel(high, 2))); + log(Log::DebugLevel::Extra, TQString("work around bug in firmware (nb_inc=%1 high=%2)") + .tqarg(toHexLabel(nb, 4)).tqarg(toHexLabel(high, 2))); if ( high==1 ) { cmd[0] = 'I'; cmd[1] = 0x40; diff --git a/src/progs/pickit1/base/pickit1_data.h b/src/progs/pickit1/base/pickit1_data.h index 767fc4b..75a65ea 100644 --- a/src/progs/pickit1/base/pickit1_data.h +++ b/src/progs/pickit1/base/pickit1_data.h @@ -9,7 +9,7 @@ #ifndef PICKIT1_DATA_H #define PICKIT1_DATA_H -#include <qstring.h> +#include <tqstring.h> namespace Pickit1 { @@ -17,7 +17,7 @@ namespace Pickit1 char entryMode; bool regenerateOsccal; }; - extern const Data &data(const QString &device); + extern const Data &data(const TQString &device); } // namespace #endif diff --git a/src/progs/pickit1/base/pickit1_prog.h b/src/progs/pickit1/base/pickit1_prog.h index c0763b4..341e879 100644 --- a/src/progs/pickit1/base/pickit1_prog.h +++ b/src/progs/pickit1/base/pickit1_prog.h @@ -17,6 +17,7 @@ namespace Pickit1 class Base : public Pickit::Base { Q_OBJECT + TQ_OBJECT public: Base(const Programmer::Group &group, const Pic::Data *data) : Pickit::Base(group, data) {} virtual bool deviceHasOsccalRegeneration() const; @@ -31,8 +32,8 @@ private: class Group : public Pickit::Group { public: - virtual QString name() const { return "pickit1"; } - virtual QString label() const { return i18n("PICkit1"); } + virtual TQString name() const { return "pickit1"; } + virtual TQString label() const { return i18n("PICkit1"); } virtual Programmer::Properties properties() const { return ::Programmer::Programmer | ::Programmer::HasFirmware | ::Programmer::CanReadMemory | ::Programmer::HasConnectedState; } protected: |