From 8d8961ab3ca22706ac2dedd2c74f29d4becd8118 Mon Sep 17 00:00:00 2001
From: Lamar Moore <lamar.moore@stfc.ac.uk>
Date: Wed, 19 Sep 2018 09:33:12 +0100
Subject: [PATCH] clang-format fix #23073

---
 .../inc/MantidGeometry/Instrument/GridDetector.h |  1 -
 .../Instrument/RectangularDetectorPixel.h        |  3 +--
 .../src/Instrument/InstrumentVisitor.cpp         | 16 ++++++++--------
 Framework/Geometry/test/GridDetectorTest.h       |  6 +++---
 .../instrumentview/src/RotationSurface.cpp       |  4 ++--
 5 files changed, 14 insertions(+), 16 deletions(-)

diff --git a/Framework/Geometry/inc/MantidGeometry/Instrument/GridDetector.h b/Framework/Geometry/inc/MantidGeometry/Instrument/GridDetector.h
index b10f5871f37..005377ba396 100644
--- a/Framework/Geometry/inc/MantidGeometry/Instrument/GridDetector.h
+++ b/Framework/Geometry/inc/MantidGeometry/Instrument/GridDetector.h
@@ -183,7 +183,6 @@ private:
   /// Private copy assignment operator
   GridDetector &operator=(const ICompAssembly &);
 
-
   /// The number of pixels in the X (horizontal) direction
   int m_xpixels;
   /// The number of pixels in the Y (vertical) direction
diff --git a/Framework/Geometry/inc/MantidGeometry/Instrument/RectangularDetectorPixel.h b/Framework/Geometry/inc/MantidGeometry/Instrument/RectangularDetectorPixel.h
index aa21b2865f7..25b20c973a5 100644
--- a/Framework/Geometry/inc/MantidGeometry/Instrument/RectangularDetectorPixel.h
+++ b/Framework/Geometry/inc/MantidGeometry/Instrument/RectangularDetectorPixel.h
@@ -1,9 +1,8 @@
 #ifndef MANTID_GEOMETRY_RECTANGULARDETECTORPIXEL_H_
 #define MANTID_GEOMETRY_RECTANGULARDETECTORPIXEL_H_
 
-#include "MantidGeometry/Instrument/GridDetectorPixel.h"
-#include "MantidKernel/System.h"
 #include "MantidGeometry/Instrument/Detector.h"
+#include "MantidGeometry/Instrument/GridDetectorPixel.h"
 #include "MantidGeometry/Instrument/ParameterMap.h"
 #include "MantidKernel/System.h"
 #include "MantidKernel/V3D.h"
diff --git a/Framework/Geometry/src/Instrument/InstrumentVisitor.cpp b/Framework/Geometry/src/Instrument/InstrumentVisitor.cpp
index 2f090b21162..09ba7f1afe8 100644
--- a/Framework/Geometry/src/Instrument/InstrumentVisitor.cpp
+++ b/Framework/Geometry/src/Instrument/InstrumentVisitor.cpp
@@ -270,10 +270,10 @@ size_t InstrumentVisitor::registerRectangularBank(const ICompAssembly &bank) {
 }
 
 /**
-* Register a structured bank
-* @param bank : Grid Detector
-* @return index assigned
-*/
+ * Register a structured bank
+ * @param bank : Grid Detector
+ * @return index assigned
+ */
 size_t InstrumentVisitor::registerGridBank(const ICompAssembly &bank) {
   auto index = registerComponentAssembly(bank);
   size_t rangesIndex = index - m_orderedDetectorIds->size();
@@ -282,10 +282,10 @@ size_t InstrumentVisitor::registerGridBank(const ICompAssembly &bank) {
 }
 
 /**
-* @brief InstrumentVisitor::registerInfiniteObjComponent
-* @param objComponent : IObjComponent being visited
-* @return Component index of this component
-*/
+ * @brief InstrumentVisitor::registerInfiniteObjComponent
+ * @param objComponent : IObjComponent being visited
+ * @return Component index of this component
+ */
 size_t InstrumentVisitor::registerInfiniteObjComponent(
     const IObjComponent &objComponent) {
   auto index = registerInfiniteComponent(objComponent);
diff --git a/Framework/Geometry/test/GridDetectorTest.h b/Framework/Geometry/test/GridDetectorTest.h
index 751247c6638..7b168471bf1 100644
--- a/Framework/Geometry/test/GridDetectorTest.h
+++ b/Framework/Geometry/test/GridDetectorTest.h
@@ -13,8 +13,8 @@
 
 using namespace Mantid;
 using namespace Mantid::Geometry;
-using Mantid::Kernel::V3D;
 using Mantid::Kernel::Quat;
+using Mantid::Kernel::V3D;
 
 class GridDetectorTest : public CxxTest::TestSuite {
 public:
@@ -118,8 +118,8 @@ public:
   }
 
   /** Create a parametrized GridDetector with a parameter that
-  * resizes it.
-  */
+   * resizes it.
+   */
   void testResizingParameter() {
     auto cuboidShape = ComponentCreationHelper::createCuboid(0.5);
 
diff --git a/qt/widgets/instrumentview/src/RotationSurface.cpp b/qt/widgets/instrumentview/src/RotationSurface.cpp
index 0e10c309e40..f2e765da646 100644
--- a/qt/widgets/instrumentview/src/RotationSurface.cpp
+++ b/qt/widgets/instrumentview/src/RotationSurface.cpp
@@ -145,8 +145,8 @@ void RotationSurface::createUnwrappedDetectors() {
 }
 
 /**
-* Initialize the surface.
-*/
+ * Initialize the surface.
+ */
 void RotationSurface::init() {
   // the actor calls this->callback for each detector
   m_unwrappedDetectors.clear();
-- 
GitLab