From 2851d0c7e61eaf092836478167e2727d2231b158 Mon Sep 17 00:00:00 2001 From: RickyRister <42636155+RickyRister@users.noreply.github.com> Date: Sat, 11 Jan 2025 18:28:02 -0800 Subject: [PATCH] add override specifier to tab subclasses (#5445) --- cockatrice/src/client/tabs/tab.h | 2 +- cockatrice/src/client/tabs/tab_account.h | 4 +-- cockatrice/src/client/tabs/tab_admin.h | 6 ++-- cockatrice/src/client/tabs/tab_deck_storage.h | 4 +-- cockatrice/src/client/tabs/tab_game.h | 4 +-- cockatrice/src/client/tabs/tab_logs.h | 6 ++-- cockatrice/src/client/tabs/tab_message.h | 10 +++---- cockatrice/src/client/tabs/tab_replays.h | 4 +-- cockatrice/src/client/tabs/tab_room.h | 10 +++---- cockatrice/src/client/tabs/tab_server.h | 6 ++-- cockatrice/src/client/tabs/tab_supervisor.h | 30 +++++++++---------- 11 files changed, 43 insertions(+), 43 deletions(-) diff --git a/cockatrice/src/client/tabs/tab.h b/cockatrice/src/client/tabs/tab.h index 75b6e1b59..3b5d89bb1 100644 --- a/cockatrice/src/client/tabs/tab.h +++ b/cockatrice/src/client/tabs/tab.h @@ -31,7 +31,7 @@ private: QList tabMenus; public: - Tab(TabSupervisor *_tabSupervisor, QWidget *parent = nullptr); + explicit Tab(TabSupervisor *_tabSupervisor, QWidget *parent = nullptr); const QList &getTabMenus() const { return tabMenus; diff --git a/cockatrice/src/client/tabs/tab_account.h b/cockatrice/src/client/tabs/tab_account.h index ba6eb78ad..94e688ee1 100644 --- a/cockatrice/src/client/tabs/tab_account.h +++ b/cockatrice/src/client/tabs/tab_account.h @@ -50,8 +50,8 @@ public: AbstractClient *_client, const ServerInfo_User &userInfo, QWidget *parent = nullptr); - void retranslateUi(); - QString getTabText() const + void retranslateUi() override; + QString getTabText() const override { return tr("Account"); } diff --git a/cockatrice/src/client/tabs/tab_admin.h b/cockatrice/src/client/tabs/tab_admin.h index 7d09caa25..f1952a658 100644 --- a/cockatrice/src/client/tabs/tab_admin.h +++ b/cockatrice/src/client/tabs/tab_admin.h @@ -22,7 +22,7 @@ private: QSpinBox *minutesEdit; public: - ShutdownDialog(QWidget *parent = nullptr); + explicit ShutdownDialog(QWidget *parent = nullptr); QString getReason() const; int getMinutes() const; }; @@ -55,8 +55,8 @@ private slots: public: TabAdmin(TabSupervisor *_tabSupervisor, AbstractClient *_client, bool _fullAdmin, QWidget *parent = nullptr); - void retranslateUi(); - QString getTabText() const + void retranslateUi() override; + QString getTabText() const override { return tr("Administration"); } diff --git a/cockatrice/src/client/tabs/tab_deck_storage.h b/cockatrice/src/client/tabs/tab_deck_storage.h index bebeaab5b..774b9f609 100644 --- a/cockatrice/src/client/tabs/tab_deck_storage.h +++ b/cockatrice/src/client/tabs/tab_deck_storage.h @@ -64,8 +64,8 @@ private slots: public: TabDeckStorage(TabSupervisor *_tabSupervisor, AbstractClient *_client); - void retranslateUi(); - QString getTabText() const + void retranslateUi() override; + QString getTabText() const override { return tr("Deck storage"); } diff --git a/cockatrice/src/client/tabs/tab_game.h b/cockatrice/src/client/tabs/tab_game.h index 427a3a746..5de957474 100644 --- a/cockatrice/src/client/tabs/tab_game.h +++ b/cockatrice/src/client/tabs/tab_game.h @@ -72,7 +72,7 @@ signals: void stateChanged(); public: - ToggleButton(QWidget *parent = nullptr); + explicit ToggleButton(QWidget *parent = nullptr); bool getState() const { return state; @@ -80,7 +80,7 @@ public: void setState(bool _state); protected: - void paintEvent(QPaintEvent *event); + void paintEvent(QPaintEvent *event) override; }; class DeckViewContainer : public QWidget diff --git a/cockatrice/src/client/tabs/tab_logs.h b/cockatrice/src/client/tabs/tab_logs.h index d31d68407..89bebf3e9 100644 --- a/cockatrice/src/client/tabs/tab_logs.h +++ b/cockatrice/src/client/tabs/tab_logs.h @@ -54,9 +54,9 @@ private slots: public: TabLog(TabSupervisor *_tabSupervisor, AbstractClient *_client, QWidget *parent = nullptr); - ~TabLog(); - void retranslateUi(); - QString getTabText() const + ~TabLog() override; + void retranslateUi() override; + QString getTabText() const override { return tr("Logs"); } diff --git a/cockatrice/src/client/tabs/tab_message.h b/cockatrice/src/client/tabs/tab_message.h index 79653ffcc..ede73d497 100644 --- a/cockatrice/src/client/tabs/tab_message.h +++ b/cockatrice/src/client/tabs/tab_message.h @@ -39,12 +39,12 @@ public: AbstractClient *_client, const ServerInfo_User &_ownUserInfo, const ServerInfo_User &_otherUserInfo); - ~TabMessage(); - void retranslateUi(); - void closeRequest(); - void tabActivated(); + ~TabMessage() override; + void retranslateUi() override; + void closeRequest() override; + void tabActivated() override; QString getUserName() const; - QString getTabText() const; + QString getTabText() const override; void processUserMessageEvent(const Event_UserMessage &event); diff --git a/cockatrice/src/client/tabs/tab_replays.h b/cockatrice/src/client/tabs/tab_replays.h index 15f92a6ab..187d2078b 100644 --- a/cockatrice/src/client/tabs/tab_replays.h +++ b/cockatrice/src/client/tabs/tab_replays.h @@ -59,8 +59,8 @@ signals: public: TabReplays(TabSupervisor *_tabSupervisor, AbstractClient *_client); - void retranslateUi(); - QString getTabText() const + void retranslateUi() override; + QString getTabText() const override { return tr("Game replays"); } diff --git a/cockatrice/src/client/tabs/tab_room.h b/cockatrice/src/client/tabs/tab_room.h index a01943742..a172d8277 100644 --- a/cockatrice/src/client/tabs/tab_room.h +++ b/cockatrice/src/client/tabs/tab_room.h @@ -91,10 +91,10 @@ public: AbstractClient *_client, ServerInfo_User *_ownUser, const ServerInfo_Room &info); - ~TabRoom(); - void retranslateUi(); - void closeRequest(); - void tabActivated(); + ~TabRoom() override; + void retranslateUi() override; + void closeRequest() override; + void tabActivated() override; void processRoomEvent(const RoomEvent &event); int getRoomId() const { @@ -108,7 +108,7 @@ public: { return roomName; } - QString getTabText() const + QString getTabText() const override { return roomName; } diff --git a/cockatrice/src/client/tabs/tab_server.h b/cockatrice/src/client/tabs/tab_server.h index aa2a17c1e..1af0e2a35 100644 --- a/cockatrice/src/client/tabs/tab_server.h +++ b/cockatrice/src/client/tabs/tab_server.h @@ -34,7 +34,7 @@ signals: void joinRoomRequest(int, bool setCurrent); public: - RoomSelector(AbstractClient *_client, QWidget *parent = nullptr); + explicit RoomSelector(AbstractClient *_client, QWidget *parent = nullptr); void retranslateUi(); }; @@ -56,8 +56,8 @@ private: public: TabServer(TabSupervisor *_tabSupervisor, AbstractClient *_client, QWidget *parent = nullptr); - void retranslateUi(); - QString getTabText() const + void retranslateUi() override; + QString getTabText() const override { return tr("Server"); } diff --git a/cockatrice/src/client/tabs/tab_supervisor.h b/cockatrice/src/client/tabs/tab_supervisor.h index 0f7dcf4ed..b05547dd9 100644 --- a/cockatrice/src/client/tabs/tab_supervisor.h +++ b/cockatrice/src/client/tabs/tab_supervisor.h @@ -38,28 +38,28 @@ class MacOSTabFixStyle : public QProxyStyle { Q_OBJECT public: - QRect subElementRect(SubElement, const QStyleOption *, const QWidget *) const; + QRect subElementRect(SubElement, const QStyleOption *, const QWidget *) const override; }; class CloseButton : public QAbstractButton { Q_OBJECT public: - CloseButton(QWidget *parent = nullptr); - QSize sizeHint() const; - inline QSize minimumSizeHint() const + explicit CloseButton(QWidget *parent = nullptr); + QSize sizeHint() const override; + inline QSize minimumSizeHint() const override { return sizeHint(); } protected: #if (QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)) - void enterEvent(QEnterEvent *event); + void enterEvent(QEnterEvent *event) override; #else - void enterEvent(QEvent *event); + void enterEvent(QEvent *event) override; #endif - void leaveEvent(QEvent *event); - void paintEvent(QPaintEvent *event); + void leaveEvent(QEvent *event) override; + void paintEvent(QPaintEvent *event) override; }; class TabSupervisor : public QTabWidget, public UserlistProxy @@ -87,8 +87,8 @@ private: bool isLocalGame; public: - TabSupervisor(AbstractClient *_client, QWidget *parent = nullptr); - ~TabSupervisor(); + explicit TabSupervisor(AbstractClient *_client, QWidget *parent = nullptr); + ~TabSupervisor() override; void retranslateUi(); void start(const ServerInfo_User &userInfo); void startLocal(const QList &_clients); @@ -116,11 +116,11 @@ public: } bool getAdminLocked() const; bool closeRequest(); - bool isOwnUserRegistered() const; - QString getOwnUsername() const; - bool isUserBuddy(const QString &userName) const; - bool isUserIgnored(const QString &userName) const; - const ServerInfo_User *getOnlineUser(const QString &userName) const; + bool isOwnUserRegistered() const override; + QString getOwnUsername() const override; + bool isUserBuddy(const QString &userName) const override; + bool isUserIgnored(const QString &userName) const override; + const ServerInfo_User *getOnlineUser(const QString &userName) const override; bool switchToGameTabIfAlreadyExists(const int gameId); void actShowPopup(const QString &message); signals: