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

src/controllers/accounts/AccountController.hpp

@@ -21,7 +21,7 @@ public:
 
     AccountModel *createModel(QObject *parent);
 
-    virtual void initialize(Settings &settings, Paths &paths) override;
+    void initialize(Settings &settings, Paths &paths) override;
 
     TwitchAccountManager twitch;
 

src/controllers/accounts/AccountModel.hpp

@@ -17,21 +17,20 @@ public:
 
 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;
 

src/controllers/commands/CommandController.hpp

@@ -33,8 +33,8 @@ public:
                         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);
 

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;
 };

src/controllers/filters/FilterModel.hpp

@@ -16,13 +16,12 @@ public:
 
 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

src/controllers/highlights/BadgeHighlightModel.hpp

@@ -25,12 +25,11 @@ public:
 
 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

src/controllers/highlights/HighlightBlacklistModel.hpp

@@ -21,13 +21,13 @@ public:
 
 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

src/controllers/highlights/HighlightModel.hpp

@@ -42,19 +42,18 @@ public:
 
 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

src/controllers/highlights/UserHighlightModel.hpp

@@ -16,18 +16,17 @@ public:
 
 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

src/controllers/hotkeys/HotkeyModel.hpp

@@ -17,21 +17,20 @@ public:
 
 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;
 

src/controllers/ignores/IgnoreModel.hpp

@@ -15,12 +15,12 @@ public:
 
 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

src/controllers/moderationactions/ModerationActionModel.hpp

@@ -15,13 +15,12 @@ public:
 
 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;
 };

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);

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;
 };

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