Fix build with Qt 5.14 RC

[dolphin.git] / src / dolphinrecenttabsmenu.cpp

diff --git a/src/dolphinrecenttabsmenu.cpp b/src/dolphinrecenttabsmenu.cpp
index 2335f1bf48ef8df63b2fe404fe0bc1a46e6600ec..e85cedbf978d0f8793dd6039fd5d68d164239181 100644 (file)
--- a/src/dolphinrecenttabsmenu.cpp
+++ b/src/dolphinrecenttabsmenu.cpp
@@ -19,39 +19,35 @@
 
 #include "dolphinrecenttabsmenu.h"
 
 
 #include "dolphinrecenttabsmenu.h"
 

-#include <KLocalizedString>

 #include <KAcceleratorManager>
 #include <KAcceleratorManager>

-#include <KMimeType>
-#include <KMenu>
+#include <KLocalizedString>
+#include <kio/global.h>
+
+#include <QMenu>

 
 DolphinRecentTabsMenu::DolphinRecentTabsMenu(QObject* parent) :
 
 DolphinRecentTabsMenu::DolphinRecentTabsMenu(QObject* parent) :

-    KActionMenu(KIcon("edit-undo"), i18n("Recently Closed Tabs"), parent)
+    KActionMenu(QIcon::fromTheme(QStringLiteral("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(QStringLiteral("edit-clear-list")));

     addAction(m_clearListAction);
 
     addSeparator();
 
     addAction(m_clearListAction);
 
     addSeparator();
 

-    connect(menu(), SIGNAL(triggered(QAction*)),
-            this, SLOT(handleAction(QAction*)));
+    connect(menu(), &QMenu::triggered,
+            this, &DolphinRecentTabsMenu::handleAction);

 }
 
 }
 

-void DolphinRecentTabsMenu::rememberClosedTab(const KUrl& primaryUrl, const KUrl& secondaryUrl)
+void DolphinRecentTabsMenu::rememberClosedTab(const QUrl& url, const QByteArray& state)

 {
     QAction* action = new QAction(menu());
 {
     QAction* action = new QAction(menu());

-    action->setText(primaryUrl.path());
-
-    const QString iconName = KMimeType::iconNameForUrl(primaryUrl);
-    action->setIcon(KIcon(iconName));
-
-    KUrl::List urls;
-    urls << primaryUrl;
-    urls << secondaryUrl;
-    action->setData(QVariant::fromValue(urls));
+    action->setText(url.path());
+    action->setData(state);
+    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
 
     // Add the closed tab menu entry after the separator and
     // "Empty Recently Closed Tabs" entry


@@ -88,17 +84,15 @@ void DolphinRecentTabsMenu::handleAction(QAction* action)
         }
         emit closedTabsCountChanged(0);
     } else {
         }
         emit closedTabsCountChanged(0);
     } else {

-        const KUrl::List urls = action->data().value<KUrl::List>();
+        const QByteArray state = action->data().toByteArray();

         removeAction(action);
         delete action;
         removeAction(action);
         delete action;

-        action = 0;
-        if (urls.count() == 2) {
-            emit restoreClosedTab(urls.first(), urls.last());
-        }
+        action = nullptr;
+        emit restoreClosedTab(state);

         emit closedTabsCountChanged(menu()->actions().size() - 2);
     }
 
     if (menu()->actions().count() <= 2) {
         setEnabled(false);
     }
         emit closedTabsCountChanged(menu()->actions().size() - 2);
     }
 
     if (menu()->actions().count() <= 2) {
         setEnabled(false);
     }

-}
\ No newline at end of file
+}