OpenCascade/occt
1
0
Fork 0
mirror of https://git.dev.opencascade.org/repos/occt.git synced 2025-04-05 18:16:23 +03:00
Code Packages Releases Activity

0024567: Coding rules - eliminate GCC warning -Wignored-qualifiers

Browse Source 
Redundant const qualifiers of return types of functions returning values are removed
This commit is contained in:
abv 2015-11-07 21:19:03 +03:00
parent cda9a0d4c2
commit 487bf1ceaa
52 changed files with 92 additions and 220 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/AIS/AIS_Dimension.cxx
View File

@ -137,15 +137,6 @@ const gp_Pln& AIS_Dimension::GetPlane() const
return myPlane; return myPlane;
} }
//=======================================================================
//function : GetGeometryType
//purpose :
//=======================================================================
const Standard_Integer AIS_Dimension::GetGeometryType () const
{
return myGeometryType;
}
//======================================================================= //=======================================================================
//function : SetUserPlane //function : SetUserPlane
//purpose : //purpose :

2
src/AIS/AIS_Dimension.hxx
View File

@ -249,7 +249,7 @@ public:
//! Geometry type defines type of shapes on which the dimension is to be built. //! Geometry type defines type of shapes on which the dimension is to be built.
//! @return type of geometry on which the dimension will be built. //! @return type of geometry on which the dimension will be built.
Standard_EXPORT const Standard_Integer GetGeometryType () const; Standard_Integer GetGeometryType () const { return myGeometryType; }
//! Sets user-defined plane where the 2D dimension presentation will be placed. //! Sets user-defined plane where the 2D dimension presentation will be placed.
//! Checks validity of this plane if geometry has been set already. //! Checks validity of this plane if geometry has been set already.

2
src/BRepFill/BRepFill_Evolved.cxx
View File

@ -127,7 +127,7 @@ static Standard_Integer NbPROFILS = 0;
static Standard_Integer NbEDGES = 0; static Standard_Integer NbEDGES = 0;
#endif #endif
static const Standard_Real BRepFill_Confusion() static Standard_Real BRepFill_Confusion()
{ {
Standard_Real Tol = 1.e-6; Standard_Real Tol = 1.e-6;
return Tol; return Tol;

2
src/BRepLib/BRepLib_FuseEdges.cxx
View File

@ -308,7 +308,7 @@ void BRepLib_FuseEdges::Faces(TopTools_DataMapOfShapeShape& theMapFac)
//purpose : //purpose :
//======================================================================= //=======================================================================
const Standard_Integer BRepLib_FuseEdges::NbVertices() Standard_Integer BRepLib_FuseEdges::NbVertices()
{ {
Standard_NullObject_Raise_if(myShape.IsNull(),"FuseEdges : No Shape"); Standard_NullObject_Raise_if(myShape.IsNull(),"FuseEdges : No Shape");

2
src/BRepLib/BRepLib_FuseEdges.hxx
View File

@ -85,7 +85,7 @@ public:
Standard_EXPORT TopoDS_Shape& Shape(); Standard_EXPORT TopoDS_Shape& Shape();
//! returns the number of vertices candidate to be removed //! returns the number of vertices candidate to be removed
Standard_EXPORT const Standard_Integer NbVertices(); Standard_EXPORT Standard_Integer NbVertices();
//! Using map of list of connex edges, fuse each list to //! Using map of list of connex edges, fuse each list to
//! one edge and then update myShape //! one edge and then update myShape

2
src/BRepMesh/BRepMesh_VertexInspector.hxx
View File

@ -113,7 +113,7 @@ public:
} }
//! Returns index of point coinciding with regerence one. //! Returns index of point coinciding with regerence one.
inline const Standard_Integer GetCoincidentPoint() const inline Standard_Integer GetCoincidentPoint() const
{ {
if ( myResIndices.Size() > 0 ) if ( myResIndices.Size() > 0 )
{ {

2
src/DDF/DDF_IOStream.cxx
View File

@ -162,7 +162,7 @@ Storage_Error DDF_IOStream::Close()
//purpose : //purpose :
//======================================================================= //=======================================================================
const Standard_CString DDF_IOStream::MagicNumber() Standard_CString DDF_IOStream::MagicNumber()
{ return MAGICNUMBER; } { return MAGICNUMBER; }
//======================================================================= //=======================================================================

2
src/DDF/DDF_IOStream.hxx
View File

@ -210,7 +210,7 @@ private:
// Methods PRIVATE // Methods PRIVATE
// //
static const Standard_CString MagicNumber() ; static Standard_CString MagicNumber() ;
// Fields PRIVATE // Fields PRIVATE

12
src/Draw/Draw_View.hxx
View File

@ -77,19 +77,19 @@ public: // @name getters and setters
} }
//! Gets horizontal offset. //! Gets horizontal offset.
const Standard_Integer GetDx() const Standard_Integer GetDx() const
{ {
return myDx; return myDx;
} }
//! Gets vertical offset. //! Gets vertical offset.
const Standard_Integer GetDy() const Standard_Integer GetDy() const
{ {
return myDy; return myDy;
} }
//! Gets parameter of zoom. //! Gets parameter of zoom.
const Standard_Real GetZoom() const Standard_Real GetZoom() const
{ {
return myZoom; return myZoom;
} }
@ -101,7 +101,7 @@ public: // @name getters and setters
} }
//! Gets focal distance. //! Gets focal distance.
const Standard_Real GetFocalDistance() const Standard_Real GetFocalDistance() const
{ {
return myFocalDistance; return myFocalDistance;
} }
@ -115,13 +115,13 @@ public: //! @name public inline methods
} }
//! Returns true value if current view in 2D mode. //! Returns true value if current view in 2D mode.
const Standard_Boolean Is2D() const Standard_Boolean Is2D() const
{ {
return myIs2D; return myIs2D;
} }
//! Returns true value if current view in perspective mode. //! Returns true value if current view in perspective mode.
const Standard_Real IsPerspective() const Standard_Real IsPerspective() const
{ {
return myIsPers; return myIsPers;
} }

2
src/FSD/FSD_BinaryFile.cxx
View File

@ -150,7 +150,7 @@ Storage_Error FSD_BinaryFile::Close()
//purpose : ------------------ PROTECTED //purpose : ------------------ PROTECTED
//======================================================================= //=======================================================================
const Standard_CString FSD_BinaryFile::MagicNumber() Standard_CString FSD_BinaryFile::MagicNumber()
{ {
return MAGICNUMBER; return MAGICNUMBER;
} }

25
src/FSD/FSD_BinaryFile.hxx
View File

@ -306,29 +306,18 @@ protected:
//! write string at the current position. //! write string at the current position.
Standard_EXPORT void WriteExtendedString (const TCollection_ExtendedString& buffer); Standard_EXPORT void WriteExtendedString (const TCollection_ExtendedString& buffer);
private:
void WriteHeader();
void ReadHeader();
static Standard_CString MagicNumber();
private: private:
Standard_EXPORT void WriteHeader();
Standard_EXPORT void ReadHeader();
Standard_EXPORT static const Standard_CString MagicNumber();
FSD_BStream myStream; FSD_BStream myStream;
FSD_FileHeader myHeader; FSD_FileHeader myHeader;
}; };
#endif // _FSD_BinaryFile_HeaderFile #endif // _FSD_BinaryFile_HeaderFile

2
src/FSD/FSD_CmpFile.cxx
View File

@ -163,7 +163,7 @@ Storage_Error FSD_CmpFile::Close()
//purpose : ------------------ PROTECTED //purpose : ------------------ PROTECTED
//======================================================================= //=======================================================================
const Standard_CString FSD_CmpFile::MagicNumber() Standard_CString FSD_CmpFile::MagicNumber()
{ {
return MAGICNUMBER; return MAGICNUMBER;
} }

21
src/FSD/FSD_CmpFile.hxx
View File

@ -279,26 +279,15 @@ protected:
Standard_EXPORT Storage_Error FindTag (const Standard_CString aTag); Standard_EXPORT Storage_Error FindTag (const Standard_CString aTag);
private:
static Standard_CString MagicNumber();
void RaiseError (const Handle(Standard_Type)& theFailure);
private: private:
Standard_EXPORT static const Standard_CString MagicNumber();
Standard_EXPORT void RaiseError (const Handle(Standard_Type)& theFailure);
FSD_FStream myStream; FSD_FStream myStream;
}; };
#endif // _FSD_CmpFile_HeaderFile #endif // _FSD_CmpFile_HeaderFile

2
src/FSD/FSD_File.cxx
View File

@ -154,7 +154,7 @@ Storage_Error FSD_File::Close()
//purpose : ------------------ PROTECTED //purpose : ------------------ PROTECTED
//======================================================================= //=======================================================================
const Standard_CString FSD_File::MagicNumber() Standard_CString FSD_File::MagicNumber()
{ {
return MAGICNUMBER; return MAGICNUMBER;
} }

17
src/FSD/FSD_File.hxx
View File

@ -297,24 +297,13 @@ protected:
Standard_EXPORT Storage_Error FindTag (const Standard_CString aTag); Standard_EXPORT Storage_Error FindTag (const Standard_CString aTag);
private:
static Standard_CString MagicNumber();
private: private:
Standard_EXPORT static const Standard_CString MagicNumber();
FSD_FStream myStream; FSD_FStream myStream;
}; };
#endif // _FSD_File_HeaderFile #endif // _FSD_File_HeaderFile

24
src/Graphic3d/Graphic3d_GraduatedTrihedron.hxx
View File

