diff --git a/Code/Mantid/API/inc/MantidAPI/AlgorithmFactory.h b/Code/Mantid/API/inc/MantidAPI/AlgorithmFactory.h index 187a860b00051f1ffd9954a3f4057efd2c7eef06..32324505edfeabc96c081e9975c5fc593d0973ad 100644 --- a/Code/Mantid/API/inc/MantidAPI/AlgorithmFactory.h +++ b/Code/Mantid/API/inc/MantidAPI/AlgorithmFactory.h @@ -106,7 +106,7 @@ public: /// Extract the name of an algorithm const std::string extractAlgName(const boost::shared_ptr<IAlgorithm> alg) const; /// Extract the version of an algorithm - const int extractAlgVersion(const boost::shared_ptr<IAlgorithm> alg) const; + int extractAlgVersion(const boost::shared_ptr<IAlgorithm> alg) const; ///Create an algorithm object with the specified name boost::shared_ptr<IAlgorithm> createAlgorithm(const std::string & name, const int version) const; diff --git a/Code/Mantid/API/inc/MantidAPI/Axis.h b/Code/Mantid/API/inc/MantidAPI/Axis.h index 466055526f4785df81810b4e3b629a561bad7652..cb1f5c357368ba04e2f7f1f3596484ab80075990 100644 --- a/Code/Mantid/API/inc/MantidAPI/Axis.h +++ b/Code/Mantid/API/inc/MantidAPI/Axis.h @@ -61,9 +61,9 @@ public: Kernel::Unit_sptr& unit(); /// Returns true is the axis is a Spectra axis - virtual const bool isSpectra() const{return false;} + virtual bool isSpectra() const{return false;} /// Returns true if the axis is numeric - virtual const bool isNumeric() const{return false;} + virtual bool isNumeric() const{return false;} /// Returns the value at a specified index /// @param index the index diff --git a/Code/Mantid/API/inc/MantidAPI/ILocatedData.h b/Code/Mantid/API/inc/MantidAPI/ILocatedData.h index 4d9f7d20ddaa87ab6fae7cc062148d63ac10eba5..754ce5e982e320541f221250c3ce09cdd4b1e946 100644 --- a/Code/Mantid/API/inc/MantidAPI/ILocatedData.h +++ b/Code/Mantid/API/inc/MantidAPI/ILocatedData.h @@ -42,7 +42,7 @@ namespace API virtual const double& X2() const =0; ///< Returns the X value of the end of the histogram bin virtual double& X2() =0; ///< Returns the X value of the end of the histogram bin - virtual const bool isHistogram() const =0; ///<Returns true if the data point is hastogram data and therefore has an X2. + virtual bool isHistogram() const =0; ///<Returns true if the data point is hastogram data and therefore has an X2. virtual ~ILocatedData() {} diff --git a/Code/Mantid/API/inc/MantidAPI/LocatedDataRef.h b/Code/Mantid/API/inc/MantidAPI/LocatedDataRef.h index 18a3e5bfb0e51fc07e2ffc0099692af3065ba502..fe537bf476cf9635e89267a5f15f328642689151 100644 --- a/Code/Mantid/API/inc/MantidAPI/LocatedDataRef.h +++ b/Code/Mantid/API/inc/MantidAPI/LocatedDataRef.h @@ -49,7 +49,7 @@ namespace API const double& X2() const; ///< Returns the X value of the end of the histogram bin double& X2(); ///< Returns the X value of the end of the histogram bin - const bool isHistogram() const; ///<Returns true if the data point is hastogram data and therefore has an X2. + bool isHistogram() const; ///<Returns true if the data point is hastogram data and therefore has an X2. double* xPointer; ///< Pointer to the value of X double* x2Pointer; ///< Pointer to the value of X diff --git a/Code/Mantid/API/inc/MantidAPI/LocatedDataValue.h b/Code/Mantid/API/inc/MantidAPI/LocatedDataValue.h index 464d89dcdcf199bd400ed7ef9627eb32cc20daaa..7a0377af39debe39051c4125afb9fef843db2423 100644 --- a/Code/Mantid/API/inc/MantidAPI/LocatedDataValue.h +++ b/Code/Mantid/API/inc/MantidAPI/LocatedDataValue.h @@ -52,7 +52,7 @@ namespace Mantid const double& X2() const; double& X2(); - const bool isHistogram() const; ///<Returns true if the data point is hastogram data and therefore has an X2. + bool isHistogram() const; ///<Returns true if the data point is hastogram data and therefore has an X2. double x2Value; ///< value of X2 diff --git a/Code/Mantid/API/inc/MantidAPI/NumericAxis.h b/Code/Mantid/API/inc/MantidAPI/NumericAxis.h index 0517085c78e010b85775d91f45ca6bc4fe2a279e..8fb205dbc60930720925b1119c560a8f78c03c67 100644 --- a/Code/Mantid/API/inc/MantidAPI/NumericAxis.h +++ b/Code/Mantid/API/inc/MantidAPI/NumericAxis.h @@ -53,7 +53,7 @@ public: virtual ~NumericAxis(){} virtual Axis* clone(const MatrixWorkspace* const parentWorkspace = NULL); ///Is the axis numeric - always true for this class - virtual const bool isNumeric() const{return true;} + virtual bool isNumeric() const{return true;} virtual int length() const{return static_cast<int>(m_values.size());} virtual double operator()(const int& index, const int& verticalIndex = 0) const; virtual void setValue(const int& index, const double& value); diff --git a/Code/Mantid/API/inc/MantidAPI/SpectraAxis.h b/Code/Mantid/API/inc/MantidAPI/SpectraAxis.h index ca54afa195357c6832b6783dfbd1f12d83a1e67c..c4f2605cddffa7073c86b34f0ca82a87ed42aad8 100644 --- a/Code/Mantid/API/inc/MantidAPI/SpectraAxis.h +++ b/Code/Mantid/API/inc/MantidAPI/SpectraAxis.h @@ -65,7 +65,7 @@ public: virtual Axis* clone(const MatrixWorkspace* const parentWorkspace = NULL); virtual int length() const{return static_cast<int>(m_values.size());} /// If this is a spectra Axis - always true for this class - virtual const bool isSpectra() const{return true;} + virtual bool isSpectra() const{return true;} virtual double operator()(const int& index, const int& verticalIndex = 0) const; virtual void setValue(const int& index, const double& value); virtual bool operator==(const Axis&) const; diff --git a/Code/Mantid/API/src/AlgorithmFactory.cpp b/Code/Mantid/API/src/AlgorithmFactory.cpp index 7007ada8f13d109638ff0f87a28db0dcd90a2807..6cbfcfdcaec018ea973991ac197052450028fa09 100644 --- a/Code/Mantid/API/src/AlgorithmFactory.cpp +++ b/Code/Mantid/API/src/AlgorithmFactory.cpp @@ -201,7 +201,7 @@ namespace Mantid * @param alg the Algrorithm to use * @returns the version of the algroithm */ - const int AlgorithmFactoryImpl::extractAlgVersion(const boost::shared_ptr<IAlgorithm> alg) const + int AlgorithmFactoryImpl::extractAlgVersion(const boost::shared_ptr<IAlgorithm> alg) const { return alg->version(); } diff --git a/Code/Mantid/API/src/LocatedDataRef.cpp b/Code/Mantid/API/src/LocatedDataRef.cpp index e63e1f12039260f939a5b06cbb6165aaa042fa50..96fe10655a0450ae116f70cd379b22edf5dbaac5 100644 --- a/Code/Mantid/API/src/LocatedDataRef.cpp +++ b/Code/Mantid/API/src/LocatedDataRef.cpp @@ -207,7 +207,7 @@ namespace Mantid /** Returns true if the data point is hastogram data and therefore has an X2. @returns true if the X2 value is present */ - const bool LocatedDataRef::isHistogram() const + bool LocatedDataRef::isHistogram() const { return (x2Pointer!=0); } diff --git a/Code/Mantid/API/src/LocatedDataValue.cpp b/Code/Mantid/API/src/LocatedDataValue.cpp index bee606d73888e8d53b928bc2c94c05ca270d24ed..75523db7896c653a53d88fac6207556f25206295 100644 --- a/Code/Mantid/API/src/LocatedDataValue.cpp +++ b/Code/Mantid/API/src/LocatedDataValue.cpp @@ -223,7 +223,7 @@ namespace Mantid return eValue; } - const bool LocatedDataValue::isHistogram() const + bool LocatedDataValue::isHistogram() const { return _isHistogram; }