Initial merge of branch 'BR_HYDRO_IMPS_2016' into BR_PORTING_OCCT_7

[modules/hydro.git] / src / HYDROData / HYDROData_NaturalObject.h

diff --git a/src/HYDROData/HYDROData_NaturalObject.h b/src/HYDROData/HYDROData_NaturalObject.h
index 5dd20651883ca46d45edd10ad1825d409a6647de..ecc4736a5a8ddc4e5e4f9aa0d7e29bfd89004c51 100644 (file)
--- a/src/HYDROData/HYDROData_NaturalObject.h
+++ b/src/HYDROData/HYDROData_NaturalObject.h
@@ -16,30 +16,11 @@
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
 
-// 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
-//
-
 #ifndef HYDROData_NaturalObject_HeaderFile
 #define HYDROData_NaturalObject_HeaderFile
 
 #include <HYDROData_Object.h>
 
-DEFINE_STANDARD_HANDLE(HYDROData_NaturalObject, HYDROData_Object)
-
-
 /**\class HYDROData_NaturalObject
  * \brief The natural objects are objects of environment not created by human.
  *
@@ -56,7 +37,7 @@ protected:
   };
 
 public:
-  DEFINE_STANDARD_RTTI(HYDROData_NaturalObject);
+  DEFINE_STANDARD_RTTIEXT(HYDROData_NaturalObject, HYDROData_Object);
 
 protected:
 
@@ -64,7 +45,7 @@ protected:
    * Creates new object in the internal data structure. Use higher level objects 
    * to create objects with real content.
    */
-  HYDRODATA_EXPORT HYDROData_NaturalObject();
+  HYDRODATA_EXPORT HYDROData_NaturalObject( Geometry );
 
   /**
    * Destructs properties of the object and object itself, removes it from the document.