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 0e92a4cfd5e695aaa699b35bf0825fa52acfbecb..92563faa5734ed0c0565a237f09c46d9a695b3b6 100644 (file)
--- a/src/views/versioncontrol/updateitemstatesthread.h
+++ b/src/views/versioncontrol/updateitemstatesthread.h
@@ -20,20 +20,18 @@
 #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
 
@@ -48,25 +46,12 @@ public:
      */
     UpdateItemStatesThread(KVersionControlPlugin* plugin,
                            const QMap<QString, QVector<VersionControlObserver::ItemState> >& itemStates);
-    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();
+    ~UpdateItemStatesThread() override;
 
     QMap<QString, QVector<VersionControlObserver::ItemState> > itemStates() const;
 
 protected:
-    virtual void run();
+    void run() override;
 
 private:
     QMutex* m_globalPluginMutex; // Protects the m_plugin globally