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 6c99b77251439a5ca9c3548696c3ecf5e01da66d..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
@@
-24,8
+24,6
@@
#include "DDS_KeyWords.h"
#include "DDS_KeyWords.h"
-#include <Basics_OCCTVersion.hxx>
-
#include <LDOMString.hxx>
#include <LDOMParser.hxx>
#include <LDOMString.hxx>
#include <LDOMParser.hxx>
@@
-40,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)();
@@
-425,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();
@@
-495,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;
@@
-516,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++ )
@@
-555,9
+552,7
@@
Standard_Real DDS_Dictionary::ToSI( const Standard_Real theValue, const Standard
if ( theUnits && *theUnits && strcmp( theUnits, "%" ) )
{
try {
if ( theUnits && *theUnits && strcmp( theUnits, "%" ) )
{
try {
-#if OCC_VERSION_LARGE > 0x06010000
OCC_CATCH_SIGNALS;
OCC_CATCH_SIGNALS;
-#endif
aRetValue = UnitsAPI::AnyToSI( theValue, theUnits );
}
catch( Standard_Failure ) {
aRetValue = UnitsAPI::AnyToSI( theValue, theUnits );
}
catch( Standard_Failure ) {
@@
-582,9
+577,7
@@
Standard_Real DDS_Dictionary::FromSI( const Standard_Real theValue, const Standa
if ( theUnits && *theUnits && strcmp( theUnits, "%" ) )
{
try {
if ( theUnits && *theUnits && strcmp( theUnits, "%" ) )
{
try {
-#if OCC_VERSION_LARGE > 0x06010000
OCC_CATCH_SIGNALS;
OCC_CATCH_SIGNALS;
-#endif
aRetValue = UnitsAPI::AnyFromSI( theValue, theUnits );
}
catch( Standard_Failure ) {
aRetValue = UnitsAPI::AnyFromSI( theValue, theUnits );
}
catch( Standard_Failure ) {