Merge branch 'master' into frameworks

Conflicts:
	dolphin/src/statusbar/statusbarspaceinfo.cpp

1 files changed, 58 insertions, 0 deletions

diff --git a/src/statusbar/mountpointobservercache.h b/src/statusbar/mountpointobservercache.h
new file mode 100644
index 000000000..425000645
--- /dev/null
+++ b/src/statusbar/mountpointobservercache.h
@@ -0,0 +1,58 @@
+/***************************************************************************
+ *   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 MOUNTPOINTOBSERVERCACHE_H
+#define MOUNTPOINTOBSERVERCACHE_H
+
+#include <QHash>
+#include <QObject>
+
+class MountPointObserver;
+class QTimer;
+
+class MountPointObserverCache : public QObject
+{
+    Q_OBJECT
+
+    MountPointObserverCache();
+    virtual ~MountPointObserverCache();
+
+public:
+    static MountPointObserverCache* instance();
+
+    /**
+     * Returns a MountPointObserver for the given \a path. A new observer is created if necessary.
+     */
+    MountPointObserver* observerForPath(const QString& path);
+
+private slots:
+    /**
+     * Removes the given \a observer from the cache.
+     */
+    void slotObserverDestroyed(QObject* observer);
+
+private:
+    QHash<QString, MountPointObserver*> m_observerForMountPoint;
+    QHash<QObject*, QString> m_mountPointForObserver;
+    QTimer* m_updateTimer;
+
+    friend class MountPointObserverCacheSingleton;
+};
+
+#endif