Merge remote-tracking branch 'origin/master' into frameworks

[dolphin.git] / src / kitemviews / kfileitemlistwidget.cpp

diff --git a/src/kitemviews/kfileitemlistwidget.cpp b/src/kitemviews/kfileitemlistwidget.cpp
index 1ea537d1df7000a9c41a058223d811457dd2fe5d..4938e9d6dbf70ea8adba4b58d4550cf2e15b4b9f 100644 (file)
--- a/src/kitemviews/kfileitemlistwidget.cpp
+++ b/src/kitemviews/kfileitemlistwidget.cpp
@@ -27,6 +27,8 @@
 #include <KLocale>
 #include <KIO/MetaData>
 #include <QDateTime>
+#include <KFormat>
+#include <QMimeDatabase>
 
 KFileItemListWidgetInformant::KFileItemListWidgetInformant() :
     KStandardItemListWidgetInformant()
@@ -78,11 +80,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 +144,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