diff --git a/cockatrice/src/interface/layouts/overlap_layout.h b/cockatrice/src/interface/layouts/overlap_layout.h index 32c74c18a..c61df6fbc 100644 --- a/cockatrice/src/interface/layouts/overlap_layout.h +++ b/cockatrice/src/interface/layouts/overlap_layout.h @@ -27,7 +27,7 @@ public: int maxRows = 2, Qt::Orientation overlapDirection = Qt::Vertical, Qt::Orientation flowDirection = Qt::Horizontal); - ~OverlapLayout(); + ~OverlapLayout() override; void insertWidgetAtIndex(QWidget *toInsert, int index); void addItem(QLayoutItem *item) override; diff --git a/cockatrice/src/interface/palette_editor/palette_grid_widget.h b/cockatrice/src/interface/palette_editor/palette_grid_widget.h index 7c527a064..250e977e3 100644 --- a/cockatrice/src/interface/palette_editor/palette_grid_widget.h +++ b/cockatrice/src/interface/palette_editor/palette_grid_widget.h @@ -31,7 +31,7 @@ signals: private: void buildGrid(QWidget *host); - void changeEvent(QEvent *e); + void changeEvent(QEvent *e) override; void refreshChromePalettes(); private slots: diff --git a/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_total_widget.h b/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_total_widget.h index 0eaecec96..d76c5bfc6 100644 --- a/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_total_widget.h +++ b/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_total_widget.h @@ -17,8 +17,8 @@ class ManaCurveTotalWidget : public QWidget public: explicit ManaCurveTotalWidget(QWidget *parent); - QSize sizeHint() const; - QSize minimumSizeHint() const; + QSize sizeHint() const override; + QSize minimumSizeHint() const override; void updateDisplay(const QString &categoryName, int minCmc, int maxCmc, diff --git a/cockatrice/src/interface/widgets/general/display/dynamic_font_size_label.h b/cockatrice/src/interface/widgets/general/display/dynamic_font_size_label.h index 189ca4324..f39c12edb 100644 --- a/cockatrice/src/interface/widgets/general/display/dynamic_font_size_label.h +++ b/cockatrice/src/interface/widgets/general/display/dynamic_font_size_label.h @@ -23,7 +23,7 @@ class DynamicFontSizeLabel : public QLabel public: explicit DynamicFontSizeLabel(QWidget *parent = nullptr, Qt::WindowFlags f = Qt::WindowFlags()); - ~DynamicFontSizeLabel() + ~DynamicFontSizeLabel() override { } @@ -37,17 +37,17 @@ signals: void clicked(); protected: - void mousePressEvent(QMouseEvent *event); + void mousePressEvent(QMouseEvent *event) override; QColor textColor; // QWidget interface protected: - void paintEvent(QPaintEvent *event); + void paintEvent(QPaintEvent *event) override; // QWidget interface public: - QSize minimumSizeHint() const; - QSize sizeHint() const; + QSize minimumSizeHint() const override; + QSize sizeHint() const override; }; #endif // DYNAMICFONTSIZELABEL_H \ No newline at end of file diff --git a/cockatrice/src/interface/widgets/general/display/dynamic_font_size_push_button.h b/cockatrice/src/interface/widgets/general/display/dynamic_font_size_push_button.h index b8b8e51bb..51f1e455f 100644 --- a/cockatrice/src/interface/widgets/general/display/dynamic_font_size_push_button.h +++ b/cockatrice/src/interface/widgets/general/display/dynamic_font_size_push_button.h @@ -25,11 +25,11 @@ public: void setTextAndColor(const QString &text, QColor color = QColor::Invalid); // QWidget interface - QSize minimumSizeHint() const; - QSize sizeHint() const; + QSize minimumSizeHint() const override; + QSize sizeHint() const override; protected: - void paintEvent(QPaintEvent *event); + void paintEvent(QPaintEvent *event) override; private: QColor textColor; diff --git a/cockatrice/src/interface/widgets/tabs/abstract_tab_deck_editor.h b/cockatrice/src/interface/widgets/tabs/abstract_tab_deck_editor.h index 1782e7afd..1212bcc88 100644 --- a/cockatrice/src/interface/widgets/tabs/abstract_tab_deck_editor.h +++ b/cockatrice/src/interface/widgets/tabs/abstract_tab_deck_editor.h @@ -90,13 +90,13 @@ public: virtual void createMenus() = 0; /** @brief Returns the display text for the tab. */ - [[nodiscard]] virtual QString getTabText() const override = 0; + [[nodiscard]] QString getTabText() const override = 0; /** @brief Confirms whether the tab can be safely closed. */ bool confirmClose(); /** @brief Retranslates the UI text. Pure virtual. */ - virtual void retranslateUi() override = 0; + void retranslateUi() override = 0; /** @brief Opens a deck in this tab. * @param deck The deck to open diff --git a/cockatrice/src/interface/widgets/visual_database_display/visual_database_filter_display_widget.h b/cockatrice/src/interface/widgets/visual_database_display/visual_database_filter_display_widget.h index 6d051bcf7..3857b5bfd 100644 --- a/cockatrice/src/interface/widgets/visual_database_display/visual_database_filter_display_widget.h +++ b/cockatrice/src/interface/widgets/visual_database_display/visual_database_filter_display_widget.h @@ -20,7 +20,7 @@ class FilterDisplayWidget : public QWidget public: explicit FilterDisplayWidget(QWidget *parent, const QString &filename, FilterTreeModel *_filterModel); - ~FilterDisplayWidget() = default; + ~FilterDisplayWidget() override = default; QSize sizeHint() const override; diff --git a/libcockatrice_deck_list/libcockatrice/deck_list/tree/abstract_deck_list_card_node.h b/libcockatrice_deck_list/libcockatrice/deck_list/tree/abstract_deck_list_card_node.h index ebfd9a0b6..03898bd20 100644 --- a/libcockatrice_deck_list/libcockatrice/deck_list/tree/abstract_deck_list_card_node.h +++ b/libcockatrice_deck_list/libcockatrice/deck_list/tree/abstract_deck_list_card_node.h @@ -75,19 +75,19 @@ public: virtual void setName(const QString &_name) = 0; /** @return The provider identifier for this card (e.g., UUID). */ - [[nodiscard]] virtual QString getCardProviderId() const override = 0; + [[nodiscard]] QString getCardProviderId() const override = 0; /** @param _cardProviderId Set the provider identifier for this card. */ virtual void setCardProviderId(const QString &_cardProviderId) = 0; /** @return The abbreviated set code (e.g., "NEO"). */ - [[nodiscard]] virtual QString getCardSetShortName() const override = 0; + [[nodiscard]] QString getCardSetShortName() const override = 0; /** @param _cardSetShortName Set the abbreviated set code. */ virtual void setCardSetShortName(const QString &_cardSetShortName) = 0; /** @return The collector number of the card within its set. */ - [[nodiscard]] virtual QString getCardCollectorNumber() const override = 0; + [[nodiscard]] QString getCardCollectorNumber() const override = 0; /** @param _cardSetNumber Set the collector number. */ virtual void setCardCollectorNumber(const QString &_cardSetNumber) = 0; diff --git a/libcockatrice_models/libcockatrice/models/database/card_set/card_sets_model.h b/libcockatrice_models/libcockatrice/models/database/card_set/card_sets_model.h index 17eab6c53..79ae30b13 100644 --- a/libcockatrice_models/libcockatrice/models/database/card_set/card_sets_model.h +++ b/libcockatrice_models/libcockatrice/models/database/card_set/card_sets_model.h @@ -41,7 +41,7 @@ public: { return oldRow; } - [[nodiscard]] QStringList formats() const + [[nodiscard]] QStringList formats() const override { return QStringList() << "application/x-cockatricecardset"; } diff --git a/libcockatrice_network/libcockatrice/network/server/remote/game/server_abstract_player.h b/libcockatrice_network/libcockatrice/network/server/remote/game/server_abstract_player.h index c92c4c3dd..a5714f25e 100644 --- a/libcockatrice_network/libcockatrice/network/server/remote/game/server_abstract_player.h +++ b/libcockatrice_network/libcockatrice/network/server/remote/game/server_abstract_player.h @@ -145,7 +145,7 @@ public: const QString &attrValue, Server_Card *unzonedCard = nullptr); - virtual Response::ResponseCode + Response::ResponseCode cmdConcede(const Command_Concede &cmd, ResponseContainer &rc, GameEventStorage &ges) override; virtual Response::ResponseCode cmdUnconcede(const Command_Unconcede &cmd, ResponseContainer &rc, GameEventStorage &ges) override; @@ -177,14 +177,14 @@ public: cmdRevealCards(const Command_RevealCards &cmd, ResponseContainer &rc, GameEventStorage &ges) override; Response::ResponseCode cmdRevealRandomCards(const Command_RevealRandomCards &cmd, ResponseContainer &rc, GameEventStorage &ges) override; - virtual Response::ResponseCode cmdChangeZoneProperties(const Command_ChangeZoneProperties &cmd, - ResponseContainer &rc, - GameEventStorage &ges) override; + Response::ResponseCode cmdChangeZoneProperties(const Command_ChangeZoneProperties &cmd, + ResponseContainer &rc, + GameEventStorage &ges) override; - virtual void getInfo(ServerInfo_Player *info, - Server_AbstractParticipant *playerWhosAsking, - bool omniscient, - bool withUserInfo) override; + void getInfo(ServerInfo_Player *info, + Server_AbstractParticipant *playerWhosAsking, + bool omniscient, + bool withUserInfo) override; }; #endif diff --git a/libcockatrice_network/libcockatrice/network/server/remote/server_protocolhandler.h b/libcockatrice_network/libcockatrice/network/server/remote/server_protocolhandler.h index 636bb4771..0a20cca13 100644 --- a/libcockatrice_network/libcockatrice/network/server/remote/server_protocolhandler.h +++ b/libcockatrice_network/libcockatrice/network/server/remote/server_protocolhandler.h @@ -129,7 +129,7 @@ public slots: public: Server_ProtocolHandler(Server *_server, Server_DatabaseInterface *_databaseInterface, QObject *parent = nullptr); - ~Server_ProtocolHandler(); + ~Server_ProtocolHandler() override; bool getAcceptsUserListChanges() const { @@ -153,17 +153,17 @@ public: /** @brief Invalidate the pending nonce (single-use). */ void clearAuthNonce(); - int getLastCommandTime() const + int getLastCommandTime() const override { return timeRunning - lastDataReceived; } - bool addSaidMessageSize(int size); + bool addSaidMessageSize(int size) override; virtual void processCommandContainer(const CommandContainer &cont); - void sendProtocolItem(const Response &item); - void sendProtocolItem(const SessionEvent &item); - void sendProtocolItem(const GameEventContainer &item); - void sendProtocolItem(const RoomEvent &item); + void sendProtocolItem(const Response &item) override; + void sendProtocolItem(const SessionEvent &item) override; + void sendProtocolItem(const GameEventContainer &item) override; + void sendProtocolItem(const RoomEvent &item) override; }; #endif diff --git a/libcockatrice_network/libcockatrice/network/server/remote/server_remoteuserinterface.h b/libcockatrice_network/libcockatrice/network/server/remote/server_remoteuserinterface.h index 3bdf04220..2c96b8809 100644 --- a/libcockatrice_network/libcockatrice/network/server/remote/server_remoteuserinterface.h +++ b/libcockatrice_network/libcockatrice/network/server/remote/server_remoteuserinterface.h @@ -14,19 +14,19 @@ public: { } - int getLastCommandTime() const + int getLastCommandTime() const override { return 0; } - bool addSaidMessageSize(int /*size*/) + bool addSaidMessageSize(int /*size*/) override { return true; } - void sendProtocolItem(const Response &item); - void sendProtocolItem(const SessionEvent &item); - void sendProtocolItem(const GameEventContainer &item); - void sendProtocolItem(const RoomEvent &item); + void sendProtocolItem(const Response &item) override; + void sendProtocolItem(const SessionEvent &item) override; + void sendProtocolItem(const GameEventContainer &item) override; + void sendProtocolItem(const RoomEvent &item) override; }; #endif