From 99cfc277576326874dc6a27cd627e37303db2c94 Mon Sep 17 00:00:00 2001 From: kgv Date: Mon, 10 Jul 2017 11:24:29 +0300 Subject: [PATCH] 0028907: Coding Rules, OpenGl_GraphicDriver - fix class fields accidentally marked public --- src/OpenGl/OpenGl_GraphicDriver.hxx | 26 +++++++++++--------------- 1 file changed, 11 insertions(+), 15 deletions(-) diff --git a/src/OpenGl/OpenGl_GraphicDriver.hxx b/src/OpenGl/OpenGl_GraphicDriver.hxx index 5fb33ca6ac..5000619a26 100644 --- a/src/OpenGl/OpenGl_GraphicDriver.hxx +++ b/src/OpenGl/OpenGl_GraphicDriver.hxx @@ -204,6 +204,14 @@ public: DEFINE_STANDARD_RTTIEXT(OpenGl_GraphicDriver,Graphic3d_GraphicDriver) +public: + + //! State counter for OpenGl structures. + OpenGl_StateCounter* GetStateCounter() const { return &myStateCounter; } + + //! Returns unique ID for primitive arrays. + Standard_Size GetNextPrimitiveArrayUID() const { return myUIDGenerator.Increment(); } + protected: Standard_Boolean myIsOwnContext; //!< indicates that shared context has been created within OpenGl_GraphicDriver @@ -213,26 +221,14 @@ protected: void* myEglConfig; //!< EGL configuration : EGLConfig #endif - Handle(OpenGl_Caps) myCaps; - NCollection_Map myMapOfView; - NCollection_DataMap myMapOfStructure; - -public: + Handle(OpenGl_Caps) myCaps; + NCollection_Map myMapOfView; + NCollection_DataMap myMapOfStructure; TColStd_MapOfInteger myLayerIds; TColStd_SequenceOfInteger myLayerSeq; OpenGl_MapOfZLayerSettings myMapOfZLayerSettings; -public: - - //! State counter for OpenGl structures. - OpenGl_StateCounter* GetStateCounter() const { return &myStateCounter; } - - //! Returns unique ID for primitive arrays. - Standard_Size GetNextPrimitiveArrayUID() const { return myUIDGenerator.Increment(); } - -protected: - mutable OpenGl_StateCounter myStateCounter; //!< State counter for OpenGl structures. mutable OpenGl_StateCounter myUIDGenerator; //!< Unique ID counter for primitive arrays. -- 2.39.5