diff options
Diffstat (limited to 'src/progs')
34 files changed, 41 insertions, 41 deletions
diff --git a/src/progs/base/generic_prog.h b/src/progs/base/generic_prog.h index c1667b0..d19f4d0 100644 --- a/src/progs/base/generic_prog.h +++ b/src/progs/base/generic_prog.h @@ -62,7 +62,7 @@ namespace Programmer 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(); diff --git a/src/progs/bootloader/base/bootloader_prog.h b/src/progs/bootloader/base/bootloader_prog.h index 52e1b0d..b1373e9 100644 --- a/src/progs/bootloader/base/bootloader_prog.h +++ b/src/progs/bootloader/base/bootloader_prog.h @@ -18,7 +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/direct/base/direct_prog.h b/src/progs/direct/base/direct_prog.h index cdfb907..f19eac1 100644 --- a/src/progs/direct/base/direct_prog.h +++ b/src/progs/direct/base/direct_prog.h @@ -24,7 +24,7 @@ namespace Direct class PicBase : public ::Programmer::PicBase { Q_OBJECT - TQ_OBJECT + public: PicBase(const ::Programmer::Group &group, const Pic::Data *data) : ::Programmer::PicBase(group, data, "pic_direct_programmer") {} @@ -37,7 +37,7 @@ private: class Mem24Base : public ::Programmer::Mem24Base { Q_OBJECT - TQ_OBJECT + public: Mem24Base(const ::Programmer::Group &group, const Mem24::Data *data) : ::Programmer::Mem24Base(group, data, "mem24_direct_programmer") {} diff --git a/src/progs/direct/gui/direct_config_widget.h b/src/progs/direct/gui/direct_config_widget.h index 8d7d5cb..72f5f72 100644 --- a/src/progs/direct/gui/direct_config_widget.h +++ b/src/progs/direct/gui/direct_config_widget.h @@ -31,7 +31,7 @@ public: class HConfigWidget : public ::Hardware::HConfigWidget { Q_OBJECT - TQ_OBJECT + public: HConfigWidget(::Programmer::Base &base, TQWidget *parent, bool edit); virtual bool set(const Port::Description &pd, const ::Hardware::Data &data); @@ -65,7 +65,7 @@ private: class ConfigWidget : public ::Hardware::ConfigWidget { Q_OBJECT - TQ_OBJECT + public: ConfigWidget(const ::Programmer::Group &group, TQWidget *parent); virtual ::Hardware::HConfigWidget *createHardwareConfigWidget(TQWidget *parent, bool edit) const; diff --git a/src/progs/gpsim/base/gpsim.h b/src/progs/gpsim/base/gpsim.h index fcdabab..cf661ec 100644 --- a/src/progs/gpsim/base/gpsim.h +++ b/src/progs/gpsim/base/gpsim.h @@ -20,7 +20,7 @@ namespace GPSim class Process : public ::Process::LineOutput, public Log::Base { Q_OBJECT - TQ_OBJECT + public: Process(Log::Base *base); diff --git a/src/progs/gpsim/base/gpsim_debug.h b/src/progs/gpsim/base/gpsim_debug.h index 920bc9a..defba01 100644 --- a/src/progs/gpsim/base/gpsim_debug.h +++ b/src/progs/gpsim/base/gpsim_debug.h @@ -19,7 +19,7 @@ namespace GPSim class Programmer : public ::Programmer::PicBase { Q_OBJECT - TQ_OBJECT + public: Programmer(const ::Programmer::Group &group, const Pic::Data *data) : Programmer::PicBase(group, data, "gpsim_programmer") {} diff --git a/src/progs/gpsim/gui/gpsim_group_ui.h b/src/progs/gpsim/gui/gpsim_group_ui.h index 26c69cc..f396e45 100644 --- a/src/progs/gpsim/gui/gpsim_group_ui.h +++ b/src/progs/gpsim/gui/gpsim_group_ui.h @@ -18,7 +18,7 @@ namespace GPSim class ConfigWidget : public ::Programmer::ConfigWidget { Q_OBJECT - TQ_OBJECT + public: ConfigWidget(const ::Programmer::Group &group, TQWidget *parent); diff --git a/src/progs/gui/hardware_config_widget.h b/src/progs/gui/hardware_config_widget.h index d6a943f..4abe980 100644 --- a/src/progs/gui/hardware_config_widget.h +++ b/src/progs/gui/hardware_config_widget.h @@ -27,7 +27,7 @@ namespace Hardware class HConfigWidget : public TQFrame { Q_OBJECT - TQ_OBJECT + public: HConfigWidget(::Programmer::Base &base, TQWidget *parent, bool edit); virtual ~HConfigWidget() { delete _hardware; } @@ -48,7 +48,7 @@ class ConfigWidget; class EditDialog : public KDialogBase { Q_OBJECT - TQ_OBJECT + public: EditDialog(ConfigWidget *parent, const TQString &name, const Port::Description &pd, Data *data); TQString savedName() const { return _savedName; } @@ -69,7 +69,7 @@ private: class ConfigWidget : public ::Programmer::ConfigWidget { Q_OBJECT - TQ_OBJECT + public: ConfigWidget(::Programmer::Base *base, Config *config, TQWidget *parent); virtual ~ConfigWidget() { delete _base; } diff --git a/src/progs/gui/port_selector.h b/src/progs/gui/port_selector.h index 6673c96..1f1f496 100644 --- a/src/progs/gui/port_selector.h +++ b/src/progs/gui/port_selector.h @@ -21,7 +21,7 @@ namespace Programmer { class Group; } class PortSelector : public TQFrame { Q_OBJECT - TQ_OBJECT + public: PortSelector(TQWidget *parent); void setGroup(const Programmer::Group &group); diff --git a/src/progs/gui/prog_config_center.h b/src/progs/gui/prog_config_center.h index e2f13c8..8350878 100644 --- a/src/progs/gui/prog_config_center.h +++ b/src/progs/gui/prog_config_center.h @@ -29,7 +29,7 @@ END_DECLARE_CONFIG_WIDGET class SelectConfigWidget : public ::ConfigWidget { Q_OBJECT - TQ_OBJECT + public: SelectConfigWidget(); virtual void loadConfig() {} diff --git a/src/progs/gui/prog_config_widget.h b/src/progs/gui/prog_config_widget.h index 0ec3fd0..121a72b 100644 --- a/src/progs/gui/prog_config_widget.h +++ b/src/progs/gui/prog_config_widget.h @@ -23,7 +23,7 @@ class HardwareDescription; class ConfigWidget: public ::ConfigWidget { Q_OBJECT - TQ_OBJECT + public: ConfigWidget(const Group &group, TQWidget *parent); virtual void loadConfig(); diff --git a/src/progs/gui/prog_group_ui.h b/src/progs/gui/prog_group_ui.h index 47ae425..1141cbb 100644 --- a/src/progs/gui/prog_group_ui.h +++ b/src/progs/gui/prog_group_ui.h @@ -27,7 +27,7 @@ class Group; class StandaloneMemoryCalibrationEditor : public Pic::MemoryCalibrationEditor { Q_OBJECT - TQ_OBJECT + public: StandaloneMemoryCalibrationEditor(const Pic::Memory &memory, TQWidget *parent); virtual void init(bool first); @@ -42,7 +42,7 @@ signals: class ButtonContainer : public ::ButtonContainer { Q_OBJECT - TQ_OBJECT + public: ButtonContainer(const TQString &title, TQObject *receiver, const char *updateSlot, TQWidget *parent); }; @@ -51,7 +51,7 @@ public: class AdvancedDialog : public Dialog { Q_OBJECT - TQ_OBJECT + public: AdvancedDialog(Base &base, TQWidget *parent, const char *name); virtual void updateDisplay(); diff --git a/src/progs/icd1/base/icd1_prog.h b/src/progs/icd1/base/icd1_prog.h index 5df72ab..0b8ea30 100644 --- a/src/progs/icd1/base/icd1_prog.h +++ b/src/progs/icd1/base/icd1_prog.h @@ -22,7 +22,7 @@ class Hardware; class ProgrammerBase : public Icd::ProgrammerBase { Q_OBJECT - TQ_OBJECT + public: ProgrammerBase(const Programmer::Group &group, const Pic::Data *data) : Icd::ProgrammerBase(group, data, "icd1_programmer_base") {} diff --git a/src/progs/icd1/gui/icd1_group_ui.h b/src/progs/icd1/gui/icd1_group_ui.h index ecfef92..0e8eede 100644 --- a/src/progs/icd1/gui/icd1_group_ui.h +++ b/src/progs/icd1/gui/icd1_group_ui.h @@ -20,7 +20,7 @@ class Group; class AdvancedDialog : public ::Programmer::PicAdvancedDialog { Q_OBJECT - TQ_OBJECT + public: AdvancedDialog(ProgrammerBase &base, TQWidget *parent); virtual void updateDisplay(); diff --git a/src/progs/icd2/base/icd2_debug.h b/src/progs/icd2/base/icd2_debug.h index 7042a22..16c223e 100644 --- a/src/progs/icd2/base/icd2_debug.h +++ b/src/progs/icd2/base/icd2_debug.h @@ -20,7 +20,7 @@ class DebuggerSpecific; class DebugProgrammer : public ProgrammerBase { Q_OBJECT - TQ_OBJECT + public: DebugProgrammer(const ::Programmer::Group &group, const Pic::Data *data); bool readDebugExecutiveVersion(); diff --git a/src/progs/icd2/base/icd2_prog.h b/src/progs/icd2/base/icd2_prog.h index 14df438..58eed6e 100644 --- a/src/progs/icd2/base/icd2_prog.h +++ b/src/progs/icd2/base/icd2_prog.h @@ -22,7 +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) {} @@ -49,7 +49,7 @@ private: class Programmer : public ProgrammerBase { Q_OBJECT - TQ_OBJECT + public: Programmer(const ::Programmer::Group &group, const Pic::Data *data); }; diff --git a/src/progs/icd2/base/icd_prog.h b/src/progs/icd2/base/icd_prog.h index 8a0ab2e..259ced6 100644 --- a/src/progs/icd2/base/icd_prog.h +++ b/src/progs/icd2/base/icd_prog.h @@ -19,7 +19,7 @@ namespace Icd class ProgrammerBase : public ::Programmer::PicBase { Q_OBJECT - TQ_OBJECT + public: ProgrammerBase(const Programmer::Group &group, const Pic::Data *data, const char *name) : ::Programmer::PicBase(group, data, name) {} diff --git a/src/progs/icd2/gui/icd2_group_ui.h b/src/progs/icd2/gui/icd2_group_ui.h index ecb7cc7..4bb3656 100644 --- a/src/progs/icd2/gui/icd2_group_ui.h +++ b/src/progs/icd2/gui/icd2_group_ui.h @@ -21,7 +21,7 @@ class Group; class AdvancedDialog : public ::Programmer::PicAdvancedDialog { Q_OBJECT - TQ_OBJECT + public: AdvancedDialog(ProgrammerBase &base, TQWidget *parent); virtual void updateDisplay(); diff --git a/src/progs/manager/breakpoint.h b/src/progs/manager/breakpoint.h index f0f1a5b..e1c5949 100644 --- a/src/progs/manager/breakpoint.h +++ b/src/progs/manager/breakpoint.h @@ -39,7 +39,7 @@ extern List &list(); class List : public GenericStorage { Q_OBJECT - TQ_OBJECT + public: List() {} void append(const Data &data); diff --git a/src/progs/manager/debug_manager.h b/src/progs/manager/debug_manager.h index 1598287..681324c 100644 --- a/src/progs/manager/debug_manager.h +++ b/src/progs/manager/debug_manager.h @@ -27,7 +27,7 @@ namespace Debugger class Manager : public TQObject, public Log::Base, public GenericView { Q_OBJECT - TQ_OBJECT + public: Manager(); virtual ~Manager(); diff --git a/src/progs/manager/prog_manager.h b/src/progs/manager/prog_manager.h index 0f0fe01..42e3c7b 100644 --- a/src/progs/manager/prog_manager.h +++ b/src/progs/manager/prog_manager.h @@ -25,7 +25,7 @@ class HardwareDescription; class Manager : public TQObject, public Log::Base { Q_OBJECT - TQ_OBJECT + public: Manager(TQObject *parent); virtual ~Manager(); diff --git a/src/progs/picdem_bootloader/base/picdem_bootloader_prog.h b/src/progs/picdem_bootloader/base/picdem_bootloader_prog.h index cb82da0..891fc03 100644 --- a/src/progs/picdem_bootloader/base/picdem_bootloader_prog.h +++ b/src/progs/picdem_bootloader/base/picdem_bootloader_prog.h @@ -19,7 +19,7 @@ namespace PicdemBootloader class ProgrammerBase : public Bootloader::ProgrammerBase { Q_OBJECT - TQ_OBJECT + public: ProgrammerBase(const Programmer::Group &group, const Pic::Data *data); }; diff --git a/src/progs/picdem_bootloader/gui/picdem_bootloader_ui.h b/src/progs/picdem_bootloader/gui/picdem_bootloader_ui.h index b23c157..20df67b 100644 --- a/src/progs/picdem_bootloader/gui/picdem_bootloader_ui.h +++ b/src/progs/picdem_bootloader/gui/picdem_bootloader_ui.h @@ -17,7 +17,7 @@ namespace PicdemBootloader class ConfigWidget: public ::Programmer::ConfigWidget { Q_OBJECT - TQ_OBJECT + public: ConfigWidget(const ::Programmer::Group &group, TQWidget *parent); virtual void loadConfig(); diff --git a/src/progs/pickit1/base/pickit1_prog.h b/src/progs/pickit1/base/pickit1_prog.h index 341e879..a74bcbe 100644 --- a/src/progs/pickit1/base/pickit1_prog.h +++ b/src/progs/pickit1/base/pickit1_prog.h @@ -17,7 +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; diff --git a/src/progs/pickit2/base/pickit2_prog.h b/src/progs/pickit2/base/pickit2_prog.h index 31efb44..a9d07b5 100644 --- a/src/progs/pickit2/base/pickit2_prog.h +++ b/src/progs/pickit2/base/pickit2_prog.h @@ -18,7 +18,7 @@ namespace Pickit2 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; diff --git a/src/progs/pickit2/base/pickit_prog.h b/src/progs/pickit2/base/pickit_prog.h index 7d2e76d..3939e37 100644 --- a/src/progs/pickit2/base/pickit_prog.h +++ b/src/progs/pickit2/base/pickit_prog.h @@ -22,7 +22,7 @@ class Hardware; class Base : public Programmer::PicBase { Q_OBJECT - TQ_OBJECT + public: Base(const Programmer::Group &group, const Pic::Data *data); virtual bool deviceHasOsccalRegeneration() const = 0; diff --git a/src/progs/pickit2/gui/pickit2_group_ui.h b/src/progs/pickit2/gui/pickit2_group_ui.h index 3c8e34d..858c670 100644 --- a/src/progs/pickit2/gui/pickit2_group_ui.h +++ b/src/progs/pickit2/gui/pickit2_group_ui.h @@ -18,7 +18,7 @@ namespace Pickit class AdvancedDialog : public ::Programmer::PicAdvancedDialog { Q_OBJECT - TQ_OBJECT + public: AdvancedDialog(Base &base, TQWidget *parent, const char *name); Base &base() { return static_cast<Base &>(_base); } diff --git a/src/progs/pickit2_bootloader/base/pickit2_bootloader_prog.h b/src/progs/pickit2_bootloader/base/pickit2_bootloader_prog.h index b7e8bd8..99d6d6a 100644 --- a/src/progs/pickit2_bootloader/base/pickit2_bootloader_prog.h +++ b/src/progs/pickit2_bootloader/base/pickit2_bootloader_prog.h @@ -19,7 +19,7 @@ namespace Pickit2Bootloader class ProgrammerBase : public ::Bootloader::ProgrammerBase { Q_OBJECT - TQ_OBJECT + public: ProgrammerBase(const Programmer::Group &group, const Pic::Data *data); virtual bool verifyDeviceId() { return true; } diff --git a/src/progs/pickit2_bootloader/gui/pickit2_bootloader_ui.h b/src/progs/pickit2_bootloader/gui/pickit2_bootloader_ui.h index 8b72728..4264c5e 100644 --- a/src/progs/pickit2_bootloader/gui/pickit2_bootloader_ui.h +++ b/src/progs/pickit2_bootloader/gui/pickit2_bootloader_ui.h @@ -17,7 +17,7 @@ namespace Pickit2Bootloader class ConfigWidget: public ::Programmer::ConfigWidget { Q_OBJECT - TQ_OBJECT + public: ConfigWidget(const::Programmer::Group &group, TQWidget *parent); virtual void loadConfig() {} diff --git a/src/progs/pickit2v2/base/pickit2v2_prog.h b/src/progs/pickit2v2/base/pickit2v2_prog.h index 5c9f764..2ac95d3 100644 --- a/src/progs/pickit2v2/base/pickit2v2_prog.h +++ b/src/progs/pickit2v2/base/pickit2v2_prog.h @@ -19,7 +19,7 @@ class Hardware; class Base : public Pickit2::Base { Q_OBJECT - TQ_OBJECT + public: Base(const Programmer::Group &group, const Pic::Data *data); virtual bool setTarget(); diff --git a/src/progs/psp/base/psp_prog.h b/src/progs/psp/base/psp_prog.h index 02d0c68..8f777d6 100644 --- a/src/progs/psp/base/psp_prog.h +++ b/src/progs/psp/base/psp_prog.h @@ -18,7 +18,7 @@ namespace Psp class Base : public Programmer::PicBase { Q_OBJECT - TQ_OBJECT + public: Base(const Programmer::Group &group, const Pic::Data *data) : Programmer::PicBase(group, data, "psp_programmer_base") {} diff --git a/src/progs/sdcdb/base/sdcdb_debug.h b/src/progs/sdcdb/base/sdcdb_debug.h index 18f3e85..a9b4b14 100644 --- a/src/progs/sdcdb/base/sdcdb_debug.h +++ b/src/progs/sdcdb/base/sdcdb_debug.h @@ -19,7 +19,7 @@ namespace SDCDB class Programmer : public ::Programmer::PicBase { Q_OBJECT - TQ_OBJECT + public: Programmer(const ::Programmer::Group &group, const Pic::Data *data) : Programmer::PicBase(group, data, "sdcdb_programmer") {} diff --git a/src/progs/tbl_bootloader/base/tbl_bootloader_prog.h b/src/progs/tbl_bootloader/base/tbl_bootloader_prog.h index 08cbf3f..eb75c98 100644 --- a/src/progs/tbl_bootloader/base/tbl_bootloader_prog.h +++ b/src/progs/tbl_bootloader/base/tbl_bootloader_prog.h @@ -18,7 +18,7 @@ namespace TinyBootloader class ProgrammerBase : public ::Bootloader::ProgrammerBase { Q_OBJECT - TQ_OBJECT + public: ProgrammerBase(const Programmer::Group &group, const Pic::Data *data); virtual bool verifyDeviceId() { return static_cast<Hardware &>(hardware()).verifyDeviceId(); } diff --git a/src/progs/tbl_bootloader/gui/tbl_bootloader_ui.h b/src/progs/tbl_bootloader/gui/tbl_bootloader_ui.h index fb85c0f..e12564f 100644 --- a/src/progs/tbl_bootloader/gui/tbl_bootloader_ui.h +++ b/src/progs/tbl_bootloader/gui/tbl_bootloader_ui.h @@ -20,7 +20,7 @@ namespace TinyBootloader class ConfigWidget: public ::Programmer::ConfigWidget { Q_OBJECT - TQ_OBJECT + public: ConfigWidget(const ::Programmer::Group &group, TQWidget *parent); virtual void loadConfig(); |