From fa6bd18ad732a63f8566a2c4664952500640d031 Mon Sep 17 00:00:00 2001 From: Nils Fenner Date: Sun, 13 Sep 2015 23:20:54 +0200 Subject: [PATCH] fix virtual overrides --- src/chatlog/chatlinecontentproxy.h | 8 ++++---- src/widget/emoticonswidget.h | 8 ++++---- src/widget/form/settings/advancedform.h | 2 +- src/widget/form/settings/generalform.h | 2 +- src/widget/groupwidget.h | 12 ++++++------ src/widget/tool/screenshotgrabber.h | 2 +- 6 files changed, 17 insertions(+), 17 deletions(-) diff --git a/src/chatlog/chatlinecontentproxy.h b/src/chatlog/chatlinecontentproxy.h index 0e9b99ab2..21afd61d5 100644 --- a/src/chatlog/chatlinecontentproxy.h +++ b/src/chatlog/chatlinecontentproxy.h @@ -39,10 +39,10 @@ public: ChatLineContentProxy(QWidget* widget, int minWidth, float widthInPercent = 1.0f); ChatLineContentProxy(FileTransferWidget* widget, int minWidth, float widthInPercent = 1.0f); - virtual QRectF boundingRect() const; - virtual void setWidth(qreal width); - virtual void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget); - virtual qreal getAscent() const; + QRectF boundingRect() const override; + void setWidth(qreal width) override; + void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) override; + qreal getAscent() const override; QWidget* getWidget() const; ChatLineContentProxyType getWidgetType() const; diff --git a/src/widget/emoticonswidget.h b/src/widget/emoticonswidget.h index c12df6fa5..6cbf5e67d 100644 --- a/src/widget/emoticonswidget.h +++ b/src/widget/emoticonswidget.h @@ -39,16 +39,16 @@ private slots: void PageButtonsUpdate(); protected: - virtual void mouseReleaseEvent(QMouseEvent *ev) final override; - virtual void mousePressEvent(QMouseEvent *ev) final override; - virtual void wheelEvent(QWheelEvent * event) final override; + void mouseReleaseEvent(QMouseEvent *ev) final override; + void mousePressEvent(QMouseEvent *ev) final override; + void wheelEvent(QWheelEvent * event) final override; private: QStackedWidget stack; QVBoxLayout layout; public: - virtual QSize sizeHint() const; + QSize sizeHint() const override; }; diff --git a/src/widget/form/settings/advancedform.h b/src/widget/form/settings/advancedform.h index 963189b2f..2a20aa45c 100644 --- a/src/widget/form/settings/advancedform.h +++ b/src/widget/form/settings/advancedform.h @@ -37,7 +37,7 @@ public: virtual QString getFormName() final override {return tr("Advanced");} protected: - bool eventFilter(QObject *o, QEvent *e); + bool eventFilter(QObject *o, QEvent *e) override; private slots: void onMakeToxPortableUpdated(); diff --git a/src/widget/form/settings/generalform.h b/src/widget/form/settings/generalform.h index 74fc7e19f..5bcacf47b 100644 --- a/src/widget/form/settings/generalform.h +++ b/src/widget/form/settings/generalform.h @@ -81,7 +81,7 @@ private: SettingsWidget *parent; protected: - bool eventFilter(QObject *o, QEvent *e); + bool eventFilter(QObject *o, QEvent *e) override; }; #endif diff --git a/src/widget/groupwidget.h b/src/widget/groupwidget.h index 4e70ae6df..68f7b6f64 100644 --- a/src/widget/groupwidget.h +++ b/src/widget/groupwidget.h @@ -45,12 +45,12 @@ signals: void removeGroup(int groupId); protected: - virtual void contextMenuEvent(QContextMenuEvent * event) final override; - virtual void mousePressEvent(QMouseEvent* event) final override; - virtual void mouseMoveEvent(QMouseEvent* event) final override; - virtual void dragEnterEvent(QDragEnterEvent* ev) override; - virtual void dragLeaveEvent(QDragLeaveEvent* ev); - virtual void dropEvent(QDropEvent* ev) override; + void contextMenuEvent(QContextMenuEvent * event) final override; + void mousePressEvent(QMouseEvent* event) final override; + void mouseMoveEvent(QMouseEvent* event) final override; + void dragEnterEvent(QDragEnterEvent* ev) override; + void dragLeaveEvent(QDragLeaveEvent* ev) override; + void dropEvent(QDropEvent* ev) override; public: int groupId; diff --git a/src/widget/tool/screenshotgrabber.h b/src/widget/tool/screenshotgrabber.h index d1aebaff2..ef7f62ea2 100644 --- a/src/widget/tool/screenshotgrabber.h +++ b/src/widget/tool/screenshotgrabber.h @@ -43,7 +43,7 @@ public: ScreenshotGrabber(QWidget* parent); ~ScreenshotGrabber() override; - bool eventFilter(QObject* object, QEvent* event); + bool eventFilter(QObject* object, QEvent* event) override; public slots: