]> cloud.milkyroute.net Git - dolphin.git/commitdiff
prevent goBack, goForward, goHome and goUp from being called twice
authorArjun AK <arjunak234@gmail.com>
Wed, 25 Jun 2014 13:23:05 +0000 (18:53 +0530)
committerArjun AK <arjunak234@gmail.com>
Wed, 25 Jun 2014 13:23:05 +0000 (18:53 +0530)
REVIEW: 118782

src/dolphinmainwindow.cpp

index 924354b4b8170767e62d33b82dbf73d3668ea147..7c9001b688f623a011da42c8e0206efe151bd661 100644 (file)
@@ -1582,7 +1582,6 @@ void DolphinMainWindow::setupActions()
 
     // setup 'Go' menu
     QAction* backAction = KStandardAction::back(this, SLOT(goBack()), actionCollection());
-    connect(backAction, &QAction::triggered, this, static_cast<void(DolphinMainWindow::*)()>(&DolphinMainWindow::goBack));
     auto backShortcuts = backAction->shortcuts();
     backShortcuts.append(QKeySequence(Qt::Key_Backspace));
     backAction->setShortcuts(backShortcuts);
@@ -1601,14 +1600,9 @@ void DolphinMainWindow::setupActions()
     m_recentTabsMenu->addSeparator();
     m_recentTabsMenu->setEnabled(false);
 
-    QAction* forwardAction = KStandardAction::forward(this, SLOT(goForward()), actionCollection());
-    connect(forwardAction, &QAction::triggered, this, static_cast<void(DolphinMainWindow::*)()>(&DolphinMainWindow::goForward));
-
-    QAction* upAction = KStandardAction::up(this, SLOT(goUp()), actionCollection());
-    connect(upAction, &QAction::triggered, this, static_cast<void(DolphinMainWindow::*)()>(&DolphinMainWindow::goUp));
-
-    QAction* homeAction = KStandardAction::home(this, SLOT(goHome()), actionCollection());
-    connect(homeAction, &QAction::triggered, this, static_cast<void(DolphinMainWindow::*)()>(&DolphinMainWindow::goHome));
+    KStandardAction::forward(this, SLOT(goForward()), actionCollection());
+    KStandardAction::up(this, SLOT(goUp()), actionCollection());
+    KStandardAction::home(this, SLOT(goHome()), actionCollection());
 
     // setup 'Tools' menu
     QAction* showFilterBar = actionCollection()->addAction("show_filter_bar");