Merge branch 'master' into frameworks

Conflicts:
	dolphin/src/statusbar/statusbarspaceinfo.cpp

1 files changed, 51 insertions, 0 deletions

diff --git a/src/statusbar/spaceinfoobserver.h b/src/statusbar/spaceinfoobserver.h
new file mode 100644
index 000000000..d2fb6ebf3
--- /dev/null
+++ b/src/statusbar/spaceinfoobserver.h
@@ -0,0 +1,51 @@
+/***************************************************************************
+ *   Copyright (C) 2014 by Frank Reininghaus <[email protected]>    *
+ *                                                                         *
+ *   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          *
+ ***************************************************************************/
+
+#ifndef SPACEINFOOBSERVER_H
+#define SPACEINFOOBSERVER_H
+
+#include <QObject>
+
+class KUrl;
+class MountPointObserver;
+
+class SpaceInfoObserver : public QObject
+{
+    Q_OBJECT
+
+public:
+    explicit SpaceInfoObserver(const KUrl& url, QObject* parent = 0);
+    virtual ~SpaceInfoObserver();
+
+    quint64 size() const;
+    quint64 available() const;
+
+    void setUrl(const KUrl& url);
+
+signals:
+    /**
+     * This signal is emitted if the information that size() and/or available() will  return has changed.
+     */
+    void valuesChanged();
+
+private:
+    MountPointObserver* m_mountPointObserver;
+};
+
+#endif