[systemsettings] Add DiskUsage result property. Contributes to JB#36290

sailfishos · Oct 6, 2016 · 143a62d · 143a62d
1 parent 473bd43
commit 143a62d
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 3 deletions.
diff --git a/src/diskusage.cpp b/src/diskusage.cpp
@@ -217,5 +217,14 @@ void DiskUsage::finished(QVariantMap usage, QJSValue *callback)
         delete callback;
     }
 
+    // the result has been set, so emit resultChanged() even if result was not valid
+    m_result = usage;
+    emit resultChanged();
+
     setWorking(false);
 }
+
+QVariantMap DiskUsage::result() const
+{
+    return m_result;
+}
diff --git a/src/diskusage.h b/src/diskusage.h
@@ -48,9 +48,9 @@ class SYSTEMSETTINGS_EXPORT DiskUsage : public QObject
     Q_DECLARE_PRIVATE(DiskUsage)
 
     // True while calculation takes place
-    Q_PROPERTY(bool working
-            READ working
-            NOTIFY workingChanged)
+    Q_PROPERTY(bool working READ working NOTIFY workingChanged)
+
+    Q_PROPERTY(QVariantMap result READ result NOTIFY resultChanged)
 
 public:
     explicit DiskUsage(QObject *parent=0);
@@ -60,8 +60,11 @@ class SYSTEMSETTINGS_EXPORT DiskUsage : public QObject
     // callback with a QVariantMap (mapping paths to usages in bytes)
     Q_INVOKABLE void calculate(const QStringList &paths, QJSValue callback);
 
+    QVariantMap result() const;
+
 signals:
     void workingChanged();
+    void resultChanged();
 
 signals:
     void submit(QStringList paths, QJSValue *callback);
@@ -81,6 +84,7 @@ private slots:
 
 private:
     QScopedPointer<DiskUsagePrivate> const d_ptr;
+    QVariantMap m_result;
     bool m_working;
 };