Merge branch 'master' into frameworks

[dolphin.git] / src / dolphinrecenttabsmenu.cpp

diff --git a/src/dolphinrecenttabsmenu.cpp b/src/dolphinrecenttabsmenu.cpp
index 2335f1bf48ef8df63b2fe404fe0bc1a46e6600ec..0f90e634b32337ceb8b843ac9a84fbc50e80ae19 100644 (file)
--- a/src/dolphinrecenttabsmenu.cpp
+++ b/src/dolphinrecenttabsmenu.cpp
@@ -25,13 +25,13 @@
 #include <KMenu>
 
 DolphinRecentTabsMenu::DolphinRecentTabsMenu(QObject* parent) :
 #include <KMenu>
 
 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);
 {
     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();
     addAction(m_clearListAction);
 
     addSeparator();


@@ -46,7 +46,7 @@ void DolphinRecentTabsMenu::rememberClosedTab(const KUrl& primaryUrl, const KUrl
     action->setText(primaryUrl.path());
 
     const QString iconName = KMimeType::iconNameForUrl(primaryUrl);
     action->setText(primaryUrl.path());
 
     const QString iconName = KMimeType::iconNameForUrl(primaryUrl);

-    action->setIcon(KIcon(iconName));
+    action->setIcon(QIcon::fromTheme(iconName));

 
     KUrl::List urls;
     urls << primaryUrl;
 
     KUrl::List urls;
     urls << primaryUrl;