X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/6747241934218c6e7529e94598d1f16cb87951ff..a76cb4c67f8b1f30f29482228fecca89a9c1cb6f:/src/kitemviews/kfileitemlistwidget.cpp

diff --git a/src/kitemviews/kfileitemlistwidget.cpp b/src/kitemviews/kfileitemlistwidget.cpp
index fe8c7e997..8b2c76155 100644
--- a/src/kitemviews/kfileitemlistwidget.cpp
+++ b/src/kitemviews/kfileitemlistwidget.cpp
@@ -22,11 +22,12 @@
 #include "kitemlistview.h"
 
 #include <kmimetype.h>
-#include <KDebug>
-#include <KGlobal>
+#include <QDebug>
 #include <KLocale>
 #include <KIO/MetaData>
 #include <QDateTime>
+#include <KFormat>
+#include <QMimeDatabase>
 
 KFileItemListWidgetInformant::KFileItemListWidgetInformant() :
     KStandardItemListWidgetInformant()
@@ -78,11 +79,11 @@ QString KFileItemListWidgetInformant::roleText(const QByteArray& role,
             }
         } else {
             const KIO::filesize_t size = roleValue.value<KIO::filesize_t>();
-            text = KGlobal::locale()->formatByteSize(size);
+            text = KFormat().formatByteSize(size);
         }
     } else if (role == "date") {
         const QDateTime dateTime = roleValue.toDateTime();
-        text = KGlobal::locale()->formatDateTime(dateTime);
+        text = KLocale::global()->formatDateTime(dateTime);
     } else {
         text = KStandardItemListWidgetInformant::roleText(role, values);
     }
@@ -142,7 +143,8 @@ int KFileItemListWidget::selectionLength(const QString& text) const
         return selectionLength;
     }
 
-    const QString extension = KMimeType::extractKnownExtension(text);
+    QMimeDatabase db;
+    const QString extension = db.suffixForFileName(text);
     if (extension.isEmpty()) {
         // For an unknown extension just exclude the extension after
         // the last point. This does not work for multiple extensions like
@@ -161,4 +163,3 @@ int KFileItemListWidget::selectionLength(const QString& text) const
     return selectionLength;
 }
 
-#include "kfileitemlistwidget.moc"