summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorElvis Angelaccio <[email protected]>2017-08-24 17:32:06 +0200
committerElvis Angelaccio <[email protected]>2017-08-24 17:32:06 +0200
commit3bfdf0d2f043a5891649c4d817d367dd4718d888 (patch)
tree9a005316a547b8535415d5af8e11319b54b2e324
parent101884841659cf7b1d735e894477415cddd1787f (diff)
Port to new KStandardAction slot syntax
For more compile-time safety.
-rw-r--r--src/dolphinmainwindow.cpp20
-rw-r--r--src/views/dolphinviewactionhandler.cpp4
2 files changed, 12 insertions, 12 deletions
diff --git a/src/dolphinmainwindow.cpp b/src/dolphinmainwindow.cpp
index 9369b3c..ff83470 100644
--- a/src/dolphinmainwindow.cpp
+++ b/src/dolphinmainwindow.cpp
@@ -1014,23 +1014,23 @@ void DolphinMainWindow::setupActions()
closeTab->setEnabled(false);
connect(closeTab, &QAction::triggered, m_tabWidget, static_cast<void(DolphinTabWidget::*)()>(&DolphinTabWidget::closeTab));
- KStandardAction::quit(this, SLOT(quit()), actionCollection());
+ KStandardAction::quit(this, &DolphinMainWindow::quit, actionCollection());
// setup 'Edit' menu
KStandardAction::undo(this,
- SLOT(undo()),
+ &DolphinMainWindow::undo,
actionCollection());
- KStandardAction::cut(this, SLOT(cut()), actionCollection());
- KStandardAction::copy(this, SLOT(copy()), actionCollection());
- QAction* paste = KStandardAction::paste(this, SLOT(paste()), actionCollection());
+ KStandardAction::cut(this, &DolphinMainWindow::cut, actionCollection());
+ KStandardAction::copy(this, &DolphinMainWindow::copy, actionCollection());
+ QAction* paste = KStandardAction::paste(this, &DolphinMainWindow::paste, actionCollection());
// The text of the paste-action is modified dynamically by Dolphin
// (e. g. to "Paste One Folder"). To prevent that the size of the toolbar changes
// due to the long text, the text "Paste" is used:
paste->setIconText(i18nc("@action:inmenu Edit", "Paste"));
- KStandardAction::find(this, SLOT(find()), actionCollection());
+ KStandardAction::find(this, &DolphinMainWindow::find, actionCollection());
QAction* selectAll = actionCollection()->addAction(QStringLiteral("select_all"));
selectAll->setText(i18nc("@action:inmenu Edit", "Select All"));
@@ -1081,7 +1081,7 @@ void DolphinMainWindow::setupActions()
connect(replaceLocation, &QAction::triggered, this, &DolphinMainWindow::replaceLocation);
// setup 'Go' menu
- QAction* backAction = KStandardAction::back(this, SLOT(goBack()), actionCollection());
+ QAction* backAction = KStandardAction::back(this, &DolphinMainWindow::goBack, actionCollection());
auto backShortcuts = backAction->shortcuts();
backShortcuts.append(QKeySequence(Qt::Key_Backspace));
actionCollection()->setDefaultShortcuts(backAction, backShortcuts);
@@ -1105,9 +1105,9 @@ void DolphinMainWindow::setupActions()
auto undoAction = actionCollection()->action(KStandardAction::name(KStandardAction::Undo));
undoAction->setEnabled(false); // undo should be disabled by default
- KStandardAction::forward(this, SLOT(goForward()), actionCollection());
- KStandardAction::up(this, SLOT(goUp()), actionCollection());
- KStandardAction::home(this, SLOT(goHome()), actionCollection());
+ KStandardAction::forward(this, &DolphinMainWindow::goForward, actionCollection());
+ KStandardAction::up(this, &DolphinMainWindow::goUp, actionCollection());
+ KStandardAction::home(this, &DolphinMainWindow::goHome, actionCollection());
// setup 'Tools' menu
QAction* showFilterBar = actionCollection()->addAction(QStringLiteral("show_filter_bar"));
diff --git a/src/views/dolphinviewactionhandler.cpp b/src/views/dolphinviewactionhandler.cpp
index 538fd8a..447d46f 100644
--- a/src/views/dolphinviewactionhandler.cpp
+++ b/src/views/dolphinviewactionhandler.cpp
@@ -144,11 +144,11 @@ void DolphinViewActionHandler::createActions()
connect(viewModeActions, static_cast<void(KSelectAction::*)(QAction*)>(&KSelectAction::triggered), this, &DolphinViewActionHandler::slotViewModeActionTriggered);
KStandardAction::zoomIn(this,
- SLOT(zoomIn()),
+ &DolphinViewActionHandler::zoomIn,
m_actionCollection);
KStandardAction::zoomOut(this,
- SLOT(zoomOut()),
+ &DolphinViewActionHandler::zoomOut,
m_actionCollection);
KToggleAction* showPreview = m_actionCollection->add<KToggleAction>(QStringLiteral("show_preview"));