@ -56,13 +56,13 @@ public:
void SetName (const TCollection_ExtendedString& theName) { myName = theName; } void SetName (const TCollection_ExtendedString& theName) { myName = theName; }
const TCollection_ExtendedString& Name() const { return myName; } const TCollection_ExtendedString& Name() const { return myName; }
const Standard_Boolean ToDrawName() const { return myToDrawName; } Standard_Boolean ToDrawName() const { return myToDrawName; }
void SetDrawName (const Standard_Boolean theToDraw) { myToDrawName = theToDraw; } void SetDrawName (const Standard_Boolean theToDraw) { myToDrawName = theToDraw; }
const Standard_Boolean ToDrawTickmarks() const { return myToDrawTickmarks; } Standard_Boolean ToDrawTickmarks() const { return myToDrawTickmarks; }
void SetDrawTickmarks (const Standard_Boolean theToDraw) { myToDrawTickmarks = theToDraw; } void SetDrawTickmarks (const Standard_Boolean theToDraw) { myToDrawTickmarks = theToDraw; }
const Standard_Boolean ToDrawValues() const { return myToDrawValues; } Standard_Boolean ToDrawValues() const { return myToDrawValues; }
void SetDrawValues (const Standard_Boolean theToDraw) { myToDrawValues = theToDraw; } void SetDrawValues (const Standard_Boolean theToDraw) { myToDrawValues = theToDraw; }
const Quantity_Color& NameColor() const { return myNameColor; } const Quantity_Color& NameColor() const { return myNameColor; }
@ -74,16 +74,16 @@ public:
//! Sets color of axis and values //! Sets color of axis and values
void SetColor (const Quantity_Color& theColor) { myColor = theColor; } void SetColor (const Quantity_Color& theColor) { myColor = theColor; }
const Standard_Integer TickmarksNumber() const { return myTickmarksNumber; } Standard_Integer TickmarksNumber() const { return myTickmarksNumber; }
void SetTickmarksNumber (const Standard_Integer theValue) { myTickmarksNumber = theValue; } void SetTickmarksNumber (const Standard_Integer theValue) { myTickmarksNumber = theValue; }
const Standard_Integer TickmarksLength() const { return myTickmarksLength; } Standard_Integer TickmarksLength() const { return myTickmarksLength; }
void SetTickmarksLength (const Standard_Integer theValue) { myTickmarksLength = theValue; } void SetTickmarksLength (const Standard_Integer theValue) { myTickmarksLength = theValue; }
const Standard_Integer ValuesOffset() const { return myValuesOffset; } Standard_Integer ValuesOffset() const { return myValuesOffset; }
void SetValuesOffset (const Standard_Integer theValue) { myValuesOffset = theValue; } void SetValuesOffset (const Standard_Integer theValue) { myValuesOffset = theValue; }
const Standard_Integer NameOffset() const { return myNameOffset; } Standard_Integer NameOffset() const { return myNameOffset; }
void SetNameOffset (const Standard_Integer theValue) { myNameOffset = theValue; } void SetNameOffset (const Standard_Integer theValue) { myNameOffset = theValue; }
protected: protected:
@ -163,16 +163,16 @@ public:
return myAxes (theIndex); return myAxes (theIndex);
} }
const Standard_ShortReal ArrowsLength() const { return myArrowsLength; } Standard_ShortReal ArrowsLength() const { return myArrowsLength; }
void SetArrowsLength (const Standard_ShortReal theValue) { myArrowsLength = theValue; } void SetArrowsLength (const Standard_ShortReal theValue) { myArrowsLength = theValue; }
const Quantity_Color& GridColor() const { return myGridColor; } const Quantity_Color& GridColor() const { return myGridColor; }
void SetGridColor (const Quantity_Color& theColor) {myGridColor = theColor; } void SetGridColor (const Quantity_Color& theColor) {myGridColor = theColor; }
const Standard_Boolean ToDrawGrid() const { return myToDrawGrid; } Standard_Boolean ToDrawGrid() const { return myToDrawGrid; }
void SetDrawGrid (const Standard_Boolean theToDraw) { myToDrawGrid = theToDraw; } void SetDrawGrid (const Standard_Boolean theToDraw) { myToDrawGrid = theToDraw; }
const Standard_Boolean ToDrawAxes() const { return myToDrawAxes; } Standard_Boolean ToDrawAxes() const { return myToDrawAxes; }
void SetDrawAxes (const Standard_Boolean theToDraw) { myToDrawAxes = theToDraw; } void SetDrawAxes (const Standard_Boolean theToDraw) { myToDrawAxes = theToDraw; }
const TCollection_AsciiString& NamesFont() const { return myNamesFont; } const TCollection_AsciiString& NamesFont() const { return myNamesFont; }
@ -181,7 +181,7 @@ public:
Font_FontAspect NamesFontAspect() const { return myNamesStyle; } Font_FontAspect NamesFontAspect() const { return myNamesStyle; }
void SetNamesFontAspect (Font_FontAspect theAspect) { myNamesStyle = theAspect; } void SetNamesFontAspect (Font_FontAspect theAspect) { myNamesStyle = theAspect; }
const Standard_Integer NamesSize() const { return myNamesSize; } Standard_Integer NamesSize() const { return myNamesSize; }
void SetNamesSize (const Standard_Integer theValue) { myNamesSize = theValue; } void SetNamesSize (const Standard_Integer theValue) { myNamesSize = theValue; }
const TCollection_AsciiString& ValuesFont () const { return myValuesFont; } const TCollection_AsciiString& ValuesFont () const { return myValuesFont; }
@ -190,7 +190,7 @@ public:
Font_FontAspect ValuesFontAspect() const { return myValuesStyle; } Font_FontAspect ValuesFontAspect() const { return myValuesStyle; }
void SetValuesFontAspect (Font_FontAspect theAspect) { myValuesStyle = theAspect; } void SetValuesFontAspect (Font_FontAspect theAspect) { myValuesStyle = theAspect; }
const Standard_Integer ValuesSize() const { return myValuesSize; } Standard_Integer ValuesSize() const { return myValuesSize; }
void SetValuesSize (const Standard_Integer theValue) { myValuesSize = theValue; } void SetValuesSize (const Standard_Integer theValue) { myValuesSize = theValue; }
public: public:

2
src/Graphic3d/Graphic3d_ZLayerSettings.hxx
View File

