Merge branch V7_3_1_BR

[modules/geom.git] / src / BlocksGUI / BlocksGUI_QuadFaceDlg.h

diff --git a/src/BlocksGUI/BlocksGUI_QuadFaceDlg.h b/src/BlocksGUI/BlocksGUI_QuadFaceDlg.h
index 1d55983f3c914b4085d12b29452e5a23416979b9..6da2154c048a810a67829ecf9775ef91dcabc7af 100644 (file)
--- a/src/BlocksGUI/BlocksGUI_QuadFaceDlg.h
+++ b/src/BlocksGUI/BlocksGUI_QuadFaceDlg.h
@@ -1,24 +1,25 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2014  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
+// 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 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.
+// 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
+// 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
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 // GEOM GEOMGUI : GUI for Geometry component
 // File   : BlocksGUI_QuadFaceDlg.h
 // Author : Julia DOROVSKIKH, Open CASCADE S.A.S. (julia.dorovskikh@opencascade.com)
@@ -26,7 +27,8 @@
 #ifndef BLOCKSGUI_QUADFACEDLG_H
 #define BLOCKSGUI_QUADFACEDLG_H
 
-#include <GEOMBase_Skeleton.h>
+#include "GEOMBase_Skeleton.h"
+#include "GEOM_GenericObjPtr.h"
 
 #include <QMap>
 
@@ -68,10 +70,10 @@ private:
 private:
   int                                myConstructorId;
 
-  GEOM::GEOM_Object_var              myShape1;
-  GEOM::GEOM_Object_var              myShape2;
-  GEOM::GEOM_Object_var              myShape3;
-  GEOM::GEOM_Object_var              myShape4;
+  GEOM::GeomObjPtr                   myShape1;
+  GEOM::GeomObjPtr                   myShape2;
+  GEOM::GeomObjPtr                   myShape3;
+  GEOM::GeomObjPtr                   myShape4;
 
   // to initialize the first selection field with a selected object on the dialog creation
   bool                               myInitial;