diff options
Diffstat (limited to 'src/devices/gui')
-rw-r--r-- | src/devices/gui/device_group_ui.h | 8 | ||||
-rw-r--r-- | src/devices/gui/hex_view.cpp | 4 | ||||
-rw-r--r-- | src/devices/gui/hex_view.h | 2 | ||||
-rw-r--r-- | src/devices/gui/hex_word_editor.cpp | 8 | ||||
-rw-r--r-- | src/devices/gui/hex_word_editor.h | 12 | ||||
-rw-r--r-- | src/devices/gui/memory_editor.cpp | 16 | ||||
-rw-r--r-- | src/devices/gui/memory_editor.h | 10 | ||||
-rw-r--r-- | src/devices/gui/register_view.cpp | 16 | ||||
-rw-r--r-- | src/devices/gui/register_view.h | 6 |
9 files changed, 41 insertions, 41 deletions
diff --git a/src/devices/gui/device_group_ui.h b/src/devices/gui/device_group_ui.h index d123d7d..7b76186 100644 --- a/src/devices/gui/device_group_ui.h +++ b/src/devices/gui/device_group_ui.h @@ -31,11 +31,11 @@ class MemoryEditor; class GroupUI : public ::Group::BaseGui { public: - virtual HexView *createHexView(const HexEditor &editor, TQWidget *tqparent) const = 0; - virtual Register::View *createRegisterView(TQWidget *tqparent) const = 0; - virtual MemoryEditor *createConfigEditor(Device::Memory &memory, TQWidget *tqparent) const = 0; + virtual HexView *createHexView(const HexEditor &editor, TQWidget *parent) const = 0; + virtual Register::View *createRegisterView(TQWidget *parent) const = 0; + virtual MemoryEditor *createConfigEditor(Device::Memory &memory, TQWidget *parent) const = 0; virtual void fillWatchListContainer(ListContainer *container, TQValueVector<Register::TypeData> &ids) const = 0; - virtual Register::ListViewItem *createWatchItem(const Register::TypeData &data, KListViewItem *tqparent) const = 0; + virtual Register::ListViewItem *createWatchItem(const Register::TypeData &data, KListViewItem *parent) const = 0; }; inline const Device::GroupUI &groupui(const Device::Data &data) { return static_cast<const Device::GroupUI &>(*data.group().gui()); } diff --git a/src/devices/gui/hex_view.cpp b/src/devices/gui/hex_view.cpp index ac82ddf..4a6319f 100644 --- a/src/devices/gui/hex_view.cpp +++ b/src/devices/gui/hex_view.cpp @@ -9,8 +9,8 @@ ***************************************************************************/ #include "hex_view.h" -Device::HexView::HexView(const HexEditor &editor, TQWidget *tqparent, const char *name) - : MemoryEditorGroup(0, tqparent, name), _editor(editor) +Device::HexView::HexView(const HexEditor &editor, TQWidget *parent, const char *name) + : MemoryEditorGroup(0, parent, name), _editor(editor) {} void Device::HexView::display(Memory *memory) diff --git a/src/devices/gui/hex_view.h b/src/devices/gui/hex_view.h index f1b953b..4aadc90 100644 --- a/src/devices/gui/hex_view.h +++ b/src/devices/gui/hex_view.h @@ -21,7 +21,7 @@ class HexView : public MemoryEditorGroup Q_OBJECT TQ_OBJECT public: - HexView(const HexEditor &editor, TQWidget *tqparent, const char *name); + HexView(const HexEditor &editor, TQWidget *parent, const char *name); virtual void display(Memory *memory); virtual uint nbChecksumChars() const = 0; virtual BitValue checksum() const = 0; diff --git a/src/devices/gui/hex_word_editor.cpp b/src/devices/gui/hex_word_editor.cpp index 5e8ab7a..163217c 100644 --- a/src/devices/gui/hex_word_editor.cpp +++ b/src/devices/gui/hex_word_editor.cpp @@ -16,8 +16,8 @@ #include <tqtimer.h> //----------------------------------------------------------------------------- -Device::HexWordEditor::HexWordEditor(Memory &memory, uint nbChars, TQWidget *tqparent) - : GenericHexWordEditor(nbChars, true, tqparent), _memory(memory) +Device::HexWordEditor::HexWordEditor(Memory &memory, uint nbChars, TQWidget *parent) + : GenericHexWordEditor(nbChars, true, parent), _memory(memory) { setOffset(-1); } @@ -29,8 +29,8 @@ void Device::HexWordEditor::setOffset(int offset) } //----------------------------------------------------------------------------- -Device::RegisterHexWordEditor::RegisterHexWordEditor(TQWidget *tqparent, uint nbChars, BitValue tqmask) - : GenericHexWordEditor(nbChars, true, tqparent), _tqmask(tqmask) +Device::RegisterHexWordEditor::RegisterHexWordEditor(TQWidget *parent, uint nbChars, BitValue mask) + : GenericHexWordEditor(nbChars, true, parent), _mask(mask) { clear(); } diff --git a/src/devices/gui/hex_word_editor.h b/src/devices/gui/hex_word_editor.h index 8744d03..94b520c 100644 --- a/src/devices/gui/hex_word_editor.h +++ b/src/devices/gui/hex_word_editor.h @@ -21,7 +21,7 @@ class HexWordEditor : public GenericHexWordEditor Q_OBJECT TQ_OBJECT public: - HexWordEditor(Memory &memory, uint nbChars, TQWidget *tqparent); + HexWordEditor(Memory &memory, uint nbChars, TQWidget *parent); void setOffset(int offset); int offset() const { return _offset; } @@ -30,7 +30,7 @@ protected: int _offset; virtual bool isValid() const { return _offset!=-1; } - virtual BitValue tqmask() const = 0; + virtual BitValue mask() const = 0; virtual BitValue normalizeWord(BitValue value) const = 0; virtual BitValue word() const = 0; virtual void setWord(BitValue value) = 0; @@ -43,7 +43,7 @@ class RegisterHexWordEditor : public GenericHexWordEditor Q_OBJECT TQ_OBJECT public: - RegisterHexWordEditor(TQWidget *tqparent, uint nbChars, BitValue tqmask); + RegisterHexWordEditor(TQWidget *parent, uint nbChars, BitValue mask); void clear() { setValue(BitValue()); } void setValue(BitValue word); BitValue value() const { return _word; } @@ -51,11 +51,11 @@ public: void unsetColor() { unsetPalette(); } private: - BitValue _tqmask, _word; + BitValue _mask, _word; virtual bool isValid() const { return true; } - virtual BitValue tqmask() const { return _tqmask; } - virtual BitValue normalizeWord(BitValue value) const { return value.maskWith(_tqmask); } + virtual BitValue mask() const { return _mask; } + virtual BitValue normalizeWord(BitValue value) const { return value.maskWith(_mask); } virtual BitValue word() const { return _word; } virtual void setWord(BitValue value) { _word = value; } virtual BitValue blankValue() const { return BitValue(); } diff --git a/src/devices/gui/memory_editor.cpp b/src/devices/gui/memory_editor.cpp index 6679a57..bee291e 100644 --- a/src/devices/gui/memory_editor.cpp +++ b/src/devices/gui/memory_editor.cpp @@ -28,8 +28,8 @@ #include "libgui/gui_prog_manager.h" //----------------------------------------------------------------------------- -Device::MemoryEditor::MemoryEditor(Device::Memory *memory, TQWidget *tqparent, const char *name) - : TQFrame(tqparent, name), _memory(memory) +Device::MemoryEditor::MemoryEditor(Device::Memory *memory, TQWidget *parent, const char *name) + : TQFrame(parent, name), _memory(memory) { _top = new TQVBoxLayout(this, 5, 10); } @@ -37,8 +37,8 @@ Device::MemoryEditor::MemoryEditor(Device::Memory *memory, TQWidget *tqparent, c //----------------------------------------------------------------------------- Device::MemoryRangeEditor::MemoryRangeEditor(Device::Memory &memory, uint nbLines, uint nbCols, uint offset, int nb, - TQWidget *tqparent, const char *name) - : MemoryEditor(&memory, tqparent, name), + TQWidget *parent, const char *name) + : MemoryEditor(&memory, parent, name), _nbLines(nbLines), _nbCols(nbCols), _offset(offset), _nb(nb) {} @@ -248,8 +248,8 @@ void Device::MemoryRangeEditor::movePrevPage() } //----------------------------------------------------------------------------- -Device::MemoryEditorGroup::MemoryEditorGroup(Device::Memory *memory, TQWidget *tqparent, const char *name) - : MemoryEditor(memory, tqparent, name) +Device::MemoryEditorGroup::MemoryEditorGroup(Device::Memory *memory, TQWidget *parent, const char *name) + : MemoryEditor(memory, parent, name) {} void Device::MemoryEditorGroup::addEditor(MemoryEditor *editor) @@ -284,8 +284,8 @@ const Device::ActionData Device::ACTION_DATA[Nb_Actions] = { }; Device::MemoryTypeEditor::MemoryTypeEditor(const HexView *hexview, Device::Memory &memory, - TQWidget *tqparent, const char *name) - : MemoryEditorGroup(&memory, tqparent, name), + TQWidget *parent, const char *name) + : MemoryEditorGroup(&memory, parent, name), _title(0), _comment(0), _hexview(hexview) { for (uint i=0; i<Nb_Actions; i++) _actions[i] = 0; diff --git a/src/devices/gui/memory_editor.h b/src/devices/gui/memory_editor.h index 2ef60d8..ac8bfdc 100644 --- a/src/devices/gui/memory_editor.h +++ b/src/devices/gui/memory_editor.h @@ -44,7 +44,7 @@ class MemoryEditor : public TQFrame Q_OBJECT TQ_OBJECT public: - MemoryEditor(Device::Memory *memory, TQWidget *tqparent, const char *name); + MemoryEditor(Device::Memory *memory, TQWidget *parent, const char *name); virtual void setReadOnly(bool readOnly) = 0; public slots: @@ -65,7 +65,7 @@ Q_OBJECT TQ_OBJECT public: MemoryRangeEditor(Device::Memory &memory, uint nbLines, uint nbCols, - uint offset, int nb, TQWidget *tqparent, const char *name); + uint offset, int nb, TQWidget *parent, const char *name); virtual void init(); virtual void setReadOnly(bool readOnly); void setComment(const TQString &text); @@ -101,7 +101,7 @@ protected: virtual uint nbWords() const = 0; virtual uint addressIncrement() const = 0; virtual Address startAddress() const = 0; - virtual HexWordEditor *createHexWordEditor(TQWidget *tqparent) = 0; + virtual HexWordEditor *createHexWordEditor(TQWidget *parent) = 0; virtual bool isRangeReadOnly() const = 0; virtual void updateAddressColor(uint i, Address address) { Q_UNUSED(i); Q_UNUSED(address); } virtual void addLegend(TQVBoxLayout *vbox) { Q_UNUSED(vbox); } @@ -113,7 +113,7 @@ class MemoryEditorGroup : public MemoryEditor Q_OBJECT TQ_OBJECT public: - MemoryEditorGroup(Device::Memory *memory, TQWidget *tqparent, const char *name); + MemoryEditorGroup(Device::Memory *memory, TQWidget *parent, const char *name); void addEditor(MemoryEditor *editor); virtual void setReadOnly(bool readOnly); @@ -131,7 +131,7 @@ class MemoryTypeEditor : public MemoryEditorGroup Q_OBJECT TQ_OBJECT public: - MemoryTypeEditor(const HexView *hexview, Device::Memory &memory, TQWidget *tqparent, const char *name); + MemoryTypeEditor(const HexView *hexview, Device::Memory &memory, TQWidget *parent, const char *name); virtual void init(bool first); virtual void setReadOnly(bool readOnly); diff --git a/src/devices/gui/register_view.cpp b/src/devices/gui/register_view.cpp index c1fa3a6..264a04b 100644 --- a/src/devices/gui/register_view.cpp +++ b/src/devices/gui/register_view.cpp @@ -12,8 +12,8 @@ #include "libgui/gui_debug_manager.h" //---------------------------------------------------------------------------- -Register::PortBitListViewItem::PortBitListViewItem(uint index, uint bit, KListViewItem *tqparent) - : KListViewItem(tqparent), _index(index), _bit(bit) +Register::PortBitListViewItem::PortBitListViewItem(uint index, uint bit, KListViewItem *parent) + : KListViewItem(parent), _index(index), _bit(bit) { const Device::RegistersData *rdata = Main::deviceData()->registersData(); setText(1, rdata->portBitName(_index, _bit)); @@ -75,8 +75,8 @@ TQString Register::PortBitListViewItem::tooltip(int col) const } //----------------------------------------------------------------------------- -Register::ListViewItem::ListViewItem(const TypeData &data, KListViewItem *tqparent) - : EditListViewItem(tqparent), _data(data), _base(NumberBase::Hex) +Register::ListViewItem::ListViewItem(const TypeData &data, KListViewItem *parent) + : EditListViewItem(parent), _data(data), _base(NumberBase::Hex) { setSelectable(false); const Device::RegistersData *rdata = Main::deviceData()->registersData(); @@ -164,8 +164,8 @@ void Register::ListViewItem::editDone(int col, const TQWidget *edit) } //---------------------------------------------------------------------------- -Register::LineEdit::LineEdit(TQWidget *tqparent, const char *name) - : NumberLineEdit(tqparent, name), _base(NumberBase::Nb_Types) +Register::LineEdit::LineEdit(TQWidget *parent, const char *name) + : NumberLineEdit(parent, name), _base(NumberBase::Nb_Types) { connect(this, TQT_SIGNAL(lostFocus()), TQT_SLOT(updateText())); connect(this, TQT_SIGNAL(returnPressed()), TQT_SLOT(returnPressedSlot())); @@ -203,6 +203,6 @@ void Register::LineEdit::keyPressEvent(TQKeyEvent *e) } //---------------------------------------------------------------------------- -Register::View::View(TQWidget *tqparent, const char *name) - : TQFrame(tqparent, name), GenericView(list()) +Register::View::View(TQWidget *parent, const char *name) + : TQFrame(parent, name), GenericView(list()) {} diff --git a/src/devices/gui/register_view.h b/src/devices/gui/register_view.h index 60c8194..9459a8d 100644 --- a/src/devices/gui/register_view.h +++ b/src/devices/gui/register_view.h @@ -23,7 +23,7 @@ enum { PortBitRtti = 1000, RegisterRtti = 1001 }; class PortBitListViewItem : public KListViewItem { public: - PortBitListViewItem(uint address, uint bit, KListViewItem *tqparent); + PortBitListViewItem(uint address, uint bit, KListViewItem *parent); virtual int rtti() const { return PortBitRtti; } void updateView(); TQString tooltip(int column) const; @@ -68,7 +68,7 @@ class LineEdit : public NumberLineEdit Q_OBJECT TQ_OBJECT public: - LineEdit(TQWidget *tqparent, const char *name = 0); + LineEdit(TQWidget *parent, const char *name = 0); void setValue(NumberBase base, BitValue value, uint nbChars); BitValue value() const { return _value; } @@ -94,7 +94,7 @@ class View : public TQFrame, public GenericView Q_OBJECT TQ_OBJECT public: - View(TQWidget *tqparent, const char *name); + View(TQWidget *parent, const char *name); signals: void readSignal(uint address); |