@ -39,7 +39,7 @@ struct Graphic3d_ZLayerSettings
{} {}
//! Returns true if theSetting is enabled. //! Returns true if theSetting is enabled.
const Standard_Boolean IsSettingEnabled (const Graphic3d_ZLayerSetting theSetting) const Standard_Boolean IsSettingEnabled (const Graphic3d_ZLayerSetting theSetting) const
{ {
return (Flags & theSetting) == theSetting; return (Flags & theSetting) == theSetting;
} }

2
src/IGESData/IGESData_ParamReader.cxx
View File

@ -172,7 +172,7 @@ Interface_ParamType IGESData_ParamReader::ParamType
//purpose : //purpose :
//======================================================================= //=======================================================================
const Standard_CString IGESData_ParamReader::ParamValue Standard_CString IGESData_ParamReader::ParamValue
(const Standard_Integer num) const (const Standard_Integer num) const
{ {
return theparams->Value(num+thebase).CValue(); return theparams->Value(num+thebase).CValue();

2
src/IGESData/IGESData_ParamReader.hxx
View File

@ -110,7 +110,7 @@ public:
Standard_EXPORT Interface_ParamType ParamType (const Standard_Integer num) const; Standard_EXPORT Interface_ParamType ParamType (const Standard_Integer num) const;
//! returns litteral value of a parameter, as it was in file //! returns litteral value of a parameter, as it was in file
Standard_EXPORT const Standard_CString ParamValue (const Standard_Integer num) const; Standard_EXPORT Standard_CString ParamValue (const Standard_Integer num) const;
//! says if a parameter is defined (not void) //! says if a parameter is defined (not void)
//! See also DefinedElseSkip //! See also DefinedElseSkip

9
src/NCollection/NCollection_AccAllocator.hxx
View File

@ -78,8 +78,7 @@ protected:
AlignedSize(){} AlignedSize(){}
AlignedSize(const Standard_Size theValue) AlignedSize(const Standard_Size theValue)
: myValue((theValue + Align - 1) & ~(Align - 1)) {} : myValue((theValue + Align - 1) & ~(Align - 1)) {}
operator Standard_Size() {return myValue;} operator Standard_Size() const {return myValue;}
operator const Standard_Size() const {return myValue;}
}; };
//! A pointer aligned to a 4 byte boundary //! A pointer aligned to a 4 byte boundary
@ -90,10 +89,8 @@ protected:
AlignedPtr(){} AlignedPtr(){}
AlignedPtr(const Standard_Address theValue) AlignedPtr(const Standard_Address theValue)
: myValue((Standard_Byte*)((Standard_Size)theValue & ~(Align - 1))) {} : myValue((Standard_Byte*)((Standard_Size)theValue & ~(Align - 1))) {}
operator Standard_Address () {return myValue;} operator Standard_Address () const {return myValue;}
operator Standard_Address const () const {return myValue;} operator Standard_Byte* () const {return myValue;}
operator Standard_Byte* () {return myValue;}
operator Standard_Byte* const () const {return myValue;}
AlignedPtr operator -(const AlignedSize theValue) const AlignedPtr operator -(const AlignedSize theValue) const
{return myValue - theValue;} {return myValue - theValue;}
AlignedPtr operator +(const AlignedSize theValue) const AlignedPtr operator +(const AlignedSize theValue) const

2
src/OpenGl/OpenGl_AspectFace.hxx
View File

@ -90,7 +90,7 @@ public:
} }
//! @return interior style //! @return interior style
const Aspect_InteriorStyle InteriorStyle() const Aspect_InteriorStyle InteriorStyle() const
{ {
return myInteriorStyle; return myInteriorStyle;
} }

2
src/OpenGl/OpenGl_GraphicDriver.hxx
View File

@ -234,7 +234,7 @@ public:
OpenGl_StateCounter* GetStateCounter() const { return &myStateCounter; } OpenGl_StateCounter* GetStateCounter() const { return &myStateCounter; }
//! Returns unique ID for primitive arrays. //! Returns unique ID for primitive arrays.
const Standard_Size GetNextPrimitiveArrayUID() const { return myUIDGenerator.Increment(); } Standard_Size GetNextPrimitiveArrayUID() const { return myUIDGenerator.Increment(); }
protected: protected:

2
src/OpenGl/OpenGl_Layer.hxx
View File

@ -63,7 +63,7 @@ public:
} }
//! Returns true if theSetting is enabled for the layer. //! Returns true if theSetting is enabled for the layer.
const Standard_Boolean IsSettingEnabled (const Graphic3d_ZLayerSetting theSetting) const Standard_Boolean IsSettingEnabled (const Graphic3d_ZLayerSetting theSetting) const
{ {
return myLayerSettings.IsSettingEnabled (theSetting); return myLayerSettings.IsSettingEnabled (theSetting);
} }

2
src/OpenGl/OpenGl_PrimitiveArray.hxx
View File

