fix error of gcc and remove old parser code.

FreeCAD · Dec 5, 2013 · 894529a · 894529a
1 parent f58ea31
commit 894529a
Show file tree

Hide file tree

Showing 9 changed files with 20 additions and 4,159 deletions.
diff --git a/src/Base/CMakeLists.txt b/src/Base/CMakeLists.txt
@@ -161,8 +161,6 @@ SET(FreeCADBase_UNITAPI_SRCS
     UnitsSchemaMKS.cpp
     UnitsSchemaImperial1.h
     UnitsSchemaImperial1.cpp
-    UnitsApi.y
-    UnitsApi.l
     Quantity.h
     Quantity.cpp
     QuantityPyImp.cpp

diff --git a/src/Base/Quantity.cpp b/src/Base/Quantity.cpp
@@ -41,8 +41,6 @@
 
 using namespace Base;
 
-double Quantity::defaultFactor = 1.0;
-
 
 Quantity::Quantity()
 {

diff --git a/src/Base/Quantity.h b/src/Base/Quantity.h
@@ -62,7 +62,12 @@ class BaseExport Quantity
     //@}
 
     /// transfer to user prefered unit/potence
-    QString getUserString(double &factor=defaultFactor,QString &unitString=QString())const;
+    QString getUserString(double &factor,QString &unitString)const;
+    QString getUserString(void)const{ // to satisfy GCC
+        double  dummy1;
+        QString dummy2;
+        return getUserString(dummy1,dummy2);
+    }
     //double getUserPrefered() const { QString dummy; return getUserPrefered(dummy); }
     //double getUserPrefered(QString &unitString) const;
     //std::string getUserString(void)const;
@@ -168,7 +173,6 @@ class BaseExport Quantity
 
 
     //@}
-    static double defaultFactor;
 
 
 protected:

diff --git a/src/Base/UnitsApi.h b/src/Base/UnitsApi.h
@@ -62,7 +62,12 @@ class BaseExport UnitsApi
      */
     static void setSchema(UnitSystem s);
 
-	static QString schemaTranslate(Base::Quantity quant,double &factor=defaultFactor,QString &unitString=QString());
+	static QString schemaTranslate(Base::Quantity quant,double &factor,QString &unitString);
+    static QString schemaTranslate(Base::Quantity quant){ // to satisfy GCC
+        double  dummy1;
+        QString dummy2;
+        return UnitsApi::schemaTranslate(quant,dummy1,dummy2);
+    }
     /// generate a value for a quantity with default user prefered system
     static double toDbl(PyObject *ArgObj,const Base::Unit &u=Base::Unit());
     /// generate a value for a quantity with default user prefered system

diff --git a/src/Base/UnitsApi.l b/src/Base/UnitsApi.l