Don't block unmounting when terminal panel's cwd is the mountpoint

[dolphin.git] / src / views / versioncontrol / updateitemstatesthread.h

diff --git a/src/views/versioncontrol/updateitemstatesthread.h b/src/views/versioncontrol/updateitemstatesthread.h
index a28169755a1b5bdc765f937b353895fec43b56a4..3dc03fc75bdfb7884e3f451064254a7644b16488 100644 (file)
--- a/src/views/versioncontrol/updateitemstatesthread.h
+++ b/src/views/versioncontrol/updateitemstatesthread.h
@@ -20,20 +20,18 @@
 #ifndef UPDATEITEMSTATESTHREAD_H
 #define UPDATEITEMSTATESTHREAD_H
 
 #ifndef UPDATEITEMSTATESTHREAD_H
 #define UPDATEITEMSTATESTHREAD_H
 

-#include <libdolphin_export.h>
+#include "dolphin_export.h"

 #include <views/versioncontrol/versioncontrolobserver.h>
 
 #include <QMutex>
 #include <QThread>
 
 #include <views/versioncontrol/versioncontrolobserver.h>
 
 #include <QMutex>
 #include <QThread>
 

-class KVersionControlPlugin;
-

 /**
  * The performance of updating the version state of items depends
  * on the used plugin. To prevent that Dolphin gets blocked by a
  * slow plugin, the updating is delegated to a thread.
  */
 /**
  * The performance of updating the version state of items depends
  * on the used plugin. To prevent that Dolphin gets blocked by a
  * slow plugin, the updating is delegated to a thread.
  */

-class LIBDOLPHINPRIVATE_EXPORT UpdateItemStatesThread : public QThread
+class DOLPHIN_EXPORT UpdateItemStatesThread : public QThread

 {
     Q_OBJECT
 
 {
     Q_OBJECT
 


@@ -47,35 +45,19 @@ public:
      * @param itemStates List of items, where the states get updated.
      */
     UpdateItemStatesThread(KVersionControlPlugin* plugin,
      * @param itemStates List of items, where the states get updated.
      */
     UpdateItemStatesThread(KVersionControlPlugin* plugin,

-                           const QList<VersionControlObserver::ItemState>& itemStates);
+                           const QMap<QString, QVector<VersionControlObserver::ItemState> >& itemStates);

     virtual ~UpdateItemStatesThread();
 
     virtual ~UpdateItemStatesThread();
 

-    /**
-     * Whenever the plugin is accessed by the thread creator, lockPlugin() must
-     * be invoked. True is returned, if the plugin could be locked within 300
-     * milliseconds.
-     */
-    bool lockPlugin();
-
-    /**
-     * Must be invoked if lockPlugin() returned true and plugin has been accessed
-     * by the thread creator.
-     */
-    void unlockPlugin();
-
-    QList<VersionControlObserver::ItemState> itemStates() const;
-
-    bool retrievedItems() const;
+    QMap<QString, QVector<VersionControlObserver::ItemState> > itemStates() const;

 
 protected:
 
 protected:

-    virtual void run();
+    virtual void run() Q_DECL_OVERRIDE;

 
 private:
     QMutex* m_globalPluginMutex; // Protects the m_plugin globally
     KVersionControlPlugin* m_plugin;
 
 
 private:
     QMutex* m_globalPluginMutex; // Protects the m_plugin globally
     KVersionControlPlugin* m_plugin;
 

-    bool m_retrievedItems;
-    QList<VersionControlObserver::ItemState> m_itemStates;
+    QMap<QString, QVector<VersionControlObserver::ItemState> > m_itemStates;

 };
 
 #endif // UPDATEITEMSTATESTHREAD_H
 };
 
 #endif // UPDATEITEMSTATESTHREAD_H