From fe1e91be68db6d50a96714849251f3076d89feae Mon Sep 17 00:00:00 2001
From: Edward Brown <edward.brown@stfc.ac.uk>
Date: Tue, 22 Aug 2017 14:05:30 +0100
Subject: [PATCH] Re #20302: Renamed DataProcessorAppendGroupCommand.
---
qt/python/CMakeLists.txt | 2 +-
qt/python/mantidqt.sip | 10 +++++-----
qt/widgets/common/CMakeLists.txt | 2 +-
...ssorAppendGroupCommand.h => AppendGroupCommand.h} | 12 ++++++------
.../DataProcessorTwoLevelTreeManager.cpp | 4 ++--
.../test/DataProcessorUI/DataProcessorCommandsTest.h | 4 ++--
.../DataProcessorTwoLevelTreeManagerTest.h | 4 ++--
.../ui/dataprocessorinterface/data_processor_gui.py | 2 +-
scripts/Interface/ui/poldi/poldi_gui.py | 2 +-
9 files changed, 21 insertions(+), 21 deletions(-)
rename qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/{DataProcessorAppendGroupCommand.h => AppendGroupCommand.h} (84%)
diff --git a/qt/python/CMakeLists.txt b/qt/python/CMakeLists.txt
index 629939ecd41..640683b4161 100644
--- a/qt/python/CMakeLists.txt
+++ b/qt/python/CMakeLists.txt
@@ -37,7 +37,7 @@ set ( SIP_HDRS
../widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/QDataProcessorWidget.h
../widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorMainPresenter.h
../widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorAppendRowCommand.h
- ../widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorAppendGroupCommand.h
+ ../widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/AppendGroupCommand.h
../widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorClearSelectedCommand.h
../widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorCopySelectedCommand.h
../widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorCutSelectedCommand.h
diff --git a/qt/python/mantidqt.sip b/qt/python/mantidqt.sip
index 11efdd444d9..7b63bf607ef 100644
--- a/qt/python/mantidqt.sip
+++ b/qt/python/mantidqt.sip
@@ -1600,13 +1600,13 @@ DataProcessorAppendRowCommand();
DataProcessorAppendRowCommand(const MantidQt::MantidWidgets::DataProcessor::DataProcessorAppendRowCommand &);
};
-class DataProcessorAppendGroupCommand
+class AppendGroupCommand
{
%TypeHeaderCode
-#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorAppendGroupCommand.h"
+#include "MantidQtWidgets/Common/DataProcessorUI/AppendGroupCommand.h"
%End
public:
-DataProcessorAppendGroupCommand(const MantidQt::MantidWidgets::DataProcessor::QDataProcessorWidget &);
+AppendGroupCommand(const MantidQt::MantidWidgets::DataProcessor::QDataProcessorWidget &);
void execute();
QString name();
QString icon();
@@ -1615,8 +1615,8 @@ QString whatsthis();
QString shortcut();
private:
-DataProcessorAppendGroupCommand();
-DataProcessorAppendGroupCommand(const MantidQt::MantidWidgets::DataProcessor::DataProcessorAppendGroupCommand &);
+AppendGroupCommand();
+AppendGroupCommand(const MantidQt::MantidWidgets::DataProcessor::AppendGroupCommand &);
};
class DataProcessorClearSelectedCommand
diff --git a/qt/widgets/common/CMakeLists.txt b/qt/widgets/common/CMakeLists.txt
index 52f7d34dfac..21c00f5a358 100644
--- a/qt/widgets/common/CMakeLists.txt
+++ b/qt/widgets/common/CMakeLists.txt
@@ -302,7 +302,7 @@ set ( INC_FILES
inc/MantidQtWidgets/Common/WorkspaceIcons.h
inc/MantidQtWidgets/Common/AlgorithmHintStrategy.h
inc/MantidQtWidgets/Common/CatalogHelper.h
- inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorAppendGroupCommand.h
+ inc/MantidQtWidgets/Common/DataProcessorUI/AppendGroupCommand.h
inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorAppendRowCommand.h
inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorClearSelectedCommand.h
inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorCommand.h
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorAppendGroupCommand.h b/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/AppendGroupCommand.h
similarity index 84%
rename from qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorAppendGroupCommand.h
rename to qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/AppendGroupCommand.h
index f1778ae0284..5df336d8454 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorAppendGroupCommand.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/AppendGroupCommand.h
@@ -7,9 +7,9 @@
namespace MantidQt {
namespace MantidWidgets {
namespace DataProcessor {
-/** @class DataProcessorAppendGroupCommand
+/** @class AppendGroupCommand
-DataProcessorAppendGroupCommand defines the action "Insert Group"
+AppendGroupCommand defines the action "Insert Group"
Copyright © 2011-16 ISIS Rutherford Appleton Laboratory, NScD Oak Ridge
National Laboratory & European Spallation Source
@@ -32,13 +32,13 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
File change history is stored at: <https://github.com/mantidproject/mantid>.
Code Documentation is available at: <http://doxygen.mantidproject.org>
*/
-class DataProcessorAppendGroupCommand : public DataProcessorCommandBase {
+class AppendGroupCommand : public DataProcessorCommandBase {
public:
- DataProcessorAppendGroupCommand(DataProcessorPresenter *tablePresenter)
+ AppendGroupCommand(DataProcessorPresenter *tablePresenter)
: DataProcessorCommandBase(tablePresenter){};
- DataProcessorAppendGroupCommand(const QDataProcessorWidget &widget)
+ AppendGroupCommand(const QDataProcessorWidget &widget)
: DataProcessorCommandBase(widget){};
- virtual ~DataProcessorAppendGroupCommand(){};
+ virtual ~AppendGroupCommand(){};
void execute() override {
m_presenter->notify(DataProcessorPresenter::AppendGroupFlag);
diff --git a/qt/widgets/common/src/DataProcessorUI/DataProcessorTwoLevelTreeManager.cpp b/qt/widgets/common/src/DataProcessorUI/DataProcessorTwoLevelTreeManager.cpp
index a2c40a090c7..f16ded4104c 100644
--- a/qt/widgets/common/src/DataProcessorUI/DataProcessorTwoLevelTreeManager.cpp
+++ b/qt/widgets/common/src/DataProcessorUI/DataProcessorTwoLevelTreeManager.cpp
@@ -2,7 +2,7 @@
#include "MantidAPI/ITableWorkspace.h"
#include "MantidAPI/TableRow.h"
#include "MantidAPI/WorkspaceFactory.h"
-#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorAppendGroupCommand.h"
+#include "MantidQtWidgets/Common/DataProcessorUI/AppendGroupCommand.h"
#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorAppendRowCommand.h"
#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorClearSelectedCommand.h"
#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorCollapseGroupsCommand.h"
@@ -105,7 +105,7 @@ DataProcessorTwoLevelTreeManager::publishCommands() {
addCommand(commands, make_unique<DataProcessorSeparatorCommand>(m_presenter));
addCommand(commands, make_unique<DataProcessorAppendRowCommand>(m_presenter));
addCommand(commands,
- make_unique<DataProcessorAppendGroupCommand>(m_presenter));
+ make_unique<AppendGroupCommand>(m_presenter));
addCommand(commands, make_unique<DataProcessorSeparatorCommand>(m_presenter));
addCommand(commands, make_unique<DataProcessorGroupRowsCommand>(m_presenter));
addCommand(commands,
diff --git a/qt/widgets/common/test/DataProcessorUI/DataProcessorCommandsTest.h b/qt/widgets/common/test/DataProcessorUI/DataProcessorCommandsTest.h
index 4c80b77b1a9..42a41c2f0d8 100644
--- a/qt/widgets/common/test/DataProcessorUI/DataProcessorCommandsTest.h
+++ b/qt/widgets/common/test/DataProcessorUI/DataProcessorCommandsTest.h
@@ -5,7 +5,7 @@
#include <gmock/gmock.h>
#include <gtest/gtest.h>
-#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorAppendGroupCommand.h"
+#include "MantidQtWidgets/Common/DataProcessorUI/AppendGroupCommand.h"
#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorAppendRowCommand.h"
#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorClearSelectedCommand.h"
#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorCollapseGroupsCommand.h"
@@ -253,7 +253,7 @@ public:
void test_append_group_command() {
NiceMock<MockDataProcessorPresenter> mockPresenter;
- DataProcessorAppendGroupCommand command(&mockPresenter);
+ AppendGroupCommand command(&mockPresenter);
// The presenter should be notified with the AppendRowFlag
EXPECT_CALL(mockPresenter, notify(DataProcessorPresenter::AppendGroupFlag))
diff --git a/qt/widgets/common/test/DataProcessorUI/DataProcessorTwoLevelTreeManagerTest.h b/qt/widgets/common/test/DataProcessorUI/DataProcessorTwoLevelTreeManagerTest.h
index e35150c0944..4d90c11022c 100644
--- a/qt/widgets/common/test/DataProcessorUI/DataProcessorTwoLevelTreeManagerTest.h
+++ b/qt/widgets/common/test/DataProcessorUI/DataProcessorTwoLevelTreeManagerTest.h
@@ -9,7 +9,7 @@
#include "MantidAPI/TableRow.h"
#include "MantidAPI/WorkspaceFactory.h"
#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorTwoLevelTreeManager.h"
-#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorAppendGroupCommand.h"
+#include "MantidQtWidgets/Common/DataProcessorUI/AppendGroupCommand.h"
#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorAppendRowCommand.h"
#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorClearSelectedCommand.h"
#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorCollapseGroupsCommand.h"
@@ -161,7 +161,7 @@ public:
TS_ASSERT(dynamic_cast<DataProcessorPlotGroupCommand *>(comm[18].get()));
TS_ASSERT(dynamic_cast<DataProcessorSeparatorCommand *>(comm[19].get()));
TS_ASSERT(dynamic_cast<DataProcessorAppendRowCommand *>(comm[20].get()));
- TS_ASSERT(dynamic_cast<DataProcessorAppendGroupCommand *>(comm[21].get()));
+ TS_ASSERT(dynamic_cast<AppendGroupCommand *>(comm[21].get()));
TS_ASSERT(dynamic_cast<DataProcessorSeparatorCommand *>(comm[22].get()));
TS_ASSERT(dynamic_cast<DataProcessorGroupRowsCommand *>(comm[23].get()));
TS_ASSERT(dynamic_cast<DataProcessorCopySelectedCommand *>(comm[24].get()));
diff --git a/scripts/Interface/ui/dataprocessorinterface/data_processor_gui.py b/scripts/Interface/ui/dataprocessorinterface/data_processor_gui.py
index cf85e90e1e2..4a88f9381fb 100644
--- a/scripts/Interface/ui/dataprocessorinterface/data_processor_gui.py
+++ b/scripts/Interface/ui/dataprocessorinterface/data_processor_gui.py
@@ -165,7 +165,7 @@ class DataProcessorGui(QtGui.QMainWindow, ui_data_processor_window.Ui_DataProces
self._create_action(MantidQt.MantidWidgets.DataProcessorPlotRowCommand(self.data_processor_table), self.menuEdit)
self._create_action(MantidQt.MantidWidgets.DataProcessorPlotGroupCommand(self.data_processor_table), self.menuEdit)
self._create_action(MantidQt.MantidWidgets.DataProcessorAppendRowCommand(self.data_processor_table), self.menuEdit)
- self._create_action(MantidQt.MantidWidgets.DataProcessorAppendGroupCommand(self.data_processor_table), self.menuEdit)
+ self._create_action(MantidQt.MantidWidgets.AppendGroupCommand(self.data_processor_table), self.menuEdit)
self._create_action(MantidQt.MantidWidgets.DataProcessorGroupRowsCommand(self.data_processor_table), self.menuEdit)
self._create_action(MantidQt.MantidWidgets.DataProcessorCopySelectedCommand(self.data_processor_table), self.menuEdit)
self._create_action(MantidQt.MantidWidgets.DataProcessorCutSelectedCommand(self.data_processor_table), self.menuEdit)
diff --git a/scripts/Interface/ui/poldi/poldi_gui.py b/scripts/Interface/ui/poldi/poldi_gui.py
index 626c531d1ae..8dedca899b6 100644
--- a/scripts/Interface/ui/poldi/poldi_gui.py
+++ b/scripts/Interface/ui/poldi/poldi_gui.py
@@ -154,7 +154,7 @@ class PoldiGui(QtGui.QMainWindow, ui_poldi_window.Ui_PoldiWindow):
self._create_action(MantidQt.MantidWidgets.DataProcessorPlotRowCommand(self.data_processor_table), self.menuEdit)
self._create_action(MantidQt.MantidWidgets.DataProcessorPlotGroupCommand(self.data_processor_table), self.menuEdit)
self._create_action(MantidQt.MantidWidgets.DataProcessorAppendRowCommand(self.data_processor_table), self.menuEdit)
- self._create_action(MantidQt.MantidWidgets.DataProcessorAppendGroupCommand(self.data_processor_table), self.menuEdit)
+ self._create_action(MantidQt.MantidWidgets.AppendGroupCommand(self.data_processor_table), self.menuEdit)
self._create_action(MantidQt.MantidWidgets.DataProcessorGroupRowsCommand(self.data_processor_table), self.menuEdit)
self._create_action(MantidQt.MantidWidgets.DataProcessorCopySelectedCommand(self.data_processor_table), self.menuEdit)
self._create_action(MantidQt.MantidWidgets.DataProcessorCutSelectedCommand(self.data_processor_table), self.menuEdit)
--
GitLab