From ab3ea08625648cf1f9f00cc9bcda5e06d2b8ffa9 Mon Sep 17 00:00:00 2001 From: Emmanuel Pescosta Date: Mon, 15 Sep 2014 18:17:30 +0200 Subject: [PATCH] * Fixed wrong signal-slot connection between KUrlNavigator and DolphinMainWindow * Use the new syntax to connect to DolphinMainWindow::openNewTab from the url navigator and from folders panel (removed the unused optional parameters from openNewTab and openNewActivatedTab) --- src/dolphinmainwindow.cpp | 20 ++++++++++---------- src/dolphinmainwindow.h | 10 ++++------ 2 files changed, 14 insertions(+), 16 deletions(-) diff --git a/src/dolphinmainwindow.cpp b/src/dolphinmainwindow.cpp index eac642118..629faa154 100644 --- a/src/dolphinmainwindow.cpp +++ b/src/dolphinmainwindow.cpp @@ -312,14 +312,14 @@ void DolphinMainWindow::openNewActivatedTab() m_tabWidget->openNewActivatedTab(); } -void DolphinMainWindow::openNewTab(const KUrl& primaryUrl, const KUrl& secondaryUrl) +void DolphinMainWindow::openNewTab(const KUrl& url) { - m_tabWidget->openNewTab(primaryUrl, secondaryUrl); + m_tabWidget->openNewTab(url); } -void DolphinMainWindow::openNewActivatedTab(const KUrl& primaryUrl, const KUrl& secondaryUrl) +void DolphinMainWindow::openNewActivatedTab(const KUrl& url) { - m_tabWidget->openNewActivatedTab(primaryUrl, secondaryUrl); + m_tabWidget->openNewActivatedTab(url); } void DolphinMainWindow::openInNewTab() @@ -1212,8 +1212,8 @@ void DolphinMainWindow::setupDockWidgets() foldersPanel, &FoldersPanel::setUrl); connect(foldersPanel, &FoldersPanel::folderActivated, this, &DolphinMainWindow::changeUrl); - connect(foldersPanel, SIGNAL(folderMiddleClicked(KUrl)), - this, SLOT(openNewTab(KUrl))); + connect(foldersPanel, &FoldersPanel::folderMiddleClicked, + this, &DolphinMainWindow::openNewTab); connect(foldersPanel, &FoldersPanel::errorMessage, this, &DolphinMainWindow::slotPanelErrorMessage); @@ -1429,8 +1429,8 @@ void DolphinMainWindow::connectViewSignals(DolphinViewContainer* container) this, &DolphinMainWindow::slotSelectionChanged); connect(view, &DolphinView::requestItemInfo, this, &DolphinMainWindow::slotRequestItemInfo); - connect(view, SIGNAL(tabRequested(KUrl)), - this, SLOT(openNewTab(KUrl))); + connect(view, &DolphinView::tabRequested, + this, &DolphinMainWindow::openNewTab); connect(view, &DolphinView::requestContextMenu, this, &DolphinMainWindow::openContextMenu); connect(view, &DolphinView::directoryLoadingStarted, @@ -1449,8 +1449,8 @@ void DolphinMainWindow::connectViewSignals(DolphinViewContainer* container) this, &DolphinMainWindow::updateHistory); connect(navigator, &KUrlNavigator::editableStateChanged, this, &DolphinMainWindow::slotEditableStateChanged); - connect(navigator, SIGNAL(tabRequested(KUrl)), - this, SLOT(openNewTab(KUrl))); + connect(navigator, &KUrlNavigator::tabRequested, + this, &DolphinMainWindow::openNewTab); } void DolphinMainWindow::updateSplitAction() diff --git a/src/dolphinmainwindow.h b/src/dolphinmainwindow.h index ae3019794..e7a366800 100644 --- a/src/dolphinmainwindow.h +++ b/src/dolphinmainwindow.h @@ -335,16 +335,14 @@ private slots: void openNewActivatedTab(); /** - * Opens a new tab in the background showing the URL \a primaryUrl and the - * optional URL \a secondaryUrl. + * Opens a new tab in the background showing the URL \a url. */ - void openNewTab(const KUrl& primaryUrl, const KUrl& secondaryUrl = KUrl()); + void openNewTab(const KUrl& url); /** - * Opens a new tab showing the URL \a primaryUrl and the optional URL - * \a secondaryUrl and activates the tab. + * Opens a new tab showing the URL \a url and activates the tab. */ - void openNewActivatedTab(const KUrl& primaryUrl, const KUrl& secondaryUrl = KUrl()); + void openNewActivatedTab(const KUrl& url); /** * Opens the selected folder in a new tab. -- 2.47.3