@ -81,7 +81,7 @@ public:
const Handle(Graphic3d_BoundBuffer)& Bounds() const { return myBounds; } const Handle(Graphic3d_BoundBuffer)& Bounds() const { return myBounds; }
//! Returns unique ID of primitive array. //! Returns unique ID of primitive array.
const Standard_Size GetUID() const { return myUID; } Standard_Size GetUID() const { return myUID; }
//! Initialize indices, attributes and bounds with new data. //! Initialize indices, attributes and bounds with new data.
Standard_EXPORT void InitBuffers (const Handle(OpenGl_Context)& theContext, Standard_EXPORT void InitBuffers (const Handle(OpenGl_Context)& theContext,

2
src/OpenGl/OpenGl_SceneGeometry.hxx
View File

@ -177,7 +177,7 @@ public:
} }
//! Returns Id of associated primitive array. //! Returns Id of associated primitive array.
const Standard_Size AssociatedPArrayID() const Standard_Size AssociatedPArrayID() const
{ {
return myArrayID; return myArrayID;
} }

2
src/OpenGl/OpenGl_ShaderStates.hxx
View File

@ -199,7 +199,7 @@ public:
void Set (const Graphic3d_TypeOfSurfaceDetail theDetail) { myDetail = theDetail; } void Set (const Graphic3d_TypeOfSurfaceDetail theDetail) { myDetail = theDetail; }
//! Returns surface detail. //! Returns surface detail.
const Graphic3d_TypeOfSurfaceDetail Detail() const { return myDetail; } Graphic3d_TypeOfSurfaceDetail Detail() const { return myDetail; }
private: private:

2
src/OpenGl/OpenGl_Structure.hxx
View File

@ -157,7 +157,7 @@ public:
Standard_Boolean IsCulled() const { return myIsCulled; } Standard_Boolean IsCulled() const { return myIsCulled; }
//! Checks if the structure should be included into BVH tree or not. //! Checks if the structure should be included into BVH tree or not.
const Standard_Boolean IsAlwaysRendered() const Standard_Boolean IsAlwaysRendered() const
{ {
return IsInfinite return IsInfinite
|| IsForHighlight || IsForHighlight

2
src/OpenGl/OpenGl_Texture.cxx
View File

@ -77,7 +77,7 @@ OpenGl_Texture::~OpenGl_Texture()
// function : HasMipmaps // function : HasMipmaps
// purpose : // purpose :
// ======================================================================= // =======================================================================
const Standard_Boolean OpenGl_Texture::HasMipmaps() const Standard_Boolean OpenGl_Texture::HasMipmaps() const
{ {
return myHasMipmaps; return myHasMipmaps;
} }

2
src/OpenGl/OpenGl_Texture.hxx
View File

@ -262,7 +262,7 @@ public:
const OpenGl_TextureFormat& theFormat); const OpenGl_TextureFormat& theFormat);
//! @return true if texture was generated within mipmaps //! @return true if texture was generated within mipmaps
Standard_EXPORT const Standard_Boolean HasMipmaps() const; Standard_EXPORT Standard_Boolean HasMipmaps() const;
//! @return assigned texture parameters (not necessary applied) //! @return assigned texture parameters (not necessary applied)
Standard_EXPORT const Handle(Graphic3d_TextureParams)& GetParams() const; Standard_EXPORT const Handle(Graphic3d_TextureParams)& GetParams() const;

2
src/PrsMgr/PrsMgr_PresentableObject.cxx
View File

@ -517,7 +517,7 @@ void PrsMgr_PresentableObject::SetMutable (const Standard_Boolean theIsMutable)
// function : IsMutable // function : IsMutable
// purpose : // purpose :
// ======================================================================= // =======================================================================
const Standard_Boolean PrsMgr_PresentableObject::IsMutable() const Standard_Boolean PrsMgr_PresentableObject::IsMutable() const
{ {
return myIsMutable; return myIsMutable;
} }

6
src/PrsMgr/PrsMgr_PresentableObject.hxx
View File

@ -182,7 +182,7 @@ public:
//! Returns true if object has mutable nature (content or location are be changed regularly). //! Returns true if object has mutable nature (content or location are be changed regularly).
//! Mutable object will be managed in different way than static onces (another optimizations). //! Mutable object will be managed in different way than static onces (another optimizations).
Standard_EXPORT const Standard_Boolean IsMutable() const; Standard_EXPORT Standard_Boolean IsMutable() const;
//! Makes theObject child of current object in scene hierarchy. //! Makes theObject child of current object in scene hierarchy.
Standard_EXPORT virtual void AddChild (const Handle(PrsMgr_PresentableObject)& theObject); Standard_EXPORT virtual void AddChild (const Handle(PrsMgr_PresentableObject)& theObject);
@ -194,10 +194,10 @@ public:
Standard_EXPORT const PrsMgr_ListOfPresentableObjects& Children() const; Standard_EXPORT const PrsMgr_ListOfPresentableObjects& Children() const;
//! Returns true if object should have own presentations. //! Returns true if object should have own presentations.
Standard_EXPORT const Standard_Boolean HasOwnPresentations() const; Standard_EXPORT Standard_Boolean HasOwnPresentations() const;
//! Returns parent of current object in scene hierarchy. //! Returns parent of current object in scene hierarchy.
Standard_EXPORT const PrsMgr_PresentableObjectPointer Parent() const; Standard_EXPORT PrsMgr_PresentableObjectPointer Parent() const;
friend class PrsMgr_Presentation; friend class PrsMgr_Presentation;

4
src/PrsMgr/PrsMgr_PresentableObject.lxx
View File

