Merge remote-tracking branch 'origin/master' into frameworks

[dolphin.git] / src / statusbar / statusbarspaceinfo.h

diff --git a/src/statusbar/statusbarspaceinfo.h b/src/statusbar/statusbarspaceinfo.h
index 9744548ca596dedbd4cbb0c3af02d5ee76d1133a..1849462a9aeb1214b31025bffc51b542e2132cd6 100644 (file)
--- a/src/statusbar/statusbarspaceinfo.h
+++ b/src/statusbar/statusbarspaceinfo.h
@@ -20,7 +20,7 @@
 #ifndef STATUSBARSPACEINFO_H
 #define STATUSBARSPACEINFO_H
 
-#include <kurl.h>
+#include <KUrl>
 
 #include <QColor>
 #include <QKeyEvent>
@@ -40,19 +40,21 @@ class StatusBarSpaceInfo : public KCapacityBar
     Q_OBJECT
 
 public:
-    explicit StatusBarSpaceInfo(QWidget* parent);
+    explicit StatusBarSpaceInfo(QWidget* parent = 0);
     virtual ~StatusBarSpaceInfo();
 
     void setUrl(const KUrl& url);
-    const KUrl& url() const;
+    KUrl url() const;
 
 protected:
     void showEvent(QShowEvent* event);
     void hideEvent(QHideEvent* event);
 
 private slots:
-    /** Refreshes the space information for the current set URL. */
-    void refresh();
+    /**
+     * Calculates the space information for the current set URL.
+     */
+    void calculateSpaceInfo();
 
 private:
     quint64 m_kBSize;
@@ -60,9 +62,4 @@ private:
     QTimer* m_timer;
 };
 
-inline const KUrl& StatusBarSpaceInfo::url() const
-{
-    return m_url;
-}
-
 #endif