From e3d5d491b1b7cbf47b8645374dd9e1a75686f9f4 Mon Sep 17 00:00:00 2001
From: Nick Draper <nick.draper@stfc.ac.uk>
Date: Tue, 3 Mar 2020 15:29:32 +0000
Subject: [PATCH] Rename a private slot that was being hidden by a signal
in a derived class
re #28185
---
.../Common/WorkspacePresenter/WorkspaceTreeWidget.h | 2 +-
.../common/src/WorkspacePresenter/WorkspaceTreeWidget.cpp | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/WorkspacePresenter/WorkspaceTreeWidget.h b/qt/widgets/common/inc/MantidQtWidgets/Common/WorkspacePresenter/WorkspaceTreeWidget.h
index ccc9f560b17..68a0672511e 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/WorkspacePresenter/WorkspaceTreeWidget.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/WorkspacePresenter/WorkspaceTreeWidget.h
@@ -190,7 +190,7 @@ protected slots:
private slots:
void handleShowSaveAlgorithm();
- void treeSelectionChanged();
+ void onTreeSelectionChanged();
void onClickGroupButton();
void onClickLoad();
void onLoadAccept();
diff --git a/qt/widgets/common/src/WorkspacePresenter/WorkspaceTreeWidget.cpp b/qt/widgets/common/src/WorkspacePresenter/WorkspaceTreeWidget.cpp
index 2d18042acb0..2fa98987cac 100644
--- a/qt/widgets/common/src/WorkspacePresenter/WorkspaceTreeWidget.cpp
+++ b/qt/widgets/common/src/WorkspacePresenter/WorkspaceTreeWidget.cpp
@@ -170,7 +170,7 @@ void WorkspaceTreeWidget::setupConnections() {
connect(this, SIGNAL(signalClearView()), this, SLOT(handleClearView()),
Qt::QueuedConnection);
connect(m_tree, SIGNAL(itemSelectionChanged()), this,
- SLOT(treeSelectionChanged()));
+ SLOT(onTreeSelectionChanged()));
connect(m_tree, SIGNAL(itemExpanded(QTreeWidgetItem *)), this,
SLOT(populateChildData(QTreeWidgetItem *)));
}
@@ -900,7 +900,7 @@ bool WorkspaceTreeWidget::shouldBeSelected(QString name) const {
return false;
}
-void WorkspaceTreeWidget::treeSelectionChanged() {
+void WorkspaceTreeWidget::onTreeSelectionChanged() {
// get selected workspaces
auto items = m_tree->selectedItems();
--
GitLab