refactor: Use override instead of virtual where possible (#4917)
This commit is contained in:
@@ -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;
|
||||
|
||||
|
||||
@@ -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();
|
||||
|
||||
+11
-11
@@ -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;
|
||||
|
||||
@@ -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();
|
||||
|
||||
@@ -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();
|
||||
|
||||
@@ -37,7 +37,7 @@ public:
|
||||
*/
|
||||
ColorPickerDialog(const QColor &initial, QWidget *parent);
|
||||
|
||||
~ColorPickerDialog();
|
||||
~ColorPickerDialog() override;
|
||||
|
||||
/**
|
||||
* @brief Return the final color selected by the user.
|
||||
|
||||
@@ -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();
|
||||
|
||||
|
||||
@@ -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 {
|
||||
|
||||
@@ -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();
|
||||
|
||||
@@ -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();
|
||||
|
||||
@@ -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 =
|
||||
|
||||
@@ -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";
|
||||
|
||||
@@ -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_{};
|
||||
|
||||
@@ -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);
|
||||
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -23,7 +23,7 @@ public:
|
||||
}
|
||||
}
|
||||
|
||||
virtual void paintEvent(QPaintEvent *)
|
||||
void paintEvent(QPaintEvent *) override
|
||||
{
|
||||
QPainter painter(this);
|
||||
|
||||
|
||||
@@ -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();
|
||||
|
||||
@@ -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();
|
||||
|
||||
@@ -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);
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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);
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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);
|
||||
|
||||
@@ -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_;
|
||||
|
||||
Reference in New Issue
Block a user