Merge remote-tracking branch 'origin/BR_SHAPE_RECOGNITION' into BR_v14_rc

[modules/hydro.git] / src / HYDROGUI / HYDROGUI_Region.cxx

diff --git a/src/HYDROGUI/HYDROGUI_Region.cxx b/src/HYDROGUI/HYDROGUI_Region.cxx
index f9e1547b472474d08dad14cd30afdc173ae92df1..a2a38b99e1036c418e677ad6a295b3370f747e71 100644 (file)
--- a/src/HYDROGUI/HYDROGUI_Region.cxx
+++ b/src/HYDROGUI/HYDROGUI_Region.cxx
@@ -1,12 +1,8 @@
-// Copyright (C) 2007-2013  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) 2014-2015  EDF-R&D
 // 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.
+// 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
@@ -32,8 +28,9 @@
 
 HYDROGUI_Region::HYDROGUI_Region( SUIT_DataObject* theParent, 
                                   Handle(HYDROData_Region) theData,
-                                  const QString& theParentEntry )
-: HYDROGUI_DataObject( theParent, theData, theParentEntry ), CAM_DataObject( theParent )
+                                  const QString& theParentEntry,
+                                  const bool theIsInOperation )
+: HYDROGUI_DataObject( theParent, theData, theParentEntry, theIsInOperation ), CAM_DataObject( theParent )
 {
 }