Clang-format changes. Get project to build again on OSX.

Framework/API/inc/MantidAPI/IFunction1DSpectrum.h

@@ -40,7 +40,6 @@ namespace API {
   */
 class DLLExport IFunction1DSpectrum : public virtual IFunction {
 public:
-
   void function(const FunctionDomain &domain,
                 FunctionValues &values) const override;
   void functionDeriv(const FunctionDomain &domain, Jacobian &jacobian) override;

Framework/API/inc/MantidAPI/IPeaksWorkspace.h

@@ -53,8 +53,6 @@ public:
     convention = Kernel::ConfigService::Instance().getString("Q.convention");
   }
 
-
-
   /// Returns a clone of the workspace
   IPeaksWorkspace_uptr clone() const { return IPeaksWorkspace_uptr(doClone()); }
 

Framework/API/inc/MantidAPI/ImplicitFunctionFactory.h

@@ -53,13 +53,15 @@ public:
   createUnwrapped(const std::string &processXML) const override;
 
   friend struct Mantid::Kernel::CreateUsingNew<ImplicitFunctionFactoryImpl>;
-  private:
+
+private:
   /// Private Constructor for singleton class
   ImplicitFunctionFactoryImpl();
   /// Private copy constructor - NO COPY ALLOWED
   ImplicitFunctionFactoryImpl(const ImplicitFunctionFactoryImpl &) = delete;
   /// Private assignment operator - NO ASSIGNMENT ALLOWED
-  ImplicitFunctionFactoryImpl &operator=(const ImplicitFunctionFactoryImpl &) = delete;
+  ImplicitFunctionFactoryImpl &
+  operator=(const ImplicitFunctionFactoryImpl &) = delete;
   /// Private Destructor
   ~ImplicitFunctionFactoryImpl() override = default;
 };

Framework/Algorithms/inc/MantidAlgorithms/TimeAtSampleStrategyDirect.h

@@ -41,6 +41,7 @@ public:
   TimeAtSampleStrategyDirect(
       boost::shared_ptr<const Mantid::API::MatrixWorkspace> ws, double ei);
   Correction calculate(const size_t &workspace_index) const override;
+
 private:
   /// Cached L1, Ei dependent const shift
   double m_constShift;

Framework/Crystal/inc/MantidCrystal/PeakBackground.h

@@ -70,7 +70,6 @@ public:
 
   /// Virutal constructor
   PeakBackground *clone() const override;
-
 };
 
 } // namespace Crystal

Framework/CurveFitting/inc/MantidCurveFitting/Functions/DiffRotDiscreteCircle.h

@@ -93,7 +93,6 @@ private:
  */
 class DLLExport DiffRotDiscreteCircle : public API::ImmutableCompositeFunction {
 public:
-
   std::string name() const override { return "DiffRotDiscreteCircle"; }
 
   const std::string category() const override { return "QuasiElastic"; }

Framework/CurveFitting/inc/MantidCurveFitting/Functions/PseudoVoigt.h

@@ -49,7 +49,6 @@ namespace Functions {
 */
 class DLLExport PseudoVoigt : public API::IPeakFunction {
 public:
-
   double centre() const override { return getParameter("PeakCentre"); }
   double height() const override { return getParameter("Height"); }
   double fwhm() const override { return getParameter("FWHM"); }

Framework/DataObjects/inc/MantidDataObjects/CoordTransformDistanceParser.h

@@ -21,6 +21,7 @@ public:
   CoordTransformDistanceParser();
   Mantid::API::CoordTransform *
   createTransform(Poco::XML::Element *coordTransElement) const override;
+
 private:
   CoordTransformDistanceParser(const CoordTransformDistanceParser &);
   CoordTransformDistanceParser &operator=(const CoordTransformDistanceParser &);

Framework/DataObjects/inc/MantidDataObjects/SkippingPolicy.h

@@ -55,7 +55,6 @@ public:
   @return True to keep going.
   */
   bool keepGoing() const override { return m_iterator->getIsMasked(); };
-
 };
 
 /// Policy that indicates no skipping should be applied.

Framework/Geometry/inc/MantidGeometry/Instrument/IDFObject.h

@@ -76,6 +76,7 @@ public:
   std::string getExtension() const override;
   std::string getMangledName() const override;
   bool exists() const override;
+
 private:
   IDFObject(const IDFObject &);
   IDFObject &operator=(const IDFObject &);

Framework/ICat/inc/MantidICat/ICat4/GSoapGenerated/ICat4Stub.h

@@ -996,7 +996,7 @@ public:
   int soap_out(struct soap *, const char *, int, const char *) const override;
   void *soap_get(struct soap *, const char *, const char *) override;
   void *soap_in(struct soap *, const char *, const char *) override;
-  ns1__refresh() { ns1__refresh::soap_default(NULL);}
+  ns1__refresh() { ns1__refresh::soap_default(NULL); }
 };
 #endif
 
@@ -1859,7 +1859,6 @@ public:
   void *soap_get(struct soap *, const char *, const char *) override;
   void *soap_in(struct soap *, const char *, const char *) override;
   ns1__facility() { ns1__facility::soap_default(NULL); }
-
 };
 #endif
 

Framework/Kernel/inc/MantidKernel/ArrayProperty.h

@@ -109,7 +109,7 @@ public:
   }
 
   ~ArrayProperty() override = default;
