From 9e3e17d41ed4b68ee208e77a003d0b79d272699f Mon Sep 17 00:00:00 2001
From: dpasukhi <dpasukhi@opencascade.com>
Date: Sat, 4 Jan 2025 11:06:47 +0000
Subject: [PATCH] Foundation Classes - Update type declaration #232

Refactor type handling in BinMDataStd and Interface modules;
update RTTI implementations in StepVisual and XCAFDoc
---
 src/BinMDataStd/BinMDataStd_GenericExtStringDriver.cxx | 5 ++---
 src/BinMDataStd/BinMDataStd_GenericExtStringDriver.hxx | 2 +-
 src/Interface/Interface_InterfaceModel.cxx             | 3 +--
 src/StepVisual/StepVisual_CoordinatesList.cxx          | 2 +-
 src/StepVisual/StepVisual_TessellatedGeometricSet.cxx  | 2 +-
 src/XCAFDoc/XCAFDoc_NotesTool.cxx                      | 2 +-
 6 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/src/BinMDataStd/BinMDataStd_GenericExtStringDriver.cxx b/src/BinMDataStd/BinMDataStd_GenericExtStringDriver.cxx
index c6f3ad78f1..ef54ba25c1 100644
--- a/src/BinMDataStd/BinMDataStd_GenericExtStringDriver.cxx
+++ b/src/BinMDataStd/BinMDataStd_GenericExtStringDriver.cxx
@@ -45,10 +45,9 @@ Handle(TDF_Attribute) BinMDataStd_GenericExtStringDriver::NewEmpty() const
 //function : SourceType
 //purpose  : 
 //=======================================================================
-Handle(Standard_Type)& BinMDataStd_GenericExtStringDriver::SourceType() const
+const Handle(Standard_Type)& BinMDataStd_GenericExtStringDriver::SourceType() const
 {
-  static Handle(Standard_Type) aSourceType = Standard_Type::Instance<TDataStd_GenericExtString>();
-  return aSourceType;
+  return Standard_Type::Instance<TDataStd_GenericExtString>();
 }
 
 //=======================================================================
diff --git a/src/BinMDataStd/BinMDataStd_GenericExtStringDriver.hxx b/src/BinMDataStd/BinMDataStd_GenericExtStringDriver.hxx
index a5efea089a..e20b2d62b4 100644
--- a/src/BinMDataStd/BinMDataStd_GenericExtStringDriver.hxx
+++ b/src/BinMDataStd/BinMDataStd_GenericExtStringDriver.hxx
@@ -38,7 +38,7 @@ public:
   
   Standard_EXPORT Handle(TDF_Attribute) NewEmpty() const Standard_OVERRIDE;
 
-  Standard_EXPORT virtual Handle(Standard_Type)& SourceType() const Standard_OVERRIDE;
+  Standard_EXPORT virtual const Handle(Standard_Type)& SourceType() const Standard_OVERRIDE;
 
   //! persistent -> transient (retrieve)
   Standard_EXPORT Standard_Boolean Paste (const BinObjMgt_Persistent& Source, const Handle(TDF_Attribute)& Target, BinObjMgt_RRelocationTable& RelocTable) const Standard_OVERRIDE;
diff --git a/src/Interface/Interface_InterfaceModel.cxx b/src/Interface/Interface_InterfaceModel.cxx
index 7c1331345f..9bbfb23446 100644
--- a/src/Interface/Interface_InterfaceModel.cxx
+++ b/src/Interface/Interface_InterfaceModel.cxx
@@ -44,8 +44,7 @@ static NCollection_DataMap<TCollection_AsciiString, Handle(Standard_Transient)>
 
 static const Handle(Standard_Type)& typerep()
 {
-  static  Handle(Standard_Type) tr = STANDARD_TYPE(Interface_ReportEntity);
-  return tr;
+  return STANDARD_TYPE(Interface_ReportEntity);
 }
 
 
diff --git a/src/StepVisual/StepVisual_CoordinatesList.cxx b/src/StepVisual/StepVisual_CoordinatesList.cxx
index 7caab6b96c..ac83411114 100644
--- a/src/StepVisual/StepVisual_CoordinatesList.cxx
+++ b/src/StepVisual/StepVisual_CoordinatesList.cxx
@@ -14,7 +14,7 @@
 
 #include <StepVisual_CoordinatesList.hxx>
 #include <StepVisual_TessellatedItem.hxx>
-IMPLEMENT_STANDARD_RTTIEXT(StepVisual_CoordinatesList,StepGeom_TessellatedItem)
+IMPLEMENT_STANDARD_RTTIEXT(StepVisual_CoordinatesList, StepVisual_TessellatedItem)
 
 StepVisual_CoordinatesList::StepVisual_CoordinatesList ()  {}
 
diff --git a/src/StepVisual/StepVisual_TessellatedGeometricSet.cxx b/src/StepVisual/StepVisual_TessellatedGeometricSet.cxx
index da4f391e21..7474863cd0 100644
--- a/src/StepVisual/StepVisual_TessellatedGeometricSet.cxx
+++ b/src/StepVisual/StepVisual_TessellatedGeometricSet.cxx
@@ -15,7 +15,7 @@
 #include <StepVisual_TessellatedGeometricSet.hxx>
 
 
-IMPLEMENT_STANDARD_RTTIEXT(StepVisual_TessellatedGeometricSet,StepGeom_TessellatedItem)
+IMPLEMENT_STANDARD_RTTIEXT(StepVisual_TessellatedGeometricSet,StepVisual_TessellatedItem)
 
 
 StepVisual_TessellatedGeometricSet::StepVisual_TessellatedGeometricSet ()  {}
diff --git a/src/XCAFDoc/XCAFDoc_NotesTool.cxx b/src/XCAFDoc/XCAFDoc_NotesTool.cxx
index 28f46daa1a..3ad294c1ca 100644
--- a/src/XCAFDoc/XCAFDoc_NotesTool.cxx
+++ b/src/XCAFDoc/XCAFDoc_NotesTool.cxx
@@ -36,7 +36,7 @@ namespace {
 
 }
 
-IMPLEMENT_DERIVED_ATTRIBUTE(XCAFDoc_NotesTool, XCAFDoc_NoteComment)
+IMPLEMENT_DERIVED_ATTRIBUTE(XCAFDoc_NotesTool, TDataStd_GenericEmpty)
 
 enum NotesTool_RootLabels
 {