GIT_SILENT Sync po/docbooks with svn

[dolphin.git] / src / statusbar / spaceinfoobserver.cpp

diff --git a/src/statusbar/spaceinfoobserver.cpp b/src/statusbar/spaceinfoobserver.cpp
index 6012f969691feb5d53f629efb4b3df79d87c95a0..ae56137d11aa57a47366db50d5a9748986a5281e 100644 (file)
--- a/src/statusbar/spaceinfoobserver.cpp
+++ b/src/statusbar/spaceinfoobserver.cpp
@@ -8,17 +8,16 @@
 
 #include "mountpointobserver.h"
 
-SpaceInfoObserver::SpaceInfoObserver(const QUrl& url, QObject* parent) :
-    QObject(parent),
-    m_mountPointObserver(nullptr),
-    m_hasData(false),
-    m_dataSize(0),
-    m_dataAvailable(0)
+SpaceInfoObserver::SpaceInfoObserver(const QUrl &url, QObject *parent)
+    : QObject(parent)
+    , m_mountPointObserver(nullptr)
+    , m_hasData(false)
+    , m_dataSize(0)
+    , m_dataAvailable(0)
 {
-    m_mountPointObserver = MountPointObserver::observerForUrl(url);
-    m_mountPointObserver->ref();
-    connect(m_mountPointObserver, &MountPointObserver::spaceInfoChanged, this, &SpaceInfoObserver::spaceInfoChanged);
-    m_mountPointObserver->update();
+    if (!url.isEmpty()) {
+        setUrl(url);
+    }
 }
 
 SpaceInfoObserver::~SpaceInfoObserver()
@@ -39,9 +38,9 @@ quint64 SpaceInfoObserver::available() const
     return m_dataAvailable;
 }
 
-void SpaceInfoObserver::setUrl(const QUrl& url)
+void SpaceInfoObserver::setUrl(const QUrl &url)
 {
-    MountPointObserver* newObserver = MountPointObserver::observerForUrl(url);
+    MountPointObserver *newObserver = MountPointObserver::observerForUrl(url);
     if (newObserver != m_mountPointObserver) {
         if (m_mountPointObserver) {
             disconnect(m_mountPointObserver, &MountPointObserver::spaceInfoChanged, this, &SpaceInfoObserver::spaceInfoChanged);
@@ -53,7 +52,7 @@ void SpaceInfoObserver::setUrl(const QUrl& url)
         m_mountPointObserver->ref();
         connect(m_mountPointObserver, &MountPointObserver::spaceInfoChanged, this, &SpaceInfoObserver::spaceInfoChanged);
 
-        // If newObserver is cached it won't call update until the next timer update, 
+        // If newObserver is cached it won't call update until the next timer update,
         // so update the observer now.
         m_mountPointObserver->update();
     }
@@ -74,6 +73,8 @@ void SpaceInfoObserver::spaceInfoChanged(quint64 size, quint64 available)
         m_dataSize = size;
         m_dataAvailable = available;
 
-        emit valuesChanged();
+        Q_EMIT valuesChanged();
     }
 }
+
+#include "moc_spaceinfoobserver.cpp"