Salome HOME
projects
/
modules
/
gui.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Upgrade to paraview 5.4
[modules/gui.git]
/
src
/
DDS
/
DDS_Dictionary.cxx
diff --git
a/src/DDS/DDS_Dictionary.cxx
b/src/DDS/DDS_Dictionary.cxx
index d22fdb0ba2279d39da44c0e8960efcbd371507ce..b26dc1e6d9203c48628028180b9ad7f0a01bef58 100644
(file)
--- a/
src/DDS/DDS_Dictionary.cxx
+++ b/
src/DDS/DDS_Dictionary.cxx
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-201
4
CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-201
6
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
@@
-38,8
+38,7
@@
#include <Standard_Failure.hxx>
#include <Standard_ErrorHandler.hxx>
#include <Standard_Failure.hxx>
#include <Standard_ErrorHandler.hxx>
-IMPLEMENT_STANDARD_HANDLE(DDS_Dictionary, MMgt_TShared)
-IMPLEMENT_STANDARD_RTTIEXT(DDS_Dictionary, MMgt_TShared)
+OCCT_IMPLEMENT_STANDARD_RTTIEXT(DDS_Dictionary, MMgt_TShared)
Handle(DDS_Dictionary) DDS_Dictionary::myDictionary = Handle(DDS_Dictionary)();
Handle(DDS_Dictionary) DDS_Dictionary::myDictionary = Handle(DDS_Dictionary)();
@@
-423,7
+422,7
@@
void DDS_Dictionary::SetActiveUnitSystem( const TCollection_AsciiString& theSyst
\brief Get the only instance of the data dictionary.
\return the only instance of the data dictionary
*/
\brief Get the only instance of the data dictionary.
\return the only instance of the data dictionary
*/
-Handle
_DDS_Dictionary
DDS_Dictionary::Get()
+Handle
(DDS_Dictionary)
DDS_Dictionary::Get()
{
if ( myDictionary.IsNull() )
myDictionary = new DDS_Dictionary();
{
if ( myDictionary.IsNull() )
myDictionary = new DDS_Dictionary();
@@
-493,7
+492,7
@@
LDOMString DDS_Dictionary::KeyWord( const TCollection_AsciiString& key )
\param theComponent component name
\return handle to the data dictionary item
*/
\param theComponent component name
\return handle to the data dictionary item
*/
-Handle
_DDS_DicItem
DDS_Dictionary::GetDicItem( const TCollection_AsciiString& theID,
+Handle
(DDS_DicItem)
DDS_Dictionary::GetDicItem( const TCollection_AsciiString& theID,
const TCollection_AsciiString& theComponent ) const
{
Handle(DDS_DicItem) aDicItem;
const TCollection_AsciiString& theComponent ) const
{
Handle(DDS_DicItem) aDicItem;
@@
-514,7
+513,7
@@
Handle_DDS_DicItem DDS_Dictionary::GetDicItem( const TCollection_AsciiString& th
\param theID data dictionary item ID
\return handle to the data dictionary item
*/
\param theID data dictionary item ID
\return handle to the data dictionary item
*/
-Handle
_DDS_DicItem
DDS_Dictionary::GetDicItem( const TCollection_AsciiString& theID ) const
+Handle
(DDS_DicItem)
DDS_Dictionary::GetDicItem( const TCollection_AsciiString& theID ) const
{
Handle(DDS_DicItem) aDicItem;
for ( Standard_Integer i = 1; i <= myGroupMap.Extent() && aDicItem.IsNull(); i++ )
{
Handle(DDS_DicItem) aDicItem;
for ( Standard_Integer i = 1; i <= myGroupMap.Extent() && aDicItem.IsNull(); i++ )