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

[dolphin.git] / src / dolphinrecenttabsmenu.cpp

diff --git a/src/dolphinrecenttabsmenu.cpp b/src/dolphinrecenttabsmenu.cpp
index fa3eaf166d4db726b21c3c786e44d4825b7c04c1..f4492a214e8fd3740f6062f3fa5e27733377f85c 100644 (file)
--- a/src/dolphinrecenttabsmenu.cpp
+++ b/src/dolphinrecenttabsmenu.cpp
@@ -21,17 +21,17 @@
 
 #include <KLocalizedString>
 #include <KAcceleratorManager>
-#include <KMimeType>
-#include <KMenu>
+#include <kio/global.h>
+#include <QMenu>
 
 DolphinRecentTabsMenu::DolphinRecentTabsMenu(QObject* parent) :
-    KActionMenu(KIcon("edit-undo"), i18n("Recently Closed Tabs"), parent)
+    KActionMenu(QIcon::fromTheme("edit-undo"), i18n("Recently Closed Tabs"), parent)
 {
     setDelayed(false);
     setEnabled(false);
 
     m_clearListAction = new QAction(i18n("Empty Recently Closed Tabs"), this);
-    m_clearListAction->setIcon(KIcon("edit-clear-list"));
+    m_clearListAction->setIcon(QIcon::fromTheme("edit-clear-list"));
     addAction(m_clearListAction);
 
     addSeparator();
@@ -45,8 +45,8 @@ void DolphinRecentTabsMenu::rememberClosedTab(const KUrl& url, const QByteArray&
     QAction* action = new QAction(menu());
     action->setText(url.path());
     action->setData(state);
-    const QString iconName = KMimeType::iconNameForUrl(url);
-    action->setIcon(KIcon(iconName));
+    const QString iconName = KIO::iconNameForUrl(url);
+    action->setIcon(QIcon::fromTheme(iconName));
 
     // Add the closed tab menu entry after the separator and
     // "Empty Recently Closed Tabs" entry