summaryrefslogtreecommitdiffstats
path: root/src/devices/mem24
diff options
context:
space:
mode:
Diffstat (limited to 'src/devices/mem24')
-rw-r--r--src/devices/mem24/gui/mem24_group_ui.cpp4
-rw-r--r--src/devices/mem24/gui/mem24_group_ui.h2
-rw-r--r--src/devices/mem24/gui/mem24_hex_view.cpp4
-rw-r--r--src/devices/mem24/gui/mem24_hex_view.h2
-rw-r--r--src/devices/mem24/gui/mem24_memory_editor.cpp12
-rw-r--r--src/devices/mem24/gui/mem24_memory_editor.h12
-rw-r--r--src/devices/mem24/mem24/mem24_memory.cpp10
7 files changed, 23 insertions, 23 deletions
diff --git a/src/devices/mem24/gui/mem24_group_ui.cpp b/src/devices/mem24/gui/mem24_group_ui.cpp
index 8a8bb5a..3cdf9e0 100644
--- a/src/devices/mem24/gui/mem24_group_ui.cpp
+++ b/src/devices/mem24/gui/mem24_group_ui.cpp
@@ -10,7 +10,7 @@
#include "mem24_hex_view.h"
-Device::HexView *Mem24::GroupUI::createHexView(const HexEditor &editor, TQWidget *tqparent) const
+Device::HexView *Mem24::GroupUI::createHexView(const HexEditor &editor, TQWidget *parent) const
{
- return new HexView(editor, tqparent);
+ return new HexView(editor, parent);
}
diff --git a/src/devices/mem24/gui/mem24_group_ui.h b/src/devices/mem24/gui/mem24_group_ui.h
index c2b3360..7f1f4c8 100644
--- a/src/devices/mem24/gui/mem24_group_ui.h
+++ b/src/devices/mem24/gui/mem24_group_ui.h
@@ -16,7 +16,7 @@ namespace Mem24
class GroupUI : public Device::GroupUI
{
public:
- virtual Device::HexView *createHexView(const HexEditor &editor, TQWidget *tqparent) const;
+ virtual Device::HexView *createHexView(const HexEditor &editor, TQWidget *parent) const;
virtual Register::View *createRegisterView(TQWidget *) const { return 0; }
virtual Device::MemoryEditor *createConfigEditor(Device::Memory &, TQWidget *) const { return 0; }
virtual void fillWatchListContainer(ListContainer *, TQValueVector<Register::TypeData> &) const {}
diff --git a/src/devices/mem24/gui/mem24_hex_view.cpp b/src/devices/mem24/gui/mem24_hex_view.cpp
index 7c30e9f..349e2fc 100644
--- a/src/devices/mem24/gui/mem24_hex_view.cpp
+++ b/src/devices/mem24/gui/mem24_hex_view.cpp
@@ -14,8 +14,8 @@
#include "mem24_memory_editor.h"
-Mem24::HexView::HexView(const HexEditor &editor, TQWidget *tqparent)
- : Device::HexView(editor, tqparent, "mem24_hex_view")
+Mem24::HexView::HexView(const HexEditor &editor, TQWidget *parent)
+ : Device::HexView(editor, parent, "mem24_hex_view")
{}
void Mem24::HexView::display()
diff --git a/src/devices/mem24/gui/mem24_hex_view.h b/src/devices/mem24/gui/mem24_hex_view.h
index 199865a..6de6ca0 100644
--- a/src/devices/mem24/gui/mem24_hex_view.h
+++ b/src/devices/mem24/gui/mem24_hex_view.h
@@ -21,7 +21,7 @@ class HexView : public Device::HexView
Q_OBJECT
TQ_OBJECT
public:
- HexView(const HexEditor &editor, TQWidget *tqparent);
+ HexView(const HexEditor &editor, TQWidget *parent);
virtual uint nbChecksumChars() const { return 4; }
virtual BitValue checksum() const;
diff --git a/src/devices/mem24/gui/mem24_memory_editor.cpp b/src/devices/mem24/gui/mem24_memory_editor.cpp
index a5203b9..c395b17 100644
--- a/src/devices/mem24/gui/mem24_memory_editor.cpp
+++ b/src/devices/mem24/gui/mem24_memory_editor.cpp
@@ -19,19 +19,19 @@
#include "devices/base/device_group.h"
//-----------------------------------------------------------------------------
-Mem24::MemoryRangeEditor::MemoryRangeEditor(Memory &memory, TQWidget *tqparent)
- : Device::MemoryRangeEditor(memory, 16, 16, 0, -1, tqparent, "mem24_memory_range_editor"),
+Mem24::MemoryRangeEditor::MemoryRangeEditor(Memory &memory, TQWidget *parent)
+ : Device::MemoryRangeEditor(memory, 16, 16, 0, -1, parent, "mem24_memory_range_editor"),
MemoryCaster(memory)
{}
-Device::HexWordEditor *Mem24::MemoryRangeEditor::createHexWordEditor(TQWidget *tqparent)
+Device::HexWordEditor *Mem24::MemoryRangeEditor::createHexWordEditor(TQWidget *parent)
{
- return new HexWordEditor(memory(), tqparent);
+ return new HexWordEditor(memory(), parent);
}
//-----------------------------------------------------------------------------
-Mem24::MemoryTypeEditor::MemoryTypeEditor(const HexView *hexview, Memory &memory, TQWidget *tqparent)
- : Device::MemoryTypeEditor(hexview, memory, tqparent, "mem24_memory_type_editor"),
+Mem24::MemoryTypeEditor::MemoryTypeEditor(const HexView *hexview, Memory &memory, TQWidget *parent)
+ : Device::MemoryTypeEditor(hexview, memory, parent, "mem24_memory_type_editor"),
MemoryCaster(memory)
{}
diff --git a/src/devices/mem24/gui/mem24_memory_editor.h b/src/devices/mem24/gui/mem24_memory_editor.h
index 657810a..47916a4 100644
--- a/src/devices/mem24/gui/mem24_memory_editor.h
+++ b/src/devices/mem24/gui/mem24_memory_editor.h
@@ -36,11 +36,11 @@ class HexWordEditor : public Device::HexWordEditor, public MemoryCaster
Q_OBJECT
TQ_OBJECT
public:
- HexWordEditor(Memory &memory, TQWidget *tqparent)
- : Device::HexWordEditor(memory, 2, tqparent), MemoryCaster(memory) {}
+ HexWordEditor(Memory &memory, TQWidget *parent)
+ : Device::HexWordEditor(memory, 2, parent), MemoryCaster(memory) {}
private:
- virtual BitValue tqmask() const { return 0xFF; }
+ virtual BitValue mask() const { return 0xFF; }
virtual BitValue normalizeWord(BitValue value) const { return value; }
virtual BitValue word() const { return memory().byte(_offset); }
virtual void setWord(BitValue value) { memory().setByte(_offset, value); }
@@ -52,13 +52,13 @@ class MemoryRangeEditor : public Device::MemoryRangeEditor, public MemoryCaster
Q_OBJECT
TQ_OBJECT
public:
- MemoryRangeEditor(Memory &memory, TQWidget *tqparent);
+ MemoryRangeEditor(Memory &memory, TQWidget *parent);
private:
virtual uint nbWords() const { return device().nbBytes(); }
virtual uint addressIncrement() const { return 1; }
virtual Address startAddress() const { return 0x0; }
- virtual Device::HexWordEditor *createHexWordEditor(TQWidget *tqparent);
+ virtual Device::HexWordEditor *createHexWordEditor(TQWidget *parent);
virtual bool isRangeReadOnly() const { return false; }
};
@@ -68,7 +68,7 @@ class MemoryTypeEditor : public Device::MemoryTypeEditor, public MemoryCaster
Q_OBJECT
TQ_OBJECT
public:
- MemoryTypeEditor(const HexView *hexview, Memory &memory, TQWidget *tqparent);
+ MemoryTypeEditor(const HexView *hexview, Memory &memory, TQWidget *parent);
virtual void init(bool first);
private:
diff --git a/src/devices/mem24/mem24/mem24_memory.cpp b/src/devices/mem24/mem24/mem24_memory.cpp
index a29cee7..f3ce758 100644
--- a/src/devices/mem24/mem24/mem24_memory.cpp
+++ b/src/devices/mem24/mem24/mem24_memory.cpp
@@ -76,17 +76,17 @@ HexBuffer Mem24::Memory::toHexBuffer() const
void Mem24::Memory::fromHexBuffer(const HexBuffer &hb, WarningTypes &result,
TQStringList &warnings, TQMap<uint, bool> &inRange)
{
- BitValue tqmask = 0xFF;
+ BitValue mask = 0xFF;
for (uint k=0; k<device().nbBytes(); k++) {
_data[k] = hb[k];
if ( _data[k].isInitialized() ) {
inRange[k] = true;
- if ( !(result & ValueTooLarge) && !_data[k].isInside(tqmask) ) {
+ if ( !(result & ValueTooLarge) && !_data[k].isInside(mask) ) {
result |= ValueTooLarge;
- warnings += i18n("At least one word (at offset %1) is larger (%2) than the corresponding tqmask (%3).")
- .tqarg(toHexLabel(k, 8)).tqarg(toHexLabel(_data[k], 8)).tqarg(toHexLabel(tqmask, 8));
+ warnings += i18n("At least one word (at offset %1) is larger (%2) than the corresponding mask (%3).")
+ .tqarg(toHexLabel(k, 8)).tqarg(toHexLabel(_data[k], 8)).tqarg(toHexLabel(mask, 8));
}
- _data[k] = _data[k].maskWith(tqmask);
+ _data[k] = _data[k].maskWith(mask);
}
}
}