From ff243261742ecd70fb9e417614e757b5956c04aa Mon Sep 17 00:00:00 2001
From: Peter Penz <peter.penz19@gmail.com>
Date: Sat, 10 Sep 2011 18:08:03 +0200
Subject: Provide KVersionControlPlugin version 2

Based on the work of Vishesh Yadav some extensions where required
for the KVersionControlPlugin interface that have found there way
now into KVersionControlPlugin2.

Beside some interface cleanups it is now possible that a version
control plugin may also provide context actions for directories or
files that are not versioned yet.

REVIEW: 102541
---
 src/views/versioncontrol/versioncontrolobserver.h | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

(limited to 'src/views/versioncontrol/versioncontrolobserver.h')

diff --git a/src/views/versioncontrol/versioncontrolobserver.h b/src/views/versioncontrol/versioncontrolobserver.h
index e160008d7..501af7d6f 100644
--- a/src/views/versioncontrol/versioncontrolobserver.h
+++ b/src/views/versioncontrol/versioncontrolobserver.h
@@ -23,7 +23,7 @@
 #include <libdolphin_export.h>
 
 #include <KFileItem>
-#include <kversioncontrolplugin.h>
+#include <kversioncontrolplugin2.h>
 #include <QList>
 #include <QMutex>
 #include <QObject>
@@ -54,8 +54,7 @@ public:
     void setModel(KFileItemModel* model);
     KFileItemModel* model() const;
 
-    QList<QAction*> contextMenuActions(const KFileItemList& items) const;
-    QList<QAction*> contextMenuActions(const QString& directory) const;
+    QList<QAction*> actions(const KFileItemList& items) const;
 
 signals:
     /**
@@ -105,7 +104,7 @@ private:
     {
         int index;
         KFileItem item;
-        KVersionControlPlugin::VersionState version;
+        KVersionControlPlugin2::ItemVersion version;
     };
 
     void updateItemStates();
-- 
cgit v1.3