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_cli | |
| 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_cli')
| -rw-r--r-- | qtmips_cli/main.cpp | 2 | ||||
| -rw-r--r-- | qtmips_cli/tracer.cpp | 1 | ||||
| -rw-r--r-- | qtmips_cli/tracer.h | 4 |
3 files changed, 5 insertions, 2 deletions
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 |