From fbbad1fdbec7cab719c3e9bdb6d8693cf8b3e61d Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 17 Feb 2012 16:01:33 -0600 Subject: Remove spurious TQ_OBJECT instances --- src/devices/base/register.h | 2 +- src/devices/gui/hex_view.h | 2 +- src/devices/gui/hex_word_editor.h | 4 ++-- src/devices/gui/memory_editor.h | 8 ++++---- src/devices/gui/register_view.h | 4 ++-- src/devices/mem24/gui/mem24_hex_view.h | 2 +- src/devices/mem24/gui/mem24_memory_editor.h | 6 +++--- src/devices/pic/gui/pic_config_editor.h | 4 ++-- src/devices/pic/gui/pic_config_word_editor.h | 6 +++--- src/devices/pic/gui/pic_hex_view.h | 2 +- src/devices/pic/gui/pic_memory_editor.h | 16 ++++++++-------- src/devices/pic/gui/pic_prog_group_ui.h | 2 +- src/devices/pic/gui/pic_register_view.h | 4 ++-- 13 files changed, 31 insertions(+), 31 deletions(-) (limited to 'src/devices') 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); } 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(); -- cgit v1.2.1