refs #5167. Fix gcc errors and warnings.

mantidproject · Aug 28, 2012 · ca8f5cd · ca8f5cd
1 parent c3395de
commit ca8f5cd
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/Code/Mantid/MantidQt/SliceViewer/inc/MantidQtSliceViewer/PeakOverlayView.h b/Code/Mantid/MantidQt/SliceViewer/inc/MantidQtSliceViewer/PeakOverlayView.h
@@ -43,7 +43,7 @@ namespace MantidQt
       /// Get the origin. md x, md y
       virtual const QPointF & getOrigin() const = 0;
       /// Get the radius. md x, md y
-      virtual const double &  getRadius() const = 0;
+      virtual double  getRadius() const = 0;
       /// Update the view.
       virtual void updateView() = 0;
       /// Destructor

diff --git a/Code/Mantid/MantidQt/SliceViewer/inc/MantidQtSliceViewer/SliceViewer.h b/Code/Mantid/MantidQt/SliceViewer/inc/MantidQtSliceViewer/SliceViewer.h
@@ -165,9 +165,6 @@ public slots:
 
 
 private:
-  // -------------------------- Controllers ------------------------
-
-  boost::shared_ptr<PeaksPresenter>  m_peaksPresenter;
 
   // -------------------------- Widgets ----------------------------
 
@@ -271,6 +268,9 @@ public slots:
 
   /// If true, the rebinned overlayWS is locked until refreshed.
   bool m_rebinLocked;
+
+  // -------------------------- Controllers ------------------------
+  boost::shared_ptr<PeaksPresenter>  m_peaksPresenter;
 };
 
 } // namespace SliceViewer

diff --git a/Code/Mantid/MantidQt/SliceViewer/test/PeaksPresenterTest.h b/Code/Mantid/MantidQt/SliceViewer/test/PeaksPresenterTest.h
@@ -28,7 +28,7 @@ class PeaksPresenterTest : public CxxTest::TestSuite
   public:
     MOCK_METHOD1(setPlaneDistance, void(const double&));
     MOCK_CONST_METHOD0(getOrigin, const QPointF&());
-    MOCK_CONST_METHOD0(getRadius, const double&());
+    MOCK_CONST_METHOD0(getRadius, const double());
     MOCK_METHOD0(updateView, void());
     ~MockPeakOverlayView(){}
   };