┌   ┐
54
└   ┘

summaryrefslogtreecommitdiff
path: root/src/statusbar
diff options
context:
space:
mode:
authorKevin Funk <[email protected]>2017-11-21 10:52:14 +0100
committerKevin Funk <[email protected]>2017-11-21 10:53:12 +0100
commita6db5029acc09639fd8c7c20a7676b1ac9f36539 (patch)
tree7b44cf022857916c483b5aeb4e418e7f648486a6 /src/statusbar
parent464b13f3828e5cdd03438d0881c3a62c7cda6333 (diff)
Modernize: Use nullptr everywhere
Diffstat (limited to 'src/statusbar')
-rw-r--r--src/statusbar/dolphinstatusbar.cpp14
-rw-r--r--src/statusbar/mountpointobserver.h2
-rw-r--r--src/statusbar/mountpointobservercache.cpp2
-rw-r--r--src/statusbar/spaceinfoobserver.cpp6
-rw-r--r--src/statusbar/spaceinfoobserver.h2
-rw-r--r--src/statusbar/statusbarspaceinfo.cpp2
-rw-r--r--src/statusbar/statusbarspaceinfo.h2
7 files changed, 15 insertions, 15 deletions
diff --git a/src/statusbar/dolphinstatusbar.cpp b/src/statusbar/dolphinstatusbar.cpp
index 31d4ab81a..9fc559eb7 100644
--- a/src/statusbar/dolphinstatusbar.cpp
+++ b/src/statusbar/dolphinstatusbar.cpp
@@ -49,14 +49,14 @@ DolphinStatusBar::DolphinStatusBar(QWidget* parent) :
QWidget(parent),
m_text(),
m_defaultText(),
- m_label(0),
- m_spaceInfo(0),
- m_zoomSlider(0),
- m_progressBar(0),
- m_stopButton(0),
+ m_label(nullptr),
+ m_spaceInfo(nullptr),
+ m_zoomSlider(nullptr),
+ m_progressBar(nullptr),
+ m_stopButton(nullptr),
m_progress(100),
- m_showProgressBarTimer(0),
- m_resetToDefaultTextTimer(0),
+ m_showProgressBarTimer(nullptr),
+ m_resetToDefaultTextTimer(nullptr),
m_textTimestamp()
{
// Initialize text label
diff --git a/src/statusbar/mountpointobserver.h b/src/statusbar/mountpointobserver.h
index 939e84866..ea24c4eea 100644
--- a/src/statusbar/mountpointobserver.h
+++ b/src/statusbar/mountpointobserver.h
@@ -53,7 +53,7 @@ class MountPointObserver : public QObject
{
Q_OBJECT
- explicit MountPointObserver(const QUrl& url, QObject* parent = 0);
+ explicit MountPointObserver(const QUrl& url, QObject* parent = nullptr);
~MountPointObserver() override {}
public:
diff --git a/src/statusbar/mountpointobservercache.cpp b/src/statusbar/mountpointobservercache.cpp
index 48796ac5a..bcdc0b61c 100644
--- a/src/statusbar/mountpointobservercache.cpp
+++ b/src/statusbar/mountpointobservercache.cpp
@@ -36,7 +36,7 @@ Q_GLOBAL_STATIC(MountPointObserverCacheSingleton, s_MountPointObserverCache)
MountPointObserverCache::MountPointObserverCache() :
m_observerForMountPoint(),
m_mountPointForObserver(),
- m_updateTimer(0)
+ m_updateTimer(nullptr)
{
m_updateTimer = new QTimer(this);
}
diff --git a/src/statusbar/spaceinfoobserver.cpp b/src/statusbar/spaceinfoobserver.cpp
index 0fb018727..8f45c18f8 100644
--- a/src/statusbar/spaceinfoobserver.cpp
+++ b/src/statusbar/spaceinfoobserver.cpp
@@ -25,7 +25,7 @@
SpaceInfoObserver::SpaceInfoObserver(const QUrl& url, QObject* parent) :
QObject(parent),
- m_mountPointObserver(0),
+ m_mountPointObserver(nullptr),
m_dataSize(0),
m_dataAvailable(0)
{
@@ -39,7 +39,7 @@ SpaceInfoObserver::~SpaceInfoObserver()
{
if (m_mountPointObserver) {
m_mountPointObserver->deref();
- m_mountPointObserver = 0;
+ m_mountPointObserver = nullptr;
}
}
@@ -60,7 +60,7 @@ void SpaceInfoObserver::setUrl(const QUrl& url)
if (m_mountPointObserver) {
disconnect(m_mountPointObserver, &MountPointObserver::spaceInfoChanged, this, &SpaceInfoObserver::spaceInfoChanged);
m_mountPointObserver->deref();
- m_mountPointObserver = 0;
+ m_mountPointObserver = nullptr;
}
m_mountPointObserver = newObserver;
diff --git a/src/statusbar/spaceinfoobserver.h b/src/statusbar/spaceinfoobserver.h
index 3f203b47f..144d11fa7 100644
--- a/src/statusbar/spaceinfoobserver.h
+++ b/src/statusbar/spaceinfoobserver.h
@@ -32,7 +32,7 @@ class SpaceInfoObserver : public QObject
Q_OBJECT
public:
- explicit SpaceInfoObserver(const QUrl& url, QObject* parent = 0);
+ explicit SpaceInfoObserver(const QUrl& url, QObject* parent = nullptr);
~SpaceInfoObserver() override;
quint64 size() const;
diff --git a/src/statusbar/statusbarspaceinfo.cpp b/src/statusbar/statusbarspaceinfo.cpp
index f364fcf5b..6b6a6d610 100644
--- a/src/statusbar/statusbarspaceinfo.cpp
+++ b/src/statusbar/statusbarspaceinfo.cpp
@@ -31,7 +31,7 @@
StatusBarSpaceInfo::StatusBarSpaceInfo(QWidget* parent) :
KCapacityBar(KCapacityBar::DrawTextInline, parent),
- m_observer(0)
+ m_observer(nullptr)
{
setCursor(Qt::PointingHandCursor);
}
diff --git a/src/statusbar/statusbarspaceinfo.h b/src/statusbar/statusbarspaceinfo.h
index e89966a59..87e9f776b 100644
--- a/src/statusbar/statusbarspaceinfo.h
+++ b/src/statusbar/statusbarspaceinfo.h
@@ -40,7 +40,7 @@ class StatusBarSpaceInfo : public KCapacityBar
Q_OBJECT
public:
- explicit StatusBarSpaceInfo(QWidget* parent = 0);
+ explicit StatusBarSpaceInfo(QWidget* parent = nullptr);
~StatusBarSpaceInfo() override;
void setUrl(const QUrl& url);