Merge branch 'V9_11_BR'

[modules/geom.git] / src / GEOM / GEOM_Application.hxx

diff --git a/src/GEOM/GEOM_Application.hxx b/src/GEOM/GEOM_Application.hxx
index c5e3f9a844b5a18a7cda8c647deafc0160b3698b..98c8fea1c89d4f9dd82911c993cb2f479288cbca 100644 (file)
--- a/src/GEOM/GEOM_Application.hxx
+++ b/src/GEOM/GEOM_Application.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2013  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2023  CEA, EDF, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -6,7 +6,7 @@
 // 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
@@ -20,92 +20,26 @@
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
 
-//  File   : GEOM_Application.hxx
-//  Module : GEOM
-//
 #ifndef _GEOM_Application_HeaderFile
 #define _GEOM_Application_HeaderFile
 
-#ifndef _Standard_HeaderFile
-#include <Standard.hxx>
-#endif
-#ifndef _Handle_GEOM_Application_HeaderFile
-#include <Handle_GEOM_Application.hxx>
-#endif
-
-#ifndef _TDocStd_Application_HeaderFile
 #include <TDocStd_Application.hxx>
-#endif
-#ifndef _Standard_CString_HeaderFile
-#include <Standard_CString.hxx>
-#endif
-class TColStd_SequenceOfExtendedString;
-
-
-class GEOM_Application : public TDocStd_Application {
+#include <Standard.hxx>
+#include <Standard_DefineHandle.hxx>
+#include <TColStd_SequenceOfExtendedString.hxx>
 
+class GEOM_Application : public TDocStd_Application
+{
 public:
+  Standard_EXPORT GEOM_Application();
+  Standard_EXPORT ~GEOM_Application();
 
-    inline void* operator new(size_t,void* anAddress) 
-      {
-        return anAddress;
-      }
-    inline void* operator new(size_t size) 
-      { 
-        return Standard::Allocate(size); 
-      }
-    inline void  operator delete(void *anAddress) 
-      { 
-        if (anAddress) Standard::Free((Standard_Address&)anAddress); 
-      }
-//    inline void  operator delete(void *anAddress, size_t size) 
-//      { 
-//        if (anAddress) Standard::Free((Standard_Address&)anAddress,size); 
-//      }
- // Methods PUBLIC
- // 
-Standard_EXPORT GEOM_Application();
-Standard_EXPORT virtual  void Formats(TColStd_SequenceOfExtendedString& Formats) ;
-Standard_EXPORT Standard_CString ResourcesName() ;
-Standard_EXPORT ~GEOM_Application();
-
-
-
-
- // Type management
- //
- Standard_EXPORT friend Handle_Standard_Type& GEOM_Application_Type_();
- Standard_EXPORT const Handle(Standard_Type)& DynamicType() const;
- Standard_EXPORT Standard_Boolean IsKind(const Handle(Standard_Type)&) const;
-
-protected:
-
- // Methods PROTECTED
- // 
-
-
- // Fields PROTECTED
- //
-
-
-private: 
-
- // Methods PRIVATE
- // 
-
-
- // Fields PRIVATE
- //
-
+  Standard_EXPORT Standard_CString ResourcesName();
 
+public:
+  DEFINE_STANDARD_RTTIEXT(GEOM_Application,TDocStd_Application)
 };
 
-
-
-
-
-// other inline functions and methods (like "C++: function call" methods)
-//
-
+DEFINE_STANDARD_HANDLE(GEOM_Application, TDocStd_Application)
 
 #endif