fix user preferred

FreeCAD · Dec 10, 2013 · 9efcb39 · 9efcb39
1 parent 69b4dd0
commit 9efcb39
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 18 deletions.
diff --git a/src/Base/Quantity.cpp b/src/Base/Quantity.cpp
@@ -130,19 +130,6 @@ QString Quantity::getUserString(double &factor,QString &unitString)const
     return Base::UnitsApi::schemaTranslate(*this,factor,unitString);
 }
 
-//double Quantity::getUserPrefered(QString &unitString)const
-//{
-//	return Base::UnitsApi::schemaPrefUnit(_Unit,unitString).getValue() * _Value;
-//}
-//
-//std::string Quantity::getUserString(void)const
-//{
-//    std::stringstream sstream;
-//    sstream << _Value << _Unit.getString();
-//    //TODO: implementing 
-//    return sstream.str();
-//}
-
 /// true if it has a number without a unit
 bool Quantity::isDimensionless(void)const
 {

diff --git a/src/Base/Quantity.h b/src/Base/Quantity.h
@@ -69,9 +69,6 @@ class BaseExport Quantity
         QString dummy2;
         return getUserString(dummy1,dummy2);
     }
-    //double getUserPrefered() const { QString dummy; return getUserPrefered(dummy); }
-    //double getUserPrefered(QString &unitString) const;
-    //std::string getUserString(void)const;
 
     static Quantity parse(const QString &string);
 

diff --git a/src/Base/QuantityPy.xml b/src/Base/QuantityPy.xml
@@ -34,7 +34,7 @@ Quantity(string) -- arbitrary mixture of numbers and chars defining a Quantity
         </UserDocu>
       </Documentation>
     </Methode>
-    <Methode Name="getUserPrefered">
+    <Methode Name="getUserPreferred">
       <Documentation>
         <UserDocu>
           returns a quantity with the translation factor and a string with the prevered unit

diff --git a/src/Base/QuantityPyImp.cpp b/src/Base/QuantityPyImp.cpp
@@ -85,7 +85,7 @@ PyObject* QuantityPy::pow(PyObject * args)
     return 0;
 }
 
-PyObject* QuantityPy::getUserPrefered(PyObject *args)
+PyObject* QuantityPy::getUserPreferred(PyObject *args)
 {
     QString uus;
     double factor;