Fix for crash which was introduced by commit

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

diff --git a/src/views/dolphinfileitemlistwidget.cpp b/src/views/dolphinfileitemlistwidget.cpp
index f3489e1b5e4f2fb17f9fce822cd10407dc7d0926..de927d91fcae721dfa3bd6fb3604dee36fabd3b7 100644 (file)
--- a/src/views/dolphinfileitemlistwidget.cpp
+++ b/src/views/dolphinfileitemlistwidget.cpp
@@ -19,15 +19,16 @@
 
 #include "dolphinfileitemlistwidget.h"
 
-#include <KIcon>
+#include <QIcon>
 #include <KIconLoader>
 #include <kversioncontrolplugin2.h>
 #include <QColor>
 
 #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,13 +115,14 @@ QPixmap DolphinFileItemListWidget::overlayForState(KVersionControlPlugin2::ItemV
         iconName = "vcs-conflicting";
         break;
     case KVersionControlPlugin::UnversionedVersion:
+    case KVersionControlPlugin2::IgnoredVersion:
+    case KVersionControlPlugin2::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"