From 257013b6dcc791cb049ebde1efa763fbd5fe0c3e Mon Sep 17 00:00:00 2001
From: Federico Montesino Pouzols <federico.montesino-pouzols@stfc.ac.uk>
Date: Wed, 7 Oct 2015 15:58:04 +0100
Subject: [PATCH] fix include and mock file name, re #13140

---
 .../src/Tomography/TomographyIfaceViewQtGUI.cpp        |  6 +++---
 .../test/{ImageCoRViewMock.h => ImageROIViewMock.h}    | 10 +++++-----
 2 files changed, 8 insertions(+), 8 deletions(-)
 rename MantidQt/CustomInterfaces/test/{ImageCoRViewMock.h => ImageROIViewMock.h} (87%)

diff --git a/MantidQt/CustomInterfaces/src/Tomography/TomographyIfaceViewQtGUI.cpp b/MantidQt/CustomInterfaces/src/Tomography/TomographyIfaceViewQtGUI.cpp
index 5af8380adb7..48fef5a2351 100644
--- a/MantidQt/CustomInterfaces/src/Tomography/TomographyIfaceViewQtGUI.cpp
+++ b/MantidQt/CustomInterfaces/src/Tomography/TomographyIfaceViewQtGUI.cpp
@@ -3,7 +3,7 @@
 #include "MantidQtAPI/AlgorithmInputHistory.h"
 #include "MantidQtAPI/AlgorithmRunner.h"
 #include "MantidQtAPI/HelpWindow.h"
-#include "MantidQtCustomInterfaces/Tomography/ImageCoRViewQtWidget.h"
+#include "MantidQtCustomInterfaces/Tomography/ImageROIViewQtWidget.h"
 #include "MantidQtCustomInterfaces/Tomography/TomographyIfaceViewQtGUI.h"
 #include "MantidQtCustomInterfaces/Tomography/TomographyIfacePresenter.h"
 #include "MantidQtCustomInterfaces/Tomography/ToolConfigAstraToolbox.h"
@@ -73,8 +73,8 @@ void TomographyIfaceViewQtGUI::initLayout() {
   m_uiTabSetup.setupUi(tabSetupW);
   m_ui.tabMain->addTab(tabSetupW, QString("Setup"));
 
-  ImageCoRViewQtWidget *tabCoRW = new ImageCoRViewQtWidget(m_ui.tabMain);
-  m_ui.tabMain->addTab(tabCoRW, QString("ROI etc."));
+  ImageROIViewQtWidget *tabROIW = new ImageROIViewQtWidget(m_ui.tabMain);
+  m_ui.tabMain->addTab(tabROIW, QString("ROI etc."));
 
   QWidget *tabFiltersW = new QWidget();
   m_ui.tabMain->addTab(tabFiltersW, QString("Filters"));
diff --git a/MantidQt/CustomInterfaces/test/ImageCoRViewMock.h b/MantidQt/CustomInterfaces/test/ImageROIViewMock.h
similarity index 87%
rename from MantidQt/CustomInterfaces/test/ImageCoRViewMock.h
rename to MantidQt/CustomInterfaces/test/ImageROIViewMock.h
index a81929e18c4..6ba7ebca13e 100644
--- a/MantidQt/CustomInterfaces/test/ImageCoRViewMock.h
+++ b/MantidQt/CustomInterfaces/test/ImageROIViewMock.h
@@ -1,11 +1,11 @@
-#ifndef MANTID_CUSTOMINTERFACES_IMAGECORVIEWMOCK_H
-#define MANTID_CUSTOMINTERFACES_IMAGECORVIEWMOCK_H
+#ifndef MANTID_CUSTOMINTERFACES_IMAGEROIVIEWMOCK_H
+#define MANTID_CUSTOMINTERFACES_IMAGEROIVIEWMOCK_H
 
 #include "MantidQtCustomInterfaces/Tomography/ITomographyIfaceView.h"
 
 #include <gmock/gmock.h>
 
-class MockImageCoRView : public MantidQt::CustomInterfaces::IImageCoRView {
+class MockImageROIView : public MantidQt::CustomInterfaces::IImageROIView {
 public:
   // void initParams(ImageStackPreParams &params)
   MOCK_METHOD1(setParams,
@@ -19,7 +19,7 @@ public:
   MOCK_CONST_METHOD0(selectionState, SelectionState());
 
   // void changeSelectionState(const SelectionState state);
-  MOCK_METHOD1(changeSelectionState, void(const IImageCoRView::SelectionState&));
+  MOCK_METHOD1(changeSelectionState, void(const IImageROIView::SelectionState&));
 
   // void showStack(const std::string &path);
   MOCK_METHOD1(showStack, void(const std::string &));
@@ -63,4 +63,4 @@ public:
   MOCK_METHOD0(resetNormArea, void());
 };
 
-#endif // MANTID_CUSTOMINTERFACES_IMAGECORVIEWMOCK_H
+#endif // MANTID_CUSTOMINTERFACES_IMAGEROIVIEWMOCK_H
-- 
GitLab