Join modifications from branch OCC_debug_for_3_2_0b1

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

diff --git a/src/OBJECT/SMESH_ActorUtils.h b/src/OBJECT/SMESH_ActorUtils.h
index f28e8d6c9ae5568fae70b246c3b4df9b1ec89c57..19ed7e282ee960085f83c09525706cc1e77a727e 100644 (file)
--- a/src/OBJECT/SMESH_ActorUtils.h
+++ b/src/OBJECT/SMESH_ActorUtils.h
@@ -23,18 +23,46 @@
 #include <qcolor.h>
 #include <qstring.h>
 
+#include "VTKViewer.h"
+
 class vtkUnstructuredGrid;
 
-namespace SMESH{
+namespace SMESH
+{
   
-  float GetFloat( const QString& theValue, float theDefault = 0 );
-  float GetFloat( const QString& theName, const QString& theSection, float theDefault = 0 );
+  vtkFloatingPointType 
+  GetFloat( const QString& theValue, 
+           vtkFloatingPointType theDefault = 0 );
+
+  vtkFloatingPointType 
+  GetFloat( const QString& theName, 
+           const QString& theSection, 
+           vtkFloatingPointType theDefault = 0 );
+
+  QColor 
+  GetColor( const QString& theSect, 
+           const QString& theName, 
+           const QColor&t = QColor() );
+
+  void
+  GetColor( const QString& theSect, 
+           const QString& theName, 
+           int&, 
+           int&, 
+           int&, 
+           const QColor&t = QColor() );
 
-  QColor GetColor( const QString& theSect, const QString& theName, const QColor&t = QColor() );
-  void   GetColor( const QString& theSect, const QString& theName, int&, int&, int&, const QColor&t = QColor() );
-  void   GetColor( const QString& theSect, const QString& theName, float&, float&, float&, const QColor&t = QColor() );
+  void
+  GetColor( const QString& theSect, 
+           const QString& theName, 
+           vtkFloatingPointType&, 
+           vtkFloatingPointType&, 
+           vtkFloatingPointType&, 
+           const QColor&t = QColor() );
 
-  void WriteUnstructuredGrid(vtkUnstructuredGrid* theGrid, const char* theFileName);
+  void 
+  WriteUnstructuredGrid(vtkUnstructuredGrid* theGrid, 
+                       const char* theFileName);
 
 }