From 1231b8fedc64c9aa859bccdeadc570a6a4a69af7 Mon Sep 17 00:00:00 2001
From: Edward Brown <edward.brown@stfc.ac.uk>
Date: Tue, 5 Sep 2017 10:44:42 +0100
Subject: [PATCH] Re #20302: Renamed DataProcessorSaveTableAsCommand
- Renamed to SaveTableAsCommand
---
qt/python/CMakeLists.txt | 2 +-
qt/python/mantidqt.sip | 10 +++++-----
qt/widgets/common/CMakeLists.txt | 2 +-
...ssorSaveTableAsCommand.h => SaveTableAsCommand.h} | 12 ++++++------
.../DataProcessorTwoLevelTreeManager.cpp | 4 ++--
.../src/DataProcessorUI/OneLevelTreeManager.cpp | 4 ++--
.../common/test/DataProcessorUI/CommandsTest.h | 4 ++--
.../DataProcessorTwoLevelTreeManagerTest.h | 4 ++--
.../test/DataProcessorUI/OneLevelTreeManagerTest.h | 4 ++--
.../ui/dataprocessorinterface/data_processor_gui.py | 2 +-
scripts/Interface/ui/poldi/poldi_gui.py | 2 +-
.../ui/sans_isis/sans_data_processor_gui.py | 2 +-
12 files changed, 26 insertions(+), 26 deletions(-)
rename qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/{DataProcessorSaveTableAsCommand.h => SaveTableAsCommand.h} (83%)
diff --git a/qt/python/CMakeLists.txt b/qt/python/CMakeLists.txt
index 8a6674339f0..cf17ad7e9d2 100644
--- a/qt/python/CMakeLists.txt
+++ b/qt/python/CMakeLists.txt
@@ -55,7 +55,7 @@ set ( SIP_HDRS
../widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/PlotRowCommand.h
../widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/ProcessCommand.h
../widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorSaveTableCommand.h
- ../widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorSaveTableAsCommand.h
+ ../widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/SaveTableAsCommand.h
../widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorSeparatorCommand.h
../widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorWorkspaceCommand.h
../widgets/common/inc/MantidQtWidgets/Common/SlitCalculator.h
diff --git a/qt/python/mantidqt.sip b/qt/python/mantidqt.sip
index bfa904b67e1..1326f6a014e 100644
--- a/qt/python/mantidqt.sip
+++ b/qt/python/mantidqt.sip
@@ -1942,13 +1942,13 @@ DataProcessorSaveTableCommand();
DataProcessorSaveTableCommand(const MantidQt::MantidWidgets::DataProcessor::DataProcessorSaveTableCommand &);
};
-class DataProcessorSaveTableAsCommand
+class SaveTableAsCommand
{
%TypeHeaderCode
-#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorSaveTableAsCommand.h"
+#include "MantidQtWidgets/Common/DataProcessorUI/SaveTableAsCommand.h"
%End
public:
-DataProcessorSaveTableAsCommand(const MantidQt::MantidWidgets::DataProcessor::QDataProcessorWidget &);
+SaveTableAsCommand(const MantidQt::MantidWidgets::DataProcessor::QDataProcessorWidget &);
void execute();
QString name();
QString icon();
@@ -1957,8 +1957,8 @@ QString whatsthis();
QString shortcut();
private:
-DataProcessorSaveTableAsCommand();
-DataProcessorSaveTableAsCommand(const MantidQt::MantidWidgets::DataProcessor::DataProcessorSaveTableAsCommand &);
+SaveTableAsCommand();
+SaveTableAsCommand(const MantidQt::MantidWidgets::DataProcessor::SaveTableAsCommand &);
};
class DataProcessorSeparatorCommand
diff --git a/qt/widgets/common/CMakeLists.txt b/qt/widgets/common/CMakeLists.txt
index 309e35cb667..f4a88bc4877 100644
--- a/qt/widgets/common/CMakeLists.txt
+++ b/qt/widgets/common/CMakeLists.txt
@@ -334,7 +334,7 @@ set ( INC_FILES
inc/MantidQtWidgets/Common/DataProcessorUI/ProcessCommand.h
inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorProcessingAlgorithm.h
inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorProcessingAlgorithmBase.h
- inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorSaveTableAsCommand.h
+ inc/MantidQtWidgets/Common/DataProcessorUI/SaveTableAsCommand.h
inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorSaveTableCommand.h
inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorTreeManager.h
inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorTwoLevelTreeManager.h
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorSaveTableAsCommand.h b/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/SaveTableAsCommand.h
similarity index 83%
rename from qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorSaveTableAsCommand.h
rename to qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/SaveTableAsCommand.h
index 1e7d3e18e7c..8bcb8ab394c 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorSaveTableAsCommand.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/SaveTableAsCommand.h
@@ -6,9 +6,9 @@
namespace MantidQt {
namespace MantidWidgets {
namespace DataProcessor {
-/** @class DataProcessorSaveTableAsCommand
+/** @class SaveTableAsCommand
-DataProcessorSaveTableAsCommand defines the action "Save Table As"
+SaveTableAsCommand defines the action "Save Table As"
Copyright © 2011-16 ISIS Rutherford Appleton Laboratory, NScD Oak Ridge
National Laboratory & European Spallation Source
@@ -31,13 +31,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 DataProcessorSaveTableAsCommand : public CommandBase {
+class SaveTableAsCommand : public CommandBase {
public:
- DataProcessorSaveTableAsCommand(DataProcessorPresenter *tablePresenter)
+ SaveTableAsCommand(DataProcessorPresenter *tablePresenter)
: CommandBase(tablePresenter){};
- DataProcessorSaveTableAsCommand(const QDataProcessorWidget &widget)
+ SaveTableAsCommand(const QDataProcessorWidget &widget)
: CommandBase(widget){};
- virtual ~DataProcessorSaveTableAsCommand(){};
+ virtual ~SaveTableAsCommand(){};
void execute() override {
m_presenter->notify(DataProcessorPresenter::SaveAsFlag);
diff --git a/qt/widgets/common/src/DataProcessorUI/DataProcessorTwoLevelTreeManager.cpp b/qt/widgets/common/src/DataProcessorUI/DataProcessorTwoLevelTreeManager.cpp
index 7b48a6ff794..4a7ecc042bd 100644
--- a/qt/widgets/common/src/DataProcessorUI/DataProcessorTwoLevelTreeManager.cpp
+++ b/qt/widgets/common/src/DataProcessorUI/DataProcessorTwoLevelTreeManager.cpp
@@ -23,7 +23,7 @@
#include "MantidQtWidgets/Common/DataProcessorUI/PlotGroupCommand.h"
#include "MantidQtWidgets/Common/DataProcessorUI/PlotRowCommand.h"
#include "MantidQtWidgets/Common/DataProcessorUI/ProcessCommand.h"
-#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorSaveTableAsCommand.h"
+#include "MantidQtWidgets/Common/DataProcessorUI/SaveTableAsCommand.h"
#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorSaveTableCommand.h"
#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorSeparatorCommand.h"
#include "MantidQtWidgets/Common/DataProcessorUI/QDataProcessorTwoLevelTreeModel.h"
@@ -82,7 +82,7 @@ DataProcessorTwoLevelTreeManager::publishCommands() {
addCommand(commands, make_unique<NewTableCommand>(m_presenter));
addCommand(commands, make_unique<DataProcessorSaveTableCommand>(m_presenter));
addCommand(commands,
- make_unique<DataProcessorSaveTableAsCommand>(m_presenter));
+ make_unique<SaveTableAsCommand>(m_presenter));
addCommand(commands, make_unique<DataProcessorSeparatorCommand>(m_presenter));
addCommand(commands,
make_unique<ImportTableCommand>(m_presenter));
diff --git a/qt/widgets/common/src/DataProcessorUI/OneLevelTreeManager.cpp b/qt/widgets/common/src/DataProcessorUI/OneLevelTreeManager.cpp
index e5c8580b4e7..75eed13f157 100644
--- a/qt/widgets/common/src/DataProcessorUI/OneLevelTreeManager.cpp
+++ b/qt/widgets/common/src/DataProcessorUI/OneLevelTreeManager.cpp
@@ -16,7 +16,7 @@
#include "MantidQtWidgets/Common/DataProcessorUI/PauseCommand.h"
#include "MantidQtWidgets/Common/DataProcessorUI/PlotRowCommand.h"
#include "MantidQtWidgets/Common/DataProcessorUI/ProcessCommand.h"
-#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorSaveTableAsCommand.h"
+#include "MantidQtWidgets/Common/DataProcessorUI/SaveTableAsCommand.h"
#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorSaveTableCommand.h"
#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorSeparatorCommand.h"
#include "MantidQtWidgets/Common/DataProcessorUI/QDataProcessorOneLevelTreeModel.h"
@@ -73,7 +73,7 @@ OneLevelTreeManager::publishCommands() {
addCommand(commands, make_unique<NewTableCommand>(m_presenter));
addCommand(commands, make_unique<DataProcessorSaveTableCommand>(m_presenter));
addCommand(commands,
- make_unique<DataProcessorSaveTableAsCommand>(m_presenter));
+ make_unique<SaveTableAsCommand>(m_presenter));
addCommand(commands, make_unique<DataProcessorSeparatorCommand>(m_presenter));
addCommand(commands,
make_unique<ImportTableCommand>(m_presenter));
diff --git a/qt/widgets/common/test/DataProcessorUI/CommandsTest.h b/qt/widgets/common/test/DataProcessorUI/CommandsTest.h
index a71efa34ced..e5f56c10ace 100644
--- a/qt/widgets/common/test/DataProcessorUI/CommandsTest.h
+++ b/qt/widgets/common/test/DataProcessorUI/CommandsTest.h
@@ -29,7 +29,7 @@
#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorPresenter.h"
#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorPresenter.h"
#include "MantidQtWidgets/Common/DataProcessorUI/ProcessCommand.h"
-#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorSaveTableAsCommand.h"
+#include "MantidQtWidgets/Common/DataProcessorUI/SaveTableAsCommand.h"
#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorSaveTableCommand.h"
#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorSeparatorCommand.h"
#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorWorkspaceCommand.h"
@@ -93,7 +93,7 @@ public:
void test_save_table_as_command() {
NiceMock<MockDataProcessorPresenter> mockPresenter;
- DataProcessorSaveTableAsCommand command(&mockPresenter);
+ SaveTableAsCommand command(&mockPresenter);
// The presenter should be notified with the SaveAsFlag
EXPECT_CALL(mockPresenter, notify(DataProcessorPresenter::SaveAsFlag))
diff --git a/qt/widgets/common/test/DataProcessorUI/DataProcessorTwoLevelTreeManagerTest.h b/qt/widgets/common/test/DataProcessorUI/DataProcessorTwoLevelTreeManagerTest.h
index f49f3e949b9..de4babc3cd4 100644
--- a/qt/widgets/common/test/DataProcessorUI/DataProcessorTwoLevelTreeManagerTest.h
+++ b/qt/widgets/common/test/DataProcessorUI/DataProcessorTwoLevelTreeManagerTest.h
@@ -31,7 +31,7 @@
#include "MantidQtWidgets/Common/DataProcessorUI/PlotGroupCommand.h"
#include "MantidQtWidgets/Common/DataProcessorUI/PlotRowCommand.h"
#include "MantidQtWidgets/Common/DataProcessorUI/ProcessCommand.h"
-#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorSaveTableAsCommand.h"
+#include "MantidQtWidgets/Common/DataProcessorUI/SaveTableAsCommand.h"
#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorSaveTableCommand.h"
#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorSeparatorCommand.h"
#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorWhiteList.h"
@@ -142,7 +142,7 @@ public:
TS_ASSERT(dynamic_cast<OpenTableCommand *>(comm[0].get()));
TS_ASSERT(dynamic_cast<NewTableCommand *>(comm[1].get()));
TS_ASSERT(dynamic_cast<DataProcessorSaveTableCommand *>(comm[2].get()));
- TS_ASSERT(dynamic_cast<DataProcessorSaveTableAsCommand *>(comm[3].get()));
+ TS_ASSERT(dynamic_cast<SaveTableAsCommand *>(comm[3].get()));
TS_ASSERT(dynamic_cast<DataProcessorSeparatorCommand *>(comm[4].get()));
TS_ASSERT(dynamic_cast<ImportTableCommand *>(comm[5].get()));
TS_ASSERT(dynamic_cast<ExportTableCommand *>(comm[6].get()));
diff --git a/qt/widgets/common/test/DataProcessorUI/OneLevelTreeManagerTest.h b/qt/widgets/common/test/DataProcessorUI/OneLevelTreeManagerTest.h
index 60b4c49ed34..8d1000ea007 100644
--- a/qt/widgets/common/test/DataProcessorUI/OneLevelTreeManagerTest.h
+++ b/qt/widgets/common/test/DataProcessorUI/OneLevelTreeManagerTest.h
@@ -24,7 +24,7 @@
#include "MantidQtWidgets/Common/DataProcessorUI/PauseCommand.h"
#include "MantidQtWidgets/Common/DataProcessorUI/PlotRowCommand.h"
#include "MantidQtWidgets/Common/DataProcessorUI/ProcessCommand.h"
-#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorSaveTableAsCommand.h"
+#include "MantidQtWidgets/Common/DataProcessorUI/SaveTableAsCommand.h"
#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorSaveTableCommand.h"
#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorSeparatorCommand.h"
#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorWhiteList.h"
@@ -130,7 +130,7 @@ public:
TS_ASSERT(dynamic_cast<OpenTableCommand *>(comm[0].get()));
TS_ASSERT(dynamic_cast<NewTableCommand *>(comm[1].get()));
TS_ASSERT(dynamic_cast<DataProcessorSaveTableCommand *>(comm[2].get()));
- TS_ASSERT(dynamic_cast<DataProcessorSaveTableAsCommand *>(comm[3].get()));
+ TS_ASSERT(dynamic_cast<SaveTableAsCommand *>(comm[3].get()));
TS_ASSERT(dynamic_cast<DataProcessorSeparatorCommand *>(comm[4].get()));
TS_ASSERT(dynamic_cast<ImportTableCommand *>(comm[5].get()));
TS_ASSERT(dynamic_cast<ExportTableCommand *>(comm[6].get()));
diff --git a/scripts/Interface/ui/dataprocessorinterface/data_processor_gui.py b/scripts/Interface/ui/dataprocessorinterface/data_processor_gui.py
index ce446e65b74..5228c974af7 100644
--- a/scripts/Interface/ui/dataprocessorinterface/data_processor_gui.py
+++ b/scripts/Interface/ui/dataprocessorinterface/data_processor_gui.py
@@ -178,7 +178,7 @@ class DataProcessorGui(QtGui.QMainWindow, ui_data_processor_window.Ui_DataProces
self._create_action(MantidQt.MantidWidgets.OpenTableCommand(self.data_processor_table), self.menuFile, workspace_list)
self._create_action(MantidQt.MantidWidgets.NewTableCommand(self.data_processor_table), self.menuFile)
self._create_action(MantidQt.MantidWidgets.DataProcessorSaveTableCommand(self.data_processor_table), self.menuFile)
- self._create_action(MantidQt.MantidWidgets.DataProcessorSaveTableAsCommand(self.data_processor_table), self.menuFile)
+ self._create_action(MantidQt.MantidWidgets.SaveTableAsCommand(self.data_processor_table), self.menuFile)
self._create_action(MantidQt.MantidWidgets.ImportTableCommand(self.data_processor_table), self.menuFile)
self._create_action(MantidQt.MantidWidgets.ExportTableCommand(self.data_processor_table), self.menuFile)
self._create_action(MantidQt.MantidWidgets.OptionsCommand(self.data_processor_table), self.menuFile)
diff --git a/scripts/Interface/ui/poldi/poldi_gui.py b/scripts/Interface/ui/poldi/poldi_gui.py
index 4f38f2bef01..47c5665289c 100644
--- a/scripts/Interface/ui/poldi/poldi_gui.py
+++ b/scripts/Interface/ui/poldi/poldi_gui.py
@@ -167,7 +167,7 @@ class PoldiGui(QtGui.QMainWindow, ui_poldi_window.Ui_PoldiWindow):
self._create_action(MantidQt.MantidWidgets.OpenTableCommand(self.data_processor_table), self.menuFile, workspace_list)
self._create_action(MantidQt.MantidWidgets.NewTableCommand(self.data_processor_table), self.menuFile)
self._create_action(MantidQt.MantidWidgets.DataProcessorSaveTableCommand(self.data_processor_table), self.menuFile)
- self._create_action(MantidQt.MantidWidgets.DataProcessorSaveTableAsCommand(self.data_processor_table), self.menuFile)
+ self._create_action(MantidQt.MantidWidgets.SaveTableAsCommand(self.data_processor_table), self.menuFile)
self._create_action(MantidQt.MantidWidgets.ImportTableCommand(self.data_processor_table), self.menuFile)
self._create_action(MantidQt.MantidWidgets.ExportTableCommand(self.data_processor_table), self.menuFile)
self._create_action(MantidQt.MantidWidgets.OptionsCommand(self.data_processor_table), self.menuFile)
diff --git a/scripts/Interface/ui/sans_isis/sans_data_processor_gui.py b/scripts/Interface/ui/sans_isis/sans_data_processor_gui.py
index 28e4db2e464..0b53e621383 100644
--- a/scripts/Interface/ui/sans_isis/sans_data_processor_gui.py
+++ b/scripts/Interface/ui/sans_isis/sans_data_processor_gui.py
@@ -1489,7 +1489,7 @@ class SANSDataProcessorGui(QtGui.QMainWindow, ui_sans_data_processor_window.Ui_S
self.menuFile)
self._create_action(MantidQt.MantidWidgets.DataProcessorSaveTableCommand(self.data_processor_table),
self.menuFile)
- self._create_action(MantidQt.MantidWidgets.DataProcessorSaveTableAsCommand(self.data_processor_table),
+ self._create_action(MantidQt.MantidWidgets.SaveTableAsCommand(self.data_processor_table),
self.menuFile)
self._create_action(MantidQt.MantidWidgets.ImportTableCommand(self.data_processor_table),
self.menuFile)
--
GitLab