┌   ┐
54
└   ┘

summaryrefslogtreecommitdiff
path: root/src/panels
diff options
context:
space:
mode:
authorMontel Laurent <[email protected]>2017-11-03 08:01:02 +0100
committerMontel Laurent <[email protected]>2017-11-03 14:54:06 +0100
commitff3f476ed816cff5fc38117979d181707f934639 (patch)
tree3caabc1f9699531bb1c0b13a0f57092c3cf06490 /src/panels
parentd1acb1d56e18f4adef3eba7fc61facb1db5deb75 (diff)
Use nullptr + add explicit keyword
Test Plan: compile Reviewers: #dolphin, broulik Reviewed By: broulik Subscribers: #dolphin Differential Revision: https://phabricator.kde.org/D8637
Diffstat (limited to 'src/panels')
-rw-r--r--src/panels/folders/folderspanel.cpp6
-rw-r--r--src/panels/folders/folderspanel.h2
-rw-r--r--src/panels/information/filemetadataconfigurationdialog.cpp4
-rw-r--r--src/panels/information/informationpanel.cpp10
-rw-r--r--src/panels/information/informationpanel.h2
-rw-r--r--src/panels/information/phononwidget.cpp16
-rw-r--r--src/panels/places/placesitem.cpp4
-rw-r--r--src/panels/places/placesitemsignalhandler.h2
-rw-r--r--src/panels/places/placespanel.cpp9
-rw-r--r--src/panels/places/placespanel.h2
-rw-r--r--src/panels/places/placesview.h2
-rw-r--r--src/panels/terminal/terminalpanel.h2
12 files changed, 31 insertions, 30 deletions
diff --git a/src/panels/folders/folderspanel.cpp b/src/panels/folders/folderspanel.cpp
index cb35fd218..eef27ce47 100644
--- a/src/panels/folders/folderspanel.cpp
+++ b/src/panels/folders/folderspanel.cpp
@@ -55,8 +55,8 @@
FoldersPanel::FoldersPanel(QWidget* parent) :
Panel(parent),
m_updateCurrentItem(false),
- m_controller(0),
- m_model(0)
+ m_controller(nullptr),
+ m_model(nullptr)
{
setLayoutDirection(Qt::LeftToRight);
}
@@ -67,7 +67,7 @@ FoldersPanel::~FoldersPanel()
if (m_controller) {
KItemListView* view = m_controller->view();
- m_controller->setView(0);
+ m_controller->setView(nullptr);
delete view;
}
}
diff --git a/src/panels/folders/folderspanel.h b/src/panels/folders/folderspanel.h
index 5f0b9a378..ab6c41b34 100644
--- a/src/panels/folders/folderspanel.h
+++ b/src/panels/folders/folderspanel.h
@@ -39,7 +39,7 @@ class FoldersPanel : public Panel
Q_OBJECT
public:
- FoldersPanel(QWidget* parent = 0);
+ explicit FoldersPanel(QWidget* parent = nullptr);
virtual ~FoldersPanel();
void setShowHiddenFiles(bool show);
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)
{
}
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;
diff --git a/src/panels/terminal/terminalpanel.h b/src/panels/terminal/terminalpanel.h
index 3de3b6d30..db5658e53 100644
--- a/src/panels/terminal/terminalpanel.h
+++ b/src/panels/terminal/terminalpanel.h
@@ -45,7 +45,7 @@ class TerminalPanel : public Panel
Q_OBJECT
public:
- TerminalPanel(QWidget* parent = 0);
+ explicit TerminalPanel(QWidget* parent = nullptr);
virtual ~TerminalPanel();
/**