diff --git a/src/TDataStd/FILES b/src/TDataStd/FILES index f9b707f64b..8f9f3ec5b2 100644 --- a/src/TDataStd/FILES +++ b/src/TDataStd/FILES @@ -8,10 +8,8 @@ TDataStd_BooleanList.cxx TDataStd_BooleanList.hxx TDataStd_ByteArray.cxx TDataStd_ByteArray.hxx -TDataStd_ByteArray.lxx TDataStd_ChildNodeIterator.cxx TDataStd_ChildNodeIterator.hxx -TDataStd_ChildNodeIterator.lxx TDataStd_Comment.cxx TDataStd_Comment.hxx TDataStd_Current.cxx @@ -42,38 +40,29 @@ TDataStd_Expression.cxx TDataStd_Expression.hxx TDataStd_ExtStringArray.cxx TDataStd_ExtStringArray.hxx -TDataStd_ExtStringArray.lxx TDataStd_ExtStringList.cxx TDataStd_ExtStringList.hxx TDataStd_HDataMapOfStringByte.cxx TDataStd_HDataMapOfStringByte.hxx -TDataStd_HDataMapOfStringByte.lxx TDataStd_HDataMapOfStringHArray1OfInteger.cxx TDataStd_HDataMapOfStringHArray1OfInteger.hxx -TDataStd_HDataMapOfStringHArray1OfInteger.lxx TDataStd_HDataMapOfStringHArray1OfReal.cxx TDataStd_HDataMapOfStringHArray1OfReal.hxx -TDataStd_HDataMapOfStringHArray1OfReal.lxx TDataStd_HDataMapOfStringInteger.cxx TDataStd_HDataMapOfStringInteger.hxx -TDataStd_HDataMapOfStringInteger.lxx TDataStd_HDataMapOfStringReal.cxx TDataStd_HDataMapOfStringReal.hxx -TDataStd_HDataMapOfStringReal.lxx TDataStd_HDataMapOfStringString.cxx TDataStd_HDataMapOfStringString.hxx -TDataStd_HDataMapOfStringString.lxx TDataStd_HLabelArray1.hxx TDataStd_Integer.cxx TDataStd_Integer.hxx TDataStd_IntegerArray.cxx TDataStd_IntegerArray.hxx -TDataStd_IntegerArray.lxx TDataStd_IntegerList.cxx TDataStd_IntegerList.hxx TDataStd_IntPackedMap.cxx TDataStd_IntPackedMap.hxx -TDataStd_IntPackedMap.lxx TDataStd_LabelArray1.hxx TDataStd_ListIteratorOfListOfByte.hxx TDataStd_ListIteratorOfListOfExtendedString.hxx @@ -91,7 +80,6 @@ TDataStd_Real.cxx TDataStd_Real.hxx TDataStd_RealArray.cxx TDataStd_RealArray.hxx -TDataStd_RealArray.lxx TDataStd_RealEnum.hxx TDataStd_RealList.cxx TDataStd_RealList.hxx diff --git a/src/TDataStd/TDataStd_ByteArray.hxx b/src/TDataStd/TDataStd_ByteArray.hxx index c270aa4dbb..f8ceedb6f1 100644 --- a/src/TDataStd/TDataStd_ByteArray.hxx +++ b/src/TDataStd/TDataStd_ByteArray.hxx @@ -39,10 +39,10 @@ DEFINE_STANDARD_HANDLE(TDataStd_ByteArray, TDF_Attribute) //! An array of Byte (unsigned char) values. class TDataStd_ByteArray : public TDF_Attribute { - + friend class TDataStd_DeltaOnModificationOfByteArray; + DEFINE_STANDARD_RTTIEXT(TDataStd_ByteArray, TDF_Attribute) public: - //! Static methods //! ============== //! Returns an ID for array. @@ -77,9 +77,9 @@ Standard_Byte operator () (const Standard_Integer Index) const //! Returns the number of elements in the array. Standard_EXPORT Standard_Integer Length() const; - - const Handle(TColStd_HArray1OfByte) InternalArray() const; - + + const Handle(TColStd_HArray1OfByte)& InternalArray() const { return myValue; } + //! Sets the inner array of the attribute to //! . If value of differs from , Backup performed //! and myValue refers to new instance of HArray1OfInteger that holds @@ -87,12 +87,12 @@ Standard_Byte operator () (const Standard_Integer Index) const //! If equal True each item of will be checked with each //! item of for coincidence (to avoid backup). Standard_EXPORT void ChangeArray (const Handle(TColStd_HArray1OfByte)& newArray, const Standard_Boolean isCheckItems = Standard_True); - - Standard_Boolean GetDelta() const; - + + Standard_Boolean GetDelta() const { return myIsDelta; } + //! for internal use only! - void SetDelta (const Standard_Boolean isDelta); - + void SetDelta (const Standard_Boolean isDelta) { myIsDelta = isDelta; } + Standard_EXPORT TDataStd_ByteArray(); Standard_EXPORT const Standard_GUID& ID() const Standard_OVERRIDE; @@ -109,33 +109,15 @@ Standard_Byte operator () (const Standard_Integer Index) const //! . Standard_EXPORT virtual Handle(TDF_DeltaOnModification) DeltaOnModification (const Handle(TDF_Attribute)& anOldAttribute) const Standard_OVERRIDE; - -friend class TDataStd_DeltaOnModificationOfByteArray; - - - DEFINE_STANDARD_RTTIEXT(TDataStd_ByteArray,TDF_Attribute) - -protected: - - - - private: + void RemoveArray() { myValue.Nullify(); } - void RemoveArray(); +private: Handle(TColStd_HArray1OfByte) myValue; Standard_Boolean myIsDelta; - }; - -#include - - - - - #endif // _TDataStd_ByteArray_HeaderFile diff --git a/src/TDataStd/TDataStd_ByteArray.lxx b/src/TDataStd/TDataStd_ByteArray.lxx deleted file mode 100644 index f3c597d509..0000000000 --- a/src/TDataStd/TDataStd_ByteArray.lxx +++ /dev/null @@ -1,53 +0,0 @@ -// Created on: 2007-12-05 -// Created by: Sergey ZARITCHNY -// Copyright (c) 2007-2014 OPEN CASCADE SAS -// -// This file is part of Open CASCADE Technology software library. -// -// This library is free software; you can redistribute it and/or modify it under -// the terms of the GNU Lesser General Public License version 2.1 as published -// by the Free Software Foundation, with special exception defined in the file -// OCCT_LGPL_EXCEPTION.txt. Consult the file LICENSE_LGPL_21.txt included in OCCT -// distribution for complete text of the license and disclaimer of any warranty. -// -// Alternatively, this file may be used under the terms of Open CASCADE -// commercial license or contractual agreement. - -#include - -//======================================================================= -//function : Array -//purpose : -//======================================================================= - -inline const Handle(TColStd_HArray1OfByte) TDataStd_ByteArray::InternalArray(void) const -{ - return myValue; -} - -//======================================================================= -//function : RemoveArray -//purpose : -//======================================================================= -inline void TDataStd_ByteArray::RemoveArray(void) -{ - myValue.Nullify(); -} - - -//======================================================================= -//function : SetDelta -//purpose : -//======================================================================= -inline void TDataStd_ByteArray::SetDelta(const Standard_Boolean isDelta) -{ - myIsDelta = isDelta; -} -//======================================================================= -//function : GetDelta -//purpose : -//======================================================================= -inline Standard_Boolean TDataStd_ByteArray::GetDelta(void) const -{ - return myIsDelta; -} diff --git a/src/TDataStd/TDataStd_ChildNodeIterator.hxx b/src/TDataStd/TDataStd_ChildNodeIterator.hxx index dcfa50ae5a..51f13bb042 100644 --- a/src/TDataStd/TDataStd_ChildNodeIterator.hxx +++ b/src/TDataStd/TDataStd_ChildNodeIterator.hxx @@ -24,7 +24,6 @@ #include class TDataStd_TreeNode; - //! Iterates on the ChildStepren step of a step, at the //! first level only. It is possible to ask the //! iterator to explore all the sub step levels of the @@ -35,7 +34,6 @@ public: DEFINE_STANDARD_ALLOC - //! Creates an empty iterator. Standard_EXPORT TDataStd_ChildNodeIterator(); @@ -52,8 +50,8 @@ public: //! Returns True if there is a current Item in the //! iteration. - Standard_Boolean More() const; - + Standard_Boolean More() const { return !myNode.IsNull(); } + //! Move to the next Item Standard_EXPORT void Next(); @@ -65,32 +63,13 @@ public: //! Returns the current item; a null Step if there is //! no one. - const Handle(TDataStd_TreeNode)& Value() const; - - - - -protected: - - - - + const Handle(TDataStd_TreeNode)& Value() const { return myNode; } private: - - Handle(TDataStd_TreeNode) myNode; Standard_Integer myFirstLevel; - }; - -#include - - - - - #endif // _TDataStd_ChildNodeIterator_HeaderFile diff --git a/src/TDataStd/TDataStd_ChildNodeIterator.lxx b/src/TDataStd/TDataStd_ChildNodeIterator.lxx deleted file mode 100644 index ec4defa14c..0000000000 --- a/src/TDataStd/TDataStd_ChildNodeIterator.lxx +++ /dev/null @@ -1,34 +0,0 @@ -// Created on: 2000-02-11 -// Created by: Vladislav ROMASHKO -// Copyright (c) 2000-2014 OPEN CASCADE SAS -// -// This file is part of Open CASCADE Technology software library. -// -// This library is free software; you can redistribute it and/or modify it under -// the terms of the GNU Lesser General Public License version 2.1 as published -// by the Free Software Foundation, with special exception defined in the file -// OCCT_LGPL_EXCEPTION.txt. Consult the file LICENSE_LGPL_21.txt included in OCCT -// distribution for complete text of the license and disclaimer of any warranty. -// -// Alternatively, this file may be used under the terms of Open CASCADE -// commercial license or contractual agreement. - -//======================================================================= -//function : More -//purpose : -//======================================================================= - -inline Standard_Boolean TDataStd_ChildNodeIterator::More() const -{ - return !myNode.IsNull(); -} - -//======================================================================= -//function : Value -//purpose : -//======================================================================= - -inline const Handle(TDataStd_TreeNode)& TDataStd_ChildNodeIterator::Value() const -{ - return myNode; -} diff --git a/src/TDataStd/TDataStd_ExtStringArray.hxx b/src/TDataStd/TDataStd_ExtStringArray.hxx index 4b68df2626..78eb44c5cb 100644 --- a/src/TDataStd/TDataStd_ExtStringArray.hxx +++ b/src/TDataStd/TDataStd_ExtStringArray.hxx @@ -36,15 +36,13 @@ class TDF_DeltaOnModification; class TDataStd_ExtStringArray; DEFINE_STANDARD_HANDLE(TDataStd_ExtStringArray, TDF_Attribute) -//! ExtStringArray Attribute. Handles an -//! array of UNICODE strings (represented by the -//! TCollection_ExtendedString class). +//! ExtStringArray Attribute. Handles an array of UNICODE strings (represented by the TCollection_ExtendedString class). class TDataStd_ExtStringArray : public TDF_Attribute { - + friend class TDataStd_DeltaOnModificationOfExtStringArray; + DEFINE_STANDARD_RTTIEXT(TDataStd_ExtStringArray, TDF_Attribute) public: - //! class methods //! ============= //! Returns the GUID for the attribute. @@ -87,15 +85,15 @@ const TCollection_ExtendedString& operator () (const Standard_Integer Index) con //! If equal True each item of will be checked with each //! item of for coincidence (to avoid backup). Standard_EXPORT void ChangeArray (const Handle(TColStd_HArray1OfExtendedString)& newArray, const Standard_Boolean isCheckItems = Standard_True); - + //! Return the inner array of the ExtStringArray attribute - const Handle(TColStd_HArray1OfExtendedString) Array() const; - - Standard_Boolean GetDelta() const; - + const Handle(TColStd_HArray1OfExtendedString)& Array() const { return myValue; } + + Standard_Boolean GetDelta() const { return myIsDelta; } + //! for internal use only! - void SetDelta (const Standard_Boolean isDelta); - + void SetDelta (const Standard_Boolean isDelta) { myIsDelta = isDelta; } + Standard_EXPORT TDataStd_ExtStringArray(); Standard_EXPORT const Standard_GUID& ID() const Standard_OVERRIDE; @@ -112,33 +110,15 @@ const TCollection_ExtendedString& operator () (const Standard_Integer Index) con //! . Standard_EXPORT virtual Handle(TDF_DeltaOnModification) DeltaOnModification (const Handle(TDF_Attribute)& anOldAttribute) const Standard_OVERRIDE; - -friend class TDataStd_DeltaOnModificationOfExtStringArray; - - - DEFINE_STANDARD_RTTIEXT(TDataStd_ExtStringArray,TDF_Attribute) - -protected: - - - - private: - - void RemoveArray(); + void RemoveArray() { myValue.Nullify(); } + +private: Handle(TColStd_HArray1OfExtendedString) myValue; Standard_Boolean myIsDelta; - }; - -#include - - - - - #endif // _TDataStd_ExtStringArray_HeaderFile diff --git a/src/TDataStd/TDataStd_ExtStringArray.lxx b/src/TDataStd/TDataStd_ExtStringArray.lxx deleted file mode 100644 index 2bcfc4c4ee..0000000000 --- a/src/TDataStd/TDataStd_ExtStringArray.lxx +++ /dev/null @@ -1,53 +0,0 @@ -// Created on: 2007-12-04 -// Created by: Sergey ZARITCHNY -// Copyright (c) 2007-2014 OPEN CASCADE SAS -// -// This file is part of Open CASCADE Technology software library. -// -// This library is free software; you can redistribute it and/or modify it under -// the terms of the GNU Lesser General Public License version 2.1 as published -// by the Free Software Foundation, with special exception defined in the file -// OCCT_LGPL_EXCEPTION.txt. Consult the file LICENSE_LGPL_21.txt included in OCCT -// distribution for complete text of the license and disclaimer of any warranty. -// -// Alternatively, this file may be used under the terms of Open CASCADE -// commercial license or contractual agreement. - -#include - -//======================================================================= -//function : Array -//purpose : -//======================================================================= - -inline const Handle(TColStd_HArray1OfExtendedString) TDataStd_ExtStringArray::Array(void) const -{ - return myValue; -} - -//======================================================================= -//function : RemoveArray -//purpose : -//======================================================================= -inline void TDataStd_ExtStringArray::RemoveArray(void) -{ - myValue.Nullify(); -} - - -//======================================================================= -//function : SetDelta -//purpose : -//======================================================================= -inline void TDataStd_ExtStringArray::SetDelta(const Standard_Boolean isDelta) -{ - myIsDelta = isDelta; -} -//======================================================================= -//function : GetDelta -//purpose : -//======================================================================= -inline Standard_Boolean TDataStd_ExtStringArray::GetDelta(void) const -{ - return myIsDelta; -} diff --git a/src/TDataStd/TDataStd_HDataMapOfStringByte.hxx b/src/TDataStd/TDataStd_HDataMapOfStringByte.hxx index 1e0e3cf96d..72b6570fe2 100644 --- a/src/TDataStd/TDataStd_HDataMapOfStringByte.hxx +++ b/src/TDataStd/TDataStd_HDataMapOfStringByte.hxx @@ -23,49 +23,27 @@ #include #include - -class TDataStd_HDataMapOfStringByte; -DEFINE_STANDARD_HANDLE(TDataStd_HDataMapOfStringByte, MMgt_TShared) - //! Extension of TDataStd_DataMapOfStringByte class //! to be manipulated by handle. class TDataStd_HDataMapOfStringByte : public MMgt_TShared { - + DEFINE_STANDARD_RTTIEXT(TDataStd_HDataMapOfStringByte, MMgt_TShared) public: - Standard_EXPORT TDataStd_HDataMapOfStringByte(const Standard_Integer NbBuckets = 1); - + Standard_EXPORT TDataStd_HDataMapOfStringByte(const TDataStd_DataMapOfStringByte& theOther); - - const TDataStd_DataMapOfStringByte& Map() const; - - TDataStd_DataMapOfStringByte& ChangeMap(); - - - - - DEFINE_STANDARD_RTTIEXT(TDataStd_HDataMapOfStringByte,MMgt_TShared) - -protected: - + const TDataStd_DataMapOfStringByte& Map() const { return myMap; } + TDataStd_DataMapOfStringByte& ChangeMap() { return myMap; } private: - TDataStd_DataMapOfStringByte myMap; - }; - -#include - - - - +DEFINE_STANDARD_HANDLE(TDataStd_HDataMapOfStringByte, MMgt_TShared) #endif // _TDataStd_HDataMapOfStringByte_HeaderFile diff --git a/src/TDataStd/TDataStd_HDataMapOfStringByte.lxx b/src/TDataStd/TDataStd_HDataMapOfStringByte.lxx deleted file mode 100644 index 1b633afa5e..0000000000 --- a/src/TDataStd/TDataStd_HDataMapOfStringByte.lxx +++ /dev/null @@ -1,32 +0,0 @@ -// Created on: 2007-08-17 -// Created by: Sergey ZARITCHNY -// Copyright (c) 2007-2014 OPEN CASCADE SAS -// -// This file is part of Open CASCADE Technology software library. -// -// This library is free software; you can redistribute it and/or modify it under -// the terms of the GNU Lesser General Public License version 2.1 as published -// by the Free Software Foundation, with special exception defined in the file -// OCCT_LGPL_EXCEPTION.txt. Consult the file LICENSE_LGPL_21.txt included in OCCT -// distribution for complete text of the license and disclaimer of any warranty. -// -// Alternatively, this file may be used under the terms of Open CASCADE -// commercial license or contractual agreement. - -//======================================================================= -//function : Map -//purpose : Access to the map -//======================================================================= -inline const TDataStd_DataMapOfStringByte& TDataStd_HDataMapOfStringByte::Map () const -{ - return myMap; -} - -//======================================================================= -//function : ChangeMap -//purpose : Access to the map for modification -//======================================================================= -inline TDataStd_DataMapOfStringByte& TDataStd_HDataMapOfStringByte::ChangeMap () -{ - return myMap; -} diff --git a/src/TDataStd/TDataStd_HDataMapOfStringHArray1OfInteger.hxx b/src/TDataStd/TDataStd_HDataMapOfStringHArray1OfInteger.hxx index fd8fde9a61..50a92f740e 100644 --- a/src/TDataStd/TDataStd_HDataMapOfStringHArray1OfInteger.hxx +++ b/src/TDataStd/TDataStd_HDataMapOfStringHArray1OfInteger.hxx @@ -23,49 +23,27 @@ #include #include - -class TDataStd_HDataMapOfStringHArray1OfInteger; -DEFINE_STANDARD_HANDLE(TDataStd_HDataMapOfStringHArray1OfInteger, MMgt_TShared) - //! Extension of TDataStd_DataMapOfStringHArray1OfInteger class //! to be manipulated by handle. class TDataStd_HDataMapOfStringHArray1OfInteger : public MMgt_TShared { - + DEFINE_STANDARD_RTTIEXT(TDataStd_HDataMapOfStringHArray1OfInteger, MMgt_TShared) public: - Standard_EXPORT TDataStd_HDataMapOfStringHArray1OfInteger(const Standard_Integer NbBuckets = 1); - + Standard_EXPORT TDataStd_HDataMapOfStringHArray1OfInteger(const TDataStd_DataMapOfStringHArray1OfInteger& theOther); - - const TDataStd_DataMapOfStringHArray1OfInteger& Map() const; - - TDataStd_DataMapOfStringHArray1OfInteger& ChangeMap(); - - - - - DEFINE_STANDARD_RTTIEXT(TDataStd_HDataMapOfStringHArray1OfInteger,MMgt_TShared) - -protected: - + const TDataStd_DataMapOfStringHArray1OfInteger& Map() const { return myMap; } + TDataStd_DataMapOfStringHArray1OfInteger& ChangeMap() { return myMap; } private: - TDataStd_DataMapOfStringHArray1OfInteger myMap; - }; - -#include - - - - +DEFINE_STANDARD_HANDLE(TDataStd_HDataMapOfStringHArray1OfInteger, MMgt_TShared) #endif // _TDataStd_HDataMapOfStringHArray1OfInteger_HeaderFile diff --git a/src/TDataStd/TDataStd_HDataMapOfStringHArray1OfInteger.lxx b/src/TDataStd/TDataStd_HDataMapOfStringHArray1OfInteger.lxx deleted file mode 100644 index 37b6ee33f8..0000000000 --- a/src/TDataStd/TDataStd_HDataMapOfStringHArray1OfInteger.lxx +++ /dev/null @@ -1,32 +0,0 @@ -// Created on: 2007-08-17 -// Created by: Sergey ZARITCHNY -// Copyright (c) 2007-2014 OPEN CASCADE SAS -// -// This file is part of Open CASCADE Technology software library. -// -// This library is free software; you can redistribute it and/or modify it under -// the terms of the GNU Lesser General Public License version 2.1 as published -// by the Free Software Foundation, with special exception defined in the file -// OCCT_LGPL_EXCEPTION.txt. Consult the file LICENSE_LGPL_21.txt included in OCCT -// distribution for complete text of the license and disclaimer of any warranty. -// -// Alternatively, this file may be used under the terms of Open CASCADE -// commercial license or contractual agreement. - -//======================================================================= -//function : Map -//purpose : Access to the map -//======================================================================= -inline const TDataStd_DataMapOfStringHArray1OfInteger& TDataStd_HDataMapOfStringHArray1OfInteger::Map () const -{ - return myMap; -} - -//======================================================================= -//function : ChangeMap -//purpose : Access to the map for modification -//======================================================================= -inline TDataStd_DataMapOfStringHArray1OfInteger& TDataStd_HDataMapOfStringHArray1OfInteger::ChangeMap () -{ - return myMap; -} diff --git a/src/TDataStd/TDataStd_HDataMapOfStringHArray1OfReal.hxx b/src/TDataStd/TDataStd_HDataMapOfStringHArray1OfReal.hxx index bb4e9e0e7d..54f3778860 100644 --- a/src/TDataStd/TDataStd_HDataMapOfStringHArray1OfReal.hxx +++ b/src/TDataStd/TDataStd_HDataMapOfStringHArray1OfReal.hxx @@ -23,49 +23,27 @@ #include #include - -class TDataStd_HDataMapOfStringHArray1OfReal; -DEFINE_STANDARD_HANDLE(TDataStd_HDataMapOfStringHArray1OfReal, MMgt_TShared) - //! Extension of TDataStd_DataMapOfStringHArray1OfReal class //! to be manipulated by handle. class TDataStd_HDataMapOfStringHArray1OfReal : public MMgt_TShared { - + DEFINE_STANDARD_RTTIEXT(TDataStd_HDataMapOfStringHArray1OfReal, MMgt_TShared) public: - Standard_EXPORT TDataStd_HDataMapOfStringHArray1OfReal(const Standard_Integer NbBuckets = 1); - + Standard_EXPORT TDataStd_HDataMapOfStringHArray1OfReal(const TDataStd_DataMapOfStringHArray1OfReal& theOther); - - const TDataStd_DataMapOfStringHArray1OfReal& Map() const; - - TDataStd_DataMapOfStringHArray1OfReal& ChangeMap(); - - - - - DEFINE_STANDARD_RTTIEXT(TDataStd_HDataMapOfStringHArray1OfReal,MMgt_TShared) - -protected: - + const TDataStd_DataMapOfStringHArray1OfReal& Map() const { return myMap; } + TDataStd_DataMapOfStringHArray1OfReal& ChangeMap() { return myMap; } private: - TDataStd_DataMapOfStringHArray1OfReal myMap; - }; - -#include - - - - +DEFINE_STANDARD_HANDLE(TDataStd_HDataMapOfStringHArray1OfReal, MMgt_TShared) #endif // _TDataStd_HDataMapOfStringHArray1OfReal_HeaderFile diff --git a/src/TDataStd/TDataStd_HDataMapOfStringHArray1OfReal.lxx b/src/TDataStd/TDataStd_HDataMapOfStringHArray1OfReal.lxx deleted file mode 100644 index 7a23eef0e1..0000000000 --- a/src/TDataStd/TDataStd_HDataMapOfStringHArray1OfReal.lxx +++ /dev/null @@ -1,32 +0,0 @@ -// Created on: 2007-08-17 -// Created by: Sergey ZARITCHNY -// Copyright (c) 2007-2014 OPEN CASCADE SAS -// -// This file is part of Open CASCADE Technology software library. -// -// This library is free software; you can redistribute it and/or modify it under -// the terms of the GNU Lesser General Public License version 2.1 as published -// by the Free Software Foundation, with special exception defined in the file -// OCCT_LGPL_EXCEPTION.txt. Consult the file LICENSE_LGPL_21.txt included in OCCT -// distribution for complete text of the license and disclaimer of any warranty. -// -// Alternatively, this file may be used under the terms of Open CASCADE -// commercial license or contractual agreement. - -//======================================================================= -//function : Map -//purpose : Access to the map -//======================================================================= -inline const TDataStd_DataMapOfStringHArray1OfReal& TDataStd_HDataMapOfStringHArray1OfReal::Map () const -{ - return myMap; -} - -//======================================================================= -//function : ChangeMap -//purpose : Access to the map for modification -//======================================================================= -inline TDataStd_DataMapOfStringHArray1OfReal& TDataStd_HDataMapOfStringHArray1OfReal::ChangeMap () -{ - return myMap; -} diff --git a/src/TDataStd/TDataStd_HDataMapOfStringInteger.hxx b/src/TDataStd/TDataStd_HDataMapOfStringInteger.hxx index bc79f9e75d..2a3693d1f9 100644 --- a/src/TDataStd/TDataStd_HDataMapOfStringInteger.hxx +++ b/src/TDataStd/TDataStd_HDataMapOfStringInteger.hxx @@ -23,49 +23,27 @@ #include #include - -class TDataStd_HDataMapOfStringInteger; -DEFINE_STANDARD_HANDLE(TDataStd_HDataMapOfStringInteger, MMgt_TShared) - //! Extension of TColStd_DataMapOfStringInteger class //! to be manipulated by handle. class TDataStd_HDataMapOfStringInteger : public MMgt_TShared { - + DEFINE_STANDARD_RTTIEXT(TDataStd_HDataMapOfStringInteger, MMgt_TShared) public: - Standard_EXPORT TDataStd_HDataMapOfStringInteger(const Standard_Integer NbBuckets = 1); - + Standard_EXPORT TDataStd_HDataMapOfStringInteger(const TColStd_DataMapOfStringInteger& theOther); - - const TColStd_DataMapOfStringInteger& Map() const; - - TColStd_DataMapOfStringInteger& ChangeMap(); - - - - - DEFINE_STANDARD_RTTIEXT(TDataStd_HDataMapOfStringInteger,MMgt_TShared) - -protected: - + const TColStd_DataMapOfStringInteger& Map() const { return myMap; } + TColStd_DataMapOfStringInteger& ChangeMap() { return myMap; } private: - TColStd_DataMapOfStringInteger myMap; - }; - -#include - - - - +DEFINE_STANDARD_HANDLE(TDataStd_HDataMapOfStringInteger, MMgt_TShared) #endif // _TDataStd_HDataMapOfStringInteger_HeaderFile diff --git a/src/TDataStd/TDataStd_HDataMapOfStringInteger.lxx b/src/TDataStd/TDataStd_HDataMapOfStringInteger.lxx deleted file mode 100644 index a447d39dae..0000000000 --- a/src/TDataStd/TDataStd_HDataMapOfStringInteger.lxx +++ /dev/null @@ -1,32 +0,0 @@ -// Created on: 2007-08-17 -// Created by: Sergey ZARITCHNY -// Copyright (c) 2007-2014 OPEN CASCADE SAS -// -// This file is part of Open CASCADE Technology software library. -// -// This library is free software; you can redistribute it and/or modify it under -// the terms of the GNU Lesser General Public License version 2.1 as published -// by the Free Software Foundation, with special exception defined in the file -// OCCT_LGPL_EXCEPTION.txt. Consult the file LICENSE_LGPL_21.txt included in OCCT -// distribution for complete text of the license and disclaimer of any warranty. -// -// Alternatively, this file may be used under the terms of Open CASCADE -// commercial license or contractual agreement. - -//======================================================================= -//function : Map -//purpose : Access to the map -//======================================================================= -inline const TColStd_DataMapOfStringInteger& TDataStd_HDataMapOfStringInteger::Map () const -{ - return myMap; -} - -//======================================================================= -//function : ChangeMap -//purpose : Access to the map for modification -//======================================================================= -inline TColStd_DataMapOfStringInteger& TDataStd_HDataMapOfStringInteger::ChangeMap () -{ - return myMap; -} diff --git a/src/TDataStd/TDataStd_HDataMapOfStringReal.hxx b/src/TDataStd/TDataStd_HDataMapOfStringReal.hxx index 110ee8b033..d2dcee1873 100644 --- a/src/TDataStd/TDataStd_HDataMapOfStringReal.hxx +++ b/src/TDataStd/TDataStd_HDataMapOfStringReal.hxx @@ -23,49 +23,27 @@ #include #include - -class TDataStd_HDataMapOfStringReal; -DEFINE_STANDARD_HANDLE(TDataStd_HDataMapOfStringReal, MMgt_TShared) - //! Extension of TDataStd_DataMapOfStringReal class //! to be manipulated by handle. class TDataStd_HDataMapOfStringReal : public MMgt_TShared { - + DEFINE_STANDARD_RTTIEXT(TDataStd_HDataMapOfStringReal, MMgt_TShared) public: - Standard_EXPORT TDataStd_HDataMapOfStringReal(const Standard_Integer NbBuckets = 1); - + Standard_EXPORT TDataStd_HDataMapOfStringReal(const TDataStd_DataMapOfStringReal& theOther); - - const TDataStd_DataMapOfStringReal& Map() const; - - TDataStd_DataMapOfStringReal& ChangeMap(); - - - - - DEFINE_STANDARD_RTTIEXT(TDataStd_HDataMapOfStringReal,MMgt_TShared) - -protected: - + const TDataStd_DataMapOfStringReal& Map() const { return myMap; } + TDataStd_DataMapOfStringReal& ChangeMap() { return myMap; } private: - TDataStd_DataMapOfStringReal myMap; - }; - -#include - - - - +DEFINE_STANDARD_HANDLE(TDataStd_HDataMapOfStringReal, MMgt_TShared) #endif // _TDataStd_HDataMapOfStringReal_HeaderFile diff --git a/src/TDataStd/TDataStd_HDataMapOfStringReal.lxx b/src/TDataStd/TDataStd_HDataMapOfStringReal.lxx deleted file mode 100644 index 75d61f5a7f..0000000000 --- a/src/TDataStd/TDataStd_HDataMapOfStringReal.lxx +++ /dev/null @@ -1,32 +0,0 @@ -// Created on: 2007-08-17 -// Created by: Sergey ZARITCHNY -// Copyright (c) 2007-2014 OPEN CASCADE SAS -// -// This file is part of Open CASCADE Technology software library. -// -// This library is free software; you can redistribute it and/or modify it under -// the terms of the GNU Lesser General Public License version 2.1 as published -// by the Free Software Foundation, with special exception defined in the file -// OCCT_LGPL_EXCEPTION.txt. Consult the file LICENSE_LGPL_21.txt included in OCCT -// distribution for complete text of the license and disclaimer of any warranty. -// -// Alternatively, this file may be used under the terms of Open CASCADE -// commercial license or contractual agreement. - -//======================================================================= -//function : Map -//purpose : Access to the map -//======================================================================= -inline const TDataStd_DataMapOfStringReal& TDataStd_HDataMapOfStringReal::Map () const -{ - return myMap; -} - -//======================================================================= -//function : ChangeMap -//purpose : Access to the map for modification -//======================================================================= -inline TDataStd_DataMapOfStringReal& TDataStd_HDataMapOfStringReal::ChangeMap () -{ - return myMap; -} diff --git a/src/TDataStd/TDataStd_HDataMapOfStringString.hxx b/src/TDataStd/TDataStd_HDataMapOfStringString.hxx index 51b625e513..37c268f347 100644 --- a/src/TDataStd/TDataStd_HDataMapOfStringString.hxx +++ b/src/TDataStd/TDataStd_HDataMapOfStringString.hxx @@ -23,49 +23,27 @@ #include #include - -class TDataStd_HDataMapOfStringString; -DEFINE_STANDARD_HANDLE(TDataStd_HDataMapOfStringString, MMgt_TShared) - //! Extension of TDataStd_DataMapOfStringString class //! to be manipulated by handle. class TDataStd_HDataMapOfStringString : public MMgt_TShared { - + DEFINE_STANDARD_RTTIEXT(TDataStd_HDataMapOfStringString, MMgt_TShared) public: - Standard_EXPORT TDataStd_HDataMapOfStringString(const Standard_Integer NbBuckets = 1); - + Standard_EXPORT TDataStd_HDataMapOfStringString(const TDataStd_DataMapOfStringString& theOther); - - const TDataStd_DataMapOfStringString& Map() const; - - TDataStd_DataMapOfStringString& ChangeMap(); - - - - - DEFINE_STANDARD_RTTIEXT(TDataStd_HDataMapOfStringString,MMgt_TShared) - -protected: - + const TDataStd_DataMapOfStringString& Map() const { return myMap; } + TDataStd_DataMapOfStringString& ChangeMap() { return myMap; } private: - TDataStd_DataMapOfStringString myMap; - }; - -#include - - - - +DEFINE_STANDARD_HANDLE(TDataStd_HDataMapOfStringString, MMgt_TShared) #endif // _TDataStd_HDataMapOfStringString_HeaderFile diff --git a/src/TDataStd/TDataStd_HDataMapOfStringString.lxx b/src/TDataStd/TDataStd_HDataMapOfStringString.lxx deleted file mode 100644 index 8ad821de56..0000000000 --- a/src/TDataStd/TDataStd_HDataMapOfStringString.lxx +++ /dev/null @@ -1,32 +0,0 @@ -// Created on: 2007-08-17 -// Created by: Sergey ZARITCHNY -// Copyright (c) 2007-2014 OPEN CASCADE SAS -// -// This file is part of Open CASCADE Technology software library. -// -// This library is free software; you can redistribute it and/or modify it under -// the terms of the GNU Lesser General Public License version 2.1 as published -// by the Free Software Foundation, with special exception defined in the file -// OCCT_LGPL_EXCEPTION.txt. Consult the file LICENSE_LGPL_21.txt included in OCCT -// distribution for complete text of the license and disclaimer of any warranty. -// -// Alternatively, this file may be used under the terms of Open CASCADE -// commercial license or contractual agreement. - -//======================================================================= -//function : Map -//purpose : Access to the map -//======================================================================= -inline const TDataStd_DataMapOfStringString& TDataStd_HDataMapOfStringString::Map () const -{ - return myMap; -} - -//======================================================================= -//function : ChangeMap -//purpose : Access to the map for modification -//======================================================================= -inline TDataStd_DataMapOfStringString& TDataStd_HDataMapOfStringString::ChangeMap () -{ - return myMap; -} diff --git a/src/TDataStd/TDataStd_IntPackedMap.hxx b/src/TDataStd/TDataStd_IntPackedMap.hxx index 088d245bdd..a7e7b007c3 100644 --- a/src/TDataStd/TDataStd_IntPackedMap.hxx +++ b/src/TDataStd/TDataStd_IntPackedMap.hxx @@ -21,10 +21,10 @@ #include #include -#include +#include #include #include -class TColStd_HPackedMapOfInteger; + class TDataStd_DeltaOnModificationOfIntPackedMap; class Standard_GUID; class TDF_Label; @@ -32,17 +32,16 @@ class TDF_Attribute; class TDF_RelocationTable; class TDF_DeltaOnModification; - class TDataStd_IntPackedMap; DEFINE_STANDARD_HANDLE(TDataStd_IntPackedMap, TDF_Attribute) //! Attribute for storing TColStd_PackedMapOfInteger class TDataStd_IntPackedMap : public TDF_Attribute { - + friend class TDataStd_DeltaOnModificationOfIntPackedMap; + DEFINE_STANDARD_RTTIEXT(TDataStd_IntPackedMap, TDF_Attribute) public: - //! class methods //! ============= //! Returns the GUID of the attribute. @@ -60,11 +59,11 @@ public: Standard_EXPORT TDataStd_IntPackedMap(); Standard_EXPORT Standard_Boolean ChangeMap (const Handle(TColStd_HPackedMapOfInteger)& theMap); - - const TColStd_PackedMapOfInteger& GetMap() const; - - const Handle(TColStd_HPackedMapOfInteger)& GetHMap() const; - + + const TColStd_PackedMapOfInteger& GetMap() const { return myMap->Map(); } + + const Handle(TColStd_HPackedMapOfInteger)& GetHMap() const { return myMap; } + Standard_EXPORT Standard_Boolean Clear(); Standard_EXPORT Standard_Boolean Add (const Standard_Integer theKey); @@ -72,16 +71,16 @@ public: Standard_EXPORT Standard_Boolean Remove (const Standard_Integer theKey); Standard_EXPORT Standard_Boolean Contains (const Standard_Integer theKey) const; - - Standard_Integer Extent() const; - - Standard_Boolean IsEmpty() const; - - Standard_Boolean GetDelta() const; - + + Standard_Integer Extent() const { return myMap->Map().Extent(); } + + Standard_Boolean IsEmpty() const { return myMap->Map().IsEmpty(); } + + Standard_Boolean GetDelta() const { return myIsDelta; } + //! for internal use only! - void SetDelta (const Standard_Boolean isDelta); - + void SetDelta (const Standard_Boolean isDelta) { myIsDelta = isDelta; } + Standard_EXPORT const Standard_GUID& ID() const Standard_OVERRIDE; Standard_EXPORT void Restore (const Handle(TDF_Attribute)& with) Standard_OVERRIDE; @@ -96,33 +95,15 @@ public: //! . Standard_EXPORT virtual Handle(TDF_DeltaOnModification) DeltaOnModification (const Handle(TDF_Attribute)& anOldAttribute) const Standard_OVERRIDE; - -friend class TDataStd_DeltaOnModificationOfIntPackedMap; - - - DEFINE_STANDARD_RTTIEXT(TDataStd_IntPackedMap,TDF_Attribute) - -protected: - - - - private: - - void RemoveMap(); + void RemoveMap() { myMap.Nullify(); } + +private: Handle(TColStd_HPackedMapOfInteger) myMap; Standard_Boolean myIsDelta; - }; - -#include - - - - - #endif // _TDataStd_IntPackedMap_HeaderFile diff --git a/src/TDataStd/TDataStd_IntPackedMap.lxx b/src/TDataStd/TDataStd_IntPackedMap.lxx deleted file mode 100644 index ee460e4034..0000000000 --- a/src/TDataStd/TDataStd_IntPackedMap.lxx +++ /dev/null @@ -1,79 +0,0 @@ -// Created on: 2008-01-24 -// Created by: Sergey ZARITCHNY -// Copyright (c) 2008-2014 OPEN CASCADE SAS -// -// This file is part of Open CASCADE Technology software library. -// -// This library is free software; you can redistribute it and/or modify it under -// the terms of the GNU Lesser General Public License version 2.1 as published -// by the Free Software Foundation, with special exception defined in the file -// OCCT_LGPL_EXCEPTION.txt. Consult the file LICENSE_LGPL_21.txt included in OCCT -// distribution for complete text of the license and disclaimer of any warranty. -// -// Alternatively, this file may be used under the terms of Open CASCADE -// commercial license or contractual agreement. - -#include -//======================================================================= -//function : GetHMap -//purpose : -//======================================================================= -inline const Handle(TColStd_HPackedMapOfInteger)& TDataStd_IntPackedMap::GetHMap () const -{ - return myMap; -} - -//======================================================================= -//function : -//purpose : -//======================================================================= - -inline const TColStd_PackedMapOfInteger& TDataStd_IntPackedMap::GetMap () const -{ - return myMap->Map(); -} - -//======================================================================= -//function : IsEmpty -//purpose : -//======================================================================= -inline Standard_Boolean TDataStd_IntPackedMap::IsEmpty() const -{ - return myMap->Map().IsEmpty(); -} - -//======================================================================= -//function : Extent -//purpose : -//======================================================================= -inline Standard_Integer TDataStd_IntPackedMap::Extent() const -{ - return myMap->Map().Extent(); -} - -//======================================================================= -//function : RemoveMap -//purpose : -//======================================================================= -inline void TDataStd_IntPackedMap::RemoveMap(void) -{ - myMap.Nullify(); -} - - -//======================================================================= -//function : SetDelta -//purpose : -//======================================================================= -inline void TDataStd_IntPackedMap::SetDelta(const Standard_Boolean isDelta) -{ - myIsDelta = isDelta; -} -//======================================================================= -//function : GetDelta -//purpose : -//======================================================================= -inline Standard_Boolean TDataStd_IntPackedMap::GetDelta(void) const -{ - return myIsDelta; -} diff --git a/src/TDataStd/TDataStd_IntegerArray.hxx b/src/TDataStd/TDataStd_IntegerArray.hxx index 72b83b1ef8..da40804a5c 100644 --- a/src/TDataStd/TDataStd_IntegerArray.hxx +++ b/src/TDataStd/TDataStd_IntegerArray.hxx @@ -39,10 +39,10 @@ DEFINE_STANDARD_HANDLE(TDataStd_IntegerArray, TDF_Attribute) //! Contains an array of integers. class TDataStd_IntegerArray : public TDF_Attribute { - + friend class TDataStd_DeltaOnModificationOfIntArray; + DEFINE_STANDARD_RTTIEXT(TDataStd_IntegerArray, TDF_Attribute) public: - //! class methods //! ============= //! Returns the GUID for arrays of integers. @@ -87,15 +87,15 @@ Standard_Integer operator () (const Standard_Integer Index) const //! If equal True each item of will be checked with each //! item of for coincidence (to avoid backup). Standard_EXPORT void ChangeArray (const Handle(TColStd_HArray1OfInteger)& newArray, const Standard_Boolean isCheckItems = Standard_True); - + //! Return the inner array of the IntegerArray attribute - const Handle(TColStd_HArray1OfInteger) Array() const; - - Standard_Boolean GetDelta() const; - + const Handle(TColStd_HArray1OfInteger)& Array() const { return myValue; } + + Standard_Boolean GetDelta() const { return myIsDelta; } + //! for internal use only! - void SetDelta (const Standard_Boolean isDelta); - + void SetDelta (const Standard_Boolean isDelta) { myIsDelta = isDelta; } + Standard_EXPORT TDataStd_IntegerArray(); Standard_EXPORT const Standard_GUID& ID() const Standard_OVERRIDE; @@ -113,33 +113,15 @@ Standard_Integer operator () (const Standard_Integer Index) const //! . Standard_EXPORT virtual Handle(TDF_DeltaOnModification) DeltaOnModification (const Handle(TDF_Attribute)& anOldAttribute) const Standard_OVERRIDE; - -friend class TDataStd_DeltaOnModificationOfIntArray; - - - DEFINE_STANDARD_RTTIEXT(TDataStd_IntegerArray,TDF_Attribute) - -protected: - - - - private: - - void RemoveArray(); + void RemoveArray() { myValue.Nullify(); } + +private: Handle(TColStd_HArray1OfInteger) myValue; Standard_Boolean myIsDelta; - }; - -#include - - - - - #endif // _TDataStd_IntegerArray_HeaderFile diff --git a/src/TDataStd/TDataStd_IntegerArray.lxx b/src/TDataStd/TDataStd_IntegerArray.lxx deleted file mode 100644 index 96879d5965..0000000000 --- a/src/TDataStd/TDataStd_IntegerArray.lxx +++ /dev/null @@ -1,53 +0,0 @@ -// Created on: 2007-10-02 -// Created by: Sergey ZARITCHNY -// Copyright (c) 2007-2014 OPEN CASCADE SAS -// -// This file is part of Open CASCADE Technology software library. -// -// This library is free software; you can redistribute it and/or modify it under -// the terms of the GNU Lesser General Public License version 2.1 as published -// by the Free Software Foundation, with special exception defined in the file -// OCCT_LGPL_EXCEPTION.txt. Consult the file LICENSE_LGPL_21.txt included in OCCT -// distribution for complete text of the license and disclaimer of any warranty. -// -// Alternatively, this file may be used under the terms of Open CASCADE -// commercial license or contractual agreement. - -#include - -//======================================================================= -//function : Array -//purpose : -//======================================================================= - -inline const Handle(TColStd_HArray1OfInteger) TDataStd_IntegerArray::Array(void) const -{ - return myValue; -} - -//======================================================================= -//function : RemoveArray -//purpose : -//======================================================================= -inline void TDataStd_IntegerArray::RemoveArray(void) -{ - myValue.Nullify(); -} - - -//======================================================================= -//function : SetDelta -//purpose : -//======================================================================= -inline void TDataStd_IntegerArray::SetDelta(const Standard_Boolean isDelta) -{ - myIsDelta = isDelta; -} -//======================================================================= -//function : GetDelta -//purpose : -//======================================================================= -inline Standard_Boolean TDataStd_IntegerArray::GetDelta(void) const -{ - return myIsDelta; -} diff --git a/src/TDataStd/TDataStd_RealArray.hxx b/src/TDataStd/TDataStd_RealArray.hxx index 6d8dd44d5f..86a020c786 100644 --- a/src/TDataStd/TDataStd_RealArray.hxx +++ b/src/TDataStd/TDataStd_RealArray.hxx @@ -40,10 +40,10 @@ DEFINE_STANDARD_HANDLE(TDataStd_RealArray, TDF_Attribute) //! A framework for an attribute composed of a real number array. class TDataStd_RealArray : public TDF_Attribute { - + friend class TDataStd_DeltaOnModificationOfRealArray; + DEFINE_STANDARD_RTTIEXT(TDataStd_RealArray, TDF_Attribute) public: - //! class methods //! ============= //! Returns the GUID for arrays of reals. @@ -88,15 +88,15 @@ Standard_Real operator () (const Standard_Integer Index) const //! If equal True each item of will be checked with each //! item of for coincidence (to avoid backup). Standard_EXPORT void ChangeArray (const Handle(TColStd_HArray1OfReal)& newArray, const Standard_Boolean isCheckItems = Standard_True); - + //! Returns the handle of this array of reals. - const Handle(TColStd_HArray1OfReal) Array() const; - - Standard_Boolean GetDelta() const; - + const Handle(TColStd_HArray1OfReal)& Array() const { return myValue; } + + Standard_Boolean GetDelta() const { return myIsDelta; } + //! for internal use only! - void SetDelta (const Standard_Boolean isDelta); - + void SetDelta (const Standard_Boolean isDelta) { myIsDelta = isDelta; } + Standard_EXPORT TDataStd_RealArray(); Standard_EXPORT const Standard_GUID& ID() const Standard_OVERRIDE; @@ -114,33 +114,15 @@ Standard_Real operator () (const Standard_Integer Index) const //! . Standard_EXPORT virtual Handle(TDF_DeltaOnModification) DeltaOnModification (const Handle(TDF_Attribute)& anOldAttribute) const Standard_OVERRIDE; - -friend class TDataStd_DeltaOnModificationOfRealArray; - - - DEFINE_STANDARD_RTTIEXT(TDataStd_RealArray,TDF_Attribute) - -protected: - - - - private: - - void RemoveArray(); + void RemoveArray() { myValue.Nullify(); } + +private: Handle(TColStd_HArray1OfReal) myValue; Standard_Boolean myIsDelta; - }; - -#include - - - - - #endif // _TDataStd_RealArray_HeaderFile diff --git a/src/TDataStd/TDataStd_RealArray.lxx b/src/TDataStd/TDataStd_RealArray.lxx deleted file mode 100644 index 473c6bd5b7..0000000000 --- a/src/TDataStd/TDataStd_RealArray.lxx +++ /dev/null @@ -1,51 +0,0 @@ -// Created on: 2007-10-30 -// Created by: Sergey ZARITCHNY -// Copyright (c) 2007-2014 OPEN CASCADE SAS -// -// This file is part of Open CASCADE Technology software library. -// -// This library is free software; you can redistribute it and/or modify it under -// the terms of the GNU Lesser General Public License version 2.1 as published -// by the Free Software Foundation, with special exception defined in the file -// OCCT_LGPL_EXCEPTION.txt. Consult the file LICENSE_LGPL_21.txt included in OCCT -// distribution for complete text of the license and disclaimer of any warranty. -// -// Alternatively, this file may be used under the terms of Open CASCADE -// commercial license or contractual agreement. - -//======================================================================= -//function : Array -//purpose : -//======================================================================= - -inline const Handle(TColStd_HArray1OfReal) TDataStd_RealArray::Array(void) const -{ - return myValue; -} - -//======================================================================= -//function : RemoveArray -//purpose : -//======================================================================= -inline void TDataStd_RealArray::RemoveArray(void) -{ - myValue.Nullify(); -} - - -//======================================================================= -//function : SetDelta -//purpose : -//======================================================================= -inline void TDataStd_RealArray::SetDelta(const Standard_Boolean isDelta) -{ - myIsDelta = isDelta; -} -//======================================================================= -//function : GetDelta -//purpose : -//======================================================================= -inline Standard_Boolean TDataStd_RealArray::GetDelta(void) const -{ - return myIsDelta; -}