diff options
| author | Karel Kočí <cynerd@email.cz> | 2017-12-17 13:31:25 +0100 |
|---|---|---|
| committer | Karel Kočí <cynerd@email.cz> | 2017-12-17 13:31:25 +0100 |
| commit | e0c757926743ee21f1a60b4b6948ca3eb895c373 (patch) | |
| tree | d2acad9475849d5abed15cdd4b6bf3b8d9030f06 /qtmips_machine/memory.h | |
| parent | 7fa050ddefca5373b09bdbcbb3aa0902eacd5d2f (diff) | |
| download | qtmips-e0c757926743ee21f1a60b4b6948ca3eb895c373.tar.gz qtmips-e0c757926743ee21f1a60b4b6948ca3eb895c373.tar.bz2 qtmips-e0c757926743ee21f1a60b4b6948ca3eb895c373.zip | |
Put qtmips_machine to machine namespace
Diffstat (limited to 'qtmips_machine/memory.h')
| -rw-r--r-- | qtmips_machine/memory.h | 9 |
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 |