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_gui/coreview/latch.cpp | 2 +- qtmips_gui/coreview/latch.h | 2 +- qtmips_gui/coreview/programcounter.cpp | 2 +- qtmips_gui/coreview/programcounter.h | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) (limited to 'qtmips_gui/coreview') diff --git a/qtmips_gui/coreview/latch.cpp b/qtmips_gui/coreview/latch.cpp index 77bb317..52f6eb3 100644 --- a/qtmips_gui/coreview/latch.cpp +++ b/qtmips_gui/coreview/latch.cpp @@ -7,7 +7,7 @@ using namespace coreview; #define PENW 1 ////////////////////// -Latch::Latch(QtMipsMachine *machine, qreal height) { +Latch::Latch(machine::QtMipsMachine *machine, qreal height) { this->height = height; connect(machine, SIGNAL(tick()), this, SLOT(tick())); } diff --git a/qtmips_gui/coreview/latch.h b/qtmips_gui/coreview/latch.h index a8738b3..0148b67 100644 --- a/qtmips_gui/coreview/latch.h +++ b/qtmips_gui/coreview/latch.h @@ -13,7 +13,7 @@ namespace coreview { class Latch : public QGraphicsObject { Q_OBJECT public: - Latch(QtMipsMachine *machine, qreal height); + Latch(machine::QtMipsMachine *machine, qreal height); QRectF boundingRect() const; void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget); diff --git a/qtmips_gui/coreview/programcounter.cpp b/qtmips_gui/coreview/programcounter.cpp index 32c907c..b25cbbe 100644 --- a/qtmips_gui/coreview/programcounter.cpp +++ b/qtmips_gui/coreview/programcounter.cpp @@ -8,7 +8,7 @@ using namespace coreview; #define PENW 1 ////////////////////// -ProgramCounter::ProgramCounter(QtMipsMachine *machine) : QGraphicsObject(nullptr), value(this), name(this) { +ProgramCounter::ProgramCounter(machine::QtMipsMachine *machine) : QGraphicsObject(nullptr), value(this), name(this) { value.setText(QString("0x") + QString::number(machine->registers()->read_pc(), 16)); value.setPos(0, HEIGHT/2 - value.boundingRect().height()/2); name.setText(QString("PC")); diff --git a/qtmips_gui/coreview/programcounter.h b/qtmips_gui/coreview/programcounter.h index 98b161d..91d1da3 100644 --- a/qtmips_gui/coreview/programcounter.h +++ b/qtmips_gui/coreview/programcounter.h @@ -12,7 +12,7 @@ namespace coreview { class ProgramCounter : public QGraphicsObject { Q_OBJECT public: - ProgramCounter(QtMipsMachine *machine); + ProgramCounter(machine::QtMipsMachine *machine); QRectF boundingRect() const; void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget); -- cgit v1.2.3