-  
+
   // Unhide the base class assignment operator
   using PropertyWithValue<std::vector<T>>::operator=;
 

Framework/Kernel/inc/MantidKernel/DirectoryValidator.h

@@ -43,6 +43,7 @@ public:
   explicit DirectoryValidator(bool testDirectoryExists = true);
   std::vector<std::string> allowedValues() const override;
   IValidator_sptr clone() const override;
+
 private:
   std::string checkValidity(const std::string &value) const override;
 };

Framework/Kernel/inc/MantidKernel/FileValidator.h

@@ -45,6 +45,7 @@ public:
       bool testFileExists = true, bool testCanWrite = false);
   std::vector<std::string> allowedValues() const override;
   IValidator_sptr clone() const override;
+
 protected:
   /// The list of permitted extensions
   std::vector<std::string> m_extensions;

Framework/Kernel/inc/MantidKernel/Unit.h

@@ -398,7 +398,6 @@ public:
   /// Constructor
   dSpacing();
 
-
 protected:
   double factorTo;   ///< Constant factor for to conversion
   double factorFrom; ///< Constant factor for from conversion

Framework/LiveData/inc/MantidLiveData/ADARA/ADARAPackets.h

@@ -359,7 +359,6 @@ private:
 
 class DLLExport ClientHelloPkt : public Packet {
 public:
-  ClientHelloPkt(const ClientHelloPkt &pkt);
 
   enum Flags {
     PAUSE_AGNOSTIC = 0x0000,

Framework/RemoteJobManagers/inc/MantidRemoteJobManagers/MantidWebServiceAPIJobManager.h

@@ -36,7 +36,6 @@ Code Documentation is available at: <http://doxygen.mantidproject.org>
 class DLLExport MantidWebServiceAPIJobManager
     : public Mantid::API::IRemoteJobManager {
 public:
-
   void authenticate(const std::string &username,
                     const std::string &password) override;
 

Framework/TestHelpers/inc/MantidTestHelpers/BoxControllerDummyIO.h

@@ -54,7 +54,7 @@ public:
   /// get the full file name of the file used for IO operations
   const std::string &getFileName() const override { return m_fileName; }
   /**Return the size of the NeXus data block used in NeXus data array*/
-  size_t getDataChunk() const { return 1; }
+  size_t getDataChunk() const override { return 1; }
 
   bool openFile(const std::string &fileName, const std::string &mode) override;
   void saveBlock(const std::vector<float> & /* DataBlock */,

MantidPlot/src/ArrowMarker.h

@@ -114,8 +114,9 @@ public:
         QwtDoubleRect boundingRect() const override;
         void setBoundingRect(double xs, double ys, double xe, double ye);
 
-	//! Recalculates the bounding rectangle in values coordinates using the pixel coordinats when the scales change
-	void updateBoundingRect();
+        //! Recalculates the bounding rectangle in values coordinates using the
+        //pixel coordinats when the scales change
+        void updateBoundingRect();
 
 	//! Returns the state of #d_editable.
 	bool editable() const { return d_editable; }
@@ -128,10 +129,10 @@ public:
 private:
   void draw(QPainter *p, const QwtScaleMap &xMap, const QwtScaleMap &yMap,
             const QRect &r) const override;
-        double theta(int xs, int ys, int xe, int ye) const;
+  double theta(int xs, int ys, int xe, int ye) const;
 
-	//! Flag specifying if the start arrow is visible
-	bool d_start_arrow;
+  //! Flag specifying if the start arrow is visible
+        bool d_start_arrow;
 
 	//! Flag specifying if the end arrow is visible
 	bool d_end_arrow;

MantidPlot/src/BoxCurve.h

@@ -46,10 +46,10 @@ public:
 
         QwtDoubleRect boundingRect() const override;
 
-        QwtSymbol::Style minStyle(){return min_style;};
-	void setMinStyle(QwtSymbol::Style s){min_style = s;};
+        QwtSymbol::Style minStyle() { return min_style; };
+        void setMinStyle(QwtSymbol::Style s) { min_style = s; };
 
-	QwtSymbol::Style maxStyle(){return max_style;};
+        QwtSymbol::Style maxStyle(){return max_style;};
 	void setMaxStyle(QwtSymbol::Style s){max_style = s;};
 
 	void setMeanStyle(QwtSymbol::Style s){mean_style = s;};
@@ -82,9 +82,10 @@ private:
         void draw(QPainter *painter, const QwtScaleMap &xMap,
                   const QwtScaleMap &yMap, int from, int to) const override;
         void drawBox(QPainter *painter, const QwtScaleMap &xMap,
-				const QwtScaleMap &yMap, double *dat, int size) const;
-	using DataCurve::drawSymbols; // Unhide base class method (avoids Intel compiler warning)
-	void drawSymbols(QPainter *painter, const QwtScaleMap &xMap,
+                     const QwtScaleMap &yMap, double *dat, int size) const;
+        using DataCurve::drawSymbols; // Unhide base class method (avoids Intel
+                                      // compiler warning)
+        void drawSymbols(QPainter *painter, const QwtScaleMap &xMap,
 				const QwtScaleMap &yMap, double *dat, int size) const;
 
 	QwtSymbol::Style min_style, max_style, mean_style, p99_style, p1_style;