The Oxygen team will provide revision control emblems for KDE 4.4. Adjust the code to use icons instead of coloring the text... The icon position at the moment is terrible, an interface extension in KFileItemDelegate is required to get the icon boundaries.

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

1 files changed, 2 insertions, 1 deletions

diff --git a/src/dolphinmodel.h b/src/dolphinmodel.h
index b03507dc5..717f21d4e 100644
--- a/src/dolphinmodel.h
+++ b/src/dolphinmodel.h
@@ -39,7 +39,8 @@ public:
 
     enum RevisionState {
         LocalRevision,
-        LatestRevision
+        LatestRevision,
+        ConflictingRevision
         // TODO...
     };