From 38302be9eb5997002c50464fec286ab8c622ef55 Mon Sep 17 00:00:00 2001
From: Edward Brown <edward.brown@stfc.ac.uk>
Date: Tue, 5 Sep 2017 10:22:18 +0100
Subject: [PATCH] Re #20302: Renamed DataProcessorNewTableCommand to
NewTableCommand.
---
qt/python/CMakeLists.txt | 2 +-
qt/python/mantidqt.sip | 10 +++++-----
qt/widgets/common/CMakeLists.txt | 2 +-
...aProcessorNewTableCommand.h => NewTableCommand.h} | 12 ++++++------
.../DataProcessorOneLevelTreeManager.cpp | 4 ++--
.../DataProcessorTwoLevelTreeManager.cpp | 4 ++--
.../common/test/DataProcessorUI/CommandsTest.h | 4 ++--
.../DataProcessorOneLevelTreeManagerTest.h | 4 ++--
.../DataProcessorTwoLevelTreeManagerTest.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/{DataProcessorNewTableCommand.h => NewTableCommand.h} (83%)
diff --git a/qt/python/CMakeLists.txt b/qt/python/CMakeLists.txt
index 2ae2e65de41..f05b391a7be 100644
--- a/qt/python/CMakeLists.txt
+++ b/qt/python/CMakeLists.txt
@@ -47,7 +47,7 @@ set ( SIP_HDRS
../widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/ExportTableCommand.h
../widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/GroupRowsCommand.h
../widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/ImportTableCommand.h
- ../widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorNewTableCommand.h
+ ../widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/NewTableCommand.h
../widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorOpenTableCommand.h
../widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorOptionsCommand.h
../widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorPasteSelectedCommand.h
diff --git a/qt/python/mantidqt.sip b/qt/python/mantidqt.sip
index 387438155a7..7ac1606d4de 100644
--- a/qt/python/mantidqt.sip
+++ b/qt/python/mantidqt.sip
@@ -1790,13 +1790,13 @@ ImportTableCommand();
ImportTableCommand(const MantidQt::MantidWidgets::DataProcessor::ImportTableCommand &);
};
-class DataProcessorNewTableCommand
+class NewTableCommand
{
%TypeHeaderCode
-#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorNewTableCommand.h"
+#include "MantidQtWidgets/Common/DataProcessorUI/NewTableCommand.h"
%End
public:
-DataProcessorNewTableCommand(const MantidQt::MantidWidgets::DataProcessor::QDataProcessorWidget &);
+NewTableCommand(const MantidQt::MantidWidgets::DataProcessor::QDataProcessorWidget &);
void execute();
QString name();
QString icon();
@@ -1805,8 +1805,8 @@ QString whatsthis();
QString shortcut();
private:
-DataProcessorNewTableCommand();
-DataProcessorNewTableCommand(const MantidQt::MantidWidgets::DataProcessor::DataProcessorNewTableCommand &);
+NewTableCommand();
+NewTableCommand(const MantidQt::MantidWidgets::DataProcessor::NewTableCommand &);
};
class DataProcessorOpenTableCommand
diff --git a/qt/widgets/common/CMakeLists.txt b/qt/widgets/common/CMakeLists.txt
index 2de33caf0f0..a89dfcb7314 100644
--- a/qt/widgets/common/CMakeLists.txt
+++ b/qt/widgets/common/CMakeLists.txt
@@ -319,7 +319,7 @@ set ( INC_FILES
inc/MantidQtWidgets/Common/DataProcessorUI/GroupRowsCommand.h
inc/MantidQtWidgets/Common/DataProcessorUI/ImportTableCommand.h
inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorMainPresenter.h
- inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorNewTableCommand.h
+ inc/MantidQtWidgets/Common/DataProcessorUI/NewTableCommand.h
inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorOneLevelTreeManager.h
inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorOpenTableCommand.h
inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorOptionsCommand.h
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorNewTableCommand.h b/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/NewTableCommand.h
similarity index 83%
rename from qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorNewTableCommand.h
rename to qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/NewTableCommand.h
index 4080e919254..102ad67ca2c 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorNewTableCommand.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/NewTableCommand.h
@@ -6,9 +6,9 @@
namespace MantidQt {
namespace MantidWidgets {
namespace DataProcessor {
-/** @class DataProcessorNewTableCommand
+/** @class NewTableCommand
-DataProcessorNewTableCommand defines the action "New Table"
+NewTableCommand defines the action "New Table"
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 DataProcessorNewTableCommand : public CommandBase {
+class NewTableCommand : public CommandBase {
public:
- DataProcessorNewTableCommand(DataProcessorPresenter *tablePresenter)
+ NewTableCommand(DataProcessorPresenter *tablePresenter)
: CommandBase(tablePresenter){};
- DataProcessorNewTableCommand(const QDataProcessorWidget &widget)
+ NewTableCommand(const QDataProcessorWidget &widget)
: CommandBase(widget){};
- virtual ~DataProcessorNewTableCommand(){};
+ virtual ~NewTableCommand(){};
void execute() override {
m_presenter->notify(DataProcessorPresenter::NewTableFlag);
diff --git a/qt/widgets/common/src/DataProcessorUI/DataProcessorOneLevelTreeManager.cpp b/qt/widgets/common/src/DataProcessorUI/DataProcessorOneLevelTreeManager.cpp
index d58ad4ce15a..8f5c053dd15 100644
--- a/qt/widgets/common/src/DataProcessorUI/DataProcessorOneLevelTreeManager.cpp
+++ b/qt/widgets/common/src/DataProcessorUI/DataProcessorOneLevelTreeManager.cpp
@@ -9,7 +9,7 @@
#include "MantidQtWidgets/Common/DataProcessorUI/DeleteRowCommand.h"
#include "MantidQtWidgets/Common/DataProcessorUI/ExportTableCommand.h"
#include "MantidQtWidgets/Common/DataProcessorUI/ImportTableCommand.h"
-#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorNewTableCommand.h"
+#include "MantidQtWidgets/Common/DataProcessorUI/NewTableCommand.h"
#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorOpenTableCommand.h"
#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorOptionsCommand.h"
#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorPasteSelectedCommand.h"
@@ -70,7 +70,7 @@ DataProcessorOneLevelTreeManager::publishCommands() {
std::vector<Command_uptr> commands;
addCommand(commands, make_unique<DataProcessorOpenTableCommand>(m_presenter));
- addCommand(commands, make_unique<DataProcessorNewTableCommand>(m_presenter));
+ addCommand(commands, make_unique<NewTableCommand>(m_presenter));
addCommand(commands, make_unique<DataProcessorSaveTableCommand>(m_presenter));
addCommand(commands,
make_unique<DataProcessorSaveTableAsCommand>(m_presenter));
diff --git a/qt/widgets/common/src/DataProcessorUI/DataProcessorTwoLevelTreeManager.cpp b/qt/widgets/common/src/DataProcessorUI/DataProcessorTwoLevelTreeManager.cpp
index 55a6eefe380..e5ac42e9e50 100644
--- a/qt/widgets/common/src/DataProcessorUI/DataProcessorTwoLevelTreeManager.cpp
+++ b/qt/widgets/common/src/DataProcessorUI/DataProcessorTwoLevelTreeManager.cpp
@@ -14,7 +14,7 @@
#include "MantidQtWidgets/Common/DataProcessorUI/ExportTableCommand.h"
#include "MantidQtWidgets/Common/DataProcessorUI/GroupRowsCommand.h"
#include "MantidQtWidgets/Common/DataProcessorUI/ImportTableCommand.h"
-#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorNewTableCommand.h"
+#include "MantidQtWidgets/Common/DataProcessorUI/NewTableCommand.h"
#include "MantidQtWidgets/Common/DataProcessorUI/ExpandGroupsCommand.h"
#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorOpenTableCommand.h"
#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorOptionsCommand.h"
@@ -79,7 +79,7 @@ DataProcessorTwoLevelTreeManager::publishCommands() {
std::vector<Command_uptr> commands;
addCommand(commands, make_unique<DataProcessorOpenTableCommand>(m_presenter));
- addCommand(commands, make_unique<DataProcessorNewTableCommand>(m_presenter));
+ addCommand(commands, make_unique<NewTableCommand>(m_presenter));
addCommand(commands, make_unique<DataProcessorSaveTableCommand>(m_presenter));
addCommand(commands,
make_unique<DataProcessorSaveTableAsCommand>(m_presenter));
diff --git a/qt/widgets/common/test/DataProcessorUI/CommandsTest.h b/qt/widgets/common/test/DataProcessorUI/CommandsTest.h
index f2eab0414d5..8206a2a574b 100644
--- a/qt/widgets/common/test/DataProcessorUI/CommandsTest.h
+++ b/qt/widgets/common/test/DataProcessorUI/CommandsTest.h
@@ -19,7 +19,7 @@
#include "MantidQtWidgets/Common/DataProcessorUI/GroupRowsCommand.h"
#include "MantidQtWidgets/Common/DataProcessorUI/ImportTableCommand.h"
#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorMockObjects.h"
-#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorNewTableCommand.h"
+#include "MantidQtWidgets/Common/DataProcessorUI/NewTableCommand.h"
#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorOpenTableCommand.h"
#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorOptionsCommand.h"
#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorPasteSelectedCommand.h"
@@ -67,7 +67,7 @@ public:
void test_new_table_command() {
NiceMock<MockDataProcessorPresenter> mockPresenter;
- DataProcessorNewTableCommand command(&mockPresenter);
+ NewTableCommand command(&mockPresenter);
// The presenter should be notified with the NewTableFlag
EXPECT_CALL(mockPresenter, notify(DataProcessorPresenter::NewTableFlag))
diff --git a/qt/widgets/common/test/DataProcessorUI/DataProcessorOneLevelTreeManagerTest.h b/qt/widgets/common/test/DataProcessorUI/DataProcessorOneLevelTreeManagerTest.h
index c2dc8a08306..b60c3c06d55 100644
--- a/qt/widgets/common/test/DataProcessorUI/DataProcessorOneLevelTreeManagerTest.h
+++ b/qt/widgets/common/test/DataProcessorUI/DataProcessorOneLevelTreeManagerTest.h
@@ -17,7 +17,7 @@
#include "MantidQtWidgets/Common/DataProcessorUI/ExportTableCommand.h"
#include "MantidQtWidgets/Common/DataProcessorUI/ImportTableCommand.h"
#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorMockObjects.h"
-#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorNewTableCommand.h"
+#include "MantidQtWidgets/Common/DataProcessorUI/NewTableCommand.h"
#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorOpenTableCommand.h"
#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorOptionsCommand.h"
#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorPasteSelectedCommand.h"
@@ -128,7 +128,7 @@ public:
TS_ASSERT_EQUALS(comm.size(), 23);
TS_ASSERT(dynamic_cast<DataProcessorOpenTableCommand *>(comm[0].get()));
- TS_ASSERT(dynamic_cast<DataProcessorNewTableCommand *>(comm[1].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<DataProcessorSeparatorCommand *>(comm[4].get()));
diff --git a/qt/widgets/common/test/DataProcessorUI/DataProcessorTwoLevelTreeManagerTest.h b/qt/widgets/common/test/DataProcessorUI/DataProcessorTwoLevelTreeManagerTest.h
index 15a8ab98893..c0b6bd5f323 100644
--- a/qt/widgets/common/test/DataProcessorUI/DataProcessorTwoLevelTreeManagerTest.h
+++ b/qt/widgets/common/test/DataProcessorUI/DataProcessorTwoLevelTreeManagerTest.h
@@ -23,7 +23,7 @@
#include "MantidQtWidgets/Common/DataProcessorUI/GroupRowsCommand.h"
#include "MantidQtWidgets/Common/DataProcessorUI/ImportTableCommand.h"
#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorMockObjects.h"
-#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorNewTableCommand.h"
+#include "MantidQtWidgets/Common/DataProcessorUI/NewTableCommand.h"
#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorOpenTableCommand.h"
#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorOptionsCommand.h"
#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorPasteSelectedCommand.h"
@@ -140,7 +140,7 @@ public:
TS_ASSERT_EQUALS(comm.size(), 31);
TS_ASSERT(dynamic_cast<DataProcessorOpenTableCommand *>(comm[0].get()));
- TS_ASSERT(dynamic_cast<DataProcessorNewTableCommand *>(comm[1].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<DataProcessorSeparatorCommand *>(comm[4].get()));
diff --git a/scripts/Interface/ui/dataprocessorinterface/data_processor_gui.py b/scripts/Interface/ui/dataprocessorinterface/data_processor_gui.py
index cce2a70f13a..500df25b44f 100644
--- a/scripts/Interface/ui/dataprocessorinterface/data_processor_gui.py
+++ b/scripts/Interface/ui/dataprocessorinterface/data_processor_gui.py
@@ -176,7 +176,7 @@ class DataProcessorGui(QtGui.QMainWindow, ui_data_processor_window.Ui_DataProces
# Actions that go in the 'File' menu
self._create_action(MantidQt.MantidWidgets.DataProcessorOpenTableCommand(self.data_processor_table), self.menuFile, workspace_list)
- self._create_action(MantidQt.MantidWidgets.DataProcessorNewTableCommand(self.data_processor_table), self.menuFile)
+ 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.ImportTableCommand(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 49c274944f8..a888d379586 100644
--- a/scripts/Interface/ui/poldi/poldi_gui.py
+++ b/scripts/Interface/ui/poldi/poldi_gui.py
@@ -165,7 +165,7 @@ class PoldiGui(QtGui.QMainWindow, ui_poldi_window.Ui_PoldiWindow):
# Actions that go in the 'File' menu
self._create_action(MantidQt.MantidWidgets.DataProcessorOpenTableCommand(self.data_processor_table), self.menuFile, workspace_list)
- self._create_action(MantidQt.MantidWidgets.DataProcessorNewTableCommand(self.data_processor_table), self.menuFile)
+ 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.ImportTableCommand(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 6eb20075a0f..bffefb9eac5 100644
--- a/scripts/Interface/ui/sans_isis/sans_data_processor_gui.py
+++ b/scripts/Interface/ui/sans_isis/sans_data_processor_gui.py
@@ -1485,7 +1485,7 @@ class SANSDataProcessorGui(QtGui.QMainWindow, ui_sans_data_processor_window.Ui_S
# Actions that go in the 'File' menu
self._create_action(MantidQt.MantidWidgets.DataProcessorOpenTableCommand(self.data_processor_table),
self.menuFile, workspace_list)
- self._create_action(MantidQt.MantidWidgets.DataProcessorNewTableCommand(self.data_processor_table),
+ self._create_action(MantidQt.MantidWidgets.NewTableCommand(self.data_processor_table),
self.menuFile)
self._create_action(MantidQt.MantidWidgets.DataProcessorSaveTableCommand(self.data_processor_table),
self.menuFile)
--
GitLab