SVN_SILENT made messages (.desktop file) - always resolve ours

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

diff --git a/src/statusbar/spaceinfoobserver.cpp b/src/statusbar/spaceinfoobserver.cpp
index 9125a9308a51fc8f406f12d931f7380e06e8f5e9..ae56137d11aa57a47366db50d5a9748986a5281e 100644 (file)
--- a/src/statusbar/spaceinfoobserver.cpp
+++ b/src/statusbar/spaceinfoobserver.cpp
@@ -1,36 +1,22 @@
-/***************************************************************************
- *   Copyright (C) 2014 by Frank Reininghaus <frank78ac@googlemail.com>    *
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- *   This program is distributed in the hope that it will be useful,       *
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
- *   GNU General Public License for more details.                          *
- *                                                                         *
- *   You should have received a copy of the GNU General Public License     *
- *   along with this program; if not, write to the                         *
- *   Free Software Foundation, Inc.,                                       *
- *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA          *
- ***************************************************************************/
+/*
+ * SPDX-FileCopyrightText: 2014 Frank Reininghaus <frank78ac@googlemail.com>
+ *
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ */
 
 #include "spaceinfoobserver.h"
 
 #include "mountpointobserver.h"
 
-#include <KUrl>
-
-SpaceInfoObserver::SpaceInfoObserver(const KUrl& url, QObject* parent) :
-    QObject(parent),
-    m_mountPointObserver(0)
+SpaceInfoObserver::SpaceInfoObserver(const QUrl &url, QObject *parent)
+    : QObject(parent)
+    , m_mountPointObserver(nullptr)
+    , m_hasData(false)
+    , m_dataSize(0)
+    , m_dataAvailable(0)
 {
-    if (url.isLocalFile()) {
-        m_mountPointObserver = MountPointObserver::observerForPath(url.toLocalFile());
-        m_mountPointObserver->ref();
-        connect(m_mountPointObserver, SIGNAL(spaceInfoChanged()), this, SIGNAL(valuesChanged()));
+    if (!url.isEmpty()) {
+        setUrl(url);
     }
 }
 
@@ -38,52 +24,57 @@ SpaceInfoObserver::~SpaceInfoObserver()
 {
     if (m_mountPointObserver) {
         m_mountPointObserver->deref();
-        m_mountPointObserver = 0;
+        m_mountPointObserver = nullptr;
     }
 }
 
 quint64 SpaceInfoObserver::size() const
 {
-    if (m_mountPointObserver && m_mountPointObserver->spaceInfo().isValid()) {
-        return m_mountPointObserver->spaceInfo().size();
-    } else {
-        return 0;
-    }
+    return m_dataSize;
 }
 
 quint64 SpaceInfoObserver::available() const
 {
-    if (m_mountPointObserver && m_mountPointObserver->spaceInfo().isValid()) {
-        return m_mountPointObserver->spaceInfo().available();
-    } else {
-        return 0;
-    }
+    return m_dataAvailable;
 }
 
-void SpaceInfoObserver::setUrl(const KUrl& url)
+void SpaceInfoObserver::setUrl(const QUrl &url)
 {
-    if (url.isLocalFile()) {
-        MountPointObserver* newObserver = MountPointObserver::observerForPath(url.toLocalFile());
-        if (newObserver != m_mountPointObserver) {
-            if (m_mountPointObserver) {
-                disconnect(m_mountPointObserver, SIGNAL(spaceInfoChanged()), this, SIGNAL(valuesChanged()));
-                m_mountPointObserver->deref();
-                m_mountPointObserver = 0;
-            }
-
-            m_mountPointObserver = newObserver;
-            m_mountPointObserver->ref();
-            connect(m_mountPointObserver, SIGNAL(spaceInfoChanged()), this, SIGNAL(valuesChanged()));
-
-            emit valuesChanged();
-        }
-    } else {
+    MountPointObserver *newObserver = MountPointObserver::observerForUrl(url);
+    if (newObserver != m_mountPointObserver) {
         if (m_mountPointObserver) {
-            disconnect(m_mountPointObserver, SIGNAL(spaceInfoChanged()), this, SIGNAL(valuesChanged()));
+            disconnect(m_mountPointObserver, &MountPointObserver::spaceInfoChanged, this, &SpaceInfoObserver::spaceInfoChanged);
             m_mountPointObserver->deref();
-            m_mountPointObserver = 0;
-
-            emit valuesChanged();
+            m_mountPointObserver = nullptr;
         }
+
+        m_mountPointObserver = newObserver;
+        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,
+        // so update the observer now.
+        m_mountPointObserver->update();
     }
 }
+
+void SpaceInfoObserver::update()
+{
+    if (m_mountPointObserver) {
+        m_mountPointObserver->update();
+    }
+}
+
+void SpaceInfoObserver::spaceInfoChanged(quint64 size, quint64 available)
+{
+    // Make sure that the size has actually changed
+    if (m_dataSize != size || m_dataAvailable != available || !m_hasData) {
+        m_hasData = true;
+        m_dataSize = size;
+        m_dataAvailable = available;
+
+        Q_EMIT valuesChanged();
+    }
+}
+
+#include "moc_spaceinfoobserver.cpp"