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 --- src/panels/places/placesitem.cpp | 4 ++-- src/panels/places/placesitemsignalhandler.h | 2 +- src/panels/places/placespanel.cpp | 9 +++++---- src/panels/places/placespanel.h | 2 +- src/panels/places/placesview.h | 2 +- 5 files changed, 10 insertions(+), 9 deletions(-) (limited to 'src/panels/places') diff --git a/src/panels/places/placesitem.cpp b/src/panels/places/placesitem.cpp index 5b8e5dbef..93cc4d5c3 100644 --- a/src/panels/places/placesitem.cpp +++ b/src/panels/places/placesitem.cpp @@ -37,8 +37,8 @@ PlacesItem::PlacesItem(const KBookmark& bookmark, PlacesItem* parent) : m_volume(), m_disc(), m_mtp(), - m_signalHandler(0), - m_trashDirLister(0), + m_signalHandler(nullptr), + m_trashDirLister(nullptr), m_bookmark() { m_signalHandler = new PlacesItemSignalHandler(this); diff --git a/src/panels/places/placesitemsignalhandler.h b/src/panels/places/placesitemsignalhandler.h index f65b57fe1..6110f717d 100644 --- a/src/panels/places/placesitemsignalhandler.h +++ b/src/panels/places/placesitemsignalhandler.h @@ -47,7 +47,7 @@ class PlacesItemSignalHandler: public QObject Q_OBJECT public: - explicit PlacesItemSignalHandler(PlacesItem* item, QObject* parent = 0); + explicit PlacesItemSignalHandler(PlacesItem* item, QObject* parent = nullptr); virtual ~PlacesItemSignalHandler(); public slots: diff --git a/src/panels/places/placespanel.cpp b/src/panels/places/placespanel.cpp index 0ce6d69a5..0b76f18d3 100644 --- a/src/panels/places/placespanel.cpp +++ b/src/panels/places/placespanel.cpp @@ -58,13 +58,14 @@ PlacesPanel::PlacesPanel(QWidget* parent) : Panel(parent), - m_controller(0), - m_model(0), + m_controller(nullptr), + m_model(nullptr), + m_view(nullptr), m_storageSetupFailedUrl(), m_triggerStorageSetupButton(), m_itemDropEventIndex(-1), - m_itemDropEventMimeData(0), - m_itemDropEvent(0) + m_itemDropEventMimeData(nullptr), + m_itemDropEvent(nullptr) { } diff --git a/src/panels/places/placespanel.h b/src/panels/places/placespanel.h index 13a38df2d..4e525a037 100644 --- a/src/panels/places/placespanel.h +++ b/src/panels/places/placespanel.h @@ -39,7 +39,7 @@ class PlacesPanel : public Panel Q_OBJECT public: - PlacesPanel(QWidget* parent); + explicit PlacesPanel(QWidget* parent); virtual ~PlacesPanel(); void proceedWithTearDown(); diff --git a/src/panels/places/placesview.h b/src/panels/places/placesview.h index 19c99c39b..ba7193525 100644 --- a/src/panels/places/placesview.h +++ b/src/panels/places/placesview.h @@ -32,7 +32,7 @@ class PlacesView : public KStandardItemListView Q_OBJECT public: - explicit PlacesView(QGraphicsWidget* parent = 0); + explicit PlacesView(QGraphicsWidget* parent = nullptr); void setIconSize(int size); int iconSize() const; -- cgit v1.3.1