diff --git a/qt/python/CMakeLists.txt b/qt/python/CMakeLists.txt
index e2a2c8432fdedaae7bed07a25606522cd1930114..9a91c810ad5f8c54f8ecb9a0b1fd9ff5bf65425e 100644
--- a/qt/python/CMakeLists.txt
+++ b/qt/python/CMakeLists.txt
@@ -43,7 +43,7 @@ set ( SIP_HDRS
../widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/CutSelectedCommand.h
../widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DeleteGroupCommand.h
../widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DeleteRowCommand.h
- ../widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorExpandCommand.h
+ ../widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/ExpandCommand.h
../widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorExportTableCommand.h
../widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorGroupRowsCommand.h
../widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorImportTableCommand.h
diff --git a/qt/python/mantidqt.sip b/qt/python/mantidqt.sip
index de03a328eaf9762d92e814623365afb461ffe7fe..88a902b4feb34f24d2ab2d3f800d3cb5e06801fc 100644
--- a/qt/python/mantidqt.sip
+++ b/qt/python/mantidqt.sip
@@ -1714,13 +1714,13 @@ DeleteRowCommand();
DeleteRowCommand(const MantidQt::MantidWidgets::DataProcessor::DeleteRowCommand &);
};
-class DataProcessorExpandCommand
+class ExpandCommand
{
%TypeHeaderCode
-#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorExpandCommand.h"
+#include "MantidQtWidgets/Common/DataProcessorUI/ExpandCommand.h"
%End
public:
-DataProcessorExpandCommand(const MantidQt::MantidWidgets::DataProcessor::QDataProcessorWidget &);
+ExpandCommand(const MantidQt::MantidWidgets::DataProcessor::QDataProcessorWidget &);
void execute();
QString name();
QString icon();
@@ -1729,8 +1729,8 @@ QString whatsthis();
QString shortcut();
private:
-DataProcessorExpandCommand();
-DataProcessorExpandCommand(const MantidQt::MantidWidgets::DataProcessor::DataProcessorExpandCommand &);
+ExpandCommand();
+ExpandCommand(const MantidQt::MantidWidgets::DataProcessor::ExpandCommand &);
};
class DataProcessorExportTableCommand
diff --git a/qt/widgets/common/CMakeLists.txt b/qt/widgets/common/CMakeLists.txt
index c8339656ed33645d35659bfa6d872ea960d75363..a5249ddc5f49b62961b0ed911cbe5833c6419b21 100644
--- a/qt/widgets/common/CMakeLists.txt
+++ b/qt/widgets/common/CMakeLists.txt
@@ -312,7 +312,7 @@ set ( INC_FILES
inc/MantidQtWidgets/Common/DataProcessorUI/CutSelectedCommand.h
inc/MantidQtWidgets/Common/DataProcessorUI/DeleteGroupCommand.h
inc/MantidQtWidgets/Common/DataProcessorUI/DeleteRowCommand.h
- inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorExpandCommand.h
+ inc/MantidQtWidgets/Common/DataProcessorUI/ExpandCommand.h
inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorExpandGroupsCommand.h
inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorExportTableCommand.h
inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorGenerateNotebook.h
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorExpandCommand.h b/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/ExpandCommand.h
similarity index 85%
rename from qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorExpandCommand.h
rename to qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/ExpandCommand.h
index 7acb0166dca5cdcb59208006c2ec734937b514e6..d3c80d102aaa1cc93b768f12095041a46b443f0a 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorExpandCommand.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/ExpandCommand.h
@@ -6,9 +6,9 @@
namespace MantidQt {
namespace MantidWidgets {
namespace DataProcessor {
-/** @class DataProcessorExpandCommand
+/** @class ExpandCommand
-DataProcessorExpandCommand defines the action "Expand Selection"
+ExpandCommand defines the action "Expand Selection"
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 DataProcessorExpandCommand : public CommandBase {
+class ExpandCommand : public CommandBase {
public:
- DataProcessorExpandCommand(DataProcessorPresenter *tablePresenter)
+ ExpandCommand(DataProcessorPresenter *tablePresenter)
: CommandBase(tablePresenter){};
- DataProcessorExpandCommand(const QDataProcessorWidget &widget)
+ ExpandCommand(const QDataProcessorWidget &widget)
: CommandBase(widget){};
- virtual ~DataProcessorExpandCommand(){};
+ virtual ~ExpandCommand(){};
void execute() override {
m_presenter->notify(DataProcessorPresenter::ExpandSelectionFlag);
diff --git a/qt/widgets/common/src/DataProcessorUI/DataProcessorTwoLevelTreeManager.cpp b/qt/widgets/common/src/DataProcessorUI/DataProcessorTwoLevelTreeManager.cpp
index 95ba28cf0217a4948c45e9898b639734f28fe186..63e9f6813514389dc68dcad68b527705304a8ed5 100644
--- a/qt/widgets/common/src/DataProcessorUI/DataProcessorTwoLevelTreeManager.cpp
+++ b/qt/widgets/common/src/DataProcessorUI/DataProcessorTwoLevelTreeManager.cpp
@@ -10,7 +10,7 @@
#include "MantidQtWidgets/Common/DataProcessorUI/CutSelectedCommand.h"
#include "MantidQtWidgets/Common/DataProcessorUI/DeleteGroupCommand.h"
#include "MantidQtWidgets/Common/DataProcessorUI/DeleteRowCommand.h"
-#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorExpandCommand.h"
+#include "MantidQtWidgets/Common/DataProcessorUI/ExpandCommand.h"
#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorExportTableCommand.h"
#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorGroupRowsCommand.h"
#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorImportTableCommand.h"
@@ -94,7 +94,7 @@ DataProcessorTwoLevelTreeManager::publishCommands() {
addCommand(commands, make_unique<DataProcessorProcessCommand>(m_presenter));
addCommand(commands, make_unique<DataProcessorPauseCommand>(m_presenter));
addCommand(commands, make_unique<DataProcessorSeparatorCommand>(m_presenter));
- addCommand(commands, make_unique<DataProcessorExpandCommand>(m_presenter));
+ addCommand(commands, make_unique<ExpandCommand>(m_presenter));
addCommand(commands,
make_unique<DataProcessorExpandGroupsCommand>(m_presenter));
addCommand(commands,
diff --git a/qt/widgets/common/test/DataProcessorUI/CommandsTest.h b/qt/widgets/common/test/DataProcessorUI/CommandsTest.h
index 6f965f308c99773d699f41a0ec77aa4c1590d53a..21cf217767486b21be6a808bfda5beadcfb60ebc 100644
--- a/qt/widgets/common/test/DataProcessorUI/CommandsTest.h
+++ b/qt/widgets/common/test/DataProcessorUI/CommandsTest.h
@@ -13,7 +13,7 @@
#include "MantidQtWidgets/Common/DataProcessorUI/CutSelectedCommand.h"
#include "MantidQtWidgets/Common/DataProcessorUI/DeleteGroupCommand.h"
#include "MantidQtWidgets/Common/DataProcessorUI/DeleteRowCommand.h"
-#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorExpandCommand.h"
+#include "MantidQtWidgets/Common/DataProcessorUI/ExpandCommand.h"
#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorExportTableCommand.h"
#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorExpandGroupsCommand.h"
#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorGroupRowsCommand.h"
@@ -172,7 +172,7 @@ public:
void test_expand_command() {
NiceMock<MockDataProcessorPresenter> mockPresenter;
- DataProcessorExpandCommand command(&mockPresenter);
+ ExpandCommand command(&mockPresenter);
// The presenter should be notified with the ExpandSelectionFlag
EXPECT_CALL(mockPresenter,
diff --git a/qt/widgets/common/test/DataProcessorUI/DataProcessorTwoLevelTreeManagerTest.h b/qt/widgets/common/test/DataProcessorUI/DataProcessorTwoLevelTreeManagerTest.h
index a513bc9256840bec9e1d49b2d5b2001257d2b23a..f8fa220c8bc2000243e5e1aa515c7afe712df1d9 100644
--- a/qt/widgets/common/test/DataProcessorUI/DataProcessorTwoLevelTreeManagerTest.h
+++ b/qt/widgets/common/test/DataProcessorUI/DataProcessorTwoLevelTreeManagerTest.h
@@ -17,7 +17,7 @@
#include "MantidQtWidgets/Common/DataProcessorUI/CutSelectedCommand.h"
#include "MantidQtWidgets/Common/DataProcessorUI/DeleteGroupCommand.h"
#include "MantidQtWidgets/Common/DataProcessorUI/DeleteRowCommand.h"
-#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorExpandCommand.h"
+#include "MantidQtWidgets/Common/DataProcessorUI/ExpandCommand.h"
#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorExpandGroupsCommand.h"
#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorExportTableCommand.h"
#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorGroupRowsCommand.h"
@@ -152,7 +152,7 @@ public:
TS_ASSERT(dynamic_cast<DataProcessorProcessCommand *>(comm[10].get()));
TS_ASSERT(dynamic_cast<DataProcessorPauseCommand *>(comm[11].get()));
TS_ASSERT(dynamic_cast<DataProcessorSeparatorCommand *>(comm[12].get()));
- TS_ASSERT(dynamic_cast<DataProcessorExpandCommand *>(comm[13].get()));
+ TS_ASSERT(dynamic_cast<ExpandCommand *>(comm[13].get()));
TS_ASSERT(dynamic_cast<DataProcessorExpandGroupsCommand *>(comm[14].get()));
TS_ASSERT(
dynamic_cast<CollapseGroupsCommand *>(comm[15].get()));
diff --git a/scripts/Interface/ui/dataprocessorinterface/data_processor_gui.py b/scripts/Interface/ui/dataprocessorinterface/data_processor_gui.py
index 9406c2c53d676e37648d07cef00936e8ad5c1a87..df3f9ee54012e49499b5841f6e016bc263b1d045 100644
--- a/scripts/Interface/ui/dataprocessorinterface/data_processor_gui.py
+++ b/scripts/Interface/ui/dataprocessorinterface/data_processor_gui.py
@@ -161,7 +161,7 @@ class DataProcessorGui(QtGui.QMainWindow, ui_data_processor_window.Ui_DataProces
# Actions that go in the 'Edit' menu
self._create_action(MantidQt.MantidWidgets.DataProcessorProcessCommand(self.data_processor_table), self.menuEdit)
- self._create_action(MantidQt.MantidWidgets.DataProcessorExpandCommand(self.data_processor_table), self.menuEdit)
+ self._create_action(MantidQt.MantidWidgets.ExpandCommand(self.data_processor_table), self.menuEdit)
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.AppendRowCommand(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 f5278694492dc905cff525a9e4324ca0ef0800be..6aef62233b3ae53811434aa72e350dd7ebc130ce 100644
--- a/scripts/Interface/ui/poldi/poldi_gui.py
+++ b/scripts/Interface/ui/poldi/poldi_gui.py
@@ -150,7 +150,7 @@ class PoldiGui(QtGui.QMainWindow, ui_poldi_window.Ui_PoldiWindow):
# Actions that go in the 'Edit' menu
self._create_action(MantidQt.MantidWidgets.DataProcessorProcessCommand(self.data_processor_table), self.menuEdit)
- self._create_action(MantidQt.MantidWidgets.DataProcessorExpandCommand(self.data_processor_table), self.menuEdit)
+ self._create_action(MantidQt.MantidWidgets.ExpandCommand(self.data_processor_table), self.menuEdit)
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.AppendRowCommand(self.data_processor_table), self.menuEdit)