Merge from BR_V5_DEV 16Feb09

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

diff --git a/src/OBJECT/SMESH_ActorUtils.h b/src/OBJECT/SMESH_ActorUtils.h
index 0370d60e165cbdb398efa367cb4a7e066663bffa..a494f743b5d317b7486e5f846031cca3bed8a10e 100644 (file)
--- a/src/OBJECT/SMESH_ActorUtils.h
+++ b/src/OBJECT/SMESH_ActorUtils.h
@@ -1,31 +1,30 @@
-//  Copyright (C) 2003  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS 
-// 
-//  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. 
-// 
-//  This library is distributed in the hope that it will be useful, 
-//  but WITHOUT ANY WARRANTY; without even the implied warranty of 
-//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU 
-//  Lesser General Public License for more details. 
-// 
-//  You should have received a copy of the GNU Lesser General Public 
-//  License along with this library; if not, write to the Free Software 
-//  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA 
-// 
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
+//  Copyright (C) 2007-2008  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
+//
+//  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.
+//
+//  This library is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//  Lesser General Public License for more details.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if not, write to the Free Software
+//  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//
+//  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
 #ifndef SMESH_ACTORUTILS_H
 #define SMESH_ACTORUTILS_H
 
 #include "SMESH_Object.h"
 
-#include <qcolor.h>
-#include <qstring.h>
-
-#include "VTKViewer.h"
+#include <QColor>
 
 class vtkUnstructuredGrid;
 
@@ -46,7 +45,7 @@ SMESHOBJECT_EXPORT
   QColor 
   GetColor( const QString& theSect, 
            const QString& theName, 
-           const QColor&t = QColor() );
+           const QColor& = QColor() );
 
 SMESHOBJECT_EXPORT
   void
@@ -55,7 +54,7 @@ SMESHOBJECT_EXPORT
            int&, 
            int&, 
            int&, 
-           const QColor&t = QColor() );
+           const QColor& = QColor() );
 
 SMESHOBJECT_EXPORT
   void
@@ -64,7 +63,7 @@ SMESHOBJECT_EXPORT
            vtkFloatingPointType&, 
            vtkFloatingPointType&, 
            vtkFloatingPointType&, 
-           const QColor&t = QColor() );
+           const QColor& = QColor() );
 
 SMESHOBJECT_EXPORT
   void