From: Lukáš Tinkl <lukas@kde.org>
Date: Tue, 21 Oct 2014 19:37:30 +0000 (+0200)
Subject: port away from KMimeType
X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/commitdiff_plain/0ce1c983b55fb79574fd4764e3ae8355f82ebf20?ds=sidebyside

port away from KMimeType
---

diff --git a/src/dolphincontextmenu.cpp b/src/dolphincontextmenu.cpp
index 9a47faef7..b01346985 100644
--- a/src/dolphincontextmenu.cpp
+++ b/src/dolphincontextmenu.cpp
@@ -37,7 +37,6 @@
 #include <KJobWidgets>
 #include <QMenu>
 #include <KMimeTypeTrader>
-#include <KMimeType>
 #include <KNewFileMenu>
 #include <konq_operations.h>
 #include <KService>
diff --git a/src/panels/places/placesitemeditdialog.cpp b/src/panels/places/placesitemeditdialog.cpp
index 257d06833..59085e474 100644
--- a/src/panels/places/placesitemeditdialog.cpp
+++ b/src/panels/places/placesitemeditdialog.cpp
@@ -30,7 +30,7 @@
 #include <KIconButton>
 #include <KLineEdit>
 #include <KLocalizedString>
-#include <KMimeType>
+#include <QMimeDatabase>
 #include <KUrlRequester>
 #include <KComponentData>
 #include <QCheckBox>
@@ -154,7 +154,8 @@ void PlacesItemEditDialog::initialize()
     m_iconButton->setIconSize(IconSize(KIconLoader::Desktop));
     m_iconButton->setIconType(KIconLoader::NoGroup, KIconLoader::Place);
     if (m_icon.isEmpty()) {
-        m_iconButton->setIcon(KMimeType::iconNameForUrl(m_url));
+        QMimeDatabase db;
+        m_iconButton->setIcon(db.mimeTypeForUrl(m_url).iconName());
     } else {
         m_iconButton->setIcon(m_icon);
     }