Modernize: Use override where possible

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

diff --git a/src/views/versioncontrol/versioncontrolobserver.h b/src/views/versioncontrol/versioncontrolobserver.h
index 2c07b0614f1a8c376262e6f316083b47ad486dc4..0b702f5f1eb3e7c7ef6ca828144f9cb4418ccbee 100644 (file)
--- a/src/views/versioncontrol/versioncontrolobserver.h
+++ b/src/views/versioncontrol/versioncontrolobserver.h
@@ -20,13 +20,14 @@
 #ifndef VERSIONCONTROLOBSERVER_H
 #define VERSIONCONTROLOBSERVER_H
 
-#include <libdolphin_export.h>
+#include "dolphin_export.h"
+
+#include "kversioncontrolplugin.h"
 
 #include <KFileItem>
-#include <KUrl>
-#include <kversioncontrolplugin2.h>
+
+#include <QUrl>
 #include <QList>
-#include <QMutex>
 #include <QObject>
 #include <QString>
 
@@ -44,13 +45,13 @@ class UpdateItemStatesThread;
  *
  * @see VersionControlPlugin
  */
-class LIBDOLPHINPRIVATE_EXPORT VersionControlObserver : public QObject
+class DOLPHIN_EXPORT VersionControlObserver : public QObject
 {
     Q_OBJECT
 
 public:
     explicit VersionControlObserver(QObject* parent = 0);
-    virtual ~VersionControlObserver();
+    ~VersionControlObserver() override;
 
     void setModel(KFileItemModel* model);
     KFileItemModel* model() const;
@@ -101,11 +102,7 @@ private slots:
     void slotThreadFinished();
 
 private:
-    struct ItemState
-    {
-        KFileItem item;
-        KVersionControlPlugin2::ItemVersion version;
-    };
+    typedef QPair<KFileItem, KVersionControlPlugin::ItemVersion> ItemState;
 
     void updateItemStates();
 
@@ -129,7 +126,7 @@ private:
      * Returns a matching plugin for the given directory.
      * 0 is returned, if no matching plugin has been found.
      */
-    KVersionControlPlugin* searchPlugin(const KUrl& directory) const;
+    KVersionControlPlugin* searchPlugin(const QUrl& directory) const;
 
     /**
      * Returns true, if the directory contains a version control information.