diff options
Diffstat (limited to 'src/panels/information')
| -rw-r--r-- | src/panels/information/filemetadataconfigurationdialog.h | 4 | ||||
| -rw-r--r-- | src/panels/information/informationpanel.cpp | 4 | ||||
| -rw-r--r-- | src/panels/information/informationpanel.h | 10 | ||||
| -rw-r--r-- | src/panels/information/informationpanelcontent.cpp | 16 | ||||
| -rw-r--r-- | src/panels/information/informationpanelcontent.h | 6 | ||||
| -rw-r--r-- | src/panels/information/phononwidget.cpp | 2 | ||||
| -rw-r--r-- | src/panels/information/phononwidget.h | 6 | ||||
| -rw-r--r-- | src/panels/information/pixmapviewer.h | 6 |
8 files changed, 27 insertions, 27 deletions
diff --git a/src/panels/information/filemetadataconfigurationdialog.h b/src/panels/information/filemetadataconfigurationdialog.h index 13562ef5c..8ca9ef6fe 100644 --- a/src/panels/information/filemetadataconfigurationdialog.h +++ b/src/panels/information/filemetadataconfigurationdialog.h @@ -43,8 +43,8 @@ class FileMetaDataConfigurationDialog : public QDialog Q_OBJECT public: - explicit FileMetaDataConfigurationDialog(QWidget* parent = 0); - virtual ~FileMetaDataConfigurationDialog(); + explicit FileMetaDataConfigurationDialog(QWidget* parent = nullptr); + ~FileMetaDataConfigurationDialog() override; /** * Sets the items, for which the visibility of the meta data should diff --git a/src/panels/information/informationpanel.cpp b/src/panels/information/informationpanel.cpp index 850d94d92..ac987c9b4 100644 --- a/src/panels/information/informationpanel.cpp +++ b/src/panels/information/informationpanel.cpp @@ -198,7 +198,7 @@ void InformationPanel::showItemInfo() void InformationPanel::slotFolderStatFinished(KJob* job) { - m_folderStatJob = 0; + m_folderStatJob = nullptr; const KIO::UDSEntry entry = static_cast<KIO::StatJob*>(job)->statResult(); m_content->showItem(KFileItem(entry, m_shownUrl)); } @@ -296,7 +296,7 @@ void InformationPanel::slotLeftDirectory(const QString& directory) void InformationPanel::cancelRequest() { delete m_folderStatJob; - m_folderStatJob = 0; + m_folderStatJob = nullptr; m_infoTimer->stop(); m_resetUrlTimer->stop(); 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.cpp b/src/panels/information/informationpanelcontent.cpp index 3c48a2296..2e279dc62 100644 --- a/src/panels/information/informationpanelcontent.cpp +++ b/src/panels/information/informationpanelcontent.cpp @@ -65,14 +65,14 @@ InformationPanelContent::InformationPanelContent(QWidget* parent) : QWidget(parent), m_item(), - m_previewJob(0), - m_outdatedPreviewTimer(0), - m_preview(0), - m_phononWidget(0), - m_nameLabel(0), - m_metaDataWidget(0), - m_metaDataArea(0), - m_placesItemModel(0) + m_previewJob(nullptr), + m_outdatedPreviewTimer(nullptr), + m_preview(nullptr), + m_phononWidget(nullptr), + m_nameLabel(nullptr), + m_metaDataWidget(nullptr), + m_metaDataArea(nullptr), + m_placesItemModel(nullptr) { parent->installEventFilter(this); diff --git a/src/panels/information/informationpanelcontent.h b/src/panels/information/informationpanelcontent.h index 533e9de3b..8b143af1d 100644 --- a/src/panels/information/informationpanelcontent.h +++ b/src/panels/information/informationpanelcontent.h @@ -57,8 +57,8 @@ class InformationPanelContent : public QWidget Q_OBJECT public: - explicit InformationPanelContent(QWidget* parent = 0); - virtual ~InformationPanelContent(); + explicit InformationPanelContent(QWidget* parent = nullptr); + ~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..947f0cdac 100644 --- a/src/panels/information/phononwidget.h +++ b/src/panels/information/phononwidget.h @@ -43,7 +43,7 @@ class PhononWidget : public QWidget { Q_OBJECT public: - PhononWidget(QWidget *parent = 0); + PhononWidget(QWidget *parent = nullptr); void setUrl(const QUrl &url); QUrl url() const; @@ -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(); |
