refactor: Use override instead of virtual where possible (#4917)

Chatterino · Oct 25, 2023 · 5c0219c · 5c0219c
1 parent da31e47
commit 5c0219c
Show file tree

Hide file tree

Showing 54 changed files with 196 additions and 206 deletions.
diff --git a/src/common/SignalVectorModel.hpp b/src/common/SignalVectorModel.hpp
@@ -101,7 +101,7 @@ class SignalVectorModel : public QAbstractTableModel,
         return this;
     }
 
-    virtual ~SignalVectorModel()
+    ~SignalVectorModel() override
     {
         for (Row &row : this->rows_)
         {

diff --git a/src/controllers/accounts/AccountController.hpp b/src/controllers/accounts/AccountController.hpp
@@ -21,7 +21,7 @@ class AccountController final : public Singleton
 
     AccountModel *createModel(QObject *parent);
 
-    virtual void initialize(Settings &settings, Paths &paths) override;
+    void initialize(Settings &settings, Paths &paths) override;
 
     TwitchAccountManager twitch;
 

diff --git a/src/controllers/accounts/AccountModel.hpp b/src/controllers/accounts/AccountModel.hpp
@@ -17,21 +17,20 @@ class AccountModel : public SignalVectorModel<std::shared_ptr<Account>>
 
 protected:
     // turn a vector item into a model row
-    virtual std::shared_ptr<Account> getItemFromRow(
+    std::shared_ptr<Account> getItemFromRow(
         std::vector<QStandardItem *> &row,
         const std::shared_ptr<Account> &original) override;
 
     // turns a row in the model into a vector item
-    virtual void getRowFromItem(const std::shared_ptr<Account> &item,
-                                std::vector<QStandardItem *> &row) override;
+    void getRowFromItem(const std::shared_ptr<Account> &item,
+                        std::vector<QStandardItem *> &row) override;
 
-    virtual int beforeInsert(const std::shared_ptr<Account> &item,
-                             std::vector<QStandardItem *> &row,
-                             int proposedIndex) override;
+    int beforeInsert(const std::shared_ptr<Account> &item,
+                     std::vector<QStandardItem *> &row,
+                     int proposedIndex) override;
 
-    virtual void afterRemoved(const std::shared_ptr<Account> &item,
-                              std::vector<QStandardItem *> &row,
-                              int index) override;
+    void afterRemoved(const std::shared_ptr<Account> &item,
+                      std::vector<QStandardItem *> &row, int index) override;
 
     friend class AccountController;
 

diff --git a/src/controllers/commands/CommandController.hpp b/src/controllers/commands/CommandController.hpp
@@ -33,8 +33,8 @@ class CommandController final : public Singleton
                         bool dryRun);
     QStringList getDefaultChatterinoCommandList();
 
-    virtual void initialize(Settings &, Paths &paths) override;
-    virtual void save() override;
+    void initialize(Settings &, Paths &paths) override;
+    void save() override;
 
     CommandModel *createModel(QObject *parent);
 

diff --git a/src/controllers/commands/CommandModel.hpp b/src/controllers/commands/CommandModel.hpp
@@ -22,12 +22,12 @@ class CommandModel : public SignalVectorModel<Command>
 
 protected:
     // turn a vector item into a model row
-    virtual Command getItemFromRow(std::vector<QStandardItem *> &row,
-                                   const Command &command) override;
+    Command getItemFromRow(std::vector<QStandardItem *> &row,
+                           const Command &command) override;
 
     // turns a row in the model into a vector item
-    virtual void getRowFromItem(const Command &item,
-                                std::vector<QStandardItem *> &row) override;
+    void getRowFromItem(const Command &item,
+                        std::vector<QStandardItem *> &row) override;
 
     friend class CommandController;
 };

diff --git a/src/controllers/filters/FilterModel.hpp b/src/controllers/filters/FilterModel.hpp
@@ -16,13 +16,12 @@ class FilterModel : public SignalVectorModel<FilterRecordPtr>
 
 protected:
     // turn a vector item into a model row
-    virtual FilterRecordPtr getItemFromRow(
-        std::vector<QStandardItem *> &row,
-        const FilterRecordPtr &original) override;
+    FilterRecordPtr getItemFromRow(std::vector<QStandardItem *> &row,
+                                   const FilterRecordPtr &original) override;
 
     // turns a row in the model into a vector item
-    virtual void getRowFromItem(const FilterRecordPtr &item,
-                                std::vector<QStandardItem *> &row) override;
+    void getRowFromItem(const FilterRecordPtr &item,
+                        std::vector<QStandardItem *> &row) override;
 };
 
 }  // namespace chatterino
diff --git a/src/controllers/highlights/BadgeHighlightModel.hpp b/src/controllers/highlights/BadgeHighlightModel.hpp
@@ -25,12 +25,11 @@ class BadgeHighlightModel : public SignalVectorModel<HighlightBadge>
 
 protected:
     // vector into model row
-    virtual HighlightBadge getItemFromRow(
-        std::vector<QStandardItem *> &row,
-        const HighlightBadge &original) override;
+    HighlightBadge getItemFromRow(std::vector<QStandardItem *> &row,
+                                  const HighlightBadge &original) override;
 
-    virtual void getRowFromItem(const HighlightBadge &item,
-                                std::vector<QStandardItem *> &row) override;
+    void getRowFromItem(const HighlightBadge &item,
+                        std::vector<QStandardItem *> &row) override;
 };
 
 }  // namespace chatterino
diff --git a/src/controllers/highlights/HighlightBlacklistModel.hpp b/src/controllers/highlights/HighlightBlacklistModel.hpp
@@ -21,13 +21,13 @@ class HighlightBlacklistModel : public SignalVectorModel<HighlightBlacklistUser>
 
 protected:
     // turn a vector item into a model row
-    virtual HighlightBlacklistUser getItemFromRow(
+    HighlightBlacklistUser getItemFromRow(
         std::vector<QStandardItem *> &row,
         const HighlightBlacklistUser &original) override;
 
     // turns a row in the model into a vector item
-    virtual void getRowFromItem(const HighlightBlacklistUser &item,
-                                std::vector<QStandardItem *> &row) override;
+    void getRowFromItem(const HighlightBlacklistUser &item,
+                        std::vector<QStandardItem *> &row) override;
 };
 
 }  // namespace chatterino
diff --git a/src/controllers/highlights/HighlightModel.hpp b/src/controllers/highlights/HighlightModel.hpp
@@ -42,19 +42,18 @@ class HighlightModel : public SignalVectorModel<HighlightPhrase>
 
 protected:
     // turn a vector item into a model row
-    virtual HighlightPhrase getItemFromRow(
-        std::vector<QStandardItem *> &row,
-        const HighlightPhrase &original) override;
+    HighlightPhrase getItemFromRow(std::vector<QStandardItem *> &row,
+                                   const HighlightPhrase &original) override;
 
     // turns a row in the model into a vector item
-    virtual void getRowFromItem(const HighlightPhrase &item,
-                                std::vector<QStandardItem *> &row) override;
+    void getRowFromItem(const HighlightPhrase &item,
+                        std::vector<QStandardItem *> &row) override;
 
-    virtual void afterInit() override;
+    void afterInit() override;
 
-    virtual void customRowSetData(const std::vector<QStandardItem *> &row,
-                                  int column, const QVariant &value, int role,
-                                  int rowIndex) override;
+    void customRowSetData(const std::vector<QStandardItem *> &row, int column,
+                          const QVariant &value, int role,
+                          int rowIndex) override;
 };
 
 }  // namespace chatterino
diff --git a/src/controllers/highlights/UserHighlightModel.hpp b/src/controllers/highlights/UserHighlightModel.hpp
@@ -16,18 +16,17 @@ class UserHighlightModel : public SignalVectorModel<HighlightPhrase>
 
 protected:
     // vector into model row
-    virtual HighlightPhrase getItemFromRow(
-        std::vector<QStandardItem *> &row,
-        const HighlightPhrase &original) override;
+    HighlightPhrase getItemFromRow(std::vector<QStandardItem *> &row,
+                                   const HighlightPhrase &original) override;
 
-    virtual void getRowFromItem(const HighlightPhrase &item,
-                                std::vector<QStandardItem *> &row) override;
+    void getRowFromItem(const HighlightPhrase &item,
+                        std::vector<QStandardItem *> &row) override;
 
-    virtual void afterInit() override;
+    void afterInit() override;
 
-    virtual void customRowSetData(const std::vector<QStandardItem *> &row,
-                                  int column, const QVariant &value, int role,
-                                  int rowIndex) override;
+    void customRowSetData(const std::vector<QStandardItem *> &row, int column,
+                          const QVariant &value, int role,
+                          int rowIndex) override;
 };
 
 }  // namespace chatterino
diff --git a/src/controllers/hotkeys/HotkeyModel.hpp b/src/controllers/hotkeys/HotkeyModel.hpp
@@ -17,21 +17,20 @@ class HotkeyModel : public SignalVectorModel<std::shared_ptr<Hotkey>>
 
 protected:
     // turn a vector item into a model row
