Switch from runSession to salome shell in the salome shell plugin of GUI.

[modules/gui.git] / src / GLViewer / GLViewer_BaseDrawers.h

diff --git a/src/GLViewer/GLViewer_BaseDrawers.h b/src/GLViewer/GLViewer_BaseDrawers.h
index ce98aa8679a561b7264b25536058fdd8ac0ce232..b95facec8ea7a7875f897ea87f215e06da4c4ef9 100644 (file)
--- a/src/GLViewer/GLViewer_BaseDrawers.h
+++ b/src/GLViewer/GLViewer_BaseDrawers.h
@@ -1,48 +1,47 @@
-//  Copyright (C) 2005 OPEN CASCADE
+// Copyright (C) 2007-2015  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-//  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.
+// Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-//  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.
+// 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, or (at your option) any later version.
 //
-//  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
+// 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.
 //
-//  See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org
+// 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
 //
-//  Author : OPEN CASCADE
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
 
+//  Author : OPEN CASCADE
 // File:      GLViewer_BaseDrawers.h
 // Created:   November, 2004
-
+//
 #ifndef GLVIEWER_BASEDRAWERS_H
 #define GLVIEWER_BASEDRAWERS_H
 
-#include <qcolor.h>
-#include <qobject.h>
-#include <qfile.h>
-#include <qfont.h>
-#include <qgl.h>
+class QColor;
 
 #include "GLViewer.h"
 #include "GLViewer_Drawer.h"
 
 class GLViewer_AspectLine;
 
-#ifdef WNT
+#ifdef WIN32
 #pragma warning( disable:4251 )
 #endif
 
-/*! Class GLViewer_MarkerDrawer
-*  Drawer for GLViewer_MarkerSet
- */
+/*! 
+  \class GLViewer_MarkerDrawer
+  Drawer for GLViewer_MarkerSet
+*/
 
 class GLVIEWER_API GLViewer_MarkerDrawer : public GLViewer_Drawer  
 {
@@ -58,8 +57,9 @@ private:
   void               drawMarker( float& x, float& y, float& radius, QColor& color, GLViewer_AspectLine* aspect );
 };
 
-/*! Class  GLViewer_PolylineDrawer
-* Drawer for GLViewer_Polyline
+/*!
+  \class  GLViewer_PolylineDrawer
+  Drawer for GLViewer_Polyline
 */
 
 class GLVIEWER_API GLViewer_PolylineDrawer : public GLViewer_Drawer  
@@ -71,8 +71,9 @@ public:
   virtual void       create( float, float, bool );    
 };
 
-/* Class GLViewer_TextDrawer
-* Drawer for GLViewer_Text
+/*!
+   \class GLViewer_TextDrawer
+   Drawer for GLViewer_Text
 */
 
 class GLVIEWER_API GLViewer_TextDrawer: public GLViewer_Drawer
@@ -88,7 +89,7 @@ public:
   void                      updateObjects();
 };
 
-#ifdef WNT
+#ifdef WIN32
 #pragma warning ( default:4251 )
 #endif