┌   ┐
54
└   ┘

summaryrefslogtreecommitdiff
path: root/src/views/versioncontrol/versioncontrolobserver.h
diff options
context:
space:
mode:
authorPeter Penz <[email protected]>2011-09-10 18:08:03 +0200
committerPeter Penz <[email protected]>2011-09-10 18:11:09 +0200
commitff243261742ecd70fb9e417614e757b5956c04aa (patch)
tree5ea6591846826b8b7f26179dc69bd2fab06c8ce5 /src/views/versioncontrol/versioncontrolobserver.h
parentc7272df5c17c804fd379e4bac2758850f03695da (diff)
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
Diffstat (limited to 'src/views/versioncontrol/versioncontrolobserver.h')
-rw-r--r--src/views/versioncontrol/versioncontrolobserver.h7
1 files changed, 3 insertions, 4 deletions
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();