diff --git a/tools/DFBrowser/DFBrowser_ItemBase.hxx b/tools/DFBrowser/DFBrowser_ItemBase.hxx index c87ca1d081..44f9cae780 100644 --- a/tools/DFBrowser/DFBrowser_ItemBase.hxx +++ b/tools/DFBrowser/DFBrowser_ItemBase.hxx @@ -85,7 +85,7 @@ protected: virtual TreeModel_ItemBasePtr createChild (int theRow, int theColumn) Standard_OVERRIDE; //! Initializes the current item. It creates a backup of the specific item information - virtual void initItem() const {} + virtual void initItem() const Standard_OVERRIDE {} protected: diff --git a/tools/DFBrowser/DFBrowser_SearchView.cxx b/tools/DFBrowser/DFBrowser_SearchView.cxx index 08ae8f658d..5ca5182b78 100644 --- a/tools/DFBrowser/DFBrowser_SearchView.cxx +++ b/tools/DFBrowser/DFBrowser_SearchView.cxx @@ -35,8 +35,7 @@ #include #include -const int DEFAULT_COLUMN_WIDTH = 500; -const int DEFAULT_ICON_SIZE = 40; +static const int DEFAULT_ICON_SIZE = 40; // ======================================================================= // function : Constructor diff --git a/tools/DFBrowserPane/DFBrowserPane_AttributePaneModel.hxx b/tools/DFBrowserPane/DFBrowserPane_AttributePaneModel.hxx index 804372ce17..e9b9d6db52 100644 --- a/tools/DFBrowserPane/DFBrowserPane_AttributePaneModel.hxx +++ b/tools/DFBrowserPane/DFBrowserPane_AttributePaneModel.hxx @@ -104,7 +104,7 @@ public: //! Returns flags for the item: ItemIsEnabled | Qt::ItemIsSelectable //! \param theIndex a model index //! \return flags - Qt::ItemFlags flags (const QModelIndex& theIndex) const + virtual Qt::ItemFlags flags (const QModelIndex& theIndex) const Standard_OVERRIDE { return theIndex.isValid() ? Qt::ItemIsEnabled | Qt::ItemIsSelectable : Qt::NoItemFlags; } private: diff --git a/tools/DFBrowserPane/DFBrowserPane_TDataStdTreeNodeItem.hxx b/tools/DFBrowserPane/DFBrowserPane_TDataStdTreeNodeItem.hxx index 9570aea1b6..3c4e0a1388 100644 --- a/tools/DFBrowserPane/DFBrowserPane_TDataStdTreeNodeItem.hxx +++ b/tools/DFBrowserPane/DFBrowserPane_TDataStdTreeNodeItem.hxx @@ -97,7 +97,7 @@ protected: : TreeModel_ItemBase (theParent, theRow, theColumn), myIsCurrentItem (false) {} //! Initializes the current item. It creates a backup of the specific item information - void initItem() const; + virtual void initItem() const Standard_OVERRIDE; //! Returns number of children attributes, initializes item is necessary int getRowCount() const; diff --git a/tools/DFBrowserPane/DFBrowserPane_TNamingNamedShape.cxx b/tools/DFBrowserPane/DFBrowserPane_TNamingNamedShape.cxx index c93f7bf8f0..781c6d6efb 100644 --- a/tools/DFBrowserPane/DFBrowserPane_TNamingNamedShape.cxx +++ b/tools/DFBrowserPane/DFBrowserPane_TNamingNamedShape.cxx @@ -49,11 +49,7 @@ #include #include -const int COLUMN_EXPORT_WIDTH = 20; -const int COLUMN_TYPE_WIDTH = 70; -const int COLUMN_POINTER_WIDTH = 110; -const int COLUMN_REFERENCE_WIDTH = 90; -const int COLUMN_EVOLUTION_WIDTH = 90; +static const int COLUMN_EXPORT_WIDTH = 20; // ======================================================================= // function : Constructor diff --git a/tools/DFBrowserPane/DFBrowserPane_TNamingNamedShape.hxx b/tools/DFBrowserPane/DFBrowserPane_TNamingNamedShape.hxx index ccffd18335..2d934d2330 100644 --- a/tools/DFBrowserPane/DFBrowserPane_TNamingNamedShape.hxx +++ b/tools/DFBrowserPane/DFBrowserPane_TNamingNamedShape.hxx @@ -51,7 +51,7 @@ public: //! Initializes the content of the pane by the parameter attribute //! \param theAttribute an OCAF attribute - Standard_EXPORT void Init (const Handle(TDF_Attribute)& theAttribute); + Standard_EXPORT virtual void Init (const Handle(TDF_Attribute)& theAttribute) Standard_OVERRIDE; //! Returns information for the given attribute //! \param theAttribute a current attribute diff --git a/tools/DFBrowserPane/DFBrowserPane_TNamingUsedShapes.hxx b/tools/DFBrowserPane/DFBrowserPane_TNamingUsedShapes.hxx index d7b0466e97..095b9556f8 100644 --- a/tools/DFBrowserPane/DFBrowserPane_TNamingUsedShapes.hxx +++ b/tools/DFBrowserPane/DFBrowserPane_TNamingUsedShapes.hxx @@ -58,7 +58,7 @@ public: protected: //! Defines widths of table columns //! \return container of widths - Standard_EXPORT virtual QMap getTableColumnWidths() const; + Standard_EXPORT virtual QMap getTableColumnWidths() const Standard_OVERRIDE; }; diff --git a/tools/DFBrowserPane/DFBrowserPane_TableView.cxx b/tools/DFBrowserPane/DFBrowserPane_TableView.cxx index 5bbf2281b6..514b46d3d1 100644 --- a/tools/DFBrowserPane/DFBrowserPane_TableView.cxx +++ b/tools/DFBrowserPane/DFBrowserPane_TableView.cxx @@ -27,8 +27,6 @@ #include #include -static const int DEFAULT_ROW_HEIGHT = 30; - // ======================================================================= // function : Constructor // purpose : diff --git a/tools/ShapeView/ShapeView_ItemRoot.hxx b/tools/ShapeView/ShapeView_ItemRoot.hxx index c05495dfd2..af31b26d6b 100644 --- a/tools/ShapeView/ShapeView_ItemRoot.hxx +++ b/tools/ShapeView/ShapeView_ItemRoot.hxx @@ -55,7 +55,7 @@ protected: //! Returns data value for the role. //! \param theItemRole a value role //! \return the value - virtual QVariant initValue(const int theItemRole) const; + virtual QVariant initValue(const int theItemRole) const Standard_OVERRIDE; //! \return number of children. virtual int initRowCount() const Standard_OVERRIDE { return myShapes.Size(); } diff --git a/tools/ShapeView/ShapeView_ItemShape.hxx b/tools/ShapeView/ShapeView_ItemShape.hxx index 6615691b61..888a0e6915 100644 --- a/tools/ShapeView/ShapeView_ItemShape.hxx +++ b/tools/ShapeView/ShapeView_ItemShape.hxx @@ -82,7 +82,7 @@ public: //! Returns data value for the role. //! \param theRole a value role //! \return the value - Standard_EXPORT virtual QVariant initValue(const int theRole) const; + Standard_EXPORT virtual QVariant initValue(const int theRole) const Standard_OVERRIDE; //! \return number of children. Standard_EXPORT virtual int initRowCount() const Standard_OVERRIDE; diff --git a/tools/ShapeView/ShapeView_OpenFileDialog.cxx b/tools/ShapeView/ShapeView_OpenFileDialog.cxx index 3ea9b1fb33..b3588d414a 100644 --- a/tools/ShapeView/ShapeView_OpenFileDialog.cxx +++ b/tools/ShapeView/ShapeView_OpenFileDialog.cxx @@ -37,14 +37,13 @@ #include #include -const int FONT_POINT_SIZE = 18; -const int ICON_SIZE = 40; +static const int ICON_SIZE = 40; -const int OPEN_DIALOG_WIDTH = 550; -const int OPEN_DIALOG_HEIGHT = 200; +static const int OPEN_DIALOG_WIDTH = 550; +static const int OPEN_DIALOG_HEIGHT = 200; -const int MARGIN_DIALOG = 4; -const int SPACING_DIALOG = 2; +static const int MARGIN_DIALOG = 4; +static const int SPACING_DIALOG = 2; // ======================================================================= // function : StartButton diff --git a/tools/ShapeView/ShapeView_Window.cxx b/tools/ShapeView/ShapeView_Window.cxx index d6f54d75cc..d53ad47439 100644 --- a/tools/ShapeView/ShapeView_Window.cxx +++ b/tools/ShapeView/ShapeView_Window.cxx @@ -62,22 +62,16 @@ #include #include -const int DEFAULT_TEXT_VIEW_WIDTH = 800; -const int DEFAULT_TEXT_VIEW_HEIGHT = 700; -const int DEFAULT_TEXT_VIEW_POSITION_X = 430; -const int DEFAULT_TEXT_VIEW_POSITION_Y = 30; -const int DEFAULT_TEXT_VIEW_DELTA = 100; +static const int DEFAULT_SHAPE_VIEW_WIDTH = 900; +static const int DEFAULT_SHAPE_VIEW_HEIGHT = 450; +static const int DEFAULT_SHAPE_VIEW_POSITION_X = 60; +static const int DEFAULT_SHAPE_VIEW_POSITION_Y = 60; -const int DEFAULT_SHAPE_VIEW_WIDTH = 900; -const int DEFAULT_SHAPE_VIEW_HEIGHT = 450; -const int DEFAULT_SHAPE_VIEW_POSITION_X = 60; -const int DEFAULT_SHAPE_VIEW_POSITION_Y = 60; +static const int SHAPEVIEW_DEFAULT_TREE_VIEW_WIDTH = 600; +static const int SHAPEVIEW_DEFAULT_TREE_VIEW_HEIGHT = 500; -const int SHAPEVIEW_DEFAULT_TREE_VIEW_WIDTH = 600; -const int SHAPEVIEW_DEFAULT_TREE_VIEW_HEIGHT = 500; - -const int SHAPEVIEW_DEFAULT_VIEW_WIDTH = 300; -const int SHAPEVIEW_DEFAULT_VIEW_HEIGHT = 1000; +static const int SHAPEVIEW_DEFAULT_VIEW_WIDTH = 300; +static const int SHAPEVIEW_DEFAULT_VIEW_HEIGHT = 1000; // ======================================================================= // function : Constructor diff --git a/tools/TInspector/TInspector_OpenFileDialog.cxx b/tools/TInspector/TInspector_OpenFileDialog.cxx index 622818ab83..04473faf58 100644 --- a/tools/TInspector/TInspector_OpenFileDialog.cxx +++ b/tools/TInspector/TInspector_OpenFileDialog.cxx @@ -40,16 +40,15 @@ #include #include -const int FONT_POINT_SIZE = 18; -const int ICON_SIZE = 40; +static const int ICON_SIZE = 40; -const int OPEN_DIALOG_WIDTH = 550; -const int OPEN_DIALOG_HEIGHT = 200; +static const int OPEN_DIALOG_WIDTH = 550; +static const int OPEN_DIALOG_HEIGHT = 200; -const int MARGIN_DIALOG = 4; -const int SPACING_DIALOG = 2; +static const int MARGIN_DIALOG = 4; +static const int SPACING_DIALOG = 2; -const int RECENT_FILES_CACHE_SIZE = 10; +static const int RECENT_FILES_CACHE_SIZE = 10; TInspector_Communicator* MyCommunicator; diff --git a/tools/TInspector/TInspector_Preferences.cxx b/tools/TInspector/TInspector_Preferences.cxx index c335fab59c..00d6593eea 100644 --- a/tools/TInspector/TInspector_Preferences.cxx +++ b/tools/TInspector/TInspector_Preferences.cxx @@ -79,7 +79,9 @@ void TInspector_Preferences::StorePreferences() QTextStream aTextStream (&aFile); QStringList aDocumentStr = aDomDocument.toString().split ("\n"); for (QStringList::ConstIterator aContentIt = aDocumentStr.begin(); aContentIt != aDocumentStr.end(); ++aContentIt) - aTextStream << *aContentIt << endl; + { + aTextStream << *aContentIt << '\n'; + } aFile.close(); } diff --git a/tools/TreeModel/TreeModel_ItemStream.hxx b/tools/TreeModel/TreeModel_ItemStream.hxx index 800e014cb1..65fa16c7ff 100644 --- a/tools/TreeModel/TreeModel_ItemStream.hxx +++ b/tools/TreeModel/TreeModel_ItemStream.hxx @@ -69,7 +69,7 @@ public: protected: //! Returns stream value of the item to fulfill property panel. //! \return stream value or dummy - Standard_EXPORT virtual void initStream (Standard_OStream& theOStream) const; + Standard_EXPORT virtual void initStream (Standard_OStream& theOStream) const Standard_OVERRIDE; //! Initializes the current item. It creates a backup of the specific item information //! Does nothing as context has been already set into item diff --git a/tools/TreeModel/TreeModel_ModelBase.cxx b/tools/TreeModel/TreeModel_ModelBase.cxx index 5dd4055b7e..30b320251c 100644 --- a/tools/TreeModel/TreeModel_ModelBase.cxx +++ b/tools/TreeModel/TreeModel_ModelBase.cxx @@ -162,7 +162,9 @@ QModelIndex TreeModel_ModelBase::parent (const QModelIndex& theIndex) const Qt::ItemFlags TreeModel_ModelBase::flags (const QModelIndex& theIndex) const { if (!theIndex.isValid()) - return 0; + { + return Qt::ItemFlags(); + } return Qt::ItemIsEnabled | Qt::ItemIsSelectable; } diff --git a/tools/ViewControl/ViewControl_ColorSelector.cxx b/tools/ViewControl/ViewControl_ColorSelector.cxx index 67fff81f73..2e480bcf7a 100644 --- a/tools/ViewControl/ViewControl_ColorSelector.cxx +++ b/tools/ViewControl/ViewControl_ColorSelector.cxx @@ -105,7 +105,7 @@ public: //! \param theColumn a model index column //! \param theRole a view role //! \return true if the value is changed - virtual bool SetData (const int theRow, const int theColumn, const QVariant& theValue, int) + virtual bool SetData (const int theRow, const int theColumn, const QVariant& theValue, int) Standard_OVERRIDE { if (theColumn != 1 || theRow < 2 || theRow > 5) return false; @@ -138,7 +138,7 @@ public: //! Returns editable flag for color RGB and alpha rows //! \return flags - Qt::ItemFlags Flags (const QModelIndex& theIndex) const + virtual Qt::ItemFlags Flags (const QModelIndex& theIndex) const Standard_OVERRIDE { Qt::ItemFlags aFlags = ViewControl_TableModelValues::Flags (theIndex); diff --git a/tools/ViewControl/ViewControl_TableModel.hxx b/tools/ViewControl/ViewControl_TableModel.hxx index 0255187feb..aeadc44bd1 100644 --- a/tools/ViewControl/ViewControl_TableModel.hxx +++ b/tools/ViewControl/ViewControl_TableModel.hxx @@ -90,7 +90,7 @@ public: //! Returns flags for the item: ItemIsEnabled | Qt::ItemIsSelectable //! \param theIndex a model index //! \return flags - Qt::ItemFlags flags (const QModelIndex& theIndex) const + virtual Qt::ItemFlags flags (const QModelIndex& theIndex) const Standard_OVERRIDE { return myModelValues ? myModelValues->Flags (theIndex) : Qt::NoItemFlags; } private: