From 2408ca900657fdb81f85092a0612aeb6217fbe0f Mon Sep 17 00:00:00 2001 From: Pavel Pisa Date: Sun, 30 Jun 2019 20:13:51 +0200 Subject: Use override to make newer versions of C++ compiler happy. Signed-off-by: Pavel Pisa --- qtmips_gui/graphicsview.h | 2 +- qtmips_gui/memorymodel.h | 4 ++-- qtmips_gui/memorytableview.h | 2 +- qtmips_gui/programmodel.h | 4 ++-- qtmips_gui/programtableview.h | 2 +- qtmips_machine/cache.h | 8 ++++---- qtmips_machine/lcddisplay.h | 4 ++-- qtmips_machine/memory.h | 8 ++++---- qtmips_machine/peripspiled.h | 4 ++-- qtmips_machine/physaddrspace.h | 6 +++--- qtmips_machine/serialport.h | 4 ++-- 11 files changed, 24 insertions(+), 24 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(); diff --git a/qtmips_machine/cache.h b/qtmips_machine/cache.h index 1c455f7..b45913f 100644 --- a/qtmips_machine/cache.h +++ b/qtmips_machine/cache.h @@ -50,12 +50,12 @@ public: unsigned memory_access_penalty_w = 1, unsigned memory_access_penalty_b = 0); ~Cache(); - bool wword(std::uint32_t address, std::uint32_t value); - std::uint32_t rword(std::uint32_t address, bool debug_access = false) const; + bool wword(std::uint32_t address, std::uint32_t value) override; + std::uint32_t rword(std::uint32_t address, bool debug_access = false) const override; virtual std::uint32_t get_change_counter() const override; void flush(); // flush cache - void sync(); // Same as flush + void sync() override; // Same as flush unsigned hit() const; // Number of recorded hits unsigned miss() const; // Number of recorded misses @@ -68,7 +68,7 @@ public: void reset(); // Reset whole state of cache const MachineConfigCache &config() const; - enum LocationStatus location_status(std::uint32_t address) const; + enum LocationStatus location_status(std::uint32_t address) const override; signals: void hit_update(unsigned) const; diff --git a/qtmips_machine/lcddisplay.h b/qtmips_machine/lcddisplay.h index 4821401..705ff67 100644 --- a/qtmips_machine/lcddisplay.h +++ b/qtmips_machine/lcddisplay.h @@ -57,8 +57,8 @@ signals: void pixel_update(uint x, uint y, uint r, uint g, uint b); public: - bool wword(std::uint32_t address, std::uint32_t value); - std::uint32_t rword(std::uint32_t address, bool debug_access = false) const; + bool wword(std::uint32_t address, std::uint32_t value) override; + std::uint32_t rword(std::uint32_t address, bool debug_access = false) const override; virtual std::uint32_t get_change_counter() const override; inline uint width() { diff --git a/qtmips_machine/memory.h b/qtmips_machine/memory.h index 2b20366..667212c 100644 --- a/qtmips_machine/memory.h +++ b/qtmips_machine/memory.h @@ -81,8 +81,8 @@ public: MemorySection(const MemorySection&); ~MemorySection(); - bool wword(std::uint32_t offset, std::uint32_t value); - std::uint32_t rword(std::uint32_t offsetbool, bool debug_access = false) const; + bool wword(std::uint32_t offset, std::uint32_t value) override; + std::uint32_t rword(std::uint32_t offsetbool, bool debug_access = false) const override; virtual std::uint32_t get_change_counter() const override; void merge(MemorySection&); @@ -112,8 +112,8 @@ public: void reset(const Memory&); MemorySection *get_section(std::uint32_t address, bool create) const; // returns section containing given address - bool wword(std::uint32_t address, std::uint32_t value); - std::uint32_t rword(std::uint32_t address, bool debug_access = false) const; + bool wword(std::uint32_t address, std::uint32_t value) override; + std::uint32_t rword(std::uint32_t address, bool debug_access = false) const override; virtual std::uint32_t get_change_counter() const override; bool operator==(const Memory&) const; diff --git a/qtmips_machine/peripspiled.h b/qtmips_machine/peripspiled.h index 70c8019..582349f 100644 --- a/qtmips_machine/peripspiled.h +++ b/qtmips_machine/peripspiled.h @@ -67,8 +67,8 @@ public slots: void green_knob_push(bool state); void blue_knob_push(bool state); public: - bool wword(std::uint32_t address, std::uint32_t value); - std::uint32_t rword(std::uint32_t address, bool debug_access = false) const; + bool wword(std::uint32_t address, std::uint32_t value) override; + std::uint32_t rword(std::uint32_t address, bool debug_access = false) const override; virtual std::uint32_t get_change_counter() const override; private: void knob_update_notify(std::uint32_t val, std::uint32_t mask, int shift); diff --git a/qtmips_machine/physaddrspace.h b/qtmips_machine/physaddrspace.h index 7bc126b..ce91570 100644 --- a/qtmips_machine/physaddrspace.h +++ b/qtmips_machine/physaddrspace.h @@ -51,14 +51,14 @@ public: PhysAddrSpace(); ~PhysAddrSpace(); - bool wword(std::uint32_t address, std::uint32_t value); - std::uint32_t rword(std::uint32_t address, bool debug_access = false) const; + bool wword(std::uint32_t address, std::uint32_t value) override; + std::uint32_t rword(std::uint32_t address, bool debug_access = false) const override; virtual std::uint32_t get_change_counter() const override; bool insert_range(MemoryAccess *mem_acces, std::uint32_t start_addr, std::uint32_t last_addr, bool move_ownership); bool remove_range(MemoryAccess *mem_acces); void clean_range(std::uint32_t start_addr, std::uint32_t last_addr); - enum LocationStatus location_status(std::uint32_t offset) const; + enum LocationStatus location_status(std::uint32_t offset) const override; private slots: void range_external_change(const MemoryAccess *mem_access, std::uint32_t start_addr, std::uint32_t last_addr, bool external); diff --git a/qtmips_machine/serialport.h b/qtmips_machine/serialport.h index 095c06e..10def57 100644 --- a/qtmips_machine/serialport.h +++ b/qtmips_machine/serialport.h @@ -61,8 +61,8 @@ public slots: void rx_queue_check() const; public: - bool wword(std::uint32_t address, std::uint32_t value); - std::uint32_t rword(std::uint32_t address, bool debug_access = false) const; + bool wword(std::uint32_t address, std::uint32_t value) override; + std::uint32_t rword(std::uint32_t address, bool debug_access = false) const override; virtual std::uint32_t get_change_counter() const override; private: void rx_queue_check_internal() const; -- cgit v1.2.3