From d13698e30723f2ed749d72a0565519dfd9a329a2 Mon Sep 17 00:00:00 2001
From: Edward Brown <edward.brown@stfc.ac.uk>
Date: Wed, 23 Aug 2017 11:27:14 +0100
Subject: [PATCH] Re #20302: Renamed DataProcessorExportTableCommand.
- Renamed to ExportTableCommand.
---
qt/python/CMakeLists.txt | 2 +-
qt/python/mantidqt.sip | 10 +++++-----
qt/widgets/common/CMakeLists.txt | 2 +-
...ssorExportTableCommand.h => ExportTableCommand.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 +-
11 files changed, 25 insertions(+), 25 deletions(-)
rename qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/{DataProcessorExportTableCommand.h => ExportTableCommand.h} (83%)
diff --git a/qt/python/CMakeLists.txt b/qt/python/CMakeLists.txt
index 9a91c810ad5..c60a7e6754c 100644
--- a/qt/python/CMakeLists.txt
+++ b/qt/python/CMakeLists.txt
@@ -44,7 +44,7 @@ set ( SIP_HDRS
../widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DeleteGroupCommand.h
../widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DeleteRowCommand.h
../widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/ExpandCommand.h
- ../widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorExportTableCommand.h
+ ../widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/ExportTableCommand.h
../widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorGroupRowsCommand.h
../widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorImportTableCommand.h
../widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorNewTableCommand.h
diff --git a/qt/python/mantidqt.sip b/qt/python/mantidqt.sip
index 88a902b4feb..7ec56ff305c 100644
--- a/qt/python/mantidqt.sip
+++ b/qt/python/mantidqt.sip
@@ -1733,13 +1733,13 @@ ExpandCommand();
ExpandCommand(const MantidQt::MantidWidgets::DataProcessor::ExpandCommand &);
};
-class DataProcessorExportTableCommand
+class ExportTableCommand
{
%TypeHeaderCode
-#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorExportTableCommand.h"
+#include "MantidQtWidgets/Common/DataProcessorUI/ExportTableCommand.h"
%End
public:
-DataProcessorExportTableCommand(const MantidQt::MantidWidgets::DataProcessor::QDataProcessorWidget &);
+ExportTableCommand(const MantidQt::MantidWidgets::DataProcessor::QDataProcessorWidget &);
void execute();
QString name();
QString icon();
@@ -1748,8 +1748,8 @@ QString whatsthis();
QString shortcut();
private:
-DataProcessorExportTableCommand();
-DataProcessorExportTableCommand(const MantidQt::MantidWidgets::DataProcessor::DataProcessorExportTableCommand &);
+ExportTableCommand();
+ExportTableCommand(const MantidQt::MantidWidgets::DataProcessor::ExportTableCommand &);
};
class DataProcessorGroupRowsCommand
diff --git a/qt/widgets/common/CMakeLists.txt b/qt/widgets/common/CMakeLists.txt
index 16736db41c2..520cdf3ca4e 100644
--- a/qt/widgets/common/CMakeLists.txt
+++ b/qt/widgets/common/CMakeLists.txt
@@ -314,7 +314,7 @@ set ( INC_FILES
inc/MantidQtWidgets/Common/DataProcessorUI/DeleteRowCommand.h
inc/MantidQtWidgets/Common/DataProcessorUI/ExpandCommand.h
inc/MantidQtWidgets/Common/DataProcessorUI/ExpandGroupsCommand.h
- inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorExportTableCommand.h
+ inc/MantidQtWidgets/Common/DataProcessorUI/ExportTableCommand.h
inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorGenerateNotebook.h
inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorGroupRowsCommand.h
inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorImportTableCommand.h
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorExportTableCommand.h b/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/ExportTableCommand.h
similarity index 83%
rename from qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorExportTableCommand.h
rename to qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/ExportTableCommand.h
index e6e6fdc09af..1970811b13c 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorExportTableCommand.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/ExportTableCommand.h
@@ -6,9 +6,9 @@
namespace MantidQt {
namespace MantidWidgets {
namespace DataProcessor {
-/** @class DataProcessorExportTableCommand
+/** @class ExportTableCommand
-DataProcessorExportTableCommand defines the action "Export .TBL"
+ExportTableCommand defines the action "Export .TBL"
processor interface presenter needs to support.
@@ -33,13 +33,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 DataProcessorExportTableCommand : public CommandBase {
+class ExportTableCommand : public CommandBase {
public:
- DataProcessorExportTableCommand(DataProcessorPresenter *tablePresenter)
+ ExportTableCommand(DataProcessorPresenter *tablePresenter)
: CommandBase(tablePresenter){};
- DataProcessorExportTableCommand(const QDataProcessorWidget &widget)
+ ExportTableCommand(const QDataProcessorWidget &widget)
: CommandBase(widget){};
- virtual ~DataProcessorExportTableCommand(){};
+ virtual ~ExportTableCommand(){};
void execute() override {
m_presenter->notify(DataProcessorPresenter::ExportTableFlag);
diff --git a/qt/widgets/common/src/DataProcessorUI/DataProcessorOneLevelTreeManager.cpp b/qt/widgets/common/src/DataProcessorUI/DataProcessorOneLevelTreeManager.cpp
index a8cbe0c0518..1a1972cf588 100644
--- a/qt/widgets/common/src/DataProcessorUI/DataProcessorOneLevelTreeManager.cpp
+++ b/qt/widgets/common/src/DataProcessorUI/DataProcessorOneLevelTreeManager.cpp
@@ -7,7 +7,7 @@
#include "MantidQtWidgets/Common/DataProcessorUI/CopySelectedCommand.h"
#include "MantidQtWidgets/Common/DataProcessorUI/CutSelectedCommand.h"
#include "MantidQtWidgets/Common/DataProcessorUI/DeleteRowCommand.h"
-#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorExportTableCommand.h"
+#include "MantidQtWidgets/Common/DataProcessorUI/ExportTableCommand.h"
#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorImportTableCommand.h"
#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorNewTableCommand.h"
#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorOpenTableCommand.h"
@@ -78,7 +78,7 @@ DataProcessorOneLevelTreeManager::publishCommands() {
addCommand(commands,
make_unique<DataProcessorImportTableCommand>(m_presenter));
addCommand(commands,
- make_unique<DataProcessorExportTableCommand>(m_presenter));
+ make_unique<ExportTableCommand>(m_presenter));
addCommand(commands, make_unique<DataProcessorSeparatorCommand>(m_presenter));
addCommand(commands, make_unique<DataProcessorOptionsCommand>(m_presenter));
addCommand(commands, make_unique<DataProcessorSeparatorCommand>(m_presenter));
diff --git a/qt/widgets/common/src/DataProcessorUI/DataProcessorTwoLevelTreeManager.cpp b/qt/widgets/common/src/DataProcessorUI/DataProcessorTwoLevelTreeManager.cpp
index 3d9c1a140b8..4cb1ce012cd 100644
--- a/qt/widgets/common/src/DataProcessorUI/DataProcessorTwoLevelTreeManager.cpp
+++ b/qt/widgets/common/src/DataProcessorUI/DataProcessorTwoLevelTreeManager.cpp
@@ -11,7 +11,7 @@
#include "MantidQtWidgets/Common/DataProcessorUI/DeleteGroupCommand.h"
#include "MantidQtWidgets/Common/DataProcessorUI/DeleteRowCommand.h"
#include "MantidQtWidgets/Common/DataProcessorUI/ExpandCommand.h"
-#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorExportTableCommand.h"
+#include "MantidQtWidgets/Common/DataProcessorUI/ExportTableCommand.h"
#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorGroupRowsCommand.h"
#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorImportTableCommand.h"
#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorNewTableCommand.h"
@@ -87,7 +87,7 @@ DataProcessorTwoLevelTreeManager::publishCommands() {
addCommand(commands,
make_unique<DataProcessorImportTableCommand>(m_presenter));
addCommand(commands,
- make_unique<DataProcessorExportTableCommand>(m_presenter));
+ make_unique<ExportTableCommand>(m_presenter));
addCommand(commands, make_unique<DataProcessorSeparatorCommand>(m_presenter));
addCommand(commands, make_unique<DataProcessorOptionsCommand>(m_presenter));
addCommand(commands, make_unique<DataProcessorSeparatorCommand>(m_presenter));
diff --git a/qt/widgets/common/test/DataProcessorUI/CommandsTest.h b/qt/widgets/common/test/DataProcessorUI/CommandsTest.h
index 7eda3877389..4cf64a05e34 100644
--- a/qt/widgets/common/test/DataProcessorUI/CommandsTest.h
+++ b/qt/widgets/common/test/DataProcessorUI/CommandsTest.h
@@ -14,7 +14,7 @@
#include "MantidQtWidgets/Common/DataProcessorUI/DeleteGroupCommand.h"
#include "MantidQtWidgets/Common/DataProcessorUI/DeleteRowCommand.h"
#include "MantidQtWidgets/Common/DataProcessorUI/ExpandCommand.h"
-#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorExportTableCommand.h"
+#include "MantidQtWidgets/Common/DataProcessorUI/ExportTableCommand.h"
#include "MantidQtWidgets/Common/DataProcessorUI/ExpandGroupsCommand.h"
#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorGroupRowsCommand.h"
#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorImportTableCommand.h"
@@ -119,7 +119,7 @@ public:
void test_export_table_command() {
NiceMock<MockDataProcessorPresenter> mockPresenter;
- DataProcessorExportTableCommand command(&mockPresenter);
+ ExportTableCommand command(&mockPresenter);
// The presenter should be notified with the ExportTableFlag
EXPECT_CALL(mockPresenter, notify(DataProcessorPresenter::ExportTableFlag))
diff --git a/qt/widgets/common/test/DataProcessorUI/DataProcessorOneLevelTreeManagerTest.h b/qt/widgets/common/test/DataProcessorUI/DataProcessorOneLevelTreeManagerTest.h
index 4d0b3a1f704..8cc1df772ee 100644
--- a/qt/widgets/common/test/DataProcessorUI/DataProcessorOneLevelTreeManagerTest.h
+++ b/qt/widgets/common/test/DataProcessorUI/DataProcessorOneLevelTreeManagerTest.h
@@ -14,7 +14,7 @@
#include "MantidQtWidgets/Common/DataProcessorUI/CopySelectedCommand.h"
#include "MantidQtWidgets/Common/DataProcessorUI/CutSelectedCommand.h"
#include "MantidQtWidgets/Common/DataProcessorUI/DeleteRowCommand.h"
-#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorExportTableCommand.h"
+#include "MantidQtWidgets/Common/DataProcessorUI/ExportTableCommand.h"
#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorImportTableCommand.h"
#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorMockObjects.h"
#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorNewTableCommand.h"
@@ -133,7 +133,7 @@ public:
TS_ASSERT(dynamic_cast<DataProcessorSaveTableAsCommand *>(comm[3].get()));
TS_ASSERT(dynamic_cast<DataProcessorSeparatorCommand *>(comm[4].get()));
TS_ASSERT(dynamic_cast<DataProcessorImportTableCommand *>(comm[5].get()));
- TS_ASSERT(dynamic_cast<DataProcessorExportTableCommand *>(comm[6].get()));
+ TS_ASSERT(dynamic_cast<ExportTableCommand *>(comm[6].get()));
TS_ASSERT(dynamic_cast<DataProcessorSeparatorCommand *>(comm[7].get()));
TS_ASSERT(dynamic_cast<DataProcessorOptionsCommand *>(comm[8].get()));
TS_ASSERT(dynamic_cast<DataProcessorSeparatorCommand *>(comm[9].get()));
diff --git a/qt/widgets/common/test/DataProcessorUI/DataProcessorTwoLevelTreeManagerTest.h b/qt/widgets/common/test/DataProcessorUI/DataProcessorTwoLevelTreeManagerTest.h
index 086e1b66013..52004dd66d0 100644
--- a/qt/widgets/common/test/DataProcessorUI/DataProcessorTwoLevelTreeManagerTest.h
+++ b/qt/widgets/common/test/DataProcessorUI/DataProcessorTwoLevelTreeManagerTest.h
@@ -19,7 +19,7 @@
#include "MantidQtWidgets/Common/DataProcessorUI/DeleteRowCommand.h"
#include "MantidQtWidgets/Common/DataProcessorUI/ExpandCommand.h"
#include "MantidQtWidgets/Common/DataProcessorUI/ExpandGroupsCommand.h"
-#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorExportTableCommand.h"
+#include "MantidQtWidgets/Common/DataProcessorUI/ExportTableCommand.h"
#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorGroupRowsCommand.h"
#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorImportTableCommand.h"
#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorMockObjects.h"
@@ -145,7 +145,7 @@ public:
TS_ASSERT(dynamic_cast<DataProcessorSaveTableAsCommand *>(comm[3].get()));
TS_ASSERT(dynamic_cast<DataProcessorSeparatorCommand *>(comm[4].get()));
TS_ASSERT(dynamic_cast<DataProcessorImportTableCommand *>(comm[5].get()));
- TS_ASSERT(dynamic_cast<DataProcessorExportTableCommand *>(comm[6].get()));
+ TS_ASSERT(dynamic_cast<ExportTableCommand *>(comm[6].get()));
TS_ASSERT(dynamic_cast<DataProcessorSeparatorCommand *>(comm[7].get()));
TS_ASSERT(dynamic_cast<DataProcessorOptionsCommand *>(comm[8].get()));
TS_ASSERT(dynamic_cast<DataProcessorSeparatorCommand *>(comm[9].get()));
diff --git a/scripts/Interface/ui/dataprocessorinterface/data_processor_gui.py b/scripts/Interface/ui/dataprocessorinterface/data_processor_gui.py
index df3f9ee5401..988da66ca49 100644
--- a/scripts/Interface/ui/dataprocessorinterface/data_processor_gui.py
+++ b/scripts/Interface/ui/dataprocessorinterface/data_processor_gui.py
@@ -180,7 +180,7 @@ class DataProcessorGui(QtGui.QMainWindow, ui_data_processor_window.Ui_DataProces
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.DataProcessorImportTableCommand(self.data_processor_table), self.menuFile)
- self._create_action(MantidQt.MantidWidgets.DataProcessorExportTableCommand(self.data_processor_table), self.menuFile)
+ self._create_action(MantidQt.MantidWidgets.ExportTableCommand(self.data_processor_table), self.menuFile)
self._create_action(MantidQt.MantidWidgets.DataProcessorOptionsCommand(self.data_processor_table), self.menuFile)
def _create_action(self, command, menu, workspace_list = None):
diff --git a/scripts/Interface/ui/poldi/poldi_gui.py b/scripts/Interface/ui/poldi/poldi_gui.py
index 6aef62233b3..ecda6edcda8 100644
--- a/scripts/Interface/ui/poldi/poldi_gui.py
+++ b/scripts/Interface/ui/poldi/poldi_gui.py
@@ -169,7 +169,7 @@ class PoldiGui(QtGui.QMainWindow, ui_poldi_window.Ui_PoldiWindow):
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.DataProcessorImportTableCommand(self.data_processor_table), self.menuFile)
- self._create_action(MantidQt.MantidWidgets.DataProcessorExportTableCommand(self.data_processor_table), self.menuFile)
+ self._create_action(MantidQt.MantidWidgets.ExportTableCommand(self.data_processor_table), self.menuFile)
self._create_action(MantidQt.MantidWidgets.DataProcessorOptionsCommand(self.data_processor_table), self.menuFile)
def _demo_clicked(self):
--
GitLab