[VM] TRY:Use namespace {VMNAME} to separate around VMs. This feature still apply...

[csp-qt/common_source_project-fm7.git] / source / src / vm / ex80 / ex80.cpp

diff --git a/source/src/vm/ex80/ex80.cpp b/source/src/vm/ex80/ex80.cpp
index 1e1e55e..f4b65d7 100644 (file)
--- a/source/src/vm/ex80/ex80.cpp
+++ b/source/src/vm/ex80/ex80.cpp
@@ -22,11 +22,16 @@
 #include "../debugger.h"
 #endif
 
-#include "cmt.h"
-#include "display.h"
-#include "keyboard.h"
+#include "./cmt.h"
+#include "./display.h"
+#include "./keyboard.h"
 #include "./memory.h"
 
+using EX80::CMT;
+using EX80::DISPLAY;
+using EX80::KEYBOARD;
+using EX80::MEMORY;
+
 // ----------------------------------------------------------------------------
 // initialize
 // ----------------------------------------------------------------------------
@@ -47,7 +52,7 @@ VM::VM(EMU* parent_emu) : VM_TEMPLATE(parent_emu)
        cmt = new CMT(this, emu);
        display = new DISPLAY(this, emu);
        keyboard = new KEYBOARD(this, emu);
-       memory = new EX80_MEMORY(this, emu);
+       memory = new MEMORY(this, emu);
        // Set names
 #if defined(_USE_QT)
        dummy->set_device_name(_T("1st Dummy"));