@ -42,12 +42,12 @@ inline const PrsMgr_ListOfPresentableObjects& PrsMgr_PresentableObject::Children
return myChildren; return myChildren;
} }
inline const Standard_Boolean PrsMgr_PresentableObject::HasOwnPresentations() const inline Standard_Boolean PrsMgr_PresentableObject::HasOwnPresentations() const
{ {
return myHasOwnPresentations; return myHasOwnPresentations;
} }
inline const PrsMgr_PresentableObjectPointer PrsMgr_PresentableObject::Parent() const inline PrsMgr_PresentableObjectPointer PrsMgr_PresentableObject::Parent() const
{ {
return myParent; return myParent;
} }

2
src/STEPConstruct/STEPConstruct_ExternRefs.cxx
View File

@ -310,7 +310,7 @@ Standard_Integer STEPConstruct_ExternRefs::NbExternRefs () const
//purpose : //purpose :
//======================================================================= //=======================================================================
const Standard_CString STEPConstruct_ExternRefs::FileName (const Standard_Integer num) const Standard_CString STEPConstruct_ExternRefs::FileName (const Standard_Integer num) const
{ {
Handle(StepBasic_DocumentFile) DocFile; Handle(StepBasic_DocumentFile) DocFile;
Handle(StepAP214_AppliedExternalIdentificationAssignment) AEIA; Handle(StepAP214_AppliedExternalIdentificationAssignment) AEIA;

2
src/STEPConstruct/STEPConstruct_ExternRefs.hxx
View File

@ -74,7 +74,7 @@ public:
//! Returns filename for numth extern reference //! Returns filename for numth extern reference
//! Returns Null if FileName is not defined or bad //! Returns Null if FileName is not defined or bad
Standard_EXPORT const Standard_CString FileName (const Standard_Integer num) const; Standard_EXPORT Standard_CString FileName (const Standard_Integer num) const;
//! Returns ProductDefinition to which numth extern reference //! Returns ProductDefinition to which numth extern reference
//! is associated. //! is associated.

2
src/Select3D/Select3D_PointData.hxx
View File

@ -77,7 +77,7 @@ public:
} }
// Returns size of internal arrays // Returns size of internal arrays
const Standard_Integer Size () const Standard_Integer Size () const
{ {
return mynbpoints; return mynbpoints;
} }

2
src/SelectMgr/SelectMgr_Selection.cxx
View File

