aboutsummaryrefslogtreecommitdiff
path: root/qtmips_machine/memory.h
diff options
context:
space:
mode:
Diffstat (limited to 'qtmips_machine/memory.h')
-rw-r--r--qtmips_machine/memory.h9
1 files changed, 6 insertions, 3 deletions
diff --git a/qtmips_machine/memory.h b/qtmips_machine/memory.h
index 7b14855..73ee534 100644
--- a/qtmips_machine/memory.h
+++ b/qtmips_machine/memory.h
@@ -6,6 +6,8 @@
#include <cstdint>
#include "qtmipsexception.h"
+namespace machine {
+
// Virtual class for common memory access
class MemoryAccess : public QObject {
Q_OBJECT
@@ -34,8 +36,6 @@ signals:
void byte_change(std::uint32_t address, std::uint32_t value);
};
-Q_DECLARE_METATYPE(MemoryAccess::AccessControl)
-
class MemorySection : public MemoryAccess {
public:
MemorySection(std::uint32_t length);
@@ -91,6 +91,9 @@ private:
static union MemoryTree *copy_section_tree(const union MemoryTree*, size_t depth);
};
-Q_DECLARE_METATYPE(Memory)
+}
+
+Q_DECLARE_METATYPE(machine::MemoryAccess::AccessControl)
+Q_DECLARE_METATYPE(machine::Memory)
#endif // MEMORY_H