From 7e03c99ebbba7fd4c6b15dc885460e4dbf18f7b4 Mon Sep 17 00:00:00 2001 From: Emmanuel Pescosta Date: Sun, 25 Jan 2015 00:14:37 +0100 Subject: [PATCH] use DolphinMainWindow::showErrorMessage instead of DolphinMainWindow::slotPanelErrorMessage because the implementation is exactly the same --- src/dolphinmainwindow.cpp | 9 ++------- src/dolphinmainwindow.h | 6 ------ 2 files changed, 2 insertions(+), 13 deletions(-) diff --git a/src/dolphinmainwindow.cpp b/src/dolphinmainwindow.cpp index 526f80474..830669726 100644 --- a/src/dolphinmainwindow.cpp +++ b/src/dolphinmainwindow.cpp @@ -899,11 +899,6 @@ void DolphinMainWindow::slotControlButtonDeleted() m_updateToolBarTimer->start(); } -void DolphinMainWindow::slotPanelErrorMessage(const QString& error) -{ - activeViewContainer()->showMessage(error, DolphinViewContainer::Error); -} - void DolphinMainWindow::slotPlaceActivated(const QUrl& url) { DolphinViewContainer* view = activeViewContainer(); @@ -1212,7 +1207,7 @@ void DolphinMainWindow::setupDockWidgets() connect(foldersPanel, &FoldersPanel::folderMiddleClicked, this, &DolphinMainWindow::openNewTab); connect(foldersPanel, &FoldersPanel::errorMessage, - this, &DolphinMainWindow::slotPanelErrorMessage); + this, &DolphinMainWindow::showErrorMessage); // Setup "Terminal" #ifndef Q_OS_WIN @@ -1264,7 +1259,7 @@ void DolphinMainWindow::setupDockWidgets() connect(placesPanel, SIGNAL(placeMiddleClicked(QUrl)), this, SLOT(openNewTab(QUrl))); connect(placesPanel, &PlacesPanel::errorMessage, - this, &DolphinMainWindow::slotPanelErrorMessage); + this, &DolphinMainWindow::showErrorMessage); connect(this, &DolphinMainWindow::urlChanged, placesPanel, &PlacesPanel::setUrl); connect(placesDock, &DolphinDockWidget::visibilityChanged, diff --git a/src/dolphinmainwindow.h b/src/dolphinmainwindow.h index 462d3d362..85383a309 100644 --- a/src/dolphinmainwindow.h +++ b/src/dolphinmainwindow.h @@ -395,12 +395,6 @@ private slots: void updateToolBar(); void slotControlButtonDeleted(); - /** - * Is called if a panel emits an error-message and shows - * the error-message in the active view-container. - */ - void slotPanelErrorMessage(const QString& error); - /** * Is called if the user clicked an item in the Places Panel. * Reloads the view if \a url is the current URL already, and changes the -- 2.47.3