Fix compilation problems under windows.

[modules/smesh.git] / src / OBJECT / SMESH_ActorUtils.h

diff --git a/src/OBJECT/SMESH_ActorUtils.h b/src/OBJECT/SMESH_ActorUtils.h
index 3a15c40adcb9c97ec7f4524c8b7a754478a8573a..4167e5ae1e27077bd161353668ccf07e034fd7c0 100644 (file)
--- a/src/OBJECT/SMESH_ActorUtils.h
+++ b/src/OBJECT/SMESH_ActorUtils.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2021  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -6,7 +6,7 @@
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
 // License as published by the Free Software Foundation; either
-// version 2.1 of the License.
+// version 2.1 of the License, or (at your option) any later version.
 //
 // This library is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -33,16 +33,23 @@ class SMESH_Actor;
 
 namespace SMESH
 {
+  //! Label font family
+  enum LabelFont { 
+    FntArial,    //!< arial font family
+    FntCourier,  //!< courier font family
+    FntTimes     //!< times font family
+  };
+
 SMESHOBJECT_EXPORT  
-  vtkFloatingPointType 
+  double 
   GetFloat( const QString& theValue, 
-            vtkFloatingPointType theDefault = 0 );
+            double theDefault = 0 );
 
 SMESHOBJECT_EXPORT
-  vtkFloatingPointType 
+  double 
   GetFloat( const QString& theName, 
             const QString& theSection, 
-            vtkFloatingPointType theDefault = 0 );
+            double theDefault = 0 );
 
 SMESHOBJECT_EXPORT
   QColor 
@@ -63,21 +70,21 @@ SMESHOBJECT_EXPORT
   void
   GetColor( const QString& theSect, 
             const QString& theName, 
-            vtkFloatingPointType&, 
-            vtkFloatingPointType&, 
-            vtkFloatingPointType&, 
+            double&, 
+            double&, 
+            double&, 
             const QColor& = QColor() );
 
  SMESHOBJECT_EXPORT
    void
    GetColor(  const QString& theSect, 
-             const QString& theName, 
-             QColor& color,
-             int& delta,
-             QString def);
+              const QString& theName, 
+              QColor& color,
+              int& delta,
+              QString def);
    
  SMESHOBJECT_EXPORT
-   std::map<SMDSAbs_ElementType,int>
+   std::map<SMDSAbs_ElementType,::smIdType>
    GetEntitiesFromObject(SMESH_VisualObj *theObject);
    
 SMESHOBJECT_EXPORT