Resolve all remaining warnings reported by GCC 6.3.

Unresolved are drawRoundRect, QFontMetrics::width
which are deprecated in newer Qt versions.

Signed-off-by: Pavel Pisa <pisa@cmp.felk.cvut.cz>

16 files changed, 16 insertions, 16 deletions

diff --git a/qtmips_gui/coreview/adder.h b/qtmips_gui/coreview/adder.h
index b16538a..e7488f9 100644
--- a/qtmips_gui/coreview/adder.h
+++ b/qtmips_gui/coreview/adder.h
@@ -49,7 +49,7 @@ public:
     ~Adder();
 
     QRectF boundingRect() const;
-    void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget);
+    virtual void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) override;
 
     void setPos(qreal x, qreal y);
     const Connector *connector_in_a() const;
diff --git a/qtmips_gui/coreview/alu.h b/qtmips_gui/coreview/alu.h
index e0012e6..9cd4877 100644
--- a/qtmips_gui/coreview/alu.h
+++ b/qtmips_gui/coreview/alu.h
@@ -47,7 +47,7 @@ public:
     ~Alu();
 
     QRectF boundingRect() const;
-    void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget);
+    virtual void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) override;
 
     void setPos(qreal x, qreal y);
     const Connector *connector_in_a() const;
diff --git a/qtmips_gui/coreview/and.h b/qtmips_gui/coreview/and.h
index 3bb6cbe..0d5b957 100644
--- a/qtmips_gui/coreview/and.h
+++ b/qtmips_gui/coreview/and.h
@@ -48,7 +48,7 @@ public:
     ~And();
 
     QRectF boundingRect() const;
-    void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget);
+    virtual void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) override;
 
     void setPos(qreal x, qreal y);
     const Connector *connector_in(unsigned) const;
diff --git a/qtmips_gui/coreview/connection.h b/qtmips_gui/coreview/connection.h
index c80292d..9e0aad1 100644
--- a/qtmips_gui/coreview/connection.h
+++ b/qtmips_gui/coreview/connection.h
@@ -79,7 +79,7 @@ public:
     Connection(const Connector *start, const Connector *end);
 
     QRectF boundingRect() const;
-    void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget);
+    virtual void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) override;
 
     void setHasText(bool has);
     void setText(QString val);
diff --git a/qtmips_gui/coreview/constant.h b/qtmips_gui/coreview/constant.h
index a4793ed..66b0bd0 100644
--- a/qtmips_gui/coreview/constant.h
+++ b/qtmips_gui/coreview/constant.h
@@ -50,7 +50,7 @@ public:
     ~Constant();
 
     QRectF boundingRect() const;
-    void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget);
+    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 59dfad2..b91517d 100644
--- a/qtmips_gui/coreview/instructionview.h
+++ b/qtmips_gui/coreview/instructionview.h
@@ -48,7 +48,7 @@ public:
     InstructionView(QColor bgnd = QColor(240, 240, 240));
 
     QRectF boundingRect() const;
-    void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget);
+    virtual void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) override;
 
 public slots:
     void instruction_update(const machine::Instruction &i, std::uint32_t inst_addr,
diff --git a/qtmips_gui/coreview/junction.h b/qtmips_gui/coreview/junction.h
index 8aff759..ee7dc15 100644
--- a/qtmips_gui/coreview/junction.h
+++ b/qtmips_gui/coreview/junction.h
@@ -49,7 +49,7 @@ public:
     ~Junction();
 
     QRectF boundingRect() const;
-    void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget);
+    virtual void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) override;
 
     void setPos(qreal x, qreal y);
     Connector *new_connector(enum Connector::Axis axis = Connector::AX_X);
diff --git a/qtmips_gui/coreview/latch.h b/qtmips_gui/coreview/latch.h
index 565e29c..13a36ad 100644
--- a/qtmips_gui/coreview/latch.h
+++ b/qtmips_gui/coreview/latch.h
@@ -53,7 +53,7 @@ public:
     ~Latch();
 
     QRectF boundingRect() const;
-    void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget);
+    virtual void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) override;
 
     QColor wedge_color();
     void set_wedge_color(QColor &c);
diff --git a/qtmips_gui/coreview/logicblock.h b/qtmips_gui/coreview/logicblock.h
index a384b06..2b0f3be 100644
--- a/qtmips_gui/coreview/logicblock.h
+++ b/qtmips_gui/coreview/logicblock.h
@@ -53,7 +53,7 @@ public:
     ~LogicBlock();
 
     QRectF boundingRect() const;
-    void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget);
+    virtual void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) override;
 
     void setPos(qreal x, qreal y);
     void setSize(qreal width, qreal height);
diff --git a/qtmips_gui/coreview/memory.h b/qtmips_gui/coreview/memory.h
index 118892f..47abf35 100644
--- a/qtmips_gui/coreview/memory.h
+++ b/qtmips_gui/coreview/memory.h
@@ -51,7 +51,7 @@ public:
     Memory(bool cache_used, const machine::Cache *cache);
 
     QRectF boundingRect() const;
-    void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget);
+    virtual void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) override;
 
 signals:
     void open_mem();
diff --git a/qtmips_gui/coreview/minimux.h b/qtmips_gui/coreview/minimux.h
index 9cc446f..ab78cc6 100644
--- a/qtmips_gui/coreview/minimux.h
+++ b/qtmips_gui/coreview/minimux.h
@@ -49,7 +49,7 @@ public:
     ~MiniMux();
 
     QRectF boundingRect() const;
-    void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget);
+    virtual void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) override;
 
     void setPos(qreal x, qreal y);
     const Connector *connector_ctl() const; // Control input
diff --git a/qtmips_gui/coreview/multiplexer.h b/qtmips_gui/coreview/multiplexer.h
index 0ba8cd9..a10b330 100644
--- a/qtmips_gui/coreview/multiplexer.h
+++ b/qtmips_gui/coreview/multiplexer.h
@@ -49,7 +49,7 @@ public:
     ~Multiplexer();
 
     QRectF boundingRect() const;
-    void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget);
+    virtual void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) override;
 
     void setPos(qreal x, qreal y);
     const Connector *connector_ctl() const; // Control input
diff --git a/qtmips_gui/coreview/multitext.h b/qtmips_gui/coreview/multitext.h
index 48c9652..9cf1b66 100644
--- a/qtmips_gui/coreview/multitext.h
+++ b/qtmips_gui/coreview/multitext.h
@@ -49,7 +49,7 @@ public:
     MultiText(QMap<std::uint32_t, QString> value_map, bool nonzero_red = false);
 
     QRectF boundingRect() const;
-    void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget);
+    virtual void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) override;
 
 public slots:
     void multitext_update(std::uint32_t value);
diff --git a/qtmips_gui/coreview/programcounter.h b/qtmips_gui/coreview/programcounter.h
index ae5d45d..256640b 100644
--- a/qtmips_gui/coreview/programcounter.h
+++ b/qtmips_gui/coreview/programcounter.h
@@ -50,7 +50,7 @@ public:
     ~ProgramCounter();
 
     QRectF boundingRect() const;
-    void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget);
+    virtual void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) override;
 
     void setPos(qreal x, qreal y);
     const Connector *connector_in() const;
diff --git a/qtmips_gui/coreview/registers.h b/qtmips_gui/coreview/registers.h
index 5d4ad95..6746341 100644
--- a/qtmips_gui/coreview/registers.h
+++ b/qtmips_gui/coreview/registers.h
@@ -50,7 +50,7 @@ public:
     ~Registers();
 
     QRectF boundingRect() const;
-    void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget);
+    virtual void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) override;
 
     void setPos(qreal x, qreal y);
     const Connector *connector_read1() const;
diff --git a/qtmips_gui/coreview/value.h b/qtmips_gui/coreview/value.h
index a8c1e76..0db8b59 100644
--- a/qtmips_gui/coreview/value.h
+++ b/qtmips_gui/coreview/value.h
@@ -50,7 +50,7 @@ public:
           QChar fillchr = '0', bool frame = true);
 
     QRectF boundingRect() const;
-    void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget);
+    virtual void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) override;
 
 public slots:
     void value_update(std::uint32_t);