From ff3f476ed816cff5fc38117979d181707f934639 Mon Sep 17 00:00:00 2001 From: Montel Laurent Date: Fri, 3 Nov 2017 08:01:02 +0100 Subject: Use nullptr + add explicit keyword Test Plan: compile Reviewers: #dolphin, broulik Reviewed By: broulik Subscribers: #dolphin Differential Revision: https://phabricator.kde.org/D8637 --- .../information/filemetadataconfigurationdialog.cpp | 4 ++-- src/panels/information/informationpanel.cpp | 10 +++++----- src/panels/information/informationpanel.h | 2 +- src/panels/information/phononwidget.cpp | 16 ++++++++-------- 4 files changed, 16 insertions(+), 16 deletions(-) (limited to 'src/panels/information') diff --git a/src/panels/information/filemetadataconfigurationdialog.cpp b/src/panels/information/filemetadataconfigurationdialog.cpp index 5671d34ef..050e78cfd 100644 --- a/src/panels/information/filemetadataconfigurationdialog.cpp +++ b/src/panels/information/filemetadataconfigurationdialog.cpp @@ -35,8 +35,8 @@ FileMetaDataConfigurationDialog::FileMetaDataConfigurationDialog(QWidget* parent) : QDialog(parent), - m_descriptionLabel(0), - m_configWidget(0) + m_descriptionLabel(nullptr), + m_configWidget(nullptr) { setWindowTitle(i18nc("@title:window", "Configure Shown Data")); diff --git a/src/panels/information/informationpanel.cpp b/src/panels/information/informationpanel.cpp index 16dc721b2..850d94d92 100644 --- a/src/panels/information/informationpanel.cpp +++ b/src/panels/information/informationpanel.cpp @@ -32,16 +32,16 @@ InformationPanel::InformationPanel(QWidget* parent) : Panel(parent), m_initialized(false), - m_infoTimer(0), - m_urlChangedTimer(0), - m_resetUrlTimer(0), + m_infoTimer(nullptr), + m_urlChangedTimer(nullptr), + m_resetUrlTimer(nullptr), m_shownUrl(), m_urlCandidate(), m_invalidUrlCandidate(), m_fileItem(), m_selection(), - m_folderStatJob(0), - m_content(0) + m_folderStatJob(nullptr), + m_content(nullptr) { } diff --git a/src/panels/information/informationpanel.h b/src/panels/information/informationpanel.h index 78e2d71ff..a698e544f 100644 --- a/src/panels/information/informationpanel.h +++ b/src/panels/information/informationpanel.h @@ -36,7 +36,7 @@ class InformationPanel : public Panel Q_OBJECT public: - explicit InformationPanel(QWidget* parent = 0); + explicit InformationPanel(QWidget* parent = nullptr); virtual ~InformationPanel(); signals: diff --git a/src/panels/information/phononwidget.cpp b/src/panels/information/phononwidget.cpp index ac4a32506..3a3268cb3 100644 --- a/src/panels/information/phononwidget.cpp +++ b/src/panels/information/phononwidget.cpp @@ -41,7 +41,7 @@ class EmbeddedVideoPlayer : public Phonon::VideoWidget Q_OBJECT public: - EmbeddedVideoPlayer(QWidget *parent = 0) : + EmbeddedVideoPlayer(QWidget *parent = nullptr) : Phonon::VideoWidget(parent) { } @@ -64,13 +64,13 @@ class EmbeddedVideoPlayer : public Phonon::VideoWidget PhononWidget::PhononWidget(QWidget *parent) : QWidget(parent), m_url(), - m_playButton(0), - m_stopButton(0), - m_topLayout(0), - m_media(0), - m_seekSlider(0), - m_audioOutput(0), - m_videoPlayer(0) + m_playButton(nullptr), + m_stopButton(nullptr), + m_topLayout(nullptr), + m_media(nullptr), + m_seekSlider(nullptr), + m_audioOutput(nullptr), + m_videoPlayer(nullptr) { } -- cgit v1.3.1