port away from KMimeType

diff --git a/src/dolphincontextmenu.cpp b/src/dolphincontextmenu.cpp
index 9a47faef72798923999a23697db8beba645b7e89..b01346985e12ccfc72b0b572f26d4d0c7f3555eb 100644 (file)
--- a/src/dolphincontextmenu.cpp
+++ b/src/dolphincontextmenu.cpp
@@ -37,7 +37,6 @@
 #include <KJobWidgets>
 #include <QMenu>
 #include <KMimeTypeTrader>
 #include <KJobWidgets>
 #include <QMenu>
 #include <KMimeTypeTrader>

-#include <KMimeType>

 #include <KNewFileMenu>
 #include <konq_operations.h>
 #include <KService>
 #include <KNewFileMenu>
 #include <konq_operations.h>
 #include <KService>

diff --git a/src/panels/places/placesitemeditdialog.cpp b/src/panels/places/placesitemeditdialog.cpp
index 257d0683397bc3820fd3eb237ef38d9770a05403..59085e4745886c064b04f9650d64e684dae4b062 100644 (file)
--- a/src/panels/places/placesitemeditdialog.cpp
+++ b/src/panels/places/placesitemeditdialog.cpp
@@ -30,7 +30,7 @@
 #include <KIconButton>
 #include <KLineEdit>
 #include <KLocalizedString>
 #include <KIconButton>
 #include <KLineEdit>
 #include <KLocalizedString>

-#include <KMimeType>
+#include <QMimeDatabase>

 #include <KUrlRequester>
 #include <KComponentData>
 #include <QCheckBox>
 #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->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);
     }
     } else {
         m_iconButton->setIcon(m_icon);
     }