X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;ds=inline;f=src%2FGLViewer%2FGLViewer_Defs.h;h=a60d9a63e36698a9a5c3763ace0b28626527cfcb;hb=e6450922454677530835b4769b0e0e3eb16ace51;hp=0ef2cb4d1007c1af50ea424fab1b199e311d648b;hpb=17f067976939532047d730120d5d30b03ab73ff8;p=modules%2Fgui.git

diff --git a/src/GLViewer/GLViewer_Defs.h b/src/GLViewer/GLViewer_Defs.h
index 0ef2cb4d1..a60d9a63e 100644
--- a/src/GLViewer/GLViewer_Defs.h
+++ b/src/GLViewer/GLViewer_Defs.h
@@ -1,13 +1,34 @@
+// Copyright (C) 2007-2016  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, 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
+// 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
+//
+
+//  Author : OPEN CASCADE
 // File:      GLViewer_Defs.h
 // Created:   March, 2005
-// Author:    OCC team
-// Copyright (C) CEA 2005
-
+//
 #ifndef GLVIEWER_DEFS_H
 #define GLVIEWER_DEFS_H
 
-#include <qmap.h>
-#include <qvaluelist.h>
+#include <QMap>
+#include <QList>
 
 class GLViewer_Object;
 //Selection staus 
@@ -24,8 +45,9 @@ static const int      SELECTION_RECT_GAP = 50;
 //! Display Text Format of Objects
 enum DisplayTextFormat
 {
-  DTF_TEXTURE   = 0,
-  DTF_BITMAP    = 1
+  DTF_TEXTURE          = 0,
+  DTF_TEXTURE_SCALABLE = 1,
+  DTF_BITMAP           = 2
 };
 
 enum SelectionStatus
@@ -37,7 +59,7 @@ enum SelectionStatus
 };
 
 typedef QMap<GLViewer_Object*,int> ObjectMap;
-typedef QValueList<GLViewer_Object*> ObjList;
+typedef QList<GLViewer_Object*> ObjList;
 
 #define SEGMENTS   32
 #define PI         3.14159265359