noury/mirror-chatterino2
1
0
Fork 0
mirror of https://github.com/Chatterino/chatterino2.git synced 2024-11-13 19:49:51 +01:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse source
This commit is contained in:
pajlada 2023-10-25 18:13:48 +02:00 committed by GitHub
parent da31e47f9a
commit 5c0219c245
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
54 changed files with 193 additions and 203 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/common/SignalVectorModel.hpp
View file

@ -101,7 +101,7 @@ public:
return this;
}
virtual ~SignalVectorModel()
~SignalVectorModel() override
{
for (Row &row : this->rows_)
{

2
src/controllers/accounts/AccountController.hpp
View file

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

17
src/controllers/accounts/AccountModel.hpp
View file

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

4
src/controllers/commands/CommandController.hpp
View file

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

8
src/controllers/commands/CommandModel.hpp
View file

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

9
src/controllers/filters/FilterModel.hpp
View file

@ -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

9
src/controllers/highlights/BadgeHighlightModel.hpp
View file

@ -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

6
src/controllers/highlights/HighlightBlacklistModel.hpp
View file

@ -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

17
src/controllers/highlights/HighlightModel.hpp
View file

@ -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

17
src/controllers/highlights/UserHighlightModel.hpp
View file

@ -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

17
src/controllers/hotkeys/HotkeyModel.hpp
View file

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

8
src/controllers/ignores/IgnoreModel.hpp
View file

@ -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

9
src/controllers/moderationactions/ModerationActionModel.hpp
View file

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

2
src/controllers/notifications/NotificationController.hpp
View file

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

8
src/controllers/notifications/NotificationModel.hpp
View file

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

8
src/controllers/pings/MutedChannelModel.hpp
View file

@ -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

2
src/providers/chatterino/ChatterinoBadges.hpp
View file

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

2
src/providers/ffz/FfzBadges.hpp
View file

@ -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 {

2
src/providers/irc/AbstractIrcServer.hpp
View file

@ -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

6
src/providers/irc/Irc2.cpp
View file

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

6
src/providers/irc/IrcChannel2.hpp
View file

@ -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 @@ public:
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);

2
src/providers/twitch/TwitchAccount.hpp
View file

@ -52,7 +52,7 @@ public:
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;

28
src/providers/twitch/TwitchChannel.hpp
View file

@ -67,7 +67,7 @@ struct HelixStream;
class TwitchIrcServer;
class TwitchChannel : public Channel, public ChannelChatters
class TwitchChannel final : public Channel, public ChannelChatters
{
public:
struct StreamStatus {
@ -109,17 +109,17 @@ public:
void initialize();
// Channel methods
virtual bool isEmpty() const override;
virtual bool canSendMessage() const override;
virtual void sendMessage(const QString &message) override;
virtual void sendReply(const QString &message, const QString &replyId);
virtual bool isMod() const override;
bool isEmpty() const override;
bool canSendMessage() const override;
void sendMessage(const QString &message) override;
void sendReply(const QString &message, const QString &replyId);
bool isMod() const override;
bool isVip() const;
bool isStaff() const;
virtual bool isBroadcaster() const override;
virtual bool hasHighRateLimit() const override;
virtual bool canReconnect() const override;
virtual void reconnect() override;
bool isBroadcaster() const override;
bool hasHighRateLimit() const override;
bool canReconnect() const override;
void reconnect() override;
void createClip();
// Data
@ -127,7 +127,7 @@ public:
const QString &channelUrl();
const QString &popoutPlayerUrl();
int chatterCount();
virtual bool isLive() const override;
bool isLive() const override;
QString roomId() const;
SharedAccessGuard<const RoomModes> accessRoomModes() const;
SharedAccessGuard<const StreamStatus> accessStreamStatus() const;
@ -140,9 +140,9 @@ public:
std::shared_ptr<const EmoteMap> ffzEmotes() const;
std::shared_ptr<const EmoteMap> seventvEmotes() const;
virtual void refreshBTTVChannelEmotes(bool manualRefresh);
virtual void refreshFFZChannelEmotes(bool manualRefresh);
virtual void refreshSevenTVChannelEmotes(bool manualRefresh);
void refreshBTTVChannelEmotes(bool manualRefresh);
void refreshFFZChannelEmotes(bool manualRefresh);
void refreshSevenTVChannelEmotes(bool manualRefresh);
const QString &seventvUserID() const;
const QString &seventvEmoteSetID() const;

26
src/providers/twitch/TwitchIrcServer.hpp
View file

@ -42,9 +42,9 @@ class TwitchIrcServer final : public AbstractIrcServer,
{
public:
TwitchIrcServer();
virtual ~TwitchIrcServer() override = default;
~TwitchIrcServer() override = default;
virtual void initialize(Settings &settings, Paths &paths) override;
void initialize(Settings &settings, Paths &paths) override;
void forEachChannelAndSpecialChannels(std::function<void(ChannelPtr)> func);
@ -89,23 +89,19 @@ public:
const IndirectChannel &getWatchingChannel() const override;
protected:
virtual void initializeConnection(IrcConnection *connection,
ConnectionType type) override;
virtual std::shared_ptr<Channel> createChannel(
const QString &channelName) override;
void initializeConnection(IrcConnection *connection,
ConnectionType type) override;
std::shared_ptr<Channel> createChannel(const QString &channelName) override;
virtual void privateMessageReceived(
Communi::IrcPrivateMessage *message) override;
virtual void readConnectionMessageReceived(
Communi::IrcMessage *message) override;
virtual void writeConnectionMessageReceived(
Communi::IrcMessage *message) override;
void privateMessageReceived(Communi::IrcPrivateMessage *message) override;
void readConnectionMessageReceived(Communi::IrcMessage *message) override;
void writeConnectionMessageReceived(Communi::IrcMessage *message) override;
virtual std::shared_ptr<Channel> getCustomChannel(
std::shared_ptr<Channel> getCustomChannel(
const QString &channelname) override;
virtual QString cleanChannelName(const QString &dirtyChannelName) override;
virtual bool hasSeparateWriteConnection() const override;
QString cleanChannelName(const QString &dirtyChannelName) override;
bool hasSeparateWriteConnection() const override;
private:
void onMessageSendRequested(TwitchChannel *channel, const QString &message,

2
src/singletons/Emotes.hpp
View file

@ -25,7 +25,7 @@ class Emotes final : public IEmotes, public Singleton
public:
Emotes();
virtual void initialize(Settings &settings, Paths &paths) override;
void initialize(Settings &settings, Paths &paths) override;
bool isIgnoredEmote(const QString &emote);

2
src/singletons/Fonts.hpp
View file

@ -43,7 +43,7 @@ class Fonts final : public Singleton
public:
Fonts();
virtual void initialize(Settings &settings, Paths &paths) override;
void initialize(Settings &settings, Paths &paths) override;
// font data gets set in createFontData(...)

2
src/singletons/Logging.hpp
View file

@ -24,7 +24,7 @@ class Logging : public Singleton
public:
Logging() = default;
virtual void initialize(Settings &settings, Paths &paths) override;
void initialize(Settings &settings, Paths &paths) override;
void addMessage(const QString &channelName, MessagePtr message,
const QString &platformName);

4
src/singletons/WindowManager.hpp
View file

@ -93,8 +93,8 @@ public:
QPoint emotePopupPos();
void setEmotePopupPos(QPoint pos);
virtual void initialize(Settings &settings, Paths &paths) override;
virtual void save() override;
void initialize(Settings &settings, Paths &paths) override;
void save() override;
void closeAll();
int getGeneration() const;

4
src/util/PostToThread.hpp
View file

@ -17,11 +17,11 @@ class LambdaRunnable : public QRunnable
{
public:
LambdaRunnable(std::function<void()> action)
: action_(std::move(action))
{
this->action_ = std::move(action);
}
void run()
void run() override
{
this->action_();
}

4
src/widgets/AttachedWindow.hpp
View file

@ -28,7 +28,7 @@ public:
bool fullscreen = false;
};
virtual ~AttachedWindow() override;
~AttachedWindow() override;
static AttachedWindow *get(void *target_, const GetArgs &args);
#ifdef USEWINSDK
@ -39,7 +39,7 @@ public:
void setChannel(ChannelPtr channel);
protected:
virtual void showEvent(QShowEvent *) override;
void showEvent(QShowEvent *) override;
// virtual void nativeEvent(const QByteArray &eventType, void *message,
// long *result) override;

4
src/widgets/BaseWidget.hpp
View file

@ -37,8 +37,8 @@ public:
float qtFontScale() const;
protected:
virtual void childEvent(QChildEvent *) override;
virtual void showEvent(QShowEvent *) override;
void childEvent(QChildEvent *) override;
void showEvent(QShowEvent *) override;
virtual void scaleChangedEvent(float newScale);
virtual void themeChangedEvent();

22
src/widgets/BaseWindow.hpp
View file

@ -72,20 +72,20 @@ protected:
bool nativeEvent(const QByteArray &eventType, void *message,
long *result) override;
#endif
virtual void scaleChangedEvent(float) override;
void scaleChangedEvent(float) override;
virtual void paintEvent(QPaintEvent *) override;
void paintEvent(QPaintEvent *) override;
virtual void changeEvent(QEvent *) override;
virtual void leaveEvent(QEvent *) override;
virtual void resizeEvent(QResizeEvent *) override;
virtual void moveEvent(QMoveEvent *) override;
virtual void closeEvent(QCloseEvent *) override;
virtual void showEvent(QShowEvent *) override;
void changeEvent(QEvent *) override;
void leaveEvent(QEvent *) override;
void resizeEvent(QResizeEvent *) override;
void moveEvent(QMoveEvent *) override;
void closeEvent(QCloseEvent *) override;
void showEvent(QShowEvent *) override;
virtual void themeChangedEvent() override;
virtual bool event(QEvent *event) override;
virtual void wheelEvent(QWheelEvent *event) override;
void themeChangedEvent() override;
bool event(QEvent *event) override;
void wheelEvent(QWheelEvent *event) override;
void mousePressEvent(QMouseEvent *event) override;
void mouseReleaseEvent(QMouseEvent *event) override;

8
src/widgets/Label.hpp
View file

@ -28,11 +28,11 @@ public:
void setHasOffset(bool hasOffset);
protected:
virtual void scaleChangedEvent(float scale_) override;
virtual void paintEvent(QPaintEvent *) override;
void scaleChangedEvent(float scale_) override;
void paintEvent(QPaintEvent *) override;
virtual QSize sizeHint() const override;
virtual QSize minimumSizeHint() const override;
QSize sizeHint() const override;
QSize minimumSizeHint() const override;
private:
void updateSize();

8
src/widgets/Notebook.hpp
View file

@ -124,10 +124,10 @@ public:
void refresh();
protected:
virtual void scaleChangedEvent(float scale_) override;
virtual void resizeEvent(QResizeEvent *) override;
virtual void mousePressEvent(QMouseEvent *event) override;
virtual void paintEvent(QPaintEvent *) override;
void scaleChangedEvent(float scale_) override;
void resizeEvent(QResizeEvent *) override;
void mousePressEvent(QMouseEvent *event) override;
void paintEvent(QPaintEvent *) override;
NotebookButton *getAddButton();
NotebookButton *addCustomButton();

2
src/widgets/dialogs/ColorPickerDialog.hpp
View file

@ -37,7 +37,7 @@ public:
*/
ColorPickerDialog(const QColor &initial, QWidget *parent);
~ColorPickerDialog();
~ColorPickerDialog() override;
/**
* @brief Return the final color selected by the user.

2
src/widgets/dialogs/IrcConnectionEditor.hpp
View file

@ -22,7 +22,7 @@ class IrcConnectionEditor : public QDialog
public:
explicit IrcConnectionEditor(const IrcServerData &data, bool isAdd = false,
QWidget *parent = nullptr);
~IrcConnectionEditor();
~IrcConnectionEditor() override;
IrcServerData data();

6
src/widgets/dialogs/SelectChannelDialog.hpp
View file

@ -27,8 +27,8 @@ public:
pajlada::Signals::NoArgSignal closed;
protected:
virtual void closeEvent(QCloseEvent *) override;
virtual void themeChangedEvent() override;
void closeEvent(QCloseEvent *) override;
void themeChangedEvent() override;
private:
class EventFilter : public QObject
@ -37,7 +37,7 @@ private:
SelectChannelDialog *dialog;
protected:
virtual bool eventFilter(QObject *watched, QEvent *event) override;
bool eventFilter(QObject *watched, QEvent *event) override;
};
struct {

6
src/widgets/dialogs/SettingsDialog.hpp
View file

@ -42,9 +42,9 @@ public:
SettingsDialogPreference::NoPreference);
protected:
virtual void scaleChangedEvent(float newDpi) override;
virtual void themeChangedEvent() override;
virtual void showEvent(QShowEvent *) override;
void scaleChangedEvent(float newDpi) override;
void themeChangedEvent() override;
void showEvent(QShowEvent *) override;
private:
void refresh();

4
src/widgets/dialogs/UserInfoPopup.hpp
View file

@ -30,8 +30,8 @@ public:
const ChannelPtr &openingChannel);
protected:
virtual void themeChangedEvent() override;
virtual void scaleChangedEvent(float scale) override;
void themeChangedEvent() override;
void scaleChangedEvent(float scale) override;
private:
void installEvents();

6
src/widgets/dialogs/switcher/NewPopupItem.hpp
View file

@ -18,10 +18,10 @@ public:
/**
* @brief Open the channel passed in the constructor in a new popup.
*/
virtual void action() override;
void action() override;
virtual void paint(QPainter *painter, const QRect &rect) const override;
virtual QSize sizeHint(const QRect &rect) const override;
void paint(QPainter *painter, const QRect &rect) const override;
QSize sizeHint(const QRect &rect) const override;
private:
static constexpr const char *TEXT_FORMAT =

6
src/widgets/dialogs/switcher/NewTabItem.hpp
View file

@ -20,10 +20,10 @@ public:
/**
* @brief Open the channel passed in the constructor in a new tab.
*/
virtual void action() override;
void action() override;
virtual void paint(QPainter *painter, const QRect &rect) const override;
virtual QSize sizeHint(const QRect &rect) const override;
void paint(QPainter *painter, const QRect &rect) const override;
QSize sizeHint(const QRect &rect) const override;
private:
static constexpr const char *TEXT_FORMAT = "Open channel \"%1\" in new tab";

6
src/widgets/dialogs/switcher/SwitchSplitItem.hpp
View file

@ -16,10 +16,10 @@ class SwitchSplitItem : public AbstractSwitcherItem
public:
SwitchSplitItem(SplitContainer *container, Split *split = nullptr);
virtual void action() override;
void action() override;
virtual void paint(QPainter *painter, const QRect &rect) const override;
virtual QSize sizeHint(const QRect &rect) const override;
void paint(QPainter *painter, const QRect &rect) const override;
QSize sizeHint(const QRect &rect) const override;
private:
SplitContainer *container_{};

8
src/widgets/helper/Button.hpp
View file

@ -69,10 +69,10 @@ protected:
#else
void enterEvent(QEvent * /*event*/) override;
#endif
virtual void leaveEvent(QEvent *) override;
virtual void mousePressEvent(QMouseEvent *event) override;
virtual void mouseReleaseEvent(QMouseEvent *event) override;
virtual void mouseMoveEvent(QMouseEvent *event) override;
void leaveEvent(QEvent *) override;
void mousePressEvent(QMouseEvent *event) override;
void mouseReleaseEvent(QMouseEvent *event) override;
void mouseMoveEvent(QMouseEvent *event) override;
void fancyPaint(QPainter &painter);

14
src/widgets/helper/ComboBoxItemDelegate.hpp
View file

@ -12,14 +12,14 @@ class ComboBoxItemDelegate : public QStyledItemDelegate
public:
ComboBoxItemDelegate(QObject *parent = nullptr);
~ComboBoxItemDelegate();
~ComboBoxItemDelegate() override;
virtual QWidget *createEditor(QWidget *parent,
const QStyleOptionViewItem &option,
const QModelIndex &index) const;
virtual void setEditorData(QWidget *editor, const QModelIndex &index) const;
virtual void setModelData(QWidget *editor, QAbstractItemModel *model,
const QModelIndex &index) const;
QWidget *createEditor(QWidget *parent, const QStyleOptionViewItem &option,
const QModelIndex &index) const override;
void setEditorData(QWidget *editor,
const QModelIndex &index) const override;
void setModelData(QWidget *editor, QAbstractItemModel *model,
const QModelIndex &index) const override;
};
} // namespace chatterino

2
src/widgets/helper/Line.hpp
View file

@ -23,7 +23,7 @@ public:
}
}
virtual void paintEvent(QPaintEvent *)
void paintEvent(QPaintEvent *) override
{
QPainter painter(this);

16
src/widgets/helper/NotebookButton.hpp
View file

@ -21,15 +21,15 @@ public:
Icon getIcon() const;
protected:
virtual void themeChangedEvent() override;
virtual void paintEvent(QPaintEvent *) override;
virtual void mouseReleaseEvent(QMouseEvent *) override;
virtual void dragEnterEvent(QDragEnterEvent *) override;
virtual void dragLeaveEvent(QDragLeaveEvent *) override;
virtual void dropEvent(QDropEvent *) override;
void themeChangedEvent() override;
void paintEvent(QPaintEvent *) override;
void mouseReleaseEvent(QMouseEvent *) override;
void dragEnterEvent(QDragEnterEvent *) override;
void dragLeaveEvent(QDragLeaveEvent *) override;
void dropEvent(QDropEvent *) override;
virtual void hideEvent(QHideEvent *) override;
virtual void showEvent(QShowEvent *) override;
void hideEvent(QHideEvent *) override;
void showEvent(QShowEvent *) override;
signals:
void leftClicked();

18
src/widgets/helper/NotebookTab.hpp
View file

@ -65,24 +65,24 @@ public:
int normalTabWidth();
protected:
virtual void themeChangedEvent() override;
void themeChangedEvent() override;
virtual void paintEvent(QPaintEvent *) override;
void paintEvent(QPaintEvent *) override;
virtual void mousePressEvent(QMouseEvent *event) override;
virtual void mouseReleaseEvent(QMouseEvent *event) override;
virtual void mouseDoubleClickEvent(QMouseEvent *event) override;
void mousePressEvent(QMouseEvent *event) override;
void mouseReleaseEvent(QMouseEvent *event) override;
void mouseDoubleClickEvent(QMouseEvent *event) override;
#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
void enterEvent(QEnterEvent *event) override;
#else
void enterEvent(QEvent *event) override;
#endif
virtual void leaveEvent(QEvent *) override;
void leaveEvent(QEvent *) override;
virtual void dragEnterEvent(QDragEnterEvent *event) override;
void dragEnterEvent(QDragEnterEvent *event) override;
virtual void mouseMoveEvent(QMouseEvent *event) override;
virtual void wheelEvent(QWheelEvent *event) override;
void mouseMoveEvent(QMouseEvent *event) override;
void wheelEvent(QWheelEvent *event) override;
private:
void showRenameDialog();

4
src/widgets/helper/QColorPicker.hpp
View file

@ -56,7 +56,7 @@ class QColorPicker : public QFrame
Q_OBJECT
public:
QColorPicker(QWidget *parent);
~QColorPicker();
~QColorPicker() override;
void setCrossVisible(bool visible);
public slots:
@ -91,7 +91,7 @@ class QColorLuminancePicker : public QWidget
Q_OBJECT
public:
QColorLuminancePicker(QWidget *parent = 0);
~QColorLuminancePicker();
~QColorLuminancePicker() override;
public slots:
void setCol(int h, int s, int v);

4
src/widgets/helper/SettingsDialogTab.hpp
View file

@ -40,8 +40,8 @@ signals:
void selectedChanged(bool);
private:
void paintEvent(QPaintEvent *);
void mousePressEvent(QMouseEvent *event);
void paintEvent(QPaintEvent *) override;
void mousePressEvent(QMouseEvent *event) override;
struct {
QString labelText;

2
src/widgets/helper/SignalLabel.hpp
View file

@ -13,7 +13,7 @@ class SignalLabel : public QLabel
public:
explicit SignalLabel(QWidget *parent = nullptr, Qt::WindowFlags f = {});
virtual ~SignalLabel() override = default;
~SignalLabel() override = default;
signals:
void mouseDoubleClick(QMouseEvent *ev);

2
src/widgets/listview/GenericItemDelegate.hpp
View file

@ -10,7 +10,7 @@ class SwitcherItemDelegate : public QStyledItemDelegate
public:
SwitcherItemDelegate(QObject *parent = nullptr);
~SwitcherItemDelegate();
~SwitcherItemDelegate() override;
void paint(QPainter *painter, const QStyleOptionViewItem &option,
const QModelIndex &index) const override;

2
src/widgets/listview/GenericListView.hpp
View file

@ -16,7 +16,7 @@ class GenericListView : public QListView
public:
GenericListView();
virtual void setModel(QAbstractItemModel *model) override;
void setModel(QAbstractItemModel *model) override;
void setModel(GenericListModel *);
void setInvokeActionOnTab(bool);
bool eventFilter(QObject *watched, QEvent *event) override;

2
src/widgets/settingspages/GeneralPage.hpp
View file

@ -19,7 +19,7 @@ class GeneralPage : public SettingsPage
public:
GeneralPage();
bool filterElements(const QString &query);
bool filterElements(const QString &query) override;
private:
void initLayout(GeneralPageView &layout);

7
src/widgets/splits/InputCompletionItem.hpp
View file

@ -19,10 +19,9 @@ public:
ActionCallback action);
// GenericListItem interface
public:
virtual void action() override;
virtual void paint(QPainter *painter, const QRect &rect) const override;
virtual QSize sizeHint(const QRect &rect) const override;
void action() override;
void paint(QPainter *painter, const QRect &rect) const override;
QSize sizeHint(const QRect &rect) const override;
private:
EmotePtr emote_;