* Use the term "version control" instead of "revision control" to be consistent with the naming in kdevplatform.

* Renamed VersionControlPlugin to KVersionControlPlugin so that the interface can be moved out of Dolphin.

svn path=/trunk/KDE/kdebase/apps/; revision=1011058

1 files changed, 2 insertions, 2 deletions

diff --git a/src/dolphinfileitemdelegate.h b/src/dolphinfileitemdelegate.h
index bd6bfdf07..287136862 100644
--- a/src/dolphinfileitemdelegate.h
+++ b/src/dolphinfileitemdelegate.h
@@ -66,12 +66,12 @@ private:
                                   const DolphinModel* dolphinModel,
                                   const QModelIndex& index);
 
-    QPixmap emblemForState(RevisionControlPlugin::RevisionState state, const QSize& size) const;
+    QPixmap emblemForState(KVersionControlPlugin::VersionState state, const QSize& size) const;
 
 private:
     bool m_hasMinimizedNameColumn;
     mutable QSize m_cachedSize;
-    mutable QPixmap m_cachedEmblems[RevisionControlPlugin::ConflictingRevision + 1];
+    mutable QPixmap m_cachedEmblems[KVersionControlPlugin::ConflictingVersion + 1];
 };
 
 inline void DolphinFileItemDelegate::setMinimizedNameColumn(bool minimized)