kde/dolphin
kde/dolphin
1
0
Fork 0
mirror of https://invent.kde.org/system/dolphin synced 2024-09-12 12:54:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

* Fixed wrong signal-slot connection between KUrlNavigator and DolphinMainWindow

Browse source 
* 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)
This commit is contained in:
Emmanuel Pescosta 2014-09-15 18:17:30 +02:00
parent 88e3cdcbc0
commit ab3ea08625
2 changed files with 14 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
src/dolphinmainwindow.cpp
View file

@ -312,14 +312,14 @@ void DolphinMainWindow::openNewActivatedTab()
m_tabWidget->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() void DolphinMainWindow::openInNewTab()
@ -1212,8 +1212,8 @@ void DolphinMainWindow::setupDockWidgets()
foldersPanel, &FoldersPanel::setUrl); foldersPanel, &FoldersPanel::setUrl);
connect(foldersPanel, &FoldersPanel::folderActivated, connect(foldersPanel, &FoldersPanel::folderActivated,
this, &DolphinMainWindow::changeUrl); this, &DolphinMainWindow::changeUrl);
connect(foldersPanel, SIGNAL(folderMiddleClicked(KUrl)), connect(foldersPanel, &FoldersPanel::folderMiddleClicked,
this, SLOT(openNewTab(KUrl))); this, &DolphinMainWindow::openNewTab);
connect(foldersPanel, &FoldersPanel::errorMessage, connect(foldersPanel, &FoldersPanel::errorMessage,
this, &DolphinMainWindow::slotPanelErrorMessage); this, &DolphinMainWindow::slotPanelErrorMessage);
@ -1429,8 +1429,8 @@ void DolphinMainWindow::connectViewSignals(DolphinViewContainer* container)
this, &DolphinMainWindow::slotSelectionChanged); this, &DolphinMainWindow::slotSelectionChanged);
connect(view, &DolphinView::requestItemInfo, connect(view, &DolphinView::requestItemInfo,
this, &DolphinMainWindow::slotRequestItemInfo); this, &DolphinMainWindow::slotRequestItemInfo);
connect(view, SIGNAL(tabRequested(KUrl)), connect(view, &DolphinView::tabRequested,
this, SLOT(openNewTab(KUrl))); this, &DolphinMainWindow::openNewTab);
connect(view, &DolphinView::requestContextMenu, connect(view, &DolphinView::requestContextMenu,
this, &DolphinMainWindow::openContextMenu); this, &DolphinMainWindow::openContextMenu);
connect(view, &DolphinView::directoryLoadingStarted, connect(view, &DolphinView::directoryLoadingStarted,
@ -1449,8 +1449,8 @@ void DolphinMainWindow::connectViewSignals(DolphinViewContainer* container)
this, &DolphinMainWindow::updateHistory); this, &DolphinMainWindow::updateHistory);
connect(navigator, &KUrlNavigator::editableStateChanged, connect(navigator, &KUrlNavigator::editableStateChanged,
this, &DolphinMainWindow::slotEditableStateChanged); this, &DolphinMainWindow::slotEditableStateChanged);
connect(navigator, SIGNAL(tabRequested(KUrl)), connect(navigator, &KUrlNavigator::tabRequested,
this, SLOT(openNewTab(KUrl))); this, &DolphinMainWindow::openNewTab);
} }
void DolphinMainWindow::updateSplitAction() void DolphinMainWindow::updateSplitAction()

10
src/dolphinmainwindow.h
View file

@ -335,16 +335,14 @@ private slots:
void openNewActivatedTab(); void openNewActivatedTab();
/** /**
* Opens a new tab in the background showing the URL \a primaryUrl and the * Opens a new tab in the background showing the URL \a url.
* optional URL \a secondaryUrl.
*/ */
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 * Opens a new tab showing the URL \a url and activates the tab.
* \a secondaryUrl 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. * Opens the selected folder in a new tab.