diff options
122 files changed, 225 insertions, 225 deletions
diff --git a/src/common/cli/cli_main.h b/src/common/cli/cli_main.h index b0d71cb..42941ad 100644 --- a/src/common/cli/cli_main.h +++ b/src/common/cli/cli_main.h @@ -58,7 +58,7 @@ private: class MainBase : public TQObject, public Log::Base { Q_OBJECT - TQ_OBJECT + public: MainBase(Properties properties); virtual OptionList optionList(const char *fileDescription) const; diff --git a/src/common/common/storage.h b/src/common/common/storage.h index b324ab5..18d375a 100644 --- a/src/common/common/storage.h +++ b/src/common/common/storage.h @@ -35,7 +35,7 @@ private: class GenericStorage : public TQObject { Q_OBJECT - TQ_OBJECT + public: GenericStorage(TQObject *parent = 0, const char *name = 0) : TQObject(parent, name), _dirty(false) {} @@ -59,7 +59,7 @@ class GenericView; class GenericViewProxy : public TQObject { Q_OBJECT - TQ_OBJECT + public: GenericViewProxy(GenericView &view) : _view(view) {} void addStorage(GenericStorage &storage); diff --git a/src/common/common/synchronous.h b/src/common/common/synchronous.h index 759747a..d7d3d00 100644 --- a/src/common/common/synchronous.h +++ b/src/common/common/synchronous.h @@ -15,7 +15,7 @@ class Synchronous : public TQObject { Q_OBJECT - TQ_OBJECT + public: Synchronous(uint timeout = 0); // timeout is ms (0 == no timeout) bool enterLoop(); // return false on timeout diff --git a/src/common/global/process.h b/src/common/global/process.h index daa8513..083fb0a 100644 --- a/src/common/global/process.h +++ b/src/common/global/process.h @@ -31,7 +31,7 @@ extern State runSynchronously(Base &process, RunActions actions, uint timeout); class Base : public TQObject { Q_OBJECT - TQ_OBJECT + public: Base(TQObject *parent, const char *name); virtual ~Base(); @@ -75,7 +75,7 @@ protected: class StringOutput : public Base { Q_OBJECT - TQ_OBJECT + public: StringOutput(TQObject *parent = 0, const char *name = 0) : Base(parent, name) {} TQString sout() const { return _stdout; } @@ -90,7 +90,7 @@ private slots: class LineBase : public Base { Q_OBJECT - TQ_OBJECT + public: LineBase(TQObject *parent = 0, const char *name = 0) : Base(parent, name) {} @@ -107,7 +107,7 @@ private: class LineOutput : public LineBase { Q_OBJECT - TQ_OBJECT + public: LineOutput(TQObject *parent = 0, const char *name = 0) : LineBase(parent, name) {} virtual bool start(uint timeout); @@ -125,7 +125,7 @@ protected: class LineSignal : public LineBase { Q_OBJECT - TQ_OBJECT + public: LineSignal(TQObject *parent = 0, const char *name = 0) : LineBase(parent, name) {} diff --git a/src/common/global/progress_monitor.h b/src/common/global/progress_monitor.h index 03628f7..3ccf424 100644 --- a/src/common/global/progress_monitor.h +++ b/src/common/global/progress_monitor.h @@ -14,7 +14,7 @@ class ProgressMonitor : public TQObject { Q_OBJECT - TQ_OBJECT + public: ProgressMonitor(TQObject *parent = 0); void clear(); diff --git a/src/common/global/purl.h b/src/common/global/purl.h index a0ee295..3fc373e 100644 --- a/src/common/global/purl.h +++ b/src/common/global/purl.h @@ -20,7 +20,7 @@ namespace PURL class Http : public TQHttp { Q_OBJECT - TQ_OBJECT + public: Http(const TQString &hostname); TQHttpResponseHeader _header; diff --git a/src/common/gui/config_widget.h b/src/common/gui/config_widget.h index 6d87705..28fc4eb 100644 --- a/src/common/gui/config_widget.h +++ b/src/common/gui/config_widget.h @@ -21,7 +21,7 @@ class ConfigWidget : public Container { Q_OBJECT - TQ_OBJECT + public: ConfigWidget(TQWidget *parent = 0) : Container(parent) {} virtual TQString title() const { return TQString(); } diff --git a/src/common/gui/container.h b/src/common/gui/container.h index 880fd28..df59d1c 100644 --- a/src/common/gui/container.h +++ b/src/common/gui/container.h @@ -20,7 +20,7 @@ class PopupButton; class Container : public TQFrame { Q_OBJECT - TQ_OBJECT + public: enum Type { Flat, Sunken }; Container(TQWidget *parent = 0, Type type = Flat); @@ -48,7 +48,7 @@ private: class ButtonContainer : public Container { Q_OBJECT - TQ_OBJECT + public: ButtonContainer(const TQString &title, TQWidget *parent); PopupButton &button() { return *_button; } diff --git a/src/common/gui/dialog.h b/src/common/gui/dialog.h index f506411..24093d2 100644 --- a/src/common/gui/dialog.h +++ b/src/common/gui/dialog.h @@ -17,7 +17,7 @@ class Dialog : public KDialogBase { Q_OBJECT - TQ_OBJECT + public: Dialog(TQWidget *parent, const char *name, bool modal, const TQString &caption, int buttonMask, ButtonCode defaultButton, bool separator, @@ -38,7 +38,7 @@ private: class TreeListDialog : public Dialog { Q_OBJECT - TQ_OBJECT + public: TreeListDialog(TQWidget *parent, const char *name, bool modal, const TQString &caption, int buttonMask, ButtonCode defaultButton, bool separator); @@ -71,7 +71,7 @@ protected: class TextEditorDialog : public Dialog { Q_OBJECT - TQ_OBJECT + public: TextEditorDialog(const TQString &text, const TQString &caption, bool wrapAtWidgetWidth, TQWidget *parent); diff --git a/src/common/gui/editlistbox.h b/src/common/gui/editlistbox.h index 53b4294..a9345d3 100644 --- a/src/common/gui/editlistbox.h +++ b/src/common/gui/editlistbox.h @@ -35,7 +35,7 @@ class EditListBox : public TQFrame { Q_OBJECT - TQ_OBJECT + public: enum Mode { DuplicatesDisallowed, DuplicatesAllowed, DuplicatesCheckedAtEntering }; enum Button { Add = 1, Remove = 2, UpDown = 4, RemoveAll = 8, Reset = 16 }; diff --git a/src/common/gui/hexword_gui.h b/src/common/gui/hexword_gui.h index 2be2a75..aa0a41c 100644 --- a/src/common/gui/hexword_gui.h +++ b/src/common/gui/hexword_gui.h @@ -19,7 +19,7 @@ class HexValueValidator : public TQValidator { Q_OBJECT - TQ_OBJECT + public: HexValueValidator(uint nbChars, TQObject *parent); virtual State validate(TQString &input, int &pos) const; @@ -32,7 +32,7 @@ private: class GenericHexWordEditor : public KLineEdit { Q_OBJECT - TQ_OBJECT + public: GenericHexWordEditor(uint nbChars, bool hasBlankValue, TQWidget *parent); virtual TQSize sizeHint() const; @@ -71,7 +71,7 @@ protected: class HexWordEditor : public GenericHexWordEditor { Q_OBJECT - TQ_OBJECT + public: HexWordEditor(uint nbChars, TQWidget *parent) : GenericHexWordEditor(nbChars, false, parent) {} void setValue(BitValue word) { _word = word; set(); } diff --git a/src/common/gui/list_container.h b/src/common/gui/list_container.h index 75abeb0..7d91ef8 100644 --- a/src/common/gui/list_container.h +++ b/src/common/gui/list_container.h @@ -27,7 +27,7 @@ public: class PopupContainer : public KPopupMenu, public ListContainer { Q_OBJECT - TQ_OBJECT + public: PopupContainer(const TQString &title, TQWidget *parent = 0, const char *name = 0); virtual ListContainer *appendBranch(const TQString &title); diff --git a/src/common/gui/list_view.h b/src/common/gui/list_view.h index 54c7a05..33aac4f 100644 --- a/src/common/gui/list_view.h +++ b/src/common/gui/list_view.h @@ -24,7 +24,7 @@ class ListViewToolTip; class ListView : public KListView { Q_OBJECT - TQ_OBJECT + public: ListView(TQWidget *parent = 0, const char *name = 0); virtual ~ListView(); diff --git a/src/common/gui/misc_gui.h b/src/common/gui/misc_gui.h index 8c6a2ee..6c7ade6 100644 --- a/src/common/gui/misc_gui.h +++ b/src/common/gui/misc_gui.h @@ -63,7 +63,7 @@ extern void text(const TQString &text, Log::ShowMode show); class PopupButton : public KPushButton { Q_OBJECT - TQ_OBJECT + public: PopupButton(TQWidget *parent = 0, const char *name = 0); PopupButton(const TQString &text, TQWidget *parent = 0, const char *name = 0); @@ -88,7 +88,7 @@ private: class Splitter : public TQSplitter { Q_OBJECT - TQ_OBJECT + public: Splitter(const TQValueList<int> &defaultSizes, Qt::Orientation orientation, TQWidget *parent, const char *name); @@ -112,7 +112,7 @@ public: class SeparatorWidget : public TQFrame { Q_OBJECT - TQ_OBJECT + public: SeparatorWidget(TQWidget *parent) : TQFrame(parent, "separator") { setFrameStyle(TQFrame::Panel | TQFrame::Sunken); @@ -125,7 +125,7 @@ public: class TabBar : public KTabBar { Q_OBJECT - TQ_OBJECT + public: TabBar(TQWidget *parent = 0, const char *name = 0); @@ -141,7 +141,7 @@ private: class TabWidget : public KTabWidget { Q_OBJECT - TQ_OBJECT + public: TabWidget(TQWidget *parent = 0, const char *name = 0); void setIgnoreWheelEvent(bool ignore); @@ -155,7 +155,7 @@ protected: class ComboBox : public TQComboBox { Q_OBJECT - TQ_OBJECT + public: ComboBox(TQWidget *parent = 0, const char *name = 0); void setIgnoreWheelEvent(bool ignore) { _ignoreWheelEvent = ignore; } diff --git a/src/common/gui/number_gui.h b/src/common/gui/number_gui.h index 659e443..683c5f9 100644 --- a/src/common/gui/number_gui.h +++ b/src/common/gui/number_gui.h @@ -26,7 +26,7 @@ extern TQValidator::State validateNumber(const TQString &s); class NumberLineEdit : public KLineEdit { Q_OBJECT - TQ_OBJECT + public: NumberLineEdit(TQWidget *parent = 0, const char *name = 0); NumberLineEdit(const TQString &text, TQWidget *parent = 0, const char *name = 0); diff --git a/src/common/gui/purl_gui.h b/src/common/gui/purl_gui.h index 3d29319..c487d86 100644 --- a/src/common/gui/purl_gui.h +++ b/src/common/gui/purl_gui.h @@ -35,7 +35,7 @@ extern Url getSaveUrl(const TQString &startDir, const TQString &filter, TQWidget class Label : public KURLLabel { Q_OBJECT - TQ_OBJECT + public: Label(const TQString &url, const TQString &text, TQWidget *parent = 0, const char *name = 0); @@ -47,7 +47,7 @@ private slots: class BaseWidget : public TQWidget { Q_OBJECT - TQ_OBJECT + public: BaseWidget(TQWidget *parent = 0, const char *name = 0); BaseWidget(const TQString &defaultDir, TQWidget *parent = 0, const char *name = 0); @@ -70,7 +70,7 @@ protected: class DirectoryWidget : public BaseWidget { Q_OBJECT - TQ_OBJECT + public: DirectoryWidget(TQWidget *parent = 0, const char *name = 0) : BaseWidget(parent, name) {} DirectoryWidget(const TQString &defaultDir, TQWidget *parent = 0, const char *name = 0) : BaseWidget(defaultDir, parent, name) {} @@ -85,7 +85,7 @@ protected slots: class DirectoriesWidget : public TQVGroupBox { Q_OBJECT - TQ_OBJECT + public: DirectoriesWidget(const TQString &title, TQWidget *parent = 0, const char *name = 0); DirectoriesWidget(const TQString &title, const TQString &defaultDir, TQWidget *parent = 0, const char *name = 0); @@ -104,7 +104,7 @@ private: class UrlWidget : public BaseWidget { Q_OBJECT - TQ_OBJECT + public: UrlWidget(const TQString &filter, TQWidget *parent = 0, const char *name = 0) : BaseWidget(parent, name), _filter(filter) {} diff --git a/src/common/nokde/nokde_kprocess.h b/src/common/nokde/nokde_kprocess.h index a18d5c5..06d6851 100644 --- a/src/common/nokde/nokde_kprocess.h +++ b/src/common/nokde/nokde_kprocess.h @@ -13,7 +13,7 @@ class Q3Process; class KProcess : public TQObject { Q_OBJECT - TQ_OBJECT + public: KProcess(TQObject *parent = 0, const char *name = 0); void clearArguments() { _arguments.clear(); } diff --git a/src/devices/base/register.h b/src/devices/base/register.h index 3936ad1..9f766cd 100644 --- a/src/devices/base/register.h +++ b/src/devices/base/register.h @@ -96,7 +96,7 @@ extern List &list(); class List : public GenericStorage { Q_OBJECT - TQ_OBJECT + public: List() : GenericStorage(0, "register_list") {} void init(); diff --git a/src/devices/gui/hex_view.h b/src/devices/gui/hex_view.h index 4aadc90..8a26d8e 100644 --- a/src/devices/gui/hex_view.h +++ b/src/devices/gui/hex_view.h @@ -19,7 +19,7 @@ namespace Device class HexView : public MemoryEditorGroup { Q_OBJECT - TQ_OBJECT + public: HexView(const HexEditor &editor, TQWidget *parent, const char *name); virtual void display(Memory *memory); diff --git a/src/devices/gui/hex_word_editor.h b/src/devices/gui/hex_word_editor.h index 94b520c..fad46a8 100644 --- a/src/devices/gui/hex_word_editor.h +++ b/src/devices/gui/hex_word_editor.h @@ -19,7 +19,7 @@ namespace Device class HexWordEditor : public GenericHexWordEditor { Q_OBJECT - TQ_OBJECT + public: HexWordEditor(Memory &memory, uint nbChars, TQWidget *parent); void setOffset(int offset); @@ -41,7 +41,7 @@ protected: class RegisterHexWordEditor : public GenericHexWordEditor { Q_OBJECT - TQ_OBJECT + public: RegisterHexWordEditor(TQWidget *parent, uint nbChars, BitValue mask); void clear() { setValue(BitValue()); } diff --git a/src/devices/gui/memory_editor.h b/src/devices/gui/memory_editor.h index ac8bfdc..78bb5a6 100644 --- a/src/devices/gui/memory_editor.h +++ b/src/devices/gui/memory_editor.h @@ -42,7 +42,7 @@ extern const ActionData ACTION_DATA[Nb_Actions]; class MemoryEditor : public TQFrame { Q_OBJECT - TQ_OBJECT + public: MemoryEditor(Device::Memory *memory, TQWidget *parent, const char *name); virtual void setReadOnly(bool readOnly) = 0; @@ -62,7 +62,7 @@ protected: class MemoryRangeEditor : public MemoryEditor { Q_OBJECT - TQ_OBJECT + public: MemoryRangeEditor(Device::Memory &memory, uint nbLines, uint nbCols, uint offset, int nb, TQWidget *parent, const char *name); @@ -111,7 +111,7 @@ protected: class MemoryEditorGroup : public MemoryEditor { Q_OBJECT - TQ_OBJECT + public: MemoryEditorGroup(Device::Memory *memory, TQWidget *parent, const char *name); void addEditor(MemoryEditor *editor); @@ -129,7 +129,7 @@ protected: class MemoryTypeEditor : public MemoryEditorGroup { Q_OBJECT - TQ_OBJECT + public: MemoryTypeEditor(const HexView *hexview, Device::Memory &memory, TQWidget *parent, const char *name); virtual void init(bool first); diff --git a/src/devices/gui/register_view.h b/src/devices/gui/register_view.h index 9459a8d..c69eeac 100644 --- a/src/devices/gui/register_view.h +++ b/src/devices/gui/register_view.h @@ -66,7 +66,7 @@ protected: class LineEdit : public NumberLineEdit { Q_OBJECT - TQ_OBJECT + public: LineEdit(TQWidget *parent, const char *name = 0); void setValue(NumberBase base, BitValue value, uint nbChars); @@ -92,7 +92,7 @@ private: class View : public TQFrame, public GenericView { Q_OBJECT - TQ_OBJECT + public: View(TQWidget *parent, const char *name); diff --git a/src/devices/mem24/gui/mem24_hex_view.h b/src/devices/mem24/gui/mem24_hex_view.h index 6de6ca0..3316d80 100644 --- a/src/devices/mem24/gui/mem24_hex_view.h +++ b/src/devices/mem24/gui/mem24_hex_view.h @@ -19,7 +19,7 @@ namespace Mem24 class HexView : public Device::HexView { Q_OBJECT - TQ_OBJECT + public: HexView(const HexEditor &editor, TQWidget *parent); virtual uint nbChecksumChars() const { return 4; } diff --git a/src/devices/mem24/gui/mem24_memory_editor.h b/src/devices/mem24/gui/mem24_memory_editor.h index 47916a4..4677fc2 100644 --- a/src/devices/mem24/gui/mem24_memory_editor.h +++ b/src/devices/mem24/gui/mem24_memory_editor.h @@ -34,7 +34,7 @@ private: class HexWordEditor : public Device::HexWordEditor, public MemoryCaster { Q_OBJECT - TQ_OBJECT + public: HexWordEditor(Memory &memory, TQWidget *parent) : Device::HexWordEditor(memory, 2, parent), MemoryCaster(memory) {} @@ -50,7 +50,7 @@ private: class MemoryRangeEditor : public Device::MemoryRangeEditor, public MemoryCaster { Q_OBJECT - TQ_OBJECT + public: MemoryRangeEditor(Memory &memory, TQWidget *parent); @@ -66,7 +66,7 @@ private: class MemoryTypeEditor : public Device::MemoryTypeEditor, public MemoryCaster { Q_OBJECT - TQ_OBJECT + public: MemoryTypeEditor(const HexView *hexview, Memory &memory, TQWidget *parent); virtual void init(bool first); diff --git a/src/devices/pic/gui/pic_config_editor.h b/src/devices/pic/gui/pic_config_editor.h index 045ca4d..b117707 100644 --- a/src/devices/pic/gui/pic_config_editor.h +++ b/src/devices/pic/gui/pic_config_editor.h @@ -19,7 +19,7 @@ class HexView; class MemoryConfigEditorWidget : public Device::MemoryEditorGroup, public MemoryCaster { Q_OBJECT - TQ_OBJECT + public: MemoryConfigEditorWidget(Memory &memory, bool withWordEditor, TQWidget *parent); }; @@ -28,7 +28,7 @@ public: class MemoryConfigEditor : public MemoryTypeEditor { Q_OBJECT - TQ_OBJECT + public: MemoryConfigEditor(const HexView *hexview, Memory &memory, TQWidget *parent); virtual void init(bool first); diff --git a/src/devices/pic/gui/pic_config_word_editor.h b/src/devices/pic/gui/pic_config_word_editor.h index 38f9573..30068e2 100644 --- a/src/devices/pic/gui/pic_config_word_editor.h +++ b/src/devices/pic/gui/pic_config_word_editor.h @@ -22,7 +22,7 @@ namespace Pic class ConfigWordDialog : public Dialog { Q_OBJECT - TQ_OBJECT + public: ConfigWordDialog(const Memory &memory, uint index, TQWidget *parent); }; @@ -31,7 +31,7 @@ public: class ConfigWordComboBox : public ComboBox { Q_OBJECT - TQ_OBJECT + public: ConfigWordComboBox(TQWidget *parent); void appendItem(const TQString &text, uint index) { insertItem(text); _map.append(index); } @@ -50,7 +50,7 @@ private: class ConfigWordEditor : public MemoryEditor { Q_OBJECT - TQ_OBJECT + public: ConfigWordEditor(Memory &memory, uint index, bool withWordEditor, TQWidget *parent); virtual void setReadOnly(bool readOnly); diff --git a/src/devices/pic/gui/pic_hex_view.h b/src/devices/pic/gui/pic_hex_view.h index c3a53f8..2c416b7 100644 --- a/src/devices/pic/gui/pic_hex_view.h +++ b/src/devices/pic/gui/pic_hex_view.h @@ -21,7 +21,7 @@ namespace Pic class HexView : public Device::HexView { Q_OBJECT - TQ_OBJECT + public: HexView(const HexEditor &editor, TQWidget *parent); Memory *memory() { return static_cast<Memory *>(_memory); } diff --git a/src/devices/pic/gui/pic_memory_editor.h b/src/devices/pic/gui/pic_memory_editor.h index e641ec4..7d0f857 100644 --- a/src/devices/pic/gui/pic_memory_editor.h +++ b/src/devices/pic/gui/pic_memory_editor.h @@ -42,7 +42,7 @@ private: class MemoryEditor : public Device::MemoryEditor, public MemoryCaster { Q_OBJECT - TQ_OBJECT + public: MemoryEditor(MemoryRangeType type, Memory &memory, TQWidget *parent, const char *name) : Device::MemoryEditor(&memory, parent, name), MemoryCaster(type, memory) {} @@ -52,7 +52,7 @@ public: class MemoryEditorLegend : public MemoryEditor { Q_OBJECT - TQ_OBJECT + public: MemoryEditorLegend(MemoryRangeType type, Memory &memory, TQWidget *parent); virtual void setReadOnly(bool) {} @@ -93,7 +93,7 @@ private: class HexWordEditor : public Device::HexWordEditor, public MemoryCaster { Q_OBJECT - TQ_OBJECT + public: HexWordEditor(MemoryRangeType type, Memory &memory, TQWidget *parent); @@ -108,7 +108,7 @@ private: class MemoryRangeEditor : public Device::MemoryRangeEditor, public MemoryCaster { Q_OBJECT - TQ_OBJECT + public: MemoryRangeEditor(MemoryRangeType type, Memory &memory, uint nbLines, uint nbCols, uint wordOffset, int nbWords, TQWidget *parent); @@ -135,7 +135,7 @@ private: class MemoryTypeEditor : public Device::MemoryTypeEditor, public MemoryCaster { Q_OBJECT - TQ_OBJECT + public: MemoryTypeEditor(const HexView *hexview, MemoryRangeType type, Memory &memory, TQWidget *parent, const char *name); virtual void init(bool first); @@ -148,7 +148,7 @@ private: class MemoryTypeRangeEditor : public MemoryTypeEditor { Q_OBJECT - TQ_OBJECT + public: MemoryTypeRangeEditor(const HexView *hexview, MemoryRangeType type, Memory &memory, TQWidget *parent); virtual void init(bool first); @@ -161,7 +161,7 @@ protected: class MemoryUserIdEditor : public MemoryTypeRangeEditor { Q_OBJECT - TQ_OBJECT + public: MemoryUserIdEditor(const HexView *hexview, Memory &memory, TQWidget *parent); virtual void init(bool first); @@ -182,7 +182,7 @@ private: class MemoryCalibrationEditor : public MemoryTypeEditor { Q_OBJECT - TQ_OBJECT + public: MemoryCalibrationEditor(const HexView *hexview, Memory &memory, TQWidget *parent); virtual void init(bool first); diff --git a/src/devices/pic/gui/pic_prog_group_ui.h b/src/devices/pic/gui/pic_prog_group_ui.h index c203da3..cd489fd 100644 --- a/src/devices/pic/gui/pic_prog_group_ui.h +++ b/src/devices/pic/gui/pic_prog_group_ui.h @@ -17,7 +17,7 @@ namespace Programmer class PicAdvancedDialog : public ::Programmer::AdvancedDialog { Q_OBJECT - TQ_OBJECT + public: PicAdvancedDialog(PicBase &base, TQWidget *parent, const char *name); virtual void updateDisplay(); diff --git a/src/devices/pic/gui/pic_register_view.h b/src/devices/pic/gui/pic_register_view.h index f7a07ac..9c2a654 100644 --- a/src/devices/pic/gui/pic_register_view.h +++ b/src/devices/pic/gui/pic_register_view.h @@ -27,7 +27,7 @@ namespace Pic class BankWidget : public TQFrame { Q_OBJECT - TQ_OBJECT + public: BankWidget(uint bank, TQWidget *parent); void updateView(); @@ -61,7 +61,7 @@ private: class RegisterView : public Register::View { Q_OBJECT - TQ_OBJECT + public: RegisterView(TQWidget *parent); virtual void updateView(); diff --git a/src/libgui/breakpoint_view.h b/src/libgui/breakpoint_view.h index 1545afa..9456182 100644 --- a/src/libgui/breakpoint_view.h +++ b/src/libgui/breakpoint_view.h @@ -29,7 +29,7 @@ private: class View : public TQWidget, public GenericView { Q_OBJECT - TQ_OBJECT + public: View(TQWidget *parent); virtual void updateView(); diff --git a/src/libgui/config_center.h b/src/libgui/config_center.h index 88ed12c..0cc7cee 100644 --- a/src/libgui/config_center.h +++ b/src/libgui/config_center.h @@ -29,7 +29,7 @@ END_DECLARE_CONFIG_WIDGET class GlobalConfigWidget : public BaseGlobalConfigWidget { Q_OBJECT - TQ_OBJECT + public: GlobalConfigWidget(); virtual TQString title() const { return i18n("General"); } @@ -48,7 +48,7 @@ private: class StandaloneConfigWidget : public ConfigWidget { Q_OBJECT - TQ_OBJECT + public: StandaloneConfigWidget(); virtual void loadConfig(); @@ -68,7 +68,7 @@ private: class ConfigCenter : public Dialog { Q_OBJECT - TQ_OBJECT + public: enum Type { General = 0, ProgSelect, ProgOptions, DebugOptions, Standalone, Nb_Types }; diff --git a/src/libgui/config_gen.h b/src/libgui/config_gen.h index b281de0..5aff752 100644 --- a/src/libgui/config_gen.h +++ b/src/libgui/config_gen.h @@ -26,7 +26,7 @@ class SimpleTextEditor; class GeneratorDialog : public Dialog { Q_OBJECT - TQ_OBJECT + public: GeneratorDialog(const TQString &title, TQWidget *parent, const char *name); void set(const Device::Data *data, const Tool::Group &group, PURL::ToolType stype); @@ -54,7 +54,7 @@ protected: class ConfigGenerator : public GeneratorDialog { Q_OBJECT - TQ_OBJECT + public: ConfigGenerator(TQWidget *parent); virtual ~ConfigGenerator(); @@ -74,7 +74,7 @@ private: class TemplateGenerator : public GeneratorDialog { Q_OBJECT - TQ_OBJECT + public: TemplateGenerator(TQWidget *parent); diff --git a/src/libgui/console.h b/src/libgui/console.h index 304c793..5f9ff4d 100644 --- a/src/libgui/console.h +++ b/src/libgui/console.h @@ -14,7 +14,7 @@ class ConsoleView : public TQWidget { Q_OBJECT - TQ_OBJECT + public: ConsoleView(TQWidget *parent); diff --git a/src/libgui/device_editor.h b/src/libgui/device_editor.h index 355ddae..19b4929 100644 --- a/src/libgui/device_editor.h +++ b/src/libgui/device_editor.h @@ -15,7 +15,7 @@ namespace Device { class Data; } class DeviceEditor : public Editor { Q_OBJECT - TQ_OBJECT + public: DeviceEditor(const TQString &title, const TQString &tag, TQWidget *parent, const char *name); DeviceEditor(TQWidget *parent, const char *name); diff --git a/src/libgui/device_gui.h b/src/libgui/device_gui.h index 887b98c..bc69136 100644 --- a/src/libgui/device_gui.h +++ b/src/libgui/device_gui.h @@ -86,7 +86,7 @@ private: class Dialog : public ::Dialog { Q_OBJECT - TQ_OBJECT + public: Dialog(const TQString &device, Type type, TQWidget *parent); virtual ~Dialog(); @@ -119,7 +119,7 @@ private: class ComboBox : public TQComboBox { Q_OBJECT - TQ_OBJECT + public: ComboBox(bool withAuto, TQWidget *parent); void setDevice(const TQString &device, const Device::Data *data = 0); @@ -134,7 +134,7 @@ private: class Button : public TQWidget { Q_OBJECT - TQ_OBJECT + public: Button(bool withAuto, TQWidget *parent); void setDevice(const TQString &device) { _combo->setDevice(device); } @@ -154,7 +154,7 @@ private: class Browser : public KTextBrowser { Q_OBJECT - TQ_OBJECT + public: Browser(TQWidget *parent); @@ -169,7 +169,7 @@ public slots: class View : public TabWidget { Q_OBJECT - TQ_OBJECT + public: View(TQWidget *parent); void clear(); @@ -188,7 +188,7 @@ private: class Editor : public DeviceEditor { Q_OBJECT - TQ_OBJECT + public: Editor(const TQString &title, const TQString &tag, TQWidget *parent); virtual bool isModified() const { return false; } diff --git a/src/libgui/editor.h b/src/libgui/editor.h index 0c80b07..330c380 100644 --- a/src/libgui/editor.h +++ b/src/libgui/editor.h @@ -21,7 +21,7 @@ class KPopupMenu; class Editor : public TQWidget { Q_OBJECT - TQ_OBJECT + public: Editor(const TQString &title, const TQString &tag, TQWidget *parent, const char *name); Editor(TQWidget *parent, const char *name); diff --git a/src/libgui/editor_manager.h b/src/libgui/editor_manager.h index c20f520..14e518f 100644 --- a/src/libgui/editor_manager.h +++ b/src/libgui/editor_manager.h @@ -23,7 +23,7 @@ class TQEvent; class SwitchToDialog : public Dialog { Q_OBJECT - TQ_OBJECT + public: SwitchToDialog(const TQStringList &names, TQWidget *parent); TQString name() const { return _edit->text(); } @@ -36,7 +36,7 @@ private: class EditorTabBar : public TabBar { Q_OBJECT - TQ_OBJECT + public: EditorTabBar(TQWidget *parent) : TabBar(parent, "editor_tab_bar") {} void setReadOnly(uint index, bool readOnly) { _readOnly[tabAt(index)] = readOnly; } @@ -67,7 +67,7 @@ private: class EditorManager : public TabWidget { Q_OBJECT - TQ_OBJECT + public: EditorManager(TQWidget *parent); diff --git a/src/libgui/gui_debug_manager.h b/src/libgui/gui_debug_manager.h index c391c76..fef410a 100644 --- a/src/libgui/gui_debug_manager.h +++ b/src/libgui/gui_debug_manager.h @@ -20,7 +20,7 @@ namespace Debugger class GuiManager : public Manager { Q_OBJECT - TQ_OBJECT + public: GuiManager() {} virtual void updateDevice(); diff --git a/src/libgui/gui_prog_manager.h b/src/libgui/gui_prog_manager.h index b747da6..af27dfc 100644 --- a/src/libgui/gui_prog_manager.h +++ b/src/libgui/gui_prog_manager.h @@ -17,7 +17,7 @@ namespace Programmer class GuiManager : public Manager { Q_OBJECT - TQ_OBJECT + public: GuiManager(TQObject *parent) : Manager(parent) {} virtual void createProgrammer(const Device::Data *data); diff --git a/src/libgui/hex_editor.h b/src/libgui/hex_editor.h index 50df57c..420eeeb 100644 --- a/src/libgui/hex_editor.h +++ b/src/libgui/hex_editor.h @@ -22,7 +22,7 @@ class HexEditor; class HexEditorPart : public KParts::ReadWritePart { Q_OBJECT - TQ_OBJECT + public: HexEditorPart(HexEditor *editor); virtual void setReadWrite(bool readWrite); @@ -36,7 +36,7 @@ private: class HexEditor : public DeviceEditor { Q_OBJECT - TQ_OBJECT + public: HexEditor(const TQString &name, TQWidget *parent); HexEditor(TQWidget *parent); diff --git a/src/libgui/likeback.h b/src/libgui/likeback.h index 1fdb165..e8db1d1 100644 --- a/src/libgui/likeback.h +++ b/src/libgui/likeback.h @@ -36,7 +36,7 @@ class KAboutData; class LikeBack : public TQWidget { Q_OBJECT - TQ_OBJECT + public: enum Button { ILike = 0x01, IDoNotLike = 0x02, IFoundABug = 0x04, Configure = 0x10, AllButtons = ILike | IDoNotLike | IFoundABug | Configure }; @@ -103,7 +103,7 @@ class LikeBack : public TQWidget class LikeBackDialog : public KDialog { Q_OBJECT - TQ_OBJECT + public: LikeBackDialog(LikeBack::Button reason, TQString windowName, TQString context); ~LikeBackDialog(); diff --git a/src/libgui/log_view.h b/src/libgui/log_view.h index 5f0fa44..7cac581 100644 --- a/src/libgui/log_view.h +++ b/src/libgui/log_view.h @@ -19,7 +19,7 @@ enum OutputType { GuiOnly = 0, GuiConsole, Nb_OutputTypes }; class Widget : public TQTextEdit, public View { Q_OBJECT - TQ_OBJECT + public: Widget(TQWidget *parent = 0, const char *name = 0); virtual void appendToLastLine(const TQString &text); diff --git a/src/libgui/new_dialogs.h b/src/libgui/new_dialogs.h index dd71f67..dbdb09e 100644 --- a/src/libgui/new_dialogs.h +++ b/src/libgui/new_dialogs.h @@ -25,7 +25,7 @@ class Project; class NewDialog : public Dialog { Q_OBJECT - TQ_OBJECT + public: NewDialog(const TQString &caption, TQWidget *parent); @@ -45,7 +45,7 @@ private slots: class NewFileDialog : public NewDialog { Q_OBJECT - TQ_OBJECT + public: NewFileDialog(Project *project, TQWidget *parent); PURL::Url url() const; diff --git a/src/libgui/object_view.h b/src/libgui/object_view.h index f65ba59..bc57b56 100644 --- a/src/libgui/object_view.h +++ b/src/libgui/object_view.h @@ -24,7 +24,7 @@ class TextObject; class BaseEditor : public SimpleTextEditor, public Log::Base { Q_OBJECT - TQ_OBJECT + public: BaseEditor(const PURL::Url &source, const Device::Data *data, TQWidget *parent); virtual ~BaseEditor(); @@ -41,7 +41,7 @@ protected: class CoffEditor : public BaseEditor { Q_OBJECT - TQ_OBJECT + public: CoffEditor(const PURL::Url &source, const Device::Data &data, TQWidget *parent); CoffEditor(const TextObject &object, TQWidget *parent); @@ -56,7 +56,7 @@ private: class ObjectEditor : public BaseEditor { Q_OBJECT - TQ_OBJECT + public: ObjectEditor(const PURL::Url &source, TQWidget *parent); virtual PURL::FileType fileType() const { return PURL::Unknown; } @@ -70,7 +70,7 @@ private: class LibraryEditor : public BaseEditor { Q_OBJECT - TQ_OBJECT + public: LibraryEditor(const PURL::Url &source, TQWidget *parent); virtual PURL::FileType fileType() const { return PURL::Unknown; } @@ -86,7 +86,7 @@ private: class DisassemblyEditor : public SimpleTextEditor, public Log::Base { Q_OBJECT - TQ_OBJECT + public: DisassemblyEditor(const PURL::Url &hexUrl, const Device::Data &data, TQWidget *parent); DisassemblyEditor(const HexEditor &e, const Device::Data &data, TQWidget *parent); diff --git a/src/libgui/project_editor.h b/src/libgui/project_editor.h index ce08aca..eb1c043 100644 --- a/src/libgui/project_editor.h +++ b/src/libgui/project_editor.h @@ -30,7 +30,7 @@ namespace DeviceChooser { class Button; } class ProjectEditor : public Dialog { Q_OBJECT - TQ_OBJECT + public: ProjectEditor(Project &project, TQWidget *parent); diff --git a/src/libgui/project_manager.h b/src/libgui/project_manager.h index 78655b8..63e3979 100644 --- a/src/libgui/project_manager.h +++ b/src/libgui/project_manager.h @@ -24,7 +24,7 @@ namespace ProjectManager class View : public ListView { Q_OBJECT - TQ_OBJECT + public: View(TQWidget *parent); virtual ~View(); diff --git a/src/libgui/project_manager_ui.h b/src/libgui/project_manager_ui.h index ea8676e..bad071c 100644 --- a/src/libgui/project_manager_ui.h +++ b/src/libgui/project_manager_ui.h @@ -20,7 +20,7 @@ class PopupMenu : public KPopupMenu { Q_OBJECT - TQ_OBJECT + public: PopupMenu() : _index(1) {} void insertItem(const TQString &icon, const TQString &label, TQObject *receiver = 0, const char *slot = 0); diff --git a/src/libgui/project_wizard.h b/src/libgui/project_wizard.h index e12ed00..abb3880 100644 --- a/src/libgui/project_wizard.h +++ b/src/libgui/project_wizard.h @@ -43,7 +43,7 @@ private: class FileListBox : public EditListBox { Q_OBJECT - TQ_OBJECT + public: FileListBox(TQWidget *parent); void setDirectory(const PURL::Directory &directory) { _directory = directory; } @@ -64,7 +64,7 @@ private: class ProjectWizard : public KWizard { Q_OBJECT - TQ_OBJECT + public: ProjectWizard(TQWidget *parent); PURL::Url url() const; diff --git a/src/libgui/register_view.h b/src/libgui/register_view.h index 18d9f1b..b4fea91 100644 --- a/src/libgui/register_view.h +++ b/src/libgui/register_view.h @@ -20,7 +20,7 @@ class View; class MainView : public DeviceEditor { Q_OBJECT - TQ_OBJECT + public: MainView(const TQString &title, const TQString &tag, TQWidget *parent = 0); virtual bool isModified() const { return false; } diff --git a/src/libgui/text_editor.h b/src/libgui/text_editor.h index d5c90c5..97704a6 100644 --- a/src/libgui/text_editor.h +++ b/src/libgui/text_editor.h @@ -25,7 +25,7 @@ class TQSplitter; class TextEditor : public Editor { Q_OBJECT - TQ_OBJECT + public: TextEditor(bool withDebugger, TQWidget *parent, const char *name = 0); virtual PURL::FileType fileType() const { return url().fileType(); } @@ -84,7 +84,7 @@ private: class SimpleTextEditor : public TextEditor { Q_OBJECT - TQ_OBJECT + public: SimpleTextEditor(bool withDebugger, PURL::FileType type, TQWidget *parent, const char *name = 0); SimpleTextEditor(bool withDebugger, TQWidget *parent, const char *name = 0); diff --git a/src/libgui/toplevel.h b/src/libgui/toplevel.h index a3c6306..2f09bd0 100644 --- a/src/libgui/toplevel.h +++ b/src/libgui/toplevel.h @@ -26,7 +26,7 @@ namespace Process { class Base; } class MainWindow : public KDockMainWindow { Q_OBJECT - TQ_OBJECT + public: MainWindow(); virtual ~MainWindow(); diff --git a/src/libgui/toplevel_ui.h b/src/libgui/toplevel_ui.h index 77ae7fc..1f769e4 100644 --- a/src/libgui/toplevel_ui.h +++ b/src/libgui/toplevel_ui.h @@ -21,7 +21,7 @@ namespace Tool { class Group; } class ProgrammerStatusWidget : public TQObject, public KeyPopupButton<TQString> { Q_OBJECT - TQ_OBJECT + public: ProgrammerStatusWidget(TQWidget *parent); @@ -37,7 +37,7 @@ private slots: class ToolStatusWidget : public TQObject, public KeyPopupButton<TQString> { Q_OBJECT - TQ_OBJECT + public: ToolStatusWidget(TQWidget *parent); @@ -54,7 +54,7 @@ private slots: class ViewMenuAction : public KToggleAction { Q_OBJECT - TQ_OBJECT + public: ViewMenuAction(KDockWidget *widget); @@ -72,7 +72,7 @@ private: class MenuBarButton : public TQToolButton { Q_OBJECT - TQ_OBJECT + public: MenuBarButton(const TQString &icon, TQWidget *parent); virtual TQSize sizeHint() const; diff --git a/src/libgui/watch_view.h b/src/libgui/watch_view.h index 0a09426..35a3d8d 100644 --- a/src/libgui/watch_view.h +++ b/src/libgui/watch_view.h @@ -22,7 +22,7 @@ namespace Register class BaseListView : public ListView { Q_OBJECT - TQ_OBJECT + public: BaseListView(TQWidget *parent); virtual void init(const Device::Data *data) = 0; @@ -41,7 +41,7 @@ protected: class RegisterListView : public BaseListView { Q_OBJECT - TQ_OBJECT + public: RegisterListView(TQWidget *parent); virtual void init(const Device::Data *data); @@ -56,7 +56,7 @@ private slots: class WatchedListView : public BaseListView { Q_OBJECT - TQ_OBJECT + public: WatchedListView(TQWidget *parent); virtual TQString tooltip(const TQListViewItem &item, int col) const; @@ -79,7 +79,7 @@ private: class WatchView : public TQWidget, public GenericView { Q_OBJECT - TQ_OBJECT + public: WatchView(TQWidget *parent); void init(bool force); diff --git a/src/piklab-coff/main.h b/src/piklab-coff/main.h index 343bd9b..75c1abd 100644 --- a/src/piklab-coff/main.h +++ b/src/piklab-coff/main.h @@ -26,7 +26,7 @@ TQ_DECLARE_OPERATORS_FOR_FLAGS(CommandProperties) class Main : public MainBase { Q_OBJECT - TQ_OBJECT + public: Main(); virtual ~Main(); diff --git a/src/piklab-hex/main.h b/src/piklab-hex/main.h index 212e175..f3a6518 100644 --- a/src/piklab-hex/main.h +++ b/src/piklab-hex/main.h @@ -37,7 +37,7 @@ extern const FillOptions FILL_OPTIONS[]; class Main : public MainBase { Q_OBJECT - TQ_OBJECT + public: Main(); virtual ~Main(); diff --git a/src/piklab-prog/cli_debug_manager.h b/src/piklab-prog/cli_debug_manager.h index 10c61ec..06a273d 100644 --- a/src/piklab-prog/cli_debug_manager.h +++ b/src/piklab-prog/cli_debug_manager.h @@ -17,7 +17,7 @@ namespace Debugger class CliManager : public Manager { Q_OBJECT - TQ_OBJECT + public: CliManager() {} virtual PURL::Url coffUrl() const { return CLI::_coffUrl; } diff --git a/src/piklab-prog/cli_interactive.h b/src/piklab-prog/cli_interactive.h index 6028ec2..4e37867 100644 --- a/src/piklab-prog/cli_interactive.h +++ b/src/piklab-prog/cli_interactive.h @@ -27,7 +27,7 @@ TQ_DECLARE_OPERATORS_FOR_FLAGS(CommandProperties) class Interactive : public TQObject, public Log::Base { Q_OBJECT - TQ_OBJECT + public: Interactive(TQObject *parent); void redisplayPrompt(); diff --git a/src/piklab-prog/cli_prog_manager.h b/src/piklab-prog/cli_prog_manager.h index 5881800..e16302c 100644 --- a/src/piklab-prog/cli_prog_manager.h +++ b/src/piklab-prog/cli_prog_manager.h @@ -18,7 +18,7 @@ namespace Programmer class CliManager : public Manager { Q_OBJECT - TQ_OBJECT + public: CliManager(TQObject *parent) : Manager(parent), _state(Idle) {} Port::Description portDescription() const; diff --git a/src/piklab-prog/cmdline.h b/src/piklab-prog/cmdline.h index 6390ace..36de6df 100644 --- a/src/piklab-prog/cmdline.h +++ b/src/piklab-prog/cmdline.h @@ -21,7 +21,7 @@ namespace CLI class Main : public MainBase { Q_OBJECT - TQ_OBJECT + public: Main(); virtual ~Main(); 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(); diff --git a/src/tools/boost/boostc_compile.h b/src/tools/boost/boostc_compile.h index a6a95d1..75d1497 100644 --- a/src/tools/boost/boostc_compile.h +++ b/src/tools/boost/boostc_compile.h @@ -17,7 +17,7 @@ namespace Boost class Process : public Compile::Process { Q_OBJECT - TQ_OBJECT + protected: virtual TQString deviceName() const { return "PIC" + _data.device; } virtual void logStderrLine(const TQString &line); @@ -27,7 +27,7 @@ protected: class CompileFile : public Process { Q_OBJECT - TQ_OBJECT + protected: virtual TQStringList genericArguments(const Compile::Config &config) const; virtual TQString outputFiles() const; @@ -37,7 +37,7 @@ protected: class Link : public Process { Q_OBJECT - TQ_OBJECT + protected: virtual TQString objectExtension() const { return "obj"; } virtual TQStringList genericArguments(const Compile::Config &config) const; diff --git a/src/tools/boost/gui/boost_ui.h b/src/tools/boost/gui/boost_ui.h index daa5047..0b42482 100644 --- a/src/tools/boost/gui/boost_ui.h +++ b/src/tools/boost/gui/boost_ui.h @@ -18,7 +18,7 @@ namespace Boost class ConfigWidget : public ToolConfigWidget { Q_OBJECT - TQ_OBJECT + public: ConfigWidget(Project *project); virtual void initEntries(); diff --git a/src/tools/c18/c18_compile.h b/src/tools/c18/c18_compile.h index 1d690df..7c303e2 100644 --- a/src/tools/c18/c18_compile.h +++ b/src/tools/c18/c18_compile.h @@ -17,7 +17,7 @@ namespace C18 class Process : public Compile::Process { Q_OBJECT - TQ_OBJECT + protected: virtual TQString deviceName() const { return _data.device.lower(); } }; @@ -26,7 +26,7 @@ protected: class CompileFile : public Process { Q_OBJECT - TQ_OBJECT + protected: virtual TQStringList genericArguments(const Compile::Config &config) const; virtual TQString outputFiles() const; @@ -37,7 +37,7 @@ protected: class Link : public Process { Q_OBJECT - TQ_OBJECT + protected: virtual TQStringList genericArguments(const Compile::Config &config) const; virtual TQString outputFiles() const; diff --git a/src/tools/c18/gui/c18_ui.h b/src/tools/c18/gui/c18_ui.h index 8ccb638..d384956 100644 --- a/src/tools/c18/gui/c18_ui.h +++ b/src/tools/c18/gui/c18_ui.h @@ -18,7 +18,7 @@ namespace C18 class ConfigWidget : public ToolConfigWidget { Q_OBJECT - TQ_OBJECT + public: ConfigWidget(Project *project); diff --git a/src/tools/cc5x/cc5x_compile.h b/src/tools/cc5x/cc5x_compile.h index e17bb6f..ea6cbb3 100644 --- a/src/tools/cc5x/cc5x_compile.h +++ b/src/tools/cc5x/cc5x_compile.h @@ -17,7 +17,7 @@ namespace CC5X class CompileFile : public Compile::Process { Q_OBJECT - TQ_OBJECT + protected: virtual TQString deviceName() const { return TQString(); } virtual TQStringList genericArguments(const Compile::Config &config) const; diff --git a/src/tools/cc5x/gui/cc5x_ui.h b/src/tools/cc5x/gui/cc5x_ui.h index f234643..e179170 100644 --- a/src/tools/cc5x/gui/cc5x_ui.h +++ b/src/tools/cc5x/gui/cc5x_ui.h @@ -18,7 +18,7 @@ namespace CC5X class ConfigWidget : public ToolConfigWidget { Q_OBJECT - TQ_OBJECT + public: ConfigWidget(Project *project); virtual void initEntries(); diff --git a/src/tools/ccsc/ccsc_compile.h b/src/tools/ccsc/ccsc_compile.h index 949714b..c108678 100644 --- a/src/tools/ccsc/ccsc_compile.h +++ b/src/tools/ccsc/ccsc_compile.h @@ -17,7 +17,7 @@ namespace CCSC class CompileFile : public Compile::Process { Q_OBJECT - TQ_OBJECT + protected: virtual TQString deviceName() const { return TQString(); } virtual TQString familyName() const; diff --git a/src/tools/ccsc/gui/ccsc_ui.h b/src/tools/ccsc/gui/ccsc_ui.h index 298dcf6..02233bb 100644 --- a/src/tools/ccsc/gui/ccsc_ui.h +++ b/src/tools/ccsc/gui/ccsc_ui.h @@ -18,7 +18,7 @@ namespace CCSC class ConfigWidget : public ToolConfigWidget { Q_OBJECT - TQ_OBJECT + public: ConfigWidget(Project *project); virtual void initEntries(); diff --git a/src/tools/gputils/gputils_compile.h b/src/tools/gputils/gputils_compile.h index 97706b1..5207389 100644 --- a/src/tools/gputils/gputils_compile.h +++ b/src/tools/gputils/gputils_compile.h @@ -17,7 +17,7 @@ namespace GPUtils class Process : public Compile::Process { Q_OBJECT - TQ_OBJECT + private: virtual TQString deviceName() const; virtual bool hasLinkerScript() const { return ( _data.linkType==Compile::Icd2Linking || Compile::Process::hasLinkerScript() ); } @@ -27,7 +27,7 @@ private: class AssembleFile : public Process { Q_OBJECT - TQ_OBJECT + private: virtual void logStderrLine(const TQString &line); }; @@ -36,7 +36,7 @@ private: class AssembleStandaloneFile : public AssembleFile { Q_OBJECT - TQ_OBJECT + private: virtual TQString outputFiles() const; virtual TQStringList genericArguments(const Compile::Config &config) const; @@ -46,7 +46,7 @@ private: class AssembleProjectFile : public AssembleFile { Q_OBJECT - TQ_OBJECT + private: virtual TQString outputFiles() const; virtual TQStringList genericArguments(const Compile::Config &config) const; @@ -56,7 +56,7 @@ private: class LinkProject : public Process { Q_OBJECT - TQ_OBJECT + private: virtual TQString outputFiles() const; virtual TQStringList genericArguments(const Compile::Config &config) const; @@ -67,7 +67,7 @@ private: class LibraryProject : public Process { Q_OBJECT - TQ_OBJECT + private: virtual TQString outputFiles() const; virtual TQStringList genericArguments(const Compile::Config &config) const; diff --git a/src/tools/gputils/gui/gputils_ui.h b/src/tools/gputils/gui/gputils_ui.h index 70b88ff..e770f8e 100644 --- a/src/tools/gputils/gui/gputils_ui.h +++ b/src/tools/gputils/gui/gputils_ui.h @@ -19,7 +19,7 @@ namespace GPUtils class ConfigWidget : public ToolConfigWidget { Q_OBJECT - TQ_OBJECT + public: ConfigWidget(Project *project); virtual void initEntries(); diff --git a/src/tools/gui/tool_config_widget.h b/src/tools/gui/tool_config_widget.h index f9239b3..a0408e2 100644 --- a/src/tools/gui/tool_config_widget.h +++ b/src/tools/gui/tool_config_widget.h @@ -27,7 +27,7 @@ namespace PURL { class DirectoriesWidget; } class ToolConfigWidget : public ::ConfigWidget { Q_OBJECT - TQ_OBJECT + public: ToolConfigWidget(Project *project); void init(Tool::Category category, const Tool::Group &group); diff --git a/src/tools/gui/toolchain_config_center.h b/src/tools/gui/toolchain_config_center.h index ee5db0a..0c2067d 100644 --- a/src/tools/gui/toolchain_config_center.h +++ b/src/tools/gui/toolchain_config_center.h @@ -22,7 +22,7 @@ class ToolchainConfigWidget; class ToolchainsConfigCenter : public TreeListDialog { Q_OBJECT - TQ_OBJECT + public: ToolchainsConfigCenter(const Tool::Group &group, TQWidget *parent); diff --git a/src/tools/gui/toolchain_config_widget.h b/src/tools/gui/toolchain_config_widget.h index 681fd98..b7b9010 100644 --- a/src/tools/gui/toolchain_config_widget.h +++ b/src/tools/gui/toolchain_config_widget.h @@ -26,7 +26,7 @@ namespace Tool { class Group; } class ToolchainConfigWidget : public ::ConfigWidget { Q_OBJECT - TQ_OBJECT + public: ToolchainConfigWidget(const Tool::Group &group, TQWidget *parent); virtual ~ToolchainConfigWidget(); diff --git a/src/tools/jal/gui/jal_ui.h b/src/tools/jal/gui/jal_ui.h index d87d3e2..3788c87 100644 --- a/src/tools/jal/gui/jal_ui.h +++ b/src/tools/jal/gui/jal_ui.h @@ -18,7 +18,7 @@ namespace JAL class ConfigWidget : public ToolConfigWidget { Q_OBJECT - TQ_OBJECT + public: ConfigWidget(Project *project); virtual void initEntries() {} diff --git a/src/tools/jal/jal_compile.h b/src/tools/jal/jal_compile.h index c3fae70..ca32add 100644 --- a/src/tools/jal/jal_compile.h +++ b/src/tools/jal/jal_compile.h @@ -17,7 +17,7 @@ namespace JAL class CompileFile : public Compile::Process { Q_OBJECT - TQ_OBJECT + protected: virtual TQString deviceName() const { return _data.device; } virtual void logStderrLine(const TQString &line); diff --git a/src/tools/jalv2/gui/jalv2_ui.h b/src/tools/jalv2/gui/jalv2_ui.h index 4944860..548203e 100644 --- a/src/tools/jalv2/gui/jalv2_ui.h +++ b/src/tools/jalv2/gui/jalv2_ui.h @@ -18,7 +18,7 @@ namespace JALV2 class ConfigWidget : public ToolConfigWidget { Q_OBJECT - TQ_OBJECT + public: ConfigWidget(Project *project); virtual void initEntries(); diff --git a/src/tools/jalv2/jalv2_compile.h b/src/tools/jalv2/jalv2_compile.h index d145c4b..a997709 100644 --- a/src/tools/jalv2/jalv2_compile.h +++ b/src/tools/jalv2/jalv2_compile.h @@ -16,7 +16,7 @@ namespace JALV2 class CompileFile : public Compile::Process { Q_OBJECT - TQ_OBJECT + protected: virtual TQString deviceName() const { return _data.device; } virtual void logStderrLine(const TQString &line); diff --git a/src/tools/list/compile_manager.h b/src/tools/list/compile_manager.h index e7b4383..fd50b3f 100644 --- a/src/tools/list/compile_manager.h +++ b/src/tools/list/compile_manager.h @@ -17,7 +17,7 @@ namespace Compile class Manager : public TQObject, public Log::Base { Q_OBJECT - TQ_OBJECT + public: enum Operation { NoOperation = 0, Clean = 1, CompileOnly = 2, Build = 4 }; TQ_DECLARE_FLAGS(Operations, Operation) diff --git a/src/tools/list/compile_process.h b/src/tools/list/compile_process.h index 2c71af0..7777ac8 100644 --- a/src/tools/list/compile_process.h +++ b/src/tools/list/compile_process.h @@ -63,7 +63,7 @@ namespace Compile class LogWidget : public Log::Widget { Q_OBJECT - TQ_OBJECT + public: LogWidget(TQWidget *parent); void appendLine(Log::LineType type, const TQString &message, const TQString &filepath, uint line); @@ -88,7 +88,7 @@ private: class BaseProcess : public TQObject { Q_OBJECT - TQ_OBJECT + public: BaseProcess(); virtual void init(const Data &data, Manager *manager); @@ -121,7 +121,7 @@ protected slots: class Process : public BaseProcess { Q_OBJECT - TQ_OBJECT + public: virtual ~Process(); virtual void init(const Data &data, Manager *manager); @@ -162,7 +162,7 @@ private: class CustomProcess : public BaseProcess { Q_OBJECT - TQ_OBJECT + public: CustomProcess(const TQString &command) : _command(command) {} virtual bool check() const { return true; } diff --git a/src/tools/list/tools_config_widget.h b/src/tools/list/tools_config_widget.h index 525aff0..6ed4fa5 100644 --- a/src/tools/list/tools_config_widget.h +++ b/src/tools/list/tools_config_widget.h @@ -26,7 +26,7 @@ class ToolConfigWidget; class HelpDialog : public Dialog { Q_OBJECT - TQ_OBJECT + public: HelpDialog(TQWidget *parent); }; @@ -35,7 +35,7 @@ public: class ToolsConfigWidget : public ConfigWidget { Q_OBJECT - TQ_OBJECT + public: ToolsConfigWidget(Project *project, TQWidget *parent); virtual void loadConfig(); diff --git a/src/tools/mpc/gui/mpc_ui.h b/src/tools/mpc/gui/mpc_ui.h index 38c0e7b..be476cc 100644 --- a/src/tools/mpc/gui/mpc_ui.h +++ b/src/tools/mpc/gui/mpc_ui.h @@ -18,7 +18,7 @@ namespace MPC class ConfigWidget : public ToolConfigWidget { Q_OBJECT - TQ_OBJECT + public: ConfigWidget(Project *project); virtual void initEntries() {} diff --git a/src/tools/mpc/mpc_compile.h b/src/tools/mpc/mpc_compile.h index 5744f1b..4a85be4 100644 --- a/src/tools/mpc/mpc_compile.h +++ b/src/tools/mpc/mpc_compile.h @@ -17,7 +17,7 @@ namespace MPC class CompileFile : public Compile::Process { Q_OBJECT - TQ_OBJECT + protected: virtual TQString deviceName() const { return TQString(); } virtual TQStringList genericArguments(const Compile::Config &config) const; diff --git a/src/tools/pic30/gui/pic30_ui.h b/src/tools/pic30/gui/pic30_ui.h index 85f798c..7bb1c0d 100644 --- a/src/tools/pic30/gui/pic30_ui.h +++ b/src/tools/pic30/gui/pic30_ui.h @@ -19,7 +19,7 @@ namespace PIC30 class ConfigWidget : public ToolConfigWidget { Q_OBJECT - TQ_OBJECT + public: ConfigWidget(Project *project); virtual void initEntries(); diff --git a/src/tools/pic30/pic30_compile.h b/src/tools/pic30/pic30_compile.h index 39bc243..f65316c 100644 --- a/src/tools/pic30/pic30_compile.h +++ b/src/tools/pic30/pic30_compile.h @@ -17,7 +17,7 @@ namespace PIC30 class Process : public Compile::Process { Q_OBJECT - TQ_OBJECT + protected: virtual TQString deviceName() const { return _data.device; } }; @@ -26,7 +26,7 @@ protected: class CompileFile : public Process { Q_OBJECT - TQ_OBJECT + protected: virtual TQStringList genericArguments(const Compile::Config &config) const; virtual TQString outputFiles() const; @@ -37,7 +37,7 @@ protected: class CompileStandaloneFile : public CompileFile { Q_OBJECT - TQ_OBJECT + protected: virtual TQStringList genericArguments(const Compile::Config &config) const; virtual TQString outputFiles() const; @@ -47,7 +47,7 @@ protected: class CompileProjectFile : public CompileFile { Q_OBJECT - TQ_OBJECT + protected: virtual TQStringList genericArguments(const Compile::Config &config) const; }; @@ -56,7 +56,7 @@ protected: class AssembleFile : public Process { Q_OBJECT - TQ_OBJECT + protected: virtual TQString outputFilepath() const { return filepath(PURL::Object); } virtual TQStringList genericArguments(const Compile::Config &config) const; @@ -68,7 +68,7 @@ protected: class AssembleStandaloneFile : public AssembleFile { Q_OBJECT - TQ_OBJECT + protected: virtual TQStringList genericArguments(const Compile::Config &config) const; }; @@ -77,7 +77,7 @@ protected: class AssembleProjectFile : public AssembleFile { Q_OBJECT - TQ_OBJECT + protected: virtual TQStringList genericArguments(const Compile::Config &config) const; }; @@ -86,7 +86,7 @@ protected: class Link : public Process { Q_OBJECT - TQ_OBJECT + protected: virtual TQString outputFilepath() const; virtual TQStringList genericArguments(const Compile::Config &config) const; @@ -98,7 +98,7 @@ protected: class LinkStandalone : public Link { Q_OBJECT - TQ_OBJECT + protected: virtual TQStringList genericArguments(const Compile::Config &config) const; }; @@ -107,7 +107,7 @@ protected: class LinkProject : public Link { Q_OBJECT - TQ_OBJECT + protected: virtual TQStringList genericArguments(const Compile::Config &config) const; }; @@ -116,7 +116,7 @@ protected: class LibraryProject : public Process { Q_OBJECT - TQ_OBJECT + protected: virtual TQStringList genericArguments(const Compile::Config &config) const; virtual TQString outputFiles() const; @@ -127,7 +127,7 @@ protected: class BinToHex : public Process { Q_OBJECT - TQ_OBJECT + protected: virtual TQString inputFilepath(uint i) const; virtual TQStringList genericArguments(const Compile::Config &config) const; diff --git a/src/tools/picc/gui/picc_ui.h b/src/tools/picc/gui/picc_ui.h index 261e4dc..f3f6b96 100644 --- a/src/tools/picc/gui/picc_ui.h +++ b/src/tools/picc/gui/picc_ui.h @@ -18,7 +18,7 @@ namespace PICC class ConfigWidget : public ToolConfigWidget { Q_OBJECT - TQ_OBJECT + public: ConfigWidget(Project *project); virtual void initEntries(); diff --git a/src/tools/picc/picc_compile.h b/src/tools/picc/picc_compile.h index 972a6d0..7613a21 100644 --- a/src/tools/picc/picc_compile.h +++ b/src/tools/picc/picc_compile.h @@ -17,7 +17,7 @@ namespace PICC class Process : public Compile::Process { Q_OBJECT - TQ_OBJECT + protected: virtual TQString deviceName() const { return _data.device; } virtual TQStringList genericArguments(const Compile::Config &config) const; @@ -29,7 +29,7 @@ protected: class CompileStandaloneFile : public Process { Q_OBJECT - TQ_OBJECT + protected: virtual TQString outputFiles() const; virtual TQStringList genericArguments(const Compile::Config &config) const; @@ -39,7 +39,7 @@ protected: class CompileProjectFile : public Process { Q_OBJECT - TQ_OBJECT + protected: virtual TQString outputFiles() const; virtual TQStringList genericArguments(const Compile::Config &config) const; @@ -49,7 +49,7 @@ protected: class AssembleStandaloneFile : public Process { Q_OBJECT - TQ_OBJECT + protected: virtual TQString outputFiles() const; virtual TQStringList genericArguments(const Compile::Config &config) const; @@ -59,7 +59,7 @@ protected: class AssembleProjectFile : public Process { Q_OBJECT - TQ_OBJECT + protected: virtual TQString outputFiles() const; virtual TQStringList genericArguments(const Compile::Config &config) const; @@ -69,7 +69,7 @@ protected: class LinkProject : public Process { Q_OBJECT - TQ_OBJECT + protected: virtual TQString outputFiles() const; virtual TQStringList genericArguments(const Compile::Config &config) const; @@ -79,7 +79,7 @@ protected: class LibraryProject : public Process { Q_OBJECT - TQ_OBJECT + protected: virtual TQString outputFiles() const; virtual TQStringList genericArguments(const Compile::Config &config) const; diff --git a/src/tools/sdcc/gui/sdcc_ui.h b/src/tools/sdcc/gui/sdcc_ui.h index 1b39fce..7c765c6 100644 --- a/src/tools/sdcc/gui/sdcc_ui.h +++ b/src/tools/sdcc/gui/sdcc_ui.h @@ -18,7 +18,7 @@ namespace SDCC class ConfigWidget : public ToolConfigWidget { Q_OBJECT - TQ_OBJECT + public: ConfigWidget(Project *project); virtual void initEntries(); diff --git a/src/tools/sdcc/sdcc_compile.h b/src/tools/sdcc/sdcc_compile.h index c5067e6..693af3c 100644 --- a/src/tools/sdcc/sdcc_compile.h +++ b/src/tools/sdcc/sdcc_compile.h @@ -17,7 +17,7 @@ namespace SDCC class Process : public Compile::Process { Q_OBJECT - TQ_OBJECT + protected: virtual TQString deviceName() const; virtual TQString familyName() const; @@ -31,7 +31,7 @@ protected: class CompileStandaloneFile : public Process { Q_OBJECT - TQ_OBJECT + private: virtual TQStringList genericArguments(const Compile::Config &config) const; virtual TQString outputFiles() const; @@ -41,7 +41,7 @@ private: class CompileProjectFile : public Process { Q_OBJECT - TQ_OBJECT + private: virtual TQStringList genericArguments(const Compile::Config &config) const; }; @@ -50,7 +50,7 @@ private: class LinkProjectFile : public Process { Q_OBJECT - TQ_OBJECT + private: virtual TQStringList genericArguments(const Compile::Config &config) const; virtual TQString outputFiles() const; |