Re #4158. Renaming setValue method to fix warnings

mantidproject · Apr 4, 2012 · f7321d6 · f7321d6
1 parent b1f2cfe
commit f7321d6
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 6 deletions.
diff --git a/Code/Mantid/Framework/API/src/AlgorithmProxy.cpp b/Code/Mantid/Framework/API/src/AlgorithmProxy.cpp
@@ -205,7 +205,7 @@ namespace Mantid
     void AlgorithmProxy::afterPropertySet(const std::string& name)
     {
       createConcreteAlg(true);
-      m_alg->getPointerToProperty(name)->setValue(*this->getPointerToProperty(name));
+      m_alg->getPointerToProperty(name)->setValueFromProperty(*this->getPointerToProperty(name));
       m_alg->afterPropertySet(name);
       copyPropertiesFrom(*m_alg);
       m_alg.reset();

diff --git a/Code/Mantid/Framework/API/test/RunTest.h b/Code/Mantid/Framework/API/test/RunTest.h
@@ -28,7 +28,7 @@ namespace
     std::string getDefault() const { return "getDefault() is not implemented in this class"; }
     std::string value() const { return "Nothing"; }
     std::string setValue( const std::string& ) { return ""; }
-    std::string setValue( const Property& right ) { return ""; }
+    std::string setValueFromProperty( const Property& right ) { return ""; }
     std::string setDataItem(const boost::shared_ptr<DataItem>) { return ""; } 
     Property& operator+=( Property const * ) { return *this; }
   };

diff --git a/Code/Mantid/Framework/Kernel/inc/MantidKernel/Property.h b/Code/Mantid/Framework/Kernel/inc/MantidKernel/Property.h
@@ -150,7 +150,7 @@ class MANTID_KERNEL_DLL Property
   /// Set the value of the property via a string.  If the value is unacceptable the value is not changed but a string is returned
   virtual std::string setValue(const std::string&) = 0;
   /// Set the value of the property via a reference to another property.  
-  virtual std::string setValue( const Property& right ) = 0;
+  virtual std::string setValueFromProperty( const Property& right ) = 0;
   /// Set the value of the property via a DataItem pointer.  If the value is unacceptable the value is not changed but a string is returned
   virtual std::string setDataItem(const boost::shared_ptr<DataItem>) = 0;
   /// Get the default value for the property which is the value the property was initialised with

diff --git a/Code/Mantid/Framework/Kernel/inc/MantidKernel/PropertyWithValue.h b/Code/Mantid/Framework/Kernel/inc/MantidKernel/PropertyWithValue.h
@@ -480,7 +480,7 @@ class PropertyWithValue : public Property
    * The value is only accepted if the other property has the same type as this
    * @param right :: A reference to a property.
    */
-  virtual std::string setValue( const Property& right )
+  virtual std::string setValueFromProperty( const Property& right )
   {
     auto prop = dynamic_cast<const PropertyWithValue<TYPE>*>(&right);
     if ( !prop )

diff --git a/Code/Mantid/Framework/Kernel/inc/MantidKernel/TimeSeriesProperty.h b/Code/Mantid/Framework/Kernel/inc/MantidKernel/TimeSeriesProperty.h
@@ -1764,7 +1764,7 @@ class DLLExport TimeSeriesProperty: public Property
    * The value is only accepted if the other property has the same type as this
    * @param right :: A reference to a property.
    */
-  virtual std::string setValue( const Property& right )
+  virtual std::string setValueFromProperty( const Property& right )
   {
     auto prop = dynamic_cast<const TimeSeriesProperty*>(&right);
     if ( !prop )

diff --git a/Code/Mantid/Framework/Kernel/test/PropertyTest.h b/Code/Mantid/Framework/Kernel/test/PropertyTest.h
@@ -15,7 +15,7 @@ class PropertyHelper : public Property
   Property* clone() { return new PropertyHelper(*this); }
   std::string value() const { return "Nothing"; }
   std::string setValue( const std::string&) { return ""; }
-  std::string setValue( const Property& right ) { return ""; }
+  std::string setValueFromProperty( const Property& right ) { return ""; }
   std::string setDataItem( const boost::shared_ptr<DataItem> ) { return ""; }
   bool isDefault() const { return true; }
   std::string getDefault() const { return "Is not implemented in this class, should be overriden"; }