Merge branch 'master' into frameworks

Conflicts:
	dolphin/src/statusbar/statusbarspaceinfo.cpp

1 files changed, 4 insertions, 6 deletions

diff --git a/src/statusbar/statusbarspaceinfo.h b/src/statusbar/statusbarspaceinfo.h
index 1849462a9..1065d9f45 100644
--- a/src/statusbar/statusbarspaceinfo.h
+++ b/src/statusbar/statusbarspaceinfo.h
@@ -31,6 +31,8 @@
 class QHideEvent;
 class QShowEvent;
 
+class SpaceInfoObserver;
+
 /**
  * @short Shows the available space for the volume represented
  *        by the given URL as part of the status bar.
@@ -51,15 +53,11 @@ protected:
     void hideEvent(QHideEvent* event);
 
 private slots:
-    /**
-     * Calculates the space information for the current set URL.
-     */
-    void calculateSpaceInfo();
+    void slotValuesChanged();
 
 private:
-    quint64 m_kBSize;
+    QScopedPointer<SpaceInfoObserver> m_observer;
     KUrl m_url;
-    QTimer* m_timer;
 };
 
 #endif