From edb841cdb7dacb9a33ed9c5e8432e90bd346fb2b Mon Sep 17 00:00:00 2001
From: Roman Tolchenov <roman.tolchenov@stfc.ac.uk>
Date: Wed, 10 Jun 2015 13:46:58 +0100
Subject: [PATCH] Re #11872. Fix windows build.

---
 .../inc/MantidQtMantidWidgets/InputController.h     | 13 +++++++------
 .../SliceViewer/src/ConcretePeaksPresenter.cpp      |  2 +-
 .../SliceViewer/test/ConcretePeaksPresenterTest.h   |  6 +++---
 3 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/Code/Mantid/MantidQt/MantidWidgets/inc/MantidQtMantidWidgets/InputController.h b/Code/Mantid/MantidQt/MantidWidgets/inc/MantidQtMantidWidgets/InputController.h
index cdb2680d233..6c2b3ab4330 100644
--- a/Code/Mantid/MantidQt/MantidWidgets/inc/MantidQtMantidWidgets/InputController.h
+++ b/Code/Mantid/MantidQt/MantidWidgets/inc/MantidQtMantidWidgets/InputController.h
@@ -1,6 +1,7 @@
 #ifndef MANTID_MANTIDWIDGETS_INPUTCONTROLLER_H
 #define MANTID_MANTIDWIDGETS_INPUTCONTROLLER_H
 
+#include "WidgetDllOption.h"
 #include <QObject>
 #include <QRect>
 #include <QColor>
@@ -26,7 +27,7 @@ namespace MantidWidgets {
     on the surface.
 
   */
-class InputController : public QObject {
+class EXPORT_OPT_MANTIDQT_MANTIDWIDGETS InputController : public QObject {
   Q_OBJECT
 public:
   explicit InputController(QObject *parent, bool contextAllowed = true);
@@ -64,7 +65,7 @@ private:
     translation, rotation and zooming.
 
   */
-class InputController3DMove : public InputController {
+class EXPORT_OPT_MANTIDQT_MANTIDWIDGETS InputController3DMove : public InputController {
   Q_OBJECT
 
 public:
@@ -99,7 +100,7 @@ private:
 /**
     Controller for picking detectors.
   */
-class InputControllerPick : public InputController {
+class EXPORT_OPT_MANTIDQT_MANTIDWIDGETS InputControllerPick : public InputController {
   Q_OBJECT
 
 public:
@@ -122,7 +123,7 @@ private:
 /**
     Controller for drawing mask shapes.
   */
-class InputControllerDrawShape : public InputController {
+class EXPORT_OPT_MANTIDQT_MANTIDWIDGETS InputControllerDrawShape : public InputController {
   Q_OBJECT
 
 public:
@@ -176,7 +177,7 @@ private:
 /**
     Controller for moving the instrument on an unwrapped surface.
   */
-class InputControllerMoveUnwrapped : public InputController {
+class EXPORT_OPT_MANTIDQT_MANTIDWIDGETS InputControllerMoveUnwrapped : public InputController {
   Q_OBJECT
 
 public:
@@ -198,7 +199,7 @@ private:
 /**
     Controller for moving the instrument on an unwrapped surface.
   */
-class InputControllerErase : public InputController {
+class EXPORT_OPT_MANTIDQT_MANTIDWIDGETS InputControllerErase : public InputController {
   Q_OBJECT
 
 public:
diff --git a/Code/Mantid/MantidQt/SliceViewer/src/ConcretePeaksPresenter.cpp b/Code/Mantid/MantidQt/SliceViewer/src/ConcretePeaksPresenter.cpp
index 9d88886456c..b77a07265de 100644
--- a/Code/Mantid/MantidQt/SliceViewer/src/ConcretePeaksPresenter.cpp
+++ b/Code/Mantid/MantidQt/SliceViewer/src/ConcretePeaksPresenter.cpp
@@ -69,7 +69,7 @@ bool canAddPeaksTo(IPeaksWorkspace const * const peaksWS,  Mantid::Kernel::Speci
      - PeaksWS Must not be integrated, because we have no concept of radius until each individual peak is integrated.
      - The MDWorkspace must be in the HKL frame otherwise we cannot interpret plot cursor coordinates.
      */
-    return peaksWS->sample().hasOrientedLattice() && !peaksWS->hasIntegratedPeaks() && frame == HKL;
+  return peaksWS->sample().hasOrientedLattice() && !peaksWS->hasIntegratedPeaks() && frame == Mantid::Kernel::HKL;
 }
 
 }
diff --git a/Code/Mantid/MantidQt/SliceViewer/test/ConcretePeaksPresenterTest.h b/Code/Mantid/MantidQt/SliceViewer/test/ConcretePeaksPresenterTest.h
index fb1b5863f6b..f849197c6ce 100644
--- a/Code/Mantid/MantidQt/SliceViewer/test/ConcretePeaksPresenterTest.h
+++ b/Code/Mantid/MantidQt/SliceViewer/test/ConcretePeaksPresenterTest.h
@@ -156,7 +156,7 @@ class ConcretePeaksPresenterTest : public CxxTest::TestSuite
   {
     // Map enum to string.
     std::string frame_str = "Q (lab frame)";
-    if(frame == HKL){
+    if(frame == Mantid::Kernel::HKL){
         frame_str = "HKL";
     } else if(frame == QSample) {
         frame_str = "Q (sample frame)";
@@ -784,7 +784,7 @@ public:
   {
       using namespace Mantid::DataObjects;
       Peak* pPeak = dynamic_cast<Peak*>(&peak);
-      pPeak->setPeakShape(boost::make_shared<PeakShapeSpherical>(radius, HKL));
+      pPeak->setPeakShape(boost::make_shared<PeakShapeSpherical>(radius, Mantid::Kernel::HKL));
   }
 
   void test_delete_in() {
@@ -792,7 +792,7 @@ public:
 
       const int nPeaks = 3;
       const double radius = 0.1;
-      auto concreteBuilder = createStandardBuild(nPeaks, radius, HKL);
+      auto concreteBuilder = createStandardBuild(nPeaks, radius, Mantid::Kernel::HKL);
 
       // Custom peaks workspace
       IPeaksWorkspace_sptr peaksWS = createPeaksWorkspace(nPeaks, radius);
-- 
GitLab