Merge remote-tracking branch 'origin/KDE/4.10'

[dolphin.git] / src / views / dolphinfileitemlistwidget.cpp

diff --git a/src/views/dolphinfileitemlistwidget.cpp b/src/views/dolphinfileitemlistwidget.cpp
index f3489e1b5e4f2fb17f9fce822cd10407dc7d0926..33ee6a277b5b85b3accd99b5d77c316b3e865c31 100644 (file)
--- a/src/views/dolphinfileitemlistwidget.cpp
+++ b/src/views/dolphinfileitemlistwidget.cpp
@@ -26,8 +26,9 @@
 
 #include <KDebug>
 
-DolphinFileItemListWidget::DolphinFileItemListWidget(QGraphicsItem* parent) :
-    KFileItemListWidget(parent)
+DolphinFileItemListWidget::DolphinFileItemListWidget(KItemListWidgetInformant* informant,
+                                                     QGraphicsItem* parent) :
+    KFileItemListWidget(informant, parent)
 {
 }
 
@@ -56,10 +57,10 @@ void DolphinFileItemListWidget::refreshCache()
         case KVersionControlPlugin2::AddedVersion:                   tintColor = Qt::green; break;
         case KVersionControlPlugin2::RemovedVersion:                 tintColor = Qt::darkRed; break;
         case KVersionControlPlugin2::ConflictingVersion:             tintColor = Qt::red; break;
-        case KVersionControlPlugin2::UnversionedVersion:             tintColor = Qt::white; break;
         case KVersionControlPlugin2::IgnoredVersion:                 tintColor = Qt::white; break;
         case KVersionControlPlugin2::MissingVersion:                 tintColor = Qt::red; break;
         case KVersionControlPlugin2::NormalVersion:
+        case KVersionControlPlugin2::UnversionedVersion:
         default:
             break;
         }
@@ -114,6 +115,8 @@ QPixmap DolphinFileItemListWidget::overlayForState(KVersionControlPlugin2::ItemV
         iconName = "vcs-conflicting";
         break;
     case KVersionControlPlugin::UnversionedVersion:
+    case KVersionControlPlugin2::IgnoredVersion:
+    case KVersionControlPlugin2::MissingVersion:
         break;
     default:
         Q_ASSERT(false);