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/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/base')
-rw-r--r-- | src/progs/base/debug_config.cpp | 4 | ||||
-rw-r--r-- | src/progs/base/generic_debug.cpp | 10 | ||||
-rw-r--r-- | src/progs/base/generic_debug.h | 16 | ||||
-rw-r--r-- | src/progs/base/generic_prog.cpp | 34 | ||||
-rw-r--r-- | src/progs/base/generic_prog.h | 15 | ||||
-rw-r--r-- | src/progs/base/hardware_config.cpp | 36 | ||||
-rw-r--r-- | src/progs/base/hardware_config.h | 26 | ||||
-rw-r--r-- | src/progs/base/prog_config.cpp | 36 | ||||
-rw-r--r-- | src/progs/base/prog_config.h | 8 | ||||
-rw-r--r-- | src/progs/base/prog_group.cpp | 2 | ||||
-rw-r--r-- | src/progs/base/prog_group.h | 10 | ||||
-rw-r--r-- | src/progs/base/prog_specific.cpp | 8 | ||||
-rw-r--r-- | src/progs/base/prog_specific.h | 12 |
13 files changed, 109 insertions, 108 deletions
diff --git a/src/progs/base/debug_config.cpp b/src/progs/base/debug_config.cpp index 387941d..b1bbda4 100644 --- a/src/progs/base/debug_config.cpp +++ b/src/progs/base/debug_config.cpp @@ -9,6 +9,6 @@ #include "debug_config.h" const Debugger::Config::Data Debugger::Config::DATA[Nb_Types] = { - { "only_stop_on_source_line", I18N_NOOP("Only stop stepping on source line."), QVariant(true, 0) }, - { "only_stop_on_project_source_line", I18N_NOOP("Only stop stepping on project source line."), QVariant(true, 0) } + { "only_stop_on_source_line", I18N_NOOP("Only stop stepping on source line."), TQVariant(true, 0) }, + { "only_stop_on_project_source_line", I18N_NOOP("Only stop stepping on project source line."), TQVariant(true, 0) } }; diff --git a/src/progs/base/generic_debug.cpp b/src/progs/base/generic_debug.cpp index 252d239..46c6597 100644 --- a/src/progs/base/generic_debug.cpp +++ b/src/progs/base/generic_debug.cpp @@ -53,7 +53,7 @@ bool Debugger::Base::init() bool Debugger::Base::update() { if ( !updateState() ) return false; - if ( _programmer.state()==::Programmer::Halted ) return _deviceSpecific->updateStatus(); + if ( _programmer.state()==::Programmer::Halted ) return _deviceSpecific->updatetqStatus(); return true; } @@ -76,7 +76,7 @@ bool Debugger::Base::halt() if ( !softHalt(success) ) return false; if ( !success ) return hardHalt(); if ( !update() ) return false; - log(Log::LineType::Information, QString("Halted at %1").arg(toHexLabel(pc(), _programmer.device()->nbCharsAddress()))); + log(Log::LineType::Information, TQString("Halted at %1").tqarg(toHexLabel(pc(), _programmer.device()->nbCharsAddress()))); _programmer.setState(::Programmer::Halted); return true; } @@ -87,13 +87,13 @@ bool Debugger::Base::reset() return update(); } -QString Debugger::Base::statusString() const +TQString Debugger::Base::statusString() const { - if ( _programmer.state()!=::Programmer::Halted ) return QString::null; + if ( _programmer.state()!=::Programmer::Halted ) return TQString(); return _deviceSpecific->statusString(); } -void Debugger::Base::setupInput(PURL::FileType type, const QString &directory, const QString &filename) +void Debugger::Base::setupInput(PURL::FileType type, const TQString &directory, const TQString &filename) { _inputType = type; _directory = directory; diff --git a/src/progs/base/generic_debug.h b/src/progs/base/generic_debug.h index 903d451..48f9e60 100644 --- a/src/progs/base/generic_debug.h +++ b/src/progs/base/generic_debug.h @@ -29,29 +29,29 @@ public: virtual ~Base(); void init(DeviceSpecific *deviceSpecific, Specific *specific); const Device::Data *device() const; - void setupInput(PURL::FileType type, const QString &directory, const QString &filename); + void setupInput(PURL::FileType type, const TQString &directory, const TQString &filename); void setCoff(const Coff::TextObject *coff) { _coff = coff; } - QString directory() const { return _directory; } + TQString directory() const { return _directory; } bool init(); bool update(); bool reset(); bool run(); bool halt(); bool step(); - QString statusString() const; - virtual bool setBreakpoints(const QValueList<Address> &addresses) = 0; + TQString statusString() const; + virtual bool setBreakpoints(const TQValueList<Address> &addresses) = 0; BitValue pc() const; Register::TypeData pcTypeData() const; virtual bool readRegister(const Register::TypeData &data, BitValue &value) = 0; virtual bool writeRegister(const Register::TypeData &data, BitValue value) = 0; - virtual bool updatePortStatus(uint index, QMap<uint, Device::PortBitData> &bits) = 0; + virtual bool updatePorttqStatus(uint index, TQMap<uint, Device::PortBitData> &bits) = 0; protected: Programmer::Base &_programmer; DeviceSpecific *_deviceSpecific; Specific *_specific; PURL::FileType _inputType; - QString _directory, _filename; + TQString _directory, _filename; const Coff::TextObject *_coff; virtual bool internalInit() = 0; @@ -68,8 +68,8 @@ class DeviceSpecific : public Log::Base { public: DeviceSpecific(Debugger::Base &base) : Log::Base(base), _base(base) {} - virtual bool updateStatus() = 0; - virtual QString statusString() const = 0; + virtual bool updatetqStatus() = 0; + virtual TQString statusString() const = 0; protected: Debugger::Base &_base; diff --git a/src/progs/base/generic_prog.cpp b/src/progs/base/generic_prog.cpp index 6386eb2..e7e6e2e 100644 --- a/src/progs/base/generic_prog.cpp +++ b/src/progs/base/generic_prog.cpp @@ -8,7 +8,7 @@ ***************************************************************************/ #include "generic_prog.h" -#include <qdir.h> +#include <tqdir.h> #include "common/global/global.h" #include "prog_group.h" @@ -70,15 +70,15 @@ bool Programmer::Base::simpleConnectHardware() disconnectHardware(); clear(); if (_device) { - QString label = _group.label(); + TQString label = _group.label(); if ( group().isSoftware() ) - log(Log::LineType::Information, i18n("Connecting %1 with device %2...").arg(label).arg(_device->name())); + log(Log::LineType::Information, i18n("Connecting %1 with device %2...").tqarg(label).tqarg(_device->name())); else { if ( !_hardware->name().isEmpty() ) label += "[" + _hardware->name() + "]"; Port::Description pd = _hardware->portDescription(); - QString s = pd.type.label(); + TQString s = pd.type.label(); if (pd.type.data().withDevice) s += " (" + pd.device + ")"; - log(Log::LineType::Information, i18n("Connecting %1 on %2 with device %3...").arg(label).arg(s).arg(_device->name())); + log(Log::LineType::Information, i18n("Connecting %1 on %2 with device %3...").tqarg(label).tqarg(s).tqarg(_device->name())); } } return _hardware->connectHardware(); @@ -98,7 +98,7 @@ bool Programmer::Base::connectHardware() if ( !checkFirmwareVersion() ) return false; if ( !setTargetPowerOn(false) ) return false; if ( !setTarget() ) return false; - log(Log::LineType::Information, i18n(" Set target self powered: %1").arg(_targetSelfPowered ? "true" : "false")); + log(Log::LineType::Information, i18n(" Set target self powered: %1").tqarg(_targetSelfPowered ? "true" : "false")); if ( !setTargetPowerOn(!_targetSelfPowered) ) return false; if ( !internalSetupHardware() ) return false; if ( !readVoltages() ) return false; @@ -133,30 +133,30 @@ bool Programmer::Base::checkFirmwareVersion() { if ( _mode==BootloadMode ) log(Log::LineType::Information, i18n("Programmer is in bootload mode.")); if ( !_firmwareVersion.isValid() ) return true; - log(Log::LineType::Information, i18n("Firmware version is %1").arg(_firmwareVersion.pretty())); + log(Log::LineType::Information, i18n("Firmware version is %1").tqarg(_firmwareVersion.pretty())); VersionData vd = _firmwareVersion.toWithoutDot(); VersionData tmp = firmwareVersion(FirmwareVersionType::Max); if ( tmp.isValid() && tmp.toWithoutDot()<vd ) { VersionData mplab = mplabVersion(FirmwareVersionType::Max); - QString s = (mplab.isValid() ? " " + i18n("MPLAB %1").arg(mplab.prettyWithoutDot()) : QString::null); + TQString s = (mplab.isValid() ? " " + i18n("MPLAB %1").tqarg(mplab.prettyWithoutDot()) : TQString()); log(Log::LineType::Warning, i18n("The firmware version (%1) is higher than the version tested with piklab (%2%3).\n" - "You may experience problems.").arg(_firmwareVersion.pretty()).arg(tmp.pretty()).arg(s)); + "You may experience problems.").tqarg(_firmwareVersion.pretty()).tqarg(tmp.pretty()).tqarg(s)); return true; } tmp = firmwareVersion(FirmwareVersionType::Min); if ( tmp.isValid() && vd<tmp.toWithoutDot() ) { VersionData mplab = mplabVersion(FirmwareVersionType::Min); - QString s = (mplab.isValid() ? " " + i18n("MPLAB %1").arg(mplab.prettyWithoutDot()) : QString::null); + TQString s = (mplab.isValid() ? " " + i18n("MPLAB %1").tqarg(mplab.prettyWithoutDot()) : TQString()); log(Log::LineType::Warning, i18n("The firmware version (%1) is lower than the version tested with piklab (%2%3).\n" - "You may experience problems.").arg(_firmwareVersion.pretty()).arg(tmp.pretty()).arg(s)); + "You may experience problems.").tqarg(_firmwareVersion.pretty()).tqarg(tmp.pretty()).tqarg(s)); return true; } tmp = firmwareVersion(FirmwareVersionType::Recommended); if ( tmp.isValid() && vd<tmp.toWithoutDot() ) { VersionData mplab = mplabVersion(FirmwareVersionType::Recommended); - QString s = (mplab.isValid() ? " " + i18n("MPLAB %1").arg(mplab.prettyWithoutDot()) : QString::null); + TQString s = (mplab.isValid() ? " " + i18n("MPLAB %1").tqarg(mplab.prettyWithoutDot()) : TQString()); log(Log::LineType::Warning, i18n("The firmware version (%1) is lower than the recommended version (%2%3).\n" - "It is recommended to upgrade the firmware.").arg(_firmwareVersion.pretty()).arg(tmp.pretty()).arg(s)); + "It is recommended to upgrade the firmware.").tqarg(_firmwareVersion.pretty()).tqarg(tmp.pretty()).tqarg(s)); return true; } return true; @@ -173,13 +173,13 @@ bool Programmer::Base::enterMode(Mode mode) return ( _mode==mode ); } -void Programmer::Base::log(Log::LineType type, const QString &message) +void Programmer::Base::log(Log::LineType type, const TQString &message) { if ( type==Log::LineType::Error ) _state = NotConnected; Log::Base::log(type, message); } -void Programmer::Base::log(Log::DebugLevel level, const QString &message) +void Programmer::Base::log(Log::DebugLevel level, const TQString &message) { Log::Base::log(level, message); } @@ -243,11 +243,11 @@ void Programmer::Base::endProgramming() bool Programmer::Base::uploadFirmware(const PURL::Url &url) { _progressMonitor.clear(); - log(Log::DebugLevel::Normal, QString(" Firmware file: %1").arg(url.pretty())); + log(Log::DebugLevel::Normal, TQString(" Firmware file: %1").tqarg(url.pretty())); Log::StringView sview; PURL::File file(url, sview); if ( !file.openForRead() ) { - log(Log::LineType::Error, i18n("Could not open firmware file \"%1\".").arg(url.pretty())); + log(Log::LineType::Error, i18n("Could not open firmware file \"%1\".").tqarg(url.pretty())); return false; } bool ok = doUploadFirmware(file); diff --git a/src/progs/base/generic_prog.h b/src/progs/base/generic_prog.h index 3b4b219..c1667b0 100644 --- a/src/progs/base/generic_prog.h +++ b/src/progs/base/generic_prog.h @@ -31,8 +31,8 @@ namespace Programmer enum VerifyAction { NormalVerify = 0, BlankCheckVerify = 1, IgnoreProtectedVerify = 2, OnlyProgrammedVerify = 4 }; - Q_DECLARE_FLAGS(VerifyActions, VerifyAction) - Q_DECLARE_OPERATORS_FOR_FLAGS(VerifyActions) + TQ_DECLARE_FLAGS(VerifyActions, VerifyAction) + TQ_DECLARE_OPERATORS_FOR_FLAGS(VerifyActions) class VerifyData { public: VerifyData(VerifyActions pactions, const Device::Memory &pmemory) : actions(pactions), memory(pmemory) {} @@ -47,7 +47,7 @@ namespace Programmer class HardwareDescription { public: Port::Description port; - QString name; + TQString name; }; BEGIN_DECLARE_ENUM(Task) @@ -59,15 +59,16 @@ namespace Programmer END_DECLARE_ENUM_NO_DATA(FirmwareVersionType) //----------------------------------------------------------------------------- -class Base : public QObject, public Log::Base +class Base : public TQObject, public Log::Base { Q_OBJECT + TQ_OBJECT public: Base(const Group &group, const Device::Data *data, const char *name); virtual ~Base(); - virtual void log(Log::LineType type, const QString &message); - virtual void log(Log::DebugLevel level, const QString &message); + virtual void log(Log::LineType type, const TQString &message); + virtual void log(Log::DebugLevel level, const TQString &message); void init(bool targetSelfPowered, Hardware *hardware, DeviceSpecific *deviceSpecific); const Device::Data *device() const { return _device; } const Group &group() const { return _group; } @@ -108,7 +109,7 @@ public: virtual void clear(); signals: - void actionMessage(const QString &message); + void actionMessage(const TQString &message); protected: Hardware *_hardware; diff --git a/src/progs/base/hardware_config.cpp b/src/progs/base/hardware_config.cpp index 5a3af7c..a3022e5 100644 --- a/src/progs/base/hardware_config.cpp +++ b/src/progs/base/hardware_config.cpp @@ -26,36 +26,36 @@ void Hardware::Data::writeConfig(GenericConfig &config) const } //----------------------------------------------------------------------------- -void Hardware::Config::writeCurrentHardware(PortType type, const QString &name) +void Hardware::Config::writeCurrentHardware(PortType type, const TQString &name) { - writeEntry(QString("current_hardware_") + type.key(), name); + writeEntry(TQString("current_hardware_") + type.key(), name); } -QString Hardware::Config::currentHardware(PortType type) +TQString Hardware::Config::currentHardware(PortType type) { - QStringList names = hardwareNames(type); - return readEntry(QString("current_hardware_") + type.key(), names[0]); + TQStringList names = hardwareNames(type); + return readEntry(TQString("current_hardware_") + type.key(), names[0]); } -QString Hardware::Config::label(const QString &name) const +TQString Hardware::Config::label(const TQString &name) const { const DataInfo *info = standardHardwareDataInfo(name); - if ( info==0 ) return QString::null; + if ( info==0 ) return TQString(); return i18n(info->label); } -QString Hardware::Config::comment(const QString &name) const +TQString Hardware::Config::comment(const TQString &name) const { const DataInfo *info = standardHardwareDataInfo(name); - if ( info==0 || info->comment==0 ) return QString::null; + if ( info==0 || info->comment==0 ) return TQString(); return i18n(info->comment); } -void Hardware::Config::writeCustomHardware(const QString& name, const Hardware::Data &hdata) +void Hardware::Config::writeCustomHardware(const TQString& name, const Hardware::Data &hdata) { Q_ASSERT( !isStandardHardware(name) ); - QStringList customNames = readListEntry("custom_hardware_names", QStringList()); - if ( !customNames.contains(name) ) { + TQStringList customNames = readListEntry("custom_hardware_names", TQStringList()); + if ( !customNames.tqcontains(name) ) { customNames += name; writeEntry("custom_hardware_names", customNames); } @@ -63,16 +63,16 @@ void Hardware::Config::writeCustomHardware(const QString& name, const Hardware:: hdata.writeConfig(config); } -void Hardware::Config::deleteCustomHardware(const QString &name) +void Hardware::Config::deleteCustomHardware(const TQString &name) { Q_ASSERT( !isStandardHardware(name) ); - QStringList customNames = readListEntry("custom_hardware_names", QStringList()); + TQStringList customNames = readListEntry("custom_hardware_names", TQStringList()); customNames.remove(name); writeEntry("custom_hardware_names", customNames); GenericConfig::deleteGroup(group() + "_custom_hardware_" + name); } -Hardware::Data *Hardware::Config::hardwareData(const QString &name) const +Hardware::Data *Hardware::Config::hardwareData(const TQString &name) const { if ( isStandardHardware(name) ) return standardHardwareData(name); Hardware::Data *hdata = createHardwareData(); @@ -82,10 +82,10 @@ Hardware::Data *Hardware::Config::hardwareData(const QString &name) const return hdata; } -QStringList Hardware::Config::hardwareNames(PortType type) +TQStringList Hardware::Config::hardwareNames(PortType type) { - QStringList names = standardHardwareNames(type); - QStringList customNames = readListEntry("custom_hardware_names", QStringList()); + TQStringList names = standardHardwareNames(type); + TQStringList customNames = readListEntry("custom_hardware_names", TQStringList()); for (uint i=0; i<uint(customNames.count()); i++) { if ( type!=PortType::Nb_Types ) { Hardware::Data *hdata = hardwareData(customNames[i]); diff --git a/src/progs/base/hardware_config.h b/src/progs/base/hardware_config.h index 5252ff3..866ecb9 100644 --- a/src/progs/base/hardware_config.h +++ b/src/progs/base/hardware_config.h @@ -30,7 +30,7 @@ public: virtual void writeConfig(GenericConfig &config) const; virtual bool isEqual(const Data &data) const; PortType portType; - QString name; + TQString name; }; //----------------------------------------------------------------------------- @@ -39,20 +39,20 @@ class Config : public GenericConfig public: Config(const char *group) : GenericConfig(group) {} virtual ~Config() {} - QStringList hardwareNames(PortType type); - bool isStandardHardware(const QString &name) const { return standardHardwareData(name); } - QString label(const QString &name) const; - QString comment(const QString &name) const; - void writeCustomHardware(const QString &name, const Hardware::Data &data); - QString currentHardware(PortType type); - void writeCurrentHardware(PortType type, const QString &name); - void deleteCustomHardware(const QString &name); - Hardware::Data *hardwareData(const QString& name) const; + TQStringList hardwareNames(PortType type); + bool isStandardHardware(const TQString &name) const { return standardHardwareData(name); } + TQString label(const TQString &name) const; + TQString comment(const TQString &name) const; + void writeCustomHardware(const TQString &name, const Hardware::Data &data); + TQString currentHardware(PortType type); + void writeCurrentHardware(PortType type, const TQString &name); + void deleteCustomHardware(const TQString &name); + Hardware::Data *hardwareData(const TQString& name) const; protected: - virtual QStringList standardHardwareNames(PortType type) const = 0; - virtual Hardware::Data *standardHardwareData(const QString &name) const = 0; - virtual const DataInfo *standardHardwareDataInfo(const QString &name) const = 0; + virtual TQStringList standardHardwareNames(PortType type) const = 0; + virtual Hardware::Data *standardHardwareData(const TQString &name) const = 0; + virtual const DataInfo *standardHardwareDataInfo(const TQString &name) const = 0; virtual Hardware::Data *createHardwareData() const = 0; }; diff --git a/src/progs/base/prog_config.cpp b/src/progs/base/prog_config.cpp index 8115ce7..9802fba 100644 --- a/src/progs/base/prog_config.cpp +++ b/src/progs/base/prog_config.cpp @@ -24,22 +24,22 @@ void Programmer::GroupConfig::writePortType(const Group &group, PortType type) config.writeEnumEntry<PortType>("port_group", type); } -QString Programmer::GroupConfig::portDevice(const Group &group, PortType portType) +TQString Programmer::GroupConfig::portDevice(const Group &group, PortType portType) { GenericConfig config(group.name()); - QString device = config.readEntry(QString(portType.key()) + "_port_device" , QString::null); + TQString device = config.readEntry(TQString(portType.key()) + "_port_device" , TQString()); if ( device.isNull() ) { - QStringList list = Port::probedDeviceList(portType); - if ( list.isEmpty() ) return QString::null; + TQStringList list = Port::probedDeviceList(portType); + if ( list.isEmpty() ) return TQString(); return list[0]; } return device; } -void Programmer::GroupConfig::writePortDevice(const Group &group, PortType type, const QString &device) +void Programmer::GroupConfig::writePortDevice(const Group &group, PortType type, const TQString &device) { if ( type==PortType::Nb_Types ) return; GenericConfig config(group.name()); - config.writeEntry(QString(type.key()) + "_port_device", device); + config.writeEntry(TQString(type.key()) + "_port_device", device); } Port::Description Programmer::GroupConfig::portDescription(const Group &group) @@ -53,12 +53,12 @@ void Programmer::GroupConfig::writePortDescription(const Group &group, const Por writePortDevice(group, dp.type, dp.device); } -QString Programmer::GroupConfig::firmwareDirectory(const Group &group) +TQString Programmer::GroupConfig::firmwareDirectory(const Group &group) { GenericConfig config(group.name()); - return config.readEntry("firmware_directory", QString::null); + return config.readEntry("firmware_directory", TQString()); } -void Programmer::GroupConfig::writeFirmwareDirectory(const Group &group, const QString &path) +void Programmer::GroupConfig::writeFirmwareDirectory(const Group &group, const TQString &path) { GenericConfig config(group.name()); config.writeEntry("firmware_directory", path); @@ -66,13 +66,13 @@ void Programmer::GroupConfig::writeFirmwareDirectory(const Group &group, const Q //---------------------------------------------------------------------------- const Programmer::Config::Data Programmer::Config::DATA[Nb_Types] = { - { "only_program_non_mask", I18N_NOOP("Only program what is needed (faster)."), QVariant(true, 0) }, - { "verify_after_program", I18N_NOOP("Verify device memory after programming."), QVariant(true, 0) }, - { "only_verify_programmed", I18N_NOOP("Only verify programmed words in code memory (faster)."), QVariant(true, 0) }, - { "power_down_after_programming", I18N_NOOP("Power down target after programming."), QVariant(true, 0) }, - { "target_self_powered", I18N_NOOP("Target is self-powered (when possible)."), QVariant(true, 0) }, - { "blank_check_after_erase", I18N_NOOP("Blank check after erase."), QVariant(false, 0) }, - { "preserve_eeprom", I18N_NOOP("Preserve data EEPROM when programming."), QVariant(false, 0) }, - { "program_eeprom", I18N_NOOP("Program data EEPROM."), QVariant(true, 0) }, - { "run_after_program", I18N_NOOP("Run device after successful programming."), QVariant(false, 0) } + { "only_program_non_tqmask", I18N_NOOP("Only program what is needed (faster)."), TQVariant(true, 0) }, + { "verify_after_program", I18N_NOOP("Verify device memory after programming."), TQVariant(true, 0) }, + { "only_verify_programmed", I18N_NOOP("Only verify programmed words in code memory (faster)."), TQVariant(true, 0) }, + { "power_down_after_programming", I18N_NOOP("Power down target after programming."), TQVariant(true, 0) }, + { "target_self_powered", I18N_NOOP("Target is self-powered (when possible)."), TQVariant(true, 0) }, + { "blank_check_after_erase", I18N_NOOP("Blank check after erase."), TQVariant(false, 0) }, + { "preserve_eeprom", I18N_NOOP("Preserve data EEPROM when programming."), TQVariant(false, 0) }, + { "program_eeprom", I18N_NOOP("Program data EEPROM."), TQVariant(true, 0) }, + { "run_after_program", I18N_NOOP("Run device after successful programming."), TQVariant(false, 0) } }; diff --git a/src/progs/base/prog_config.h b/src/progs/base/prog_config.h index 0c772c2..425d92c 100644 --- a/src/progs/base/prog_config.h +++ b/src/progs/base/prog_config.h @@ -22,12 +22,12 @@ class GroupConfig public: static PortType portType(const Group &group); static void writePortType(const Group &group, PortType type); - static QString portDevice(const Group &group, PortType type); - static void writePortDevice(const Group &group, PortType type, const QString &device); + static TQString portDevice(const Group &group, PortType type); + static void writePortDevice(const Group &group, PortType type, const TQString &device); static Port::Description portDescription(const Group &group); static void writePortDescription(const Group &group, const Port::Description &pd); - static QString firmwareDirectory(const Group &group); - static void writeFirmwareDirectory(const Group &group, const QString &path); + static TQString firmwareDirectory(const Group &group); + static void writeFirmwareDirectory(const Group &group, const TQString &path); }; //---------------------------------------------------------------------------- diff --git a/src/progs/base/prog_group.cpp b/src/progs/base/prog_group.cpp index 5801318..d1a2a2b 100644 --- a/src/progs/base/prog_group.cpp +++ b/src/progs/base/prog_group.cpp @@ -19,7 +19,7 @@ const PURL::FileType Programmer::INPUT_FILE_TYPE_DATA[Nb_InputFileTypes] = { PURL::Coff, PURL::Cod, PURL::Hex }; -QString Programmer::Group::statusLabel(PortType type) const +TQString Programmer::Group::statusLabel(PortType type) const { uint nb = 0; FOR_EACH(PortType, ptype) if ( isPortSupported(ptype) ) nb++; diff --git a/src/progs/base/prog_group.h b/src/progs/base/prog_group.h index 07807fe..f72c783 100644 --- a/src/progs/base/prog_group.h +++ b/src/progs/base/prog_group.h @@ -9,7 +9,7 @@ #ifndef PROG_GROUP_H #define PROG_GROUP_H -class QWidget; +class TQWidget; #include "common/common/group.h" #include "common/port/port.h" #include "common/common/purl_base.h" @@ -29,8 +29,8 @@ enum Property { NoProperty = 0, Programmer = 1, Debugger = 2, CanReleaseReset = 4, HasFirmware = 8, CanUploadFirmware = 16, NeedDeviceSpecificFirmware = 32, HasSelfTest = 64, CanReadMemory = 128, HasConnectedState = 256 }; -Q_DECLARE_FLAGS(Properties, Property) -Q_DECLARE_OPERATORS_FOR_FLAGS(Properties) +TQ_DECLARE_FLAGS(Properties, Property) +TQ_DECLARE_OPERATORS_FOR_FLAGS(Properties) enum TargetPowerMode { TargetPowerModeFromConfig, TargetSelfPowered, TargetExternallyPowered }; @@ -40,10 +40,10 @@ extern const PURL::FileType INPUT_FILE_TYPE_DATA[Nb_InputFileTypes]; class Group : public ::Group::Base { public: - virtual QString xmlName() const { return name(); } + virtual TQString xmlName() const { return name(); } virtual ::Hardware::Config *hardwareConfig() const { return 0; } virtual Properties properties() const = 0; - virtual QString statusLabel(PortType type) const; + virtual TQString statusLabel(PortType type) const; virtual bool canReadVoltages() const = 0; virtual TargetPowerMode targetPowerMode() const = 0; bool isDebugger() const { return ( properties() & Debugger ); } diff --git a/src/progs/base/prog_specific.cpp b/src/progs/base/prog_specific.cpp index a372e92..32bc5e3 100644 --- a/src/progs/base/prog_specific.cpp +++ b/src/progs/base/prog_specific.cpp @@ -16,7 +16,7 @@ Programmer::DeviceSpecific::DeviceSpecific(Programmer::Base &base) {} //----------------------------------------------------------------------------- -Programmer::Hardware::Hardware(Programmer::Base &base, Port::Base *port, const QString &name) +Programmer::Hardware::Hardware(Programmer::Base &base, Port::Base *port, const TQString &name) : Log::Base(&base), _port(port), _name(name), _base(base) {} @@ -37,14 +37,14 @@ void Programmer::Hardware::disconnectHardware() internalDisconnectHardware(); } -bool Programmer::Hardware::rawWrite(const QString &data) +bool Programmer::Hardware::rawWrite(const TQString &data) { Q_ASSERT(_port); - QByteArray a = toAscii(data); + TQByteArray a = toAscii(data); return _port->send(a.data(), a.count()); } -bool Programmer::Hardware::rawRead(uint size, QString &data) +bool Programmer::Hardware::rawRead(uint size, TQString &data) { Q_ASSERT(_port); return _port->receive(size, data); 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 <qfile.h> +#include <tqfile.h> #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; |