┌   ┐
54
└   ┘

summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEmmanuel Pescosta <[email protected]>2015-01-25 00:14:37 +0100
committerEmmanuel Pescosta <[email protected]>2015-01-28 14:54:47 +0100
commit7e03c99ebbba7fd4c6b15dc885460e4dbf18f7b4 (patch)
tree789b98c3fdce7032a8e01acb4fdb973368663663
parent9cdbd1eb09b89df7e709ea44c889c0f225cb8b98 (diff)
use DolphinMainWindow::showErrorMessage instead of DolphinMainWindow::slotPanelErrorMessage because the implementation is exactly the same
-rw-r--r--src/dolphinmainwindow.cpp9
-rw-r--r--src/dolphinmainwindow.h6
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
@@ -396,12 +396,6 @@ private slots:
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
* current URL otherwise.