X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/01e4f60a0931aba506b184d384a4e2f926b2233c..44a21ea51a055c7429ddee866e35b0a5a21c072b:/src/dolphinrecenttabsmenu.cpp diff --git a/src/dolphinrecenttabsmenu.cpp b/src/dolphinrecenttabsmenu.cpp index f4492a214..e85cedbf9 100644 --- a/src/dolphinrecenttabsmenu.cpp +++ b/src/dolphinrecenttabsmenu.cpp @@ -19,28 +19,29 @@ #include "dolphinrecenttabsmenu.h" -#include #include +#include #include + #include DolphinRecentTabsMenu::DolphinRecentTabsMenu(QObject* parent) : - KActionMenu(QIcon::fromTheme("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); - m_clearListAction->setIcon(QIcon::fromTheme("edit-clear-list")); + m_clearListAction->setIcon(QIcon::fromTheme(QStringLiteral("edit-clear-list"))); 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& url, const QByteArray& state) +void DolphinRecentTabsMenu::rememberClosedTab(const QUrl& url, const QByteArray& state) { QAction* action = new QAction(menu()); action->setText(url.path()); @@ -83,10 +84,10 @@ void DolphinRecentTabsMenu::handleAction(QAction* action) } emit closedTabsCountChanged(0); } else { - const QByteArray state = action->data().value(); + const QByteArray state = action->data().toByteArray(); removeAction(action); delete action; - action = 0; + action = nullptr; emit restoreClosedTab(state); emit closedTabsCountChanged(menu()->actions().size() - 2); } @@ -94,4 +95,4 @@ void DolphinRecentTabsMenu::handleAction(QAction* action) if (menu()->actions().count() <= 2) { setEnabled(false); } -} \ No newline at end of file +}