From e0c757926743ee21f1a60b4b6948ca3eb895c373 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Karel=20Ko=C4=8D=C3=AD?= Date: Sun, 17 Dec 2017 13:31:25 +0100 Subject: Put qtmips_machine to machine namespace --- qtmips_machine/memory.h | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'qtmips_machine/memory.h') 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 #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 -- cgit v1.2.3