Commit a714c4e1 authored by Hahn, Steven's avatar Hahn, Steven
Browse files

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

parent f3ebfa21
...@@ -40,7 +40,6 @@ namespace API { ...@@ -40,7 +40,6 @@ namespace API {
*/ */
class DLLExport IFunction1DSpectrum : public virtual IFunction { class DLLExport IFunction1DSpectrum : public virtual IFunction {
public: public:
void function(const FunctionDomain &domain, void function(const FunctionDomain &domain,
FunctionValues &values) const override; FunctionValues &values) const override;
void functionDeriv(const FunctionDomain &domain, Jacobian &jacobian) override; void functionDeriv(const FunctionDomain &domain, Jacobian &jacobian) override;
......
...@@ -53,8 +53,6 @@ public: ...@@ -53,8 +53,6 @@ public:
convention = Kernel::ConfigService::Instance().getString("Q.convention"); convention = Kernel::ConfigService::Instance().getString("Q.convention");
} }
/// Returns a clone of the workspace /// Returns a clone of the workspace
IPeaksWorkspace_uptr clone() const { return IPeaksWorkspace_uptr(doClone()); } IPeaksWorkspace_uptr clone() const { return IPeaksWorkspace_uptr(doClone()); }
......
...@@ -53,13 +53,15 @@ public: ...@@ -53,13 +53,15 @@ public:
createUnwrapped(const std::string &processXML) const override; createUnwrapped(const std::string &processXML) const override;
friend struct Mantid::Kernel::CreateUsingNew<ImplicitFunctionFactoryImpl>; friend struct Mantid::Kernel::CreateUsingNew<ImplicitFunctionFactoryImpl>;
private:
private:
/// Private Constructor for singleton class /// Private Constructor for singleton class
ImplicitFunctionFactoryImpl(); ImplicitFunctionFactoryImpl();
/// Private copy constructor - NO COPY ALLOWED /// Private copy constructor - NO COPY ALLOWED
ImplicitFunctionFactoryImpl(const ImplicitFunctionFactoryImpl &) = delete; ImplicitFunctionFactoryImpl(const ImplicitFunctionFactoryImpl &) = delete;
/// Private assignment operator - NO ASSIGNMENT ALLOWED /// Private assignment operator - NO ASSIGNMENT ALLOWED
ImplicitFunctionFactoryImpl &operator=(const ImplicitFunctionFactoryImpl &) = delete; ImplicitFunctionFactoryImpl &
operator=(const ImplicitFunctionFactoryImpl &) = delete;
/// Private Destructor /// Private Destructor
~ImplicitFunctionFactoryImpl() override = default; ~ImplicitFunctionFactoryImpl() override = default;
}; };
......
...@@ -41,6 +41,7 @@ public: ...@@ -41,6 +41,7 @@ public:
TimeAtSampleStrategyDirect( TimeAtSampleStrategyDirect(
boost::shared_ptr<const Mantid::API::MatrixWorkspace> ws, double ei); boost::shared_ptr<const Mantid::API::MatrixWorkspace> ws, double ei);
Correction calculate(const size_t &workspace_index) const override; Correction calculate(const size_t &workspace_index) const override;
private: private:
/// Cached L1, Ei dependent const shift /// Cached L1, Ei dependent const shift
double m_constShift; double m_constShift;
......
...@@ -70,7 +70,6 @@ public: ...@@ -70,7 +70,6 @@ public:
/// Virutal constructor /// Virutal constructor
PeakBackground *clone() const override; PeakBackground *clone() const override;
}; };
} // namespace Crystal } // namespace Crystal
......
...@@ -93,7 +93,6 @@ private: ...@@ -93,7 +93,6 @@ private:
*/ */
class DLLExport DiffRotDiscreteCircle : public API::ImmutableCompositeFunction { class DLLExport DiffRotDiscreteCircle : public API::ImmutableCompositeFunction {
public: public:
std::string name() const override { return "DiffRotDiscreteCircle"; } std::string name() const override { return "DiffRotDiscreteCircle"; }
const std::string category() const override { return "QuasiElastic"; } const std::string category() const override { return "QuasiElastic"; }
......
...@@ -49,7 +49,6 @@ namespace Functions { ...@@ -49,7 +49,6 @@ namespace Functions {
*/ */
class DLLExport PseudoVoigt : public API::IPeakFunction { class DLLExport PseudoVoigt : public API::IPeakFunction {
public: public:
double centre() const override { return getParameter("PeakCentre"); } double centre() const override { return getParameter("PeakCentre"); }
double height() const override { return getParameter("Height"); } double height() const override { return getParameter("Height"); }
double fwhm() const override { return getParameter("FWHM"); } double fwhm() const override { return getParameter("FWHM"); }
......
...@@ -21,6 +21,7 @@ public: ...@@ -21,6 +21,7 @@ public:
CoordTransformDistanceParser(); CoordTransformDistanceParser();
Mantid::API::CoordTransform * Mantid::API::CoordTransform *
createTransform(Poco::XML::Element *coordTransElement) const override; createTransform(Poco::XML::Element *coordTransElement) const override;
private: private:
CoordTransformDistanceParser(const CoordTransformDistanceParser &); CoordTransformDistanceParser(const CoordTransformDistanceParser &);
CoordTransformDistanceParser &operator=(const CoordTransformDistanceParser &); CoordTransformDistanceParser &operator=(const CoordTransformDistanceParser &);
......
...@@ -55,7 +55,6 @@ public: ...@@ -55,7 +55,6 @@ public:
@return True to keep going. @return True to keep going.
*/ */
bool keepGoing() const override { return m_iterator->getIsMasked(); }; bool keepGoing() const override { return m_iterator->getIsMasked(); };
}; };
/// Policy that indicates no skipping should be applied. /// Policy that indicates no skipping should be applied.
......
...@@ -76,6 +76,7 @@ public: ...@@ -76,6 +76,7 @@ public:
std::string getExtension() const override; std::string getExtension() const override;
std::string getMangledName() const override; std::string getMangledName() const override;
bool exists() const override; bool exists() const override;
private: private:
IDFObject(const IDFObject &); IDFObject(const IDFObject &);
IDFObject &operator=(const IDFObject &); IDFObject &operator=(const IDFObject &);
......
...@@ -996,7 +996,7 @@ public: ...@@ -996,7 +996,7 @@ public:
int soap_out(struct soap *, const char *, int, const char *) const override; int soap_out(struct soap *, const char *, int, const char *) const override;
void *soap_get(struct soap *, const char *, const char *) override; void *soap_get(struct soap *, const char *, const char *) override;
void *soap_in(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 #endif
...@@ -1859,7 +1859,6 @@ public: ...@@ -1859,7 +1859,6 @@ public:
void *soap_get(struct soap *, const char *, const char *) override; void *soap_get(struct soap *, const char *, const char *) override;
void *soap_in(struct soap *, const char *, const char *) override; void *soap_in(struct soap *, const char *, const char *) override;
ns1__facility() { ns1__facility::soap_default(NULL); } ns1__facility() { ns1__facility::soap_default(NULL); }
}; };
#endif #endif
......
...@@ -109,7 +109,7 @@ public: ...@@ -109,7 +109,7 @@ public:
} }
~ArrayProperty() override = default; ~ArrayProperty() override = default;
// Unhide the base class assignment operator // Unhide the base class assignment operator
using PropertyWithValue<std::vector<T>>::operator=; using PropertyWithValue<std::vector<T>>::operator=;
......
...@@ -43,6 +43,7 @@ public: ...@@ -43,6 +43,7 @@ public:
explicit DirectoryValidator(bool testDirectoryExists = true); explicit DirectoryValidator(bool testDirectoryExists = true);
std::vector<std::string> allowedValues() const override; std::vector<std::string> allowedValues() const override;
IValidator_sptr clone() const override; IValidator_sptr clone() const override;
private: private:
std::string checkValidity(const std::string &value) const override; std::string checkValidity(const std::string &value) const override;
}; };
......
...@@ -45,6 +45,7 @@ public: ...@@ -45,6 +45,7 @@ public:
bool testFileExists = true, bool testCanWrite = false); bool testFileExists = true, bool testCanWrite = false);
std::vector<std::string> allowedValues() const override; std::vector<std::string> allowedValues() const override;
IValidator_sptr clone() const override; IValidator_sptr clone() const override;
protected: protected:
/// The list of permitted extensions /// The list of permitted extensions
std::vector<std::string> m_extensions; std::vector<std::string> m_extensions;
......
...@@ -398,7 +398,6 @@ public: ...@@ -398,7 +398,6 @@ public:
/// Constructor /// Constructor
dSpacing(); dSpacing();
protected: protected:
double factorTo; ///< Constant factor for to conversion double factorTo; ///< Constant factor for to conversion
double factorFrom; ///< Constant factor for from conversion double factorFrom; ///< Constant factor for from conversion
......
...@@ -359,7 +359,6 @@ private: ...@@ -359,7 +359,6 @@ private:
class DLLExport ClientHelloPkt : public Packet { class DLLExport ClientHelloPkt : public Packet {
public: public:
ClientHelloPkt(const ClientHelloPkt &pkt);
enum Flags { enum Flags {
PAUSE_AGNOSTIC = 0x0000, PAUSE_AGNOSTIC = 0x0000,
......
...@@ -36,7 +36,6 @@ Code Documentation is available at: <http://doxygen.mantidproject.org> ...@@ -36,7 +36,6 @@ Code Documentation is available at: <http://doxygen.mantidproject.org>
class DLLExport MantidWebServiceAPIJobManager class DLLExport MantidWebServiceAPIJobManager
: public Mantid::API::IRemoteJobManager { : public Mantid::API::IRemoteJobManager {
public: public:
void authenticate(const std::string &username, void authenticate(const std::string &username,
const std::string &password) override; const std::string &password) override;
......
...@@ -54,7 +54,7 @@ public: ...@@ -54,7 +54,7 @@ public:
/// get the full file name of the file used for IO operations /// get the full file name of the file used for IO operations
const std::string &getFileName() const override { return m_fileName; } const std::string &getFileName() const override { return m_fileName; }
/**Return the size of the NeXus data block used in NeXus data array*/ /**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; bool openFile(const std::string &fileName, const std::string &mode) override;
void saveBlock(const std::vector<float> & /* DataBlock */, void saveBlock(const std::vector<float> & /* DataBlock */,
......
...@@ -114,8 +114,9 @@ public: ...@@ -114,8 +114,9 @@ public:
QwtDoubleRect boundingRect() const override; QwtDoubleRect boundingRect() const override;
void setBoundingRect(double xs, double ys, double xe, double ye); 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 //! Recalculates the bounding rectangle in values coordinates using the
void updateBoundingRect(); //pixel coordinats when the scales change
void updateBoundingRect();
//! Returns the state of #d_editable. //! Returns the state of #d_editable.
bool editable() const { return d_editable; } bool editable() const { return d_editable; }
...@@ -128,10 +129,10 @@ public: ...@@ -128,10 +129,10 @@ public:
private: private:
void draw(QPainter *p, const QwtScaleMap &xMap, const QwtScaleMap &yMap, void draw(QPainter *p, const QwtScaleMap &xMap, const QwtScaleMap &yMap,
const QRect &r) const override; 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 //! Flag specifying if the start arrow is visible
bool d_start_arrow; bool d_start_arrow;
//! Flag specifying if the end arrow is visible //! Flag specifying if the end arrow is visible
bool d_end_arrow; bool d_end_arrow;
......
...@@ -46,10 +46,10 @@ public: ...@@ -46,10 +46,10 @@ public:
QwtDoubleRect boundingRect() const override; QwtDoubleRect boundingRect() const override;
QwtSymbol::Style minStyle(){return min_style;}; QwtSymbol::Style minStyle() { return min_style; };
void setMinStyle(QwtSymbol::Style s){min_style = s;}; 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 setMaxStyle(QwtSymbol::Style s){max_style = s;};
void setMeanStyle(QwtSymbol::Style s){mean_style = s;}; void setMeanStyle(QwtSymbol::Style s){mean_style = s;};
...@@ -82,9 +82,10 @@ private: ...@@ -82,9 +82,10 @@ private:
void draw(QPainter *painter, const QwtScaleMap &xMap, void draw(QPainter *painter, const QwtScaleMap &xMap,
const QwtScaleMap &yMap, int from, int to) const override; const QwtScaleMap &yMap, int from, int to) const override;
void drawBox(QPainter *painter, const QwtScaleMap &xMap, void drawBox(QPainter *painter, const QwtScaleMap &xMap,
const QwtScaleMap &yMap, double *dat, int size) const; const QwtScaleMap &yMap, double *dat, int size) const;
using DataCurve::drawSymbols; // Unhide base class method (avoids Intel compiler warning) using DataCurve::drawSymbols; // Unhide base class method (avoids Intel
void drawSymbols(QPainter *painter, const QwtScaleMap &xMap, // compiler warning)
void drawSymbols(QPainter *painter, const QwtScaleMap &xMap,
const QwtScaleMap &yMap, double *dat, int size) const; const QwtScaleMap &yMap, double *dat, int size) const;
QwtSymbol::Style min_style, max_style, mean_style, p99_style, p1_style; QwtSymbol::Style min_style, max_style, mean_style, p99_style, p1_style;
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment