From e0c757926743ee21f1a60b4b6948ca3eb895c373 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Karel=20Ko=C4=8D=C3=AD?= <cynerd@email.cz>
Date: Sun, 17 Dec 2017 13:31:25 +0100
Subject: Put qtmips_machine to machine namespace

---
 qtmips_cli/main.cpp   | 2 ++
 qtmips_cli/tracer.cpp | 1 +
 qtmips_cli/tracer.h   | 4 ++--
 3 files changed, 5 insertions(+), 2 deletions(-)

(limited to 'qtmips_cli')

diff --git a/qtmips_cli/main.cpp b/qtmips_cli/main.cpp
index 6240414..4c4652b 100644
--- a/qtmips_cli/main.cpp
+++ b/qtmips_cli/main.cpp
@@ -3,6 +3,8 @@
 #include <iostream>
 #include "tracer.h"
 
+using namespace machine;
+
 void create_parser(QCommandLineParser &p) {
     p.setApplicationDescription("QtMips CLI machine simulator");
     p.addHelpOption();
diff --git a/qtmips_cli/tracer.cpp b/qtmips_cli/tracer.cpp
index 5cbf339..2969112 100644
--- a/qtmips_cli/tracer.cpp
+++ b/qtmips_cli/tracer.cpp
@@ -2,6 +2,7 @@
 #include <iostream>
 
 using namespace std;
+using namespace machine;
 
 Tracer::Tracer(QtMipsMachine *machine) {
     this->machine = machine;
diff --git a/qtmips_cli/tracer.h b/qtmips_cli/tracer.h
index 7055cd8..d5a476b 100644
--- a/qtmips_cli/tracer.h
+++ b/qtmips_cli/tracer.h
@@ -7,7 +7,7 @@
 class Tracer : public QObject {
     Q_OBJECT
 public:
-    Tracer(QtMipsMachine *machine);
+    Tracer(machine::QtMipsMachine *machine);
 
     // Trace registers
     void reg_pc();
@@ -16,7 +16,7 @@ private slots:
     void regs_pc_update(std::uint32_t val);
 
 private:
-    QtMipsMachine *machine;
+    machine::QtMipsMachine *machine;
 };
 
 #endif // TRACER_H
-- 
cgit v1.2.3