@ -122,7 +122,7 @@ Handle(SelectMgr_SensitiveEntity)& SelectMgr_Selection::GetEntityById (const Sta
// function: GetSelectionState // function: GetSelectionState
// purpose : Returns status of selection // purpose : Returns status of selection
//================================================== //==================================================
const SelectMgr_StateOfSelection SelectMgr_Selection::GetSelectionState() const SelectMgr_StateOfSelection SelectMgr_Selection::GetSelectionState() const
{ {
return mySelectionState; return mySelectionState;
} }

2
src/SelectMgr/SelectMgr_Selection.hxx
View File

@ -124,7 +124,7 @@ public:
SelectMgr_TypeOfBVHUpdate BVHUpdateStatus() const; SelectMgr_TypeOfBVHUpdate BVHUpdateStatus() const;
//! Returns status of selection //! Returns status of selection
Standard_EXPORT const SelectMgr_StateOfSelection GetSelectionState() const; Standard_EXPORT SelectMgr_StateOfSelection GetSelectionState() const;
//! Sets status of selection //! Sets status of selection
Standard_EXPORT void SetSelectionState (const SelectMgr_StateOfSelection theState) const; Standard_EXPORT void SetSelectionState (const SelectMgr_StateOfSelection theState) const;

2
src/TCollection/TCollection_ExtendedString.cxx
View File

@ -774,7 +774,7 @@ TCollection_ExtendedString TCollection_ExtendedString::Token
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
// ToExtString // ToExtString
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
const Standard_ExtString TCollection_ExtendedString::ToExtString() const Standard_ExtString TCollection_ExtendedString::ToExtString() const
{ {
if(mystring) return mystring; if(mystring) return mystring;
return NULL_EXTSTRING; return NULL_EXTSTRING;

2
src/TCollection/TCollection_ExtendedString.hxx
View File

@ -273,7 +273,7 @@ friend Standard_EXPORT Standard_OStream& operator << (Standard_OStream& astream,
Standard_EXPORT TCollection_ExtendedString Token (const Standard_ExtString separators, const Standard_Integer whichone = 1) const; Standard_EXPORT TCollection_ExtendedString Token (const Standard_ExtString separators, const Standard_Integer whichone = 1) const;
//! Returns pointer to ExtString //! Returns pointer to ExtString
Standard_EXPORT const Standard_ExtString ToExtString() const; Standard_EXPORT Standard_ExtString ToExtString() const;
//! Truncates <me> to <ahowmany> characters. //! Truncates <me> to <ahowmany> characters.
//! Example: me = "Hello Dolly" -> Trunc(3) -> me = "Hel" //! Example: me = "Hello Dolly" -> Trunc(3) -> me = "Hel"

8
src/TCollection/TCollection_HExtendedString.cxx
View File

@ -253,14 +253,6 @@ Handle(TCollection_HExtendedString) TCollection_HExtendedString::Token
return new TCollection_HExtendedString(myString.Token(separators,whichone)); return new TCollection_HExtendedString(myString.Token(separators,whichone));
} }
// ----------------------------------------------------------------------------
// ToExtString
// ----------------------------------------------------------------------------
const Standard_ExtString TCollection_HExtendedString::ToExtString() const
{
return (myString.ToExtString());
}
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
// Trunc // Trunc
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------

5
src/TCollection/TCollection_HExtendedString.hxx
View File

@ -163,7 +163,10 @@ public:
Standard_EXPORT Standard_Integer SearchFromEnd (const Handle(TCollection_HExtendedString)& what) const; Standard_EXPORT Standard_Integer SearchFromEnd (const Handle(TCollection_HExtendedString)& what) const;
//! Returns pointer to ExtString //! Returns pointer to ExtString
Standard_EXPORT const Standard_ExtString ToExtString() const; Standard_ExtString ToExtString() const
{
return myString.ToExtString();
}
//! Extracts <whichone> token from <me>. //! Extracts <whichone> token from <me>.
//! By default, the <separators> is set to space and tabulation. //! By default, the <separators> is set to space and tabulation.

1
src/TNaming/FILES
View File

@ -33,7 +33,6 @@ TNaming_MapIteratorOfMapOfNamedShape.hxx
TNaming_MapOfNamedShape.hxx TNaming_MapOfNamedShape.hxx
TNaming_Name.cxx TNaming_Name.cxx
TNaming_Name.hxx TNaming_Name.hxx
TNaming_Name.lxx
TNaming_NamedShape.cxx TNaming_NamedShape.cxx
TNaming_NamedShape.hxx TNaming_NamedShape.hxx
TNaming_NamedShape.lxx TNaming_NamedShape.lxx

26
src/TNaming/TNaming_Name.hxx
View File

@ -76,25 +76,16 @@ public:
Standard_EXPORT const TDF_Label& ContextLabel() const; Standard_EXPORT const TDF_Label& ContextLabel() const;
const TopAbs_Orientation Orientation() const; TopAbs_Orientation Orientation() const
{
return myOrientation;
}
Standard_EXPORT Standard_Boolean Solve (const TDF_Label& aLab, const TDF_LabelMap& Valid) const; Standard_EXPORT Standard_Boolean Solve (const TDF_Label& aLab, const TDF_LabelMap& Valid) const;
Standard_EXPORT void Paste (TNaming_Name& into, const Handle(TDF_RelocationTable)& RT) const; Standard_EXPORT void Paste (TNaming_Name& into, const Handle(TDF_RelocationTable)& RT) const;
protected:
private: private:
TNaming_NameType myType; TNaming_NameType myType;
TopAbs_ShapeEnum myShapeType; TopAbs_ShapeEnum myShapeType;
TNaming_ListOfNamedShape myArgs; TNaming_ListOfNamedShape myArgs;
@ -103,15 +94,6 @@ private:
TopoDS_Shape myShape; TopoDS_Shape myShape;
TDF_Label myContextLabel; TDF_Label myContextLabel;
TopAbs_Orientation myOrientation; TopAbs_Orientation myOrientation;
}; };
#include <TNaming_Name.lxx>
#endif // _TNaming_Name_HeaderFile #endif // _TNaming_Name_HeaderFile

26
src/TNaming/TNaming_Name.lxx
View File

@ -1,26 +0,0 @@
// File: TNaming_Name.lxx
// Copyright: Open CASCADE 2013
// Created on: 2013-07-03
// Created by: Sergey Zaritchny
// Copyright (c) 1999-2013 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 : Orientation
//purpose : Get
//=======================================================================
inline const TopAbs_Orientation TNaming_Name::Orientation() const
{
return myOrientation;
}

4
src/TestTopOpeTools/TestTopOpeTools_Trace.cxx
View File

