aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPavel Pisa <pisa@cmp.felk.cvut.cz>2019-07-02 22:28:37 +0200
committerPavel Pisa <pisa@cmp.felk.cvut.cz>2019-07-02 22:28:37 +0200
commit7e10c3ff8149a8d25431807fe15a73fe40cfdc5b (patch)
tree8b6dcd701b3e01cf78a1298ba5887b5b5e3fb7a3
parent5c4482e8ede2a39dc865772f243950d234809681 (diff)
downloadqtmips-7e10c3ff8149a8d25431807fe15a73fe40cfdc5b.tar.gz
qtmips-7e10c3ff8149a8d25431807fe15a73fe40cfdc5b.tar.bz2
qtmips-7e10c3ff8149a8d25431807fe15a73fe40cfdc5b.zip
Next round of override warning silence from emscripten build.
Signed-off-by: Pavel Pisa <pisa@cmp.felk.cvut.cz>
-rw-r--r--qtmips_gui/cacheview.h4
-rw-r--r--qtmips_gui/coreview/adder.h2
-rw-r--r--qtmips_gui/coreview/alu.h2
-rw-r--r--qtmips_gui/coreview/and.h2
-rw-r--r--qtmips_gui/coreview/connection.h2
-rw-r--r--qtmips_gui/coreview/constant.h2
-rw-r--r--qtmips_gui/coreview/instructionview.h2
-rw-r--r--qtmips_gui/coreview/junction.h2
-rw-r--r--qtmips_gui/coreview/latch.h2
-rw-r--r--qtmips_gui/coreview/logicblock.h4
-rw-r--r--qtmips_gui/coreview/memory.h4
-rw-r--r--qtmips_gui/coreview/minimux.h2
-rw-r--r--qtmips_gui/coreview/multiplexer.h2
-rw-r--r--qtmips_gui/coreview/multitext.h2
-rw-r--r--qtmips_gui/coreview/programcounter.h4
-rw-r--r--qtmips_gui/coreview/registers.h4
-rw-r--r--qtmips_gui/coreview/value.h2
17 files changed, 22 insertions, 22 deletions
diff --git a/qtmips_gui/cacheview.h b/qtmips_gui/cacheview.h
index 0b11a2b..084dd8a 100644
--- a/qtmips_gui/cacheview.h
+++ b/qtmips_gui/cacheview.h
@@ -48,7 +48,7 @@ class CacheAddressBlock : public QGraphicsObject {
public:
CacheAddressBlock(const machine::Cache *cache, unsigned width);
- QRectF boundingRect() const;
+ QRectF boundingRect() const override;
virtual void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) override;
@@ -69,7 +69,7 @@ public:
CacheViewBlock(const machine::Cache *cache, unsigned block, bool last);
~CacheViewBlock();
- QRectF boundingRect() const;
+ QRectF boundingRect() const override;
void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) override;
diff --git a/qtmips_gui/coreview/adder.h b/qtmips_gui/coreview/adder.h
index e7488f9..4b938a9 100644
--- a/qtmips_gui/coreview/adder.h
+++ b/qtmips_gui/coreview/adder.h
@@ -48,7 +48,7 @@ public:
Adder();
~Adder();
- QRectF boundingRect() const;
+ QRectF boundingRect() const override;
virtual void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) override;
void setPos(qreal x, qreal y);
diff --git a/qtmips_gui/coreview/alu.h b/qtmips_gui/coreview/alu.h
index 9cd4877..f65a29c 100644
--- a/qtmips_gui/coreview/alu.h
+++ b/qtmips_gui/coreview/alu.h
@@ -46,7 +46,7 @@ public:
Alu();
~Alu();
- QRectF boundingRect() const;
+ QRectF boundingRect() const override;
virtual void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) override;
void setPos(qreal x, qreal y);
diff --git a/qtmips_gui/coreview/and.h b/qtmips_gui/coreview/and.h
index 0d5b957..1ad28a0 100644
--- a/qtmips_gui/coreview/and.h
+++ b/qtmips_gui/coreview/and.h
@@ -47,7 +47,7 @@ public:
And(unsigned size = 2);
~And();
- QRectF boundingRect() const;
+ QRectF boundingRect() const override;
virtual void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) override;
void setPos(qreal x, qreal y);
diff --git a/qtmips_gui/coreview/connection.h b/qtmips_gui/coreview/connection.h
index 9e0aad1..91e3edd 100644
--- a/qtmips_gui/coreview/connection.h
+++ b/qtmips_gui/coreview/connection.h
@@ -78,7 +78,7 @@ class Connection : public QGraphicsObject {
public:
Connection(const Connector *start, const Connector *end);
- QRectF boundingRect() const;
+ QRectF boundingRect() const override;
virtual void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) override;
void setHasText(bool has);
diff --git a/qtmips_gui/coreview/constant.h b/qtmips_gui/coreview/constant.h
index 66b0bd0..f0ef001 100644
--- a/qtmips_gui/coreview/constant.h
+++ b/qtmips_gui/coreview/constant.h
@@ -49,7 +49,7 @@ public:
Constant(const Connector *con, const QString &text);
~Constant();
- QRectF boundingRect() const;
+ QRectF boundingRect() const override;
virtual void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) override;
void set_text(const QString &text);
diff --git a/qtmips_gui/coreview/instructionview.h b/qtmips_gui/coreview/instructionview.h
index b91517d..39f5f72 100644
--- a/qtmips_gui/coreview/instructionview.h
+++ b/qtmips_gui/coreview/instructionview.h
@@ -47,7 +47,7 @@ class InstructionView : public QGraphicsObject {
public:
InstructionView(QColor bgnd = QColor(240, 240, 240));
- QRectF boundingRect() const;
+ QRectF boundingRect() const override;
virtual void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) override;
public slots:
diff --git a/qtmips_gui/coreview/junction.h b/qtmips_gui/coreview/junction.h
index ee7dc15..5127a4a 100644
--- a/qtmips_gui/coreview/junction.h
+++ b/qtmips_gui/coreview/junction.h
@@ -48,7 +48,7 @@ public:
Junction(bool point = true);
~Junction();
- QRectF boundingRect() const;
+ QRectF boundingRect() const override;
virtual void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) override;
void setPos(qreal x, qreal y);
diff --git a/qtmips_gui/coreview/latch.h b/qtmips_gui/coreview/latch.h
index 13a36ad..f5f8a2e 100644
--- a/qtmips_gui/coreview/latch.h
+++ b/qtmips_gui/coreview/latch.h
@@ -52,7 +52,7 @@ public:
Latch(machine::QtMipsMachine *machine, qreal height);
~Latch();
- QRectF boundingRect() const;
+ QRectF boundingRect() const override;
virtual void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) override;
QColor wedge_color();
diff --git a/qtmips_gui/coreview/logicblock.h b/qtmips_gui/coreview/logicblock.h
index 2b0f3be..52569bf 100644
--- a/qtmips_gui/coreview/logicblock.h
+++ b/qtmips_gui/coreview/logicblock.h
@@ -52,7 +52,7 @@ public:
LogicBlock(QVector<QString> name);
~LogicBlock();
- QRectF boundingRect() const;
+ QRectF boundingRect() const override;
virtual void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) override;
void setPos(qreal x, qreal y);
@@ -79,7 +79,7 @@ private:
QPointF con_pos(qreal x, qreal y);
protected:
- void mouseDoubleClickEvent(QGraphicsSceneMouseEvent *event);
+ void mouseDoubleClickEvent(QGraphicsSceneMouseEvent *event) override;
};
}
diff --git a/qtmips_gui/coreview/memory.h b/qtmips_gui/coreview/memory.h
index 47abf35..1b29570 100644
--- a/qtmips_gui/coreview/memory.h
+++ b/qtmips_gui/coreview/memory.h
@@ -50,7 +50,7 @@ class Memory : public QGraphicsObject {
public:
Memory(bool cache_used, const machine::Cache *cache);
- QRectF boundingRect() const;
+ QRectF boundingRect() const override;
virtual void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) override;
signals:
@@ -62,7 +62,7 @@ private slots:
void cache_miss_update(unsigned);
protected:
- void mouseDoubleClickEvent(QGraphicsSceneMouseEvent *event);
+ void mouseDoubleClickEvent(QGraphicsSceneMouseEvent *event) override;
void set_type(const QString&);
diff --git a/qtmips_gui/coreview/minimux.h b/qtmips_gui/coreview/minimux.h
index ab78cc6..2b45efe 100644
--- a/qtmips_gui/coreview/minimux.h
+++ b/qtmips_gui/coreview/minimux.h
@@ -48,7 +48,7 @@ public:
MiniMux(unsigned size, bool ctl_up = false);
~MiniMux();
- QRectF boundingRect() const;
+ QRectF boundingRect() const override;
virtual void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) override;
void setPos(qreal x, qreal y);
diff --git a/qtmips_gui/coreview/multiplexer.h b/qtmips_gui/coreview/multiplexer.h
index a10b330..cd8b8b7 100644
--- a/qtmips_gui/coreview/multiplexer.h
+++ b/qtmips_gui/coreview/multiplexer.h
@@ -48,7 +48,7 @@ public:
Multiplexer(unsigned size, bool ctl_up = false);
~Multiplexer();
- QRectF boundingRect() const;
+ QRectF boundingRect() const override;
virtual void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) override;
void setPos(qreal x, qreal y);
diff --git a/qtmips_gui/coreview/multitext.h b/qtmips_gui/coreview/multitext.h
index 9cf1b66..5e28685 100644
--- a/qtmips_gui/coreview/multitext.h
+++ b/qtmips_gui/coreview/multitext.h
@@ -48,7 +48,7 @@ class MultiText : public QGraphicsObject {
public:
MultiText(QMap<std::uint32_t, QString> value_map, bool nonzero_red = false);
- QRectF boundingRect() const;
+ QRectF boundingRect() const override;
virtual void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) override;
public slots:
diff --git a/qtmips_gui/coreview/programcounter.h b/qtmips_gui/coreview/programcounter.h
index 256640b..cb8fb5b 100644
--- a/qtmips_gui/coreview/programcounter.h
+++ b/qtmips_gui/coreview/programcounter.h
@@ -49,7 +49,7 @@ public:
ProgramCounter(machine::QtMipsMachine *machine);
~ProgramCounter();
- QRectF boundingRect() const;
+ QRectF boundingRect() const override;
virtual void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) override;
void setPos(qreal x, qreal y);
@@ -61,7 +61,7 @@ signals:
void jump_to_pc(std::uint32_t addr);
protected:
- void mouseDoubleClickEvent(QGraphicsSceneMouseEvent *event);
+ void mouseDoubleClickEvent(QGraphicsSceneMouseEvent *event) override;
private slots:
void pc_update(std::uint32_t val);
diff --git a/qtmips_gui/coreview/registers.h b/qtmips_gui/coreview/registers.h
index 6746341..9e720c6 100644
--- a/qtmips_gui/coreview/registers.h
+++ b/qtmips_gui/coreview/registers.h
@@ -49,7 +49,7 @@ public:
Registers();
~Registers();
- QRectF boundingRect() const;
+ QRectF boundingRect() const override;
virtual void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) override;
void setPos(qreal x, qreal y);
@@ -65,7 +65,7 @@ signals:
void open_registers();
protected:
- void mouseDoubleClickEvent(QGraphicsSceneMouseEvent *event);
+ void mouseDoubleClickEvent(QGraphicsSceneMouseEvent *event) override;
private:
Connector *con_read1, *con_read1_reg, *con_read2, *con_read2_reg;
diff --git a/qtmips_gui/coreview/value.h b/qtmips_gui/coreview/value.h
index 0db8b59..9d6a6c7 100644
--- a/qtmips_gui/coreview/value.h
+++ b/qtmips_gui/coreview/value.h
@@ -49,7 +49,7 @@ public:
unsigned init_val = 0, unsigned base = 16,
QChar fillchr = '0', bool frame = true);
- QRectF boundingRect() const;
+ QRectF boundingRect() const override;
virtual void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) override;
public slots: