diff options
author | Pavel Pisa <pisa@cmp.felk.cvut.cz> | 2019-06-30 20:13:51 +0200 |
---|---|---|
committer | Pavel Pisa <pisa@cmp.felk.cvut.cz> | 2019-06-30 20:13:51 +0200 |
commit | 2408ca900657fdb81f85092a0612aeb6217fbe0f (patch) | |
tree | 6d2ea3953704adf34d92fdfc25fc647957bd7471 /qtmips_gui | |
parent | 9dc519887f61ae33ff82bb125fb69398503f91f6 (diff) | |
download | qtmips-2408ca900657fdb81f85092a0612aeb6217fbe0f.tar.gz qtmips-2408ca900657fdb81f85092a0612aeb6217fbe0f.tar.bz2 qtmips-2408ca900657fdb81f85092a0612aeb6217fbe0f.zip |
Use override to make newer versions of C++ compiler happy.
Signed-off-by: Pavel Pisa <pisa@cmp.felk.cvut.cz>
Diffstat (limited to 'qtmips_gui')
-rw-r--r-- | qtmips_gui/graphicsview.h | 2 | ||||
-rw-r--r-- | qtmips_gui/memorymodel.h | 4 | ||||
-rw-r--r-- | qtmips_gui/memorytableview.h | 2 | ||||
-rw-r--r-- | qtmips_gui/programmodel.h | 4 | ||||
-rw-r--r-- | qtmips_gui/programtableview.h | 2 |
5 files changed, 7 insertions, 7 deletions
diff --git a/qtmips_gui/graphicsview.h b/qtmips_gui/graphicsview.h index b970e86..83d22a7 100644 --- a/qtmips_gui/graphicsview.h +++ b/qtmips_gui/graphicsview.h @@ -51,7 +51,7 @@ public: void setScene(QGraphicsScene *scene); protected: - void resizeEvent(QResizeEvent *event); + void resizeEvent(QResizeEvent *event) override; void wheelEvent(QWheelEvent *event) override; void keyPressEvent(QKeyEvent *event) override; diff --git a/qtmips_gui/memorymodel.h b/qtmips_gui/memorymodel.h index 353757a..97b4270 100644 --- a/qtmips_gui/memorymodel.h +++ b/qtmips_gui/memorymodel.h @@ -57,8 +57,8 @@ public: int columnCount(const QModelIndex &parent = QModelIndex()) const override; QVariant headerData(int section, Qt::Orientation orientation, int role) const override; QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override; - Qt::ItemFlags flags(const QModelIndex &index) const; - bool setData(const QModelIndex & index, const QVariant & value, int role); + Qt::ItemFlags flags(const QModelIndex &index) const override; + bool setData(const QModelIndex & index, const QVariant & value, int role) override; bool adjustRowAndOffset(int &row, std::uint32_t address); void update_all(); diff --git a/qtmips_gui/memorytableview.h b/qtmips_gui/memorytableview.h index 0b71444..fcac694 100644 --- a/qtmips_gui/memorytableview.h +++ b/qtmips_gui/memorytableview.h @@ -60,7 +60,7 @@ public slots: void focus_address(std::uint32_t address); void recompute_columns(); protected: - void keyPressEvent(QKeyEvent *event); + void keyPressEvent(QKeyEvent *event) override; private slots: void adjust_scroll_pos_check(); void adjust_scroll_pos_process(); diff --git a/qtmips_gui/programmodel.h b/qtmips_gui/programmodel.h index d458eef..a2eff4b 100644 --- a/qtmips_gui/programmodel.h +++ b/qtmips_gui/programmodel.h @@ -51,8 +51,8 @@ public: int columnCount(const QModelIndex &parent = QModelIndex()) const override; QVariant headerData(int section, Qt::Orientation orientation, int role) const override; QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override; - Qt::ItemFlags flags(const QModelIndex &index) const; - bool setData(const QModelIndex & index, const QVariant & value, int role); + Qt::ItemFlags flags(const QModelIndex &index) const override; + bool setData(const QModelIndex & index, const QVariant & value, int role) override; bool adjustRowAndOffset(int &row, std::uint32_t address); void update_all(); diff --git a/qtmips_gui/programtableview.h b/qtmips_gui/programtableview.h index f9e0474..65e8ce0 100644 --- a/qtmips_gui/programtableview.h +++ b/qtmips_gui/programtableview.h @@ -59,7 +59,7 @@ public slots: void focus_address(std::uint32_t address); void focus_address_with_save(std::uint32_t address); protected: - void keyPressEvent(QKeyEvent *event); + void keyPressEvent(QKeyEvent *event) override; private slots: void adjust_scroll_pos_check(); void adjust_scroll_pos_process(); |