diff options
| author | Kevin Funk <[email protected]> | 2017-11-20 23:25:06 +0100 |
|---|---|---|
| committer | Kevin Funk <[email protected]> | 2017-11-20 23:25:48 +0100 |
| commit | 464b13f3828e5cdd03438d0881c3a62c7cda6333 (patch) | |
| tree | 724c10c4e06ac3030666f2604066b6cbcc83ffd0 /src/panels/information | |
| parent | 5bee1889e1682f1e7ffe55e49beaf4544eaf7157 (diff) | |
Modernize: Use override where possible
Also use override instead of Q_DECL_OVERRIDE
Diffstat (limited to 'src/panels/information')
| -rw-r--r-- | src/panels/information/filemetadataconfigurationdialog.h | 2 | ||||
| -rw-r--r-- | src/panels/information/informationpanel.h | 10 | ||||
| -rw-r--r-- | src/panels/information/informationpanelcontent.h | 4 | ||||
| -rw-r--r-- | src/panels/information/phononwidget.cpp | 2 | ||||
| -rw-r--r-- | src/panels/information/phononwidget.h | 4 | ||||
| -rw-r--r-- | src/panels/information/pixmapviewer.h | 6 |
6 files changed, 14 insertions, 14 deletions
diff --git a/src/panels/information/filemetadataconfigurationdialog.h b/src/panels/information/filemetadataconfigurationdialog.h index 13562ef5c..f471d545f 100644 --- a/src/panels/information/filemetadataconfigurationdialog.h +++ b/src/panels/information/filemetadataconfigurationdialog.h @@ -44,7 +44,7 @@ class FileMetaDataConfigurationDialog : public QDialog public: explicit FileMetaDataConfigurationDialog(QWidget* parent = 0); - virtual ~FileMetaDataConfigurationDialog(); + ~FileMetaDataConfigurationDialog() override; /** * Sets the items, for which the visibility of the meta data should diff --git a/src/panels/information/informationpanel.h b/src/panels/information/informationpanel.h index a698e544f..89a1bc3d2 100644 --- a/src/panels/information/informationpanel.h +++ b/src/panels/information/informationpanel.h @@ -37,7 +37,7 @@ class InformationPanel : public Panel public: explicit InformationPanel(QWidget* parent = nullptr); - virtual ~InformationPanel(); + ~InformationPanel() override; signals: void urlActivated(const QUrl& url); @@ -59,16 +59,16 @@ public slots: protected: /** @see Panel::urlChanged() */ - virtual bool urlChanged() Q_DECL_OVERRIDE; + bool urlChanged() override; /** @see QWidget::showEvent() */ - virtual void showEvent(QShowEvent* event) Q_DECL_OVERRIDE; + void showEvent(QShowEvent* event) override; /** @see QWidget::resizeEvent() */ - virtual void resizeEvent(QResizeEvent* event) Q_DECL_OVERRIDE; + void resizeEvent(QResizeEvent* event) override; /** @see QWidget::contextMenuEvent() */ - virtual void contextMenuEvent(QContextMenuEvent* event) Q_DECL_OVERRIDE; + void contextMenuEvent(QContextMenuEvent* event) override; private slots: /** diff --git a/src/panels/information/informationpanelcontent.h b/src/panels/information/informationpanelcontent.h index 533e9de3b..925e89a2b 100644 --- a/src/panels/information/informationpanelcontent.h +++ b/src/panels/information/informationpanelcontent.h @@ -58,7 +58,7 @@ class InformationPanelContent : public QWidget public: explicit InformationPanelContent(QWidget* parent = 0); - virtual ~InformationPanelContent(); + ~InformationPanelContent() override; /** * Shows the meta information for the item \p item. @@ -85,7 +85,7 @@ signals: protected: /** @see QObject::eventFilter() */ - virtual bool eventFilter(QObject* obj, QEvent* event) Q_DECL_OVERRIDE; + bool eventFilter(QObject* obj, QEvent* event) override; private slots: /** diff --git a/src/panels/information/phononwidget.cpp b/src/panels/information/phononwidget.cpp index 3a3268cb3..a71a77897 100644 --- a/src/panels/information/phononwidget.cpp +++ b/src/panels/information/phononwidget.cpp @@ -52,7 +52,7 @@ class EmbeddedVideoPlayer : public Phonon::VideoWidget updateGeometry(); } - QSize sizeHint() const Q_DECL_OVERRIDE + QSize sizeHint() const override { return m_sizeHint.isValid() ? m_sizeHint : Phonon::VideoWidget::sizeHint(); } diff --git a/src/panels/information/phononwidget.h b/src/panels/information/phononwidget.h index 837a66888..940239144 100644 --- a/src/panels/information/phononwidget.h +++ b/src/panels/information/phononwidget.h @@ -63,8 +63,8 @@ class PhononWidget : public QWidget void hasVideoChanged(bool hasVideo); protected: - virtual void showEvent(QShowEvent *event) Q_DECL_OVERRIDE; - virtual void hideEvent(QHideEvent *event) Q_DECL_OVERRIDE; + void showEvent(QShowEvent *event) override; + void hideEvent(QHideEvent *event) override; private slots: void stateChanged(Phonon::State); diff --git a/src/panels/information/pixmapviewer.h b/src/panels/information/pixmapviewer.h index ddc183351..f6b456ee6 100644 --- a/src/panels/information/pixmapviewer.h +++ b/src/panels/information/pixmapviewer.h @@ -62,7 +62,7 @@ public: explicit PixmapViewer(QWidget* parent, Transition transition = DefaultTransition); - virtual ~PixmapViewer(); + ~PixmapViewer() override; void setPixmap(const QPixmap& pixmap); QPixmap pixmap() const; @@ -71,10 +71,10 @@ public: * of the parent widget. Per default no size hint is given. */ void setSizeHint(const QSize& size); - virtual QSize sizeHint() const Q_DECL_OVERRIDE; + QSize sizeHint() const override; protected: - virtual void paintEvent(QPaintEvent* event) Q_DECL_OVERRIDE; + void paintEvent(QPaintEvent* event) override; private Q_SLOTS: void checkPendingPixmaps(); |
