From f35e4ea58b2beb2fe3d180bfeed9bc0e4450c33a Mon Sep 17 00:00:00 2001
From: Janik Zikovsky <zikovskyjl@ornl.gov>
Date: Tue, 10 Aug 2010 16:28:42 +0000
Subject: [PATCH] Refs #1455: removed another const modifier to a function
return value (const bool).
---
Code/Mantid/API/inc/MantidAPI/AlgorithmFactory.h | 2 +-
Code/Mantid/API/inc/MantidAPI/Axis.h | 4 ++--
Code/Mantid/API/inc/MantidAPI/ILocatedData.h | 2 +-
Code/Mantid/API/inc/MantidAPI/LocatedDataRef.h | 2 +-
Code/Mantid/API/inc/MantidAPI/LocatedDataValue.h | 2 +-
Code/Mantid/API/inc/MantidAPI/NumericAxis.h | 2 +-
Code/Mantid/API/inc/MantidAPI/SpectraAxis.h | 2 +-
Code/Mantid/API/src/AlgorithmFactory.cpp | 2 +-
Code/Mantid/API/src/LocatedDataRef.cpp | 2 +-
Code/Mantid/API/src/LocatedDataValue.cpp | 2 +-
10 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/Code/Mantid/API/inc/MantidAPI/AlgorithmFactory.h b/Code/Mantid/API/inc/MantidAPI/AlgorithmFactory.h
index 187a860b000..32324505edf 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 466055526f4..cb1f5c35736 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 4d9f7d20dda..754ce5e982e 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 18a3e5bfb0e..fe537bf476c 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 464d89dcdcf..7a0377af39d 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 0517085c78e..8fb205dbc60 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 ca54afa1953..c4f2605cddf 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 7007ada8f13..6cbfcfdcaec 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 e63e1f12039..96fe10655a0 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 bee606d7388..75523db7896 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;
}
--
GitLab