From 4db6d89bc6d71c5bc627acde17c27dbbba52bae3 Mon Sep 17 00:00:00 2001 From: kgv Date: Thu, 10 Jun 2021 17:46:20 +0300 Subject: [PATCH] 0032429: Coding - Warnings during compilation on macosx arm64 with option BUILD_Inspector:BOOL=ON --- tools/DFBrowser/DFBrowser_Item.hxx | 2 +- tools/DFBrowser/DFBrowser_TreeModel.cxx | 2 -- tools/DFBrowser/DFBrowser_Window.cxx | 8 -------- tools/MessageModel/MessageModel_ItemBase.hxx | 2 +- tools/VInspector/VInspector_ItemContext.hxx | 2 +- tools/VInspector/VInspector_ItemGraphic3dCLight.hxx | 2 +- tools/VInspector/VInspector_ItemPresentableObject.hxx | 2 +- .../VInspector/VInspector_ItemSelectMgrViewerSelector.hxx | 2 +- tools/VInspector/VInspector_ItemV3dViewer.hxx | 2 +- 9 files changed, 7 insertions(+), 17 deletions(-) diff --git a/tools/DFBrowser/DFBrowser_Item.hxx b/tools/DFBrowser/DFBrowser_Item.hxx index 0a00c746d5..05acf68fff 100644 --- a/tools/DFBrowser/DFBrowser_Item.hxx +++ b/tools/DFBrowser/DFBrowser_Item.hxx @@ -88,7 +88,7 @@ protected: : DFBrowser_ItemBase (theParent, theRow, theColumn) {} //! Initializes the current item. It creates a backup of the specific item information - void initItem() const; + virtual void initItem() const Standard_OVERRIDE; //! Sets the item attribute //! \param theAttribute an item attribute diff --git a/tools/DFBrowser/DFBrowser_TreeModel.cxx b/tools/DFBrowser/DFBrowser_TreeModel.cxx index 70857bc046..7294704f99 100644 --- a/tools/DFBrowser/DFBrowser_TreeModel.cxx +++ b/tools/DFBrowser/DFBrowser_TreeModel.cxx @@ -32,8 +32,6 @@ #include #include -const int COLUMN_NAME_WIDTH = 300; - // ======================================================================= // function : Constructor // purpose : diff --git a/tools/DFBrowser/DFBrowser_Window.cxx b/tools/DFBrowser/DFBrowser_Window.cxx index a41b589fe8..2e6d4dde89 100644 --- a/tools/DFBrowser/DFBrowser_Window.cxx +++ b/tools/DFBrowser/DFBrowser_Window.cxx @@ -86,19 +86,11 @@ #endif #include -const int DFBROWSER_DEFAULT_WIDTH = 650; -const int DFBROWSER_DEFAULT_HEIGHT = 350; const int DFBROWSER_DEFAULT_TREE_VIEW_WIDTH = 325; const int DFBROWSER_DEFAULT_TREE_VIEW_HEIGHT = 500; const int DFBROWSER_DEFAULT_VIEW_WIDTH = 400; const int DFBROWSER_DEFAULT_VIEW_HEIGHT = 300; -const int DFBROWSER_DEFAULT_POSITION_X = 200; -const int DFBROWSER_DEFAULT_POSITION_Y = 60; - -const int DEFAULT_PROPERTY_PANEL_HEIGHT = 200; -const int DEFAULT_BROWSER_HEIGHT = 800; - static Standard_Boolean MyIsUseDumpJson = Standard_False; // ======================================================================= diff --git a/tools/MessageModel/MessageModel_ItemBase.hxx b/tools/MessageModel/MessageModel_ItemBase.hxx index 0b77bec706..fdf3329e92 100644 --- a/tools/MessageModel/MessageModel_ItemBase.hxx +++ b/tools/MessageModel/MessageModel_ItemBase.hxx @@ -35,7 +35,7 @@ public: protected: //! Initialize the current item. It creates a backup of the specific item information - virtual void initItem() const {}; + virtual void initItem() const Standard_OVERRIDE {}; //! Constructor //! param theParent a parent item diff --git a/tools/VInspector/VInspector_ItemContext.hxx b/tools/VInspector/VInspector_ItemContext.hxx index 6308f59df6..7651adeb30 100644 --- a/tools/VInspector/VInspector_ItemContext.hxx +++ b/tools/VInspector/VInspector_ItemContext.hxx @@ -40,7 +40,7 @@ public: //! Returns data object of the item. //! \return object - virtual const Handle(Standard_Transient)& Object() const { initItem(); return myContext; } + virtual const Handle(Standard_Transient)& Object() const Standard_OVERRIDE { initItem(); return myContext; } //! Returns number of displayed presentations //! \return rows count diff --git a/tools/VInspector/VInspector_ItemGraphic3dCLight.hxx b/tools/VInspector/VInspector_ItemGraphic3dCLight.hxx index 4fac119726..a101baa923 100644 --- a/tools/VInspector/VInspector_ItemGraphic3dCLight.hxx +++ b/tools/VInspector/VInspector_ItemGraphic3dCLight.hxx @@ -45,7 +45,7 @@ public: //! Returns data object of the item. //! \return object - virtual const Handle(Standard_Transient)& Object() const { initItem(); return myLight; } + virtual const Handle(Standard_Transient)& Object() const Standard_OVERRIDE { initItem(); return myLight; } //! Returns the current light, init item if it was not initialized yet //! \return interactive object diff --git a/tools/VInspector/VInspector_ItemPresentableObject.hxx b/tools/VInspector/VInspector_ItemPresentableObject.hxx index 31df492fc6..a5704b9665 100644 --- a/tools/VInspector/VInspector_ItemPresentableObject.hxx +++ b/tools/VInspector/VInspector_ItemPresentableObject.hxx @@ -43,7 +43,7 @@ public: //! Returns data object of the item. //! \return object - virtual const Handle(Standard_Transient)& Object() const { initItem(); return myIO; } + virtual const Handle(Standard_Transient)& Object() const Standard_OVERRIDE { initItem(); return myIO; } //! Returns the current interactive object, init item if it was not initialized yet //! \return interactive object diff --git a/tools/VInspector/VInspector_ItemSelectMgrViewerSelector.hxx b/tools/VInspector/VInspector_ItemSelectMgrViewerSelector.hxx index aa2d4c7fb3..f6e6f4efda 100644 --- a/tools/VInspector/VInspector_ItemSelectMgrViewerSelector.hxx +++ b/tools/VInspector/VInspector_ItemSelectMgrViewerSelector.hxx @@ -45,7 +45,7 @@ public: //! Returns data object of the item. //! \return object - virtual const Handle(Standard_Transient)& Object() const { initItem(); return myViewerSelector; } + virtual const Handle(Standard_Transient)& Object() const Standard_OVERRIDE { initItem(); return myViewerSelector; } //! Returns the current viewer, init item if it was not initialized yet //! \return interactive object diff --git a/tools/VInspector/VInspector_ItemV3dViewer.hxx b/tools/VInspector/VInspector_ItemV3dViewer.hxx index b70c046e0c..693fed2d77 100644 --- a/tools/VInspector/VInspector_ItemV3dViewer.hxx +++ b/tools/VInspector/VInspector_ItemV3dViewer.hxx @@ -45,7 +45,7 @@ public: //! Returns data object of the item. //! \return object - virtual const Handle(Standard_Transient)& Object() const { initItem(); return myViewer; } + virtual const Handle(Standard_Transient)& Object() const Standard_OVERRIDE { initItem(); return myViewer; } //! Returns the current viewer, init item if it was not initialized yet //! \return interactive object