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 92a9d59c9d5c92219839220c6fc80b6ba1a4033b..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
 
 #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>
 
 
 #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
 


@@ -48,12 +46,12 @@ public:
      */
     UpdateItemStatesThread(KVersionControlPlugin* plugin,
                            const QMap<QString, QVector<VersionControlObserver::ItemState> >& itemStates);
      */
     UpdateItemStatesThread(KVersionControlPlugin* plugin,
                            const QMap<QString, QVector<VersionControlObserver::ItemState> >& itemStates);

-    virtual ~UpdateItemStatesThread();
+    ~UpdateItemStatesThread() override;

 
     QMap<QString, QVector<VersionControlObserver::ItemState> > itemStates() const;
 
 protected:
 
     QMap<QString, QVector<VersionControlObserver::ItemState> > itemStates() const;
 
 protected:

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

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