-    virtual std::shared_ptr<Hotkey> getItemFromRow(
+    std::shared_ptr<Hotkey> getItemFromRow(
         std::vector<QStandardItem *> &row,
         const std::shared_ptr<Hotkey> &original) override;
 
     // turns a row in the model into a vector item
-    virtual void getRowFromItem(const std::shared_ptr<Hotkey> &item,
-                                std::vector<QStandardItem *> &row) override;
+    void getRowFromItem(const std::shared_ptr<Hotkey> &item,
+                        std::vector<QStandardItem *> &row) override;
 
-    virtual int beforeInsert(const std::shared_ptr<Hotkey> &item,
-                             std::vector<QStandardItem *> &row,
-                             int proposedIndex) override;
+    int beforeInsert(const std::shared_ptr<Hotkey> &item,
+                     std::vector<QStandardItem *> &row,
+                     int proposedIndex) override;
 
-    virtual void afterRemoved(const std::shared_ptr<Hotkey> &item,
-                              std::vector<QStandardItem *> &row,
-                              int index) override;
+    void afterRemoved(const std::shared_ptr<Hotkey> &item,
+                      std::vector<QStandardItem *> &row, int index) override;
 
     friend class HotkeyController;
 

diff --git a/src/controllers/ignores/IgnoreModel.hpp b/src/controllers/ignores/IgnoreModel.hpp
@@ -15,12 +15,12 @@ class IgnoreModel : public SignalVectorModel<IgnorePhrase>
 
 protected:
     // turn a vector item into a model row
-    virtual IgnorePhrase getItemFromRow(std::vector<QStandardItem *> &row,
-                                        const IgnorePhrase &original) override;
+    IgnorePhrase getItemFromRow(std::vector<QStandardItem *> &row,
+                                const IgnorePhrase &original) override;
 
     // turns a row in the model into a vector item
-    virtual void getRowFromItem(const IgnorePhrase &item,
-                                std::vector<QStandardItem *> &row) override;
+    void getRowFromItem(const IgnorePhrase &item,
+                        std::vector<QStandardItem *> &row) override;
 };
 
 }  // namespace chatterino
diff --git a/src/controllers/moderationactions/ModerationActionModel.hpp b/src/controllers/moderationactions/ModerationActionModel.hpp
@@ -15,13 +15,12 @@ class ModerationActionModel : public SignalVectorModel<ModerationAction>
 
 protected:
     // turn a vector item into a model row
-    virtual ModerationAction getItemFromRow(
-        std::vector<QStandardItem *> &row,
-        const ModerationAction &original) override;
+    ModerationAction getItemFromRow(std::vector<QStandardItem *> &row,
+                                    const ModerationAction &original) override;
 
     // turns a row in the model into a vector item
-    virtual void getRowFromItem(const ModerationAction &item,
-                                std::vector<QStandardItem *> &row) override;
+    void getRowFromItem(const ModerationAction &item,
+                        std::vector<QStandardItem *> &row) override;
 
     friend class HighlightController;
 };

diff --git a/src/controllers/notifications/NotificationController.hpp b/src/controllers/notifications/NotificationController.hpp
@@ -20,7 +20,7 @@ enum class Platform : uint8_t {
 class NotificationController final : public Singleton, private QObject
 {
 public:
-    virtual void initialize(Settings &settings, Paths &paths) override;
+    void initialize(Settings &settings, Paths &paths) override;
 
     bool isChannelNotified(const QString &channelName, Platform p);
     void updateChannelNotification(const QString &channelName, Platform p);

diff --git a/src/controllers/notifications/NotificationModel.hpp b/src/controllers/notifications/NotificationModel.hpp
@@ -14,12 +14,12 @@ class NotificationModel : public SignalVectorModel<QString>
 
 protected:
     // turn a vector item into a model row
-    virtual QString getItemFromRow(std::vector<QStandardItem *> &row,
-                                   const QString &original) override;
+    QString getItemFromRow(std::vector<QStandardItem *> &row,
+                           const QString &original) override;
 
     // turns a row in the model into a vector item
-    virtual void getRowFromItem(const QString &item,
-                                std::vector<QStandardItem *> &row) override;
+    void getRowFromItem(const QString &item,
+                        std::vector<QStandardItem *> &row) override;
 
     friend class NotificationController;
 };

diff --git a/src/controllers/pings/MutedChannelModel.hpp b/src/controllers/pings/MutedChannelModel.hpp
@@ -12,12 +12,12 @@ class MutedChannelModel : public SignalVectorModel<QString>
 
 protected:
     // turn a vector item into a model row
-    virtual QString getItemFromRow(std::vector<QStandardItem *> &row,
-                                   const QString &original) override;
+    QString getItemFromRow(std::vector<QStandardItem *> &row,
+                           const QString &original) override;
 
     // turns a row in the model into a vector item
-    virtual void getRowFromItem(const QString &item,
-                                std::vector<QStandardItem *> &row) override;
+    void getRowFromItem(const QString &item,
+                        std::vector<QStandardItem *> &row) override;
 };
 
 }  // namespace chatterino
