Update from BR_V5_DEV 13Feb2009

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

diff --git a/src/GLViewer/GLViewer_Object.h b/src/GLViewer/GLViewer_Object.h
index 2384bb4408db88e3522320870621435e329c5c48..a694e88b691762421f0112db0c8fbd3108cc287e 100644 (file)
--- a/src/GLViewer/GLViewer_Object.h
+++ b/src/GLViewer/GLViewer_Object.h
@@ -1,4 +1,7 @@
-//  Copyright (C) 2005 OPEN CASCADE
+//  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
@@ -14,34 +17,29 @@
 //  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
+//  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
 //  Author : OPEN CASCADE
-//
-
 // File:      GLViewer_Object.h
 // Created:   November, 2004
-
+//
 #ifndef GLVIEWER_OBJECT_H
 #define GLVIEWER_OBJECT_H
 
-#ifdef WNT
+#ifdef WIN32
 #include <windows.h>
 #endif
 
 #include "GLViewer.h"
-#include "GLViewer_Defs.h"
 #include "GLViewer_Geom.h"
 
-#include <SUIT_DataOwner.h>
-
 #include <GL/gl.h>
 
-#include <qfile.h>
-#include <qstring.h>
-#include <qrect.h>
+#include <QString>
+
+class QFile;
 
-#ifdef WNT
+#ifdef WIN32
 #pragma warning( disable:4251 )
 #endif
 
@@ -52,6 +50,8 @@ class GLViewer_CoordSystem;
 class GLViewer_Text;
 //class GLViewer_Owner;
 
+class SUIT_DataOwner;
+
 /*! 
  * Class GLViewer_Object
  * Base Object for all GLViewer objects
@@ -303,7 +303,7 @@ protected:
   GLViewer_Group*           myGroup;
 };
 
-#ifdef WNT
+#ifdef WIN32
 #pragma warning ( default:4251 )
 #endif