From d84909dc36acbd91c37de76e793f81dca9b2ace9 Mon Sep 17 00:00:00 2001 From: Peter Penz Date: Thu, 13 Aug 2009 20:48:58 +0000 Subject: * 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 --- src/dolphinfileitemdelegate.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/dolphinfileitemdelegate.h') 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) -- cgit v1.3