diff --git a/src/providers/chatterino/ChatterinoBadges.hpp b/src/providers/chatterino/ChatterinoBadges.hpp
@@ -18,7 +18,7 @@ using EmotePtr = std::shared_ptr<const Emote>;
 class ChatterinoBadges : public Singleton
 {
 public:
-    virtual void initialize(Settings &settings, Paths &paths) override;
+    void initialize(Settings &settings, Paths &paths) override;
     ChatterinoBadges();
 
     std::optional<EmotePtr> getBadge(const UserId &id);

diff --git a/src/providers/ffz/FfzBadges.hpp b/src/providers/ffz/FfzBadges.hpp
@@ -21,7 +21,7 @@ using EmotePtr = std::shared_ptr<const Emote>;
 class FfzBadges : public Singleton
 {
 public:
-    virtual void initialize(Settings &settings, Paths &paths) override;
+    void initialize(Settings &settings, Paths &paths) override;
     FfzBadges() = default;
 
     struct Badge {

diff --git a/src/providers/irc/AbstractIrcServer.hpp b/src/providers/irc/AbstractIrcServer.hpp
@@ -22,7 +22,7 @@ class AbstractIrcServer : public QObject
 public:
     enum ConnectionType { Read = 1, Write = 2, Both = 3 };
 
-    virtual ~AbstractIrcServer() = default;
+    ~AbstractIrcServer() override = default;
 
     // initializeIrc must be called from the derived class
     // this allows us to initialize the abstract IRC server based on the derived class's parameters

diff --git a/src/providers/irc/Irc2.cpp b/src/providers/irc/Irc2.cpp
@@ -18,6 +18,7 @@
 namespace chatterino {
 
 namespace {
+
     QString configPath()
     {
         return combinePath(getPaths()->settingsDirectory, "irc.json");
@@ -33,7 +34,7 @@ namespace {
 
         // turn a vector item into a model row
         IrcServerData getItemFromRow(std::vector<QStandardItem *> &row,
-                                     const IrcServerData &original)
+                                     const IrcServerData &original) override
         {
             return IrcServerData{
                 row[0]->data(Qt::EditRole).toString(),      // host
@@ -50,7 +51,7 @@ namespace {
 
         // turns a row in the model into a vector item
         void getRowFromItem(const IrcServerData &item,
-                            std::vector<QStandardItem *> &row)
+                            std::vector<QStandardItem *> &row) override
         {
             setStringItem(row[0], item.host, false);
             setStringItem(row[1], QString::number(item.port));
@@ -60,6 +61,7 @@ namespace {
             setStringItem(row[5], item.real);
         }
     };
+
 }  // namespace
 
 inline QString escape(QString str)

diff --git a/src/providers/irc/IrcChannel2.hpp b/src/providers/irc/IrcChannel2.hpp
@@ -8,7 +8,7 @@ namespace chatterino {
 class Irc;
 class IrcServer;
 
-class IrcChannel : public Channel, public ChannelChatters
+class IrcChannel final : public Channel, public ChannelChatters
 {
 public:
     explicit IrcChannel(const QString &name, IrcServer *server);
@@ -19,8 +19,8 @@ class IrcChannel : public Channel, public ChannelChatters
     IrcServer *server();
 
     // Channel methods
-    virtual bool canReconnect() const override;
-    virtual void reconnect() override;
+    bool canReconnect() const override;
+    void reconnect() override;
 
 private:
     void setServer(IrcServer *server);

diff --git a/src/providers/twitch/TwitchAccount.hpp b/src/providers/twitch/TwitchAccount.hpp
@@ -52,7 +52,7 @@ class TwitchAccount : public Account
     TwitchAccount(const QString &username, const QString &oauthToken_,
                   const QString &oauthClient_, const QString &_userID);
 
-    virtual QString toString() const override;
+    QString toString() const override;
 
     const QString &getUserName() const;
     const QString &getOAuthToken() const;