X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/c7272df5c17c804fd379e4bac2758850f03695da..7f4c3976c0626657362b6324c0dad2867cc24e9b:/src/views/dolphinfileitemlistwidget.cpp

diff --git a/src/views/dolphinfileitemlistwidget.cpp b/src/views/dolphinfileitemlistwidget.cpp
index d39d58cd0..f15230841 100644
--- a/src/views/dolphinfileitemlistwidget.cpp
+++ b/src/views/dolphinfileitemlistwidget.cpp
@@ -19,14 +19,15 @@
 
 #include "dolphinfileitemlistwidget.h"
 
-#include <KIcon>
+#include <QIcon>
 #include <KIconLoader>
 #include <QColor>
 
-#include <KDebug>
+#include "dolphindebug.h"
 
-DolphinFileItemListWidget::DolphinFileItemListWidget(QGraphicsItem* parent) :
-    KFileItemListWidget(parent)
+DolphinFileItemListWidget::DolphinFileItemListWidget(KItemListWidgetInformant* informant,
+                                                     QGraphicsItem* parent) :
+    KFileItemListWidget(informant, parent)
 {
 }
 
@@ -41,7 +42,7 @@ void DolphinFileItemListWidget::refreshCache()
     if (values.contains("version")) {
         // The item is under version control. Apply the text color corresponding
         // to its version state.
-        const KVersionControlPlugin::VersionState version = static_cast<KVersionControlPlugin::VersionState>(values.value("version").toInt());
+        const KVersionControlPlugin::ItemVersion version = static_cast<KVersionControlPlugin::ItemVersion>(values.value("version").toInt());
         const QColor textColor = styleOption().palette.text().color();
         QColor tintColor = textColor;
 
@@ -55,8 +56,10 @@ void DolphinFileItemListWidget::refreshCache()
         case KVersionControlPlugin::AddedVersion:                   tintColor = Qt::green; break;
         case KVersionControlPlugin::RemovedVersion:                 tintColor = Qt::darkRed; break;
         case KVersionControlPlugin::ConflictingVersion:             tintColor = Qt::red; break;
-        case KVersionControlPlugin::UnversionedVersion:             tintColor = Qt::white; break;
+        case KVersionControlPlugin::IgnoredVersion:                 tintColor = Qt::white; break;
+        case KVersionControlPlugin::MissingVersion:                 tintColor = Qt::red; break;
         case KVersionControlPlugin::NormalVersion:
+        case KVersionControlPlugin::UnversionedVersion:
         default:
             break;
         }
@@ -74,7 +77,7 @@ void DolphinFileItemListWidget::refreshCache()
     setTextColor(color);
 }
 
-QPixmap DolphinFileItemListWidget::overlayForState(KVersionControlPlugin::VersionState version, int size)
+QPixmap DolphinFileItemListWidget::overlayForState(KVersionControlPlugin::ItemVersion version, int size)
 {
     int overlayHeight = KIconLoader::SizeSmall;
     if (size >= KIconLoader::SizeEnormous) {
@@ -111,13 +114,14 @@ QPixmap DolphinFileItemListWidget::overlayForState(KVersionControlPlugin::Versio
         iconName = "vcs-conflicting";
         break;
     case KVersionControlPlugin::UnversionedVersion:
+    case KVersionControlPlugin::IgnoredVersion:
+    case KVersionControlPlugin::MissingVersion:
         break;
     default:
         Q_ASSERT(false);
         break;
     }
 
-    return KIcon(iconName).pixmap(QSize(overlayHeight, overlayHeight));
+    return QIcon::fromTheme(iconName).pixmap(QSize(overlayHeight, overlayHeight));
 }
 
-#include "dolphinfileitemlistwidget.moc"