SVN_SILENT made messages (.desktop file) - always resolve ours

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

diff --git a/src/views/versioncontrol/updateitemstatesthread.h b/src/views/versioncontrol/updateitemstatesthread.h
index 9fac6192cb8d4264d21c761ecd705b33d22f4b4f..92563faa5734ed0c0565a237f09c46d9a695b3b6 100644 (file)
--- a/src/views/versioncontrol/updateitemstatesthread.h
+++ b/src/views/versioncontrol/updateitemstatesthread.h
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2009 by Peter Penz <peter.penz@gmx.at>                  *
+ *   Copyright (C) 2009 by Peter Penz <peter.penz19@gmail.com>             *
  *                                                                         *
  *   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  *
@@ -20,27 +20,22 @@
 #ifndef UPDATEITEMSTATESTHREAD_H
 #define UPDATEITEMSTATESTHREAD_H
 
-#include <libdolphin_export.h>
-#include <views/versioncontrol/versioncontrolobserver.h>
+#include "dolphin_export.h"
+#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.
  */
-class LIBDOLPHINPRIVATE_EXPORT UpdateItemStatesThread : public QThread
+class DOLPHIN_EXPORT UpdateItemStatesThread : public QThread
 {
     Q_OBJECT
 
 public:
-    UpdateItemStatesThread();
-    virtual ~UpdateItemStatesThread();
-
     /**
      * @param plugin     Version control plugin that is used to update the
      *                   state of the items. Whenever the plugin is accessed
@@ -49,36 +44,20 @@ public:
      *                   UpdateItemStatesThread::unlockPlugin() must be used.
      * @param itemStates List of items, where the states get updated.
      */
-    void setData(KVersionControlPlugin* plugin,
-                 const QList<VersionControlObserver::ItemState>& itemStates);
-
-    /**
-     * 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;
+    UpdateItemStatesThread(KVersionControlPlugin* plugin,
+                           const QMap<QString, QVector<VersionControlObserver::ItemState> >& itemStates);
+    ~UpdateItemStatesThread() override;
 
-    bool retrievedItems() const;
+    QMap<QString, QVector<VersionControlObserver::ItemState> > itemStates() const;
 
 protected:
-    virtual void run();
+    void run() override;
 
 private:
     QMutex* m_globalPluginMutex; // Protects the m_plugin globally
     KVersionControlPlugin* m_plugin;
 
-    mutable QMutex m_itemMutex; // Protects m_retrievedItems and m_itemStates
-    bool m_retrievedItems;
-    QList<VersionControlObserver::ItemState> m_itemStates;
+    QMap<QString, QVector<VersionControlObserver::ItemState> > m_itemStates;
 };
 
 #endif // UPDATEITEMSTATESTHREAD_H