@ -158,10 +158,10 @@ Standard_Boolean TestTopOpeTools_Trace::Exist
const t_flag TestTopOpeTools_Trace::Getflag(const Standard_Integer index) const t_flag TestTopOpeTools_Trace::Getflag(const Standard_Integer index)
{ return (t_flag)myflag.Value(index); } { return (t_flag)myflag.Value(index); }
const tf_value TestTopOpeTools_Trace::Getfunc(const Standard_Integer index) tf_value TestTopOpeTools_Trace::Getfunc(const Standard_Integer index)
{ return myfunc.Value(index); } { return myfunc.Value(index); }
const te_ftyp TestTopOpeTools_Trace::Getftyp(const Standard_Integer index) te_ftyp TestTopOpeTools_Trace::Getftyp(const Standard_Integer index)
{ {
//JR/Hp : //JR/Hp :
Standard_Integer intenum = myftyp.Value(index); Standard_Integer intenum = myftyp.Value(index);

4
src/TestTopOpeTools/TestTopOpeTools_Trace.hxx
View File

@ -116,8 +116,8 @@ private:
// ==== Methods // ==== Methods
const t_flag Getflag(const Standard_Integer index); const t_flag Getflag(const Standard_Integer index);
const tf_value Getfunc(const Standard_Integer index); tf_value Getfunc(const Standard_Integer index);
const te_ftyp Getftyp(const Standard_Integer index); te_ftyp Getftyp(const Standard_Integer index);
Standard_Integer Add(const t_flag flag,const tf_value func,const te_ftyp ftyp); Standard_Integer Add(const t_flag flag,const tf_value func,const te_ftyp ftyp);
// ==== Fields // ==== Fields

1
src/TopOpeBRepTool/FILES
View File

@ -64,7 +64,6 @@ TopOpeBRepTool_PURGE.cxx
TopOpeBRepTool_PURGE.hxx TopOpeBRepTool_PURGE.hxx
TopOpeBRepTool_PurgeInternalEdges.cxx TopOpeBRepTool_PurgeInternalEdges.cxx
TopOpeBRepTool_PurgeInternalEdges.hxx TopOpeBRepTool_PurgeInternalEdges.hxx
TopOpeBRepTool_PurgeInternalEdges.lxx
TopOpeBRepTool_RegularizeS.cxx TopOpeBRepTool_RegularizeS.cxx
TopOpeBRepTool_RegularizeW.cxx TopOpeBRepTool_RegularizeW.cxx
TopOpeBRepTool_REGUS.cxx TopOpeBRepTool_REGUS.cxx

2
src/TopOpeBRepTool/TopOpeBRepTool_FuseEdges.cxx
View File

@ -163,7 +163,7 @@ void TopOpeBRepTool_FuseEdges::Faces(TopTools_DataMapOfShapeShape& theMapFac)
//purpose : //purpose :
//======================================================================= //=======================================================================
const Standard_Integer TopOpeBRepTool_FuseEdges::NbVertices() Standard_Integer TopOpeBRepTool_FuseEdges::NbVertices()
{ {
Standard_NullObject_Raise_if(myShape.IsNull(),"FuseEdges : No Shape"); Standard_NullObject_Raise_if(myShape.IsNull(),"FuseEdges : No Shape");

2
src/TopOpeBRepTool/TopOpeBRepTool_FuseEdges.hxx
View File

@ -82,7 +82,7 @@ public:
Standard_EXPORT TopoDS_Shape& Shape(); Standard_EXPORT TopoDS_Shape& Shape();
//! returns the number of vertices candidate to be removed //! returns the number of vertices candidate to be removed
Standard_EXPORT const Standard_Integer NbVertices(); Standard_EXPORT Standard_Integer NbVertices();
//! Using map of list of connex edges, fuse each list to //! Using map of list of connex edges, fuse each list to
//! one edge and then update myShape //! one edge and then update myShape

2
src/TopOpeBRepTool/TopOpeBRepTool_PurgeInternalEdges.cxx
View File

@ -67,7 +67,7 @@ TopOpeBRepTool_PurgeInternalEdges::TopOpeBRepTool_PurgeInternalEdges(const TopoD
//purpose : //purpose :
//======================================================================= //=======================================================================
const Standard_Integer TopOpeBRepTool_PurgeInternalEdges::NbEdges() const Standard_Integer TopOpeBRepTool_PurgeInternalEdges::NbEdges() const
{ {
Standard_NullObject_Raise_if(myShape.IsNull(),"PurgeInternalEdges : No Shape"); Standard_NullObject_Raise_if(myShape.IsNull(),"PurgeInternalEdges : No Shape");

24
src/TopOpeBRepTool/TopOpeBRepTool_PurgeInternalEdges.hxx
View File

@ -65,47 +65,35 @@ public:
Standard_EXPORT TopoDS_Shape& Shape(); Standard_EXPORT TopoDS_Shape& Shape();
//! returns the number of edges candidate to be removed //! returns the number of edges candidate to be removed
Standard_EXPORT const Standard_Integer NbEdges() const; Standard_EXPORT Standard_Integer NbEdges() const;
//! returns False if the list of internal edges has //! returns False if the list of internal edges has
//! not been extracted //! not been extracted
Standard_Boolean IsDone() const; Standard_Boolean IsDone() const
{
return myIsDone;
}
//! Using the list of internal edge from each face, //! Using the list of internal edge from each face,
//! rebuild myShape by removing thoses edges. //! rebuild myShape by removing thoses edges.
Standard_EXPORT void Perform(); Standard_EXPORT void Perform();
protected: protected:
TopTools_IndexedDataMapOfShapeListOfShape myMapEdgLstFac; TopTools_IndexedDataMapOfShapeListOfShape myMapEdgLstFac;
private: private:
//! Do the main job. Explore all the edges of myShape and //! Do the main job. Explore all the edges of myShape and
//! build a map with faces as a key and list of internal //! build a map with faces as a key and list of internal
//! edges(without connected faces) as value. //! edges(without connected faces) as value.
Standard_EXPORT void BuildList(); Standard_EXPORT void BuildList();
private:
TopoDS_Shape myShape; TopoDS_Shape myShape;
Standard_Boolean myIsDone; Standard_Boolean myIsDone;
TopTools_DataMapOfShapeListOfShape myMapFacLstEdg; TopTools_DataMapOfShapeListOfShape myMapFacLstEdg;
}; };
#include <TopOpeBRepTool_PurgeInternalEdges.lxx>
#endif // _TopOpeBRepTool_PurgeInternalEdges_HeaderFile #endif // _TopOpeBRepTool_PurgeInternalEdges_HeaderFile

20
src/TopOpeBRepTool/TopOpeBRepTool_PurgeInternalEdges.lxx
View File

@ -1,20 +0,0 @@
// Copyright (c) 1998-1999 Matra Datavision
// Copyright (c) 1999-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.
inline Standard_Boolean TopOpeBRepTool_PurgeInternalEdges::IsDone() const
{
return myIsDone;
}