OpenCascade/occt
1
0
Fork 0
mirror of https://git.dev.opencascade.org/repos/occt.git synced 2025-04-03 17:56:21 +03:00
Code Packages Releases Activity

0032429: Coding - Warnings during compilation on macosx arm64 with option BUILD_Inspector:BOOL=ON - part 2

Browse Source
This commit is contained in:
kgv 2021-07-06 16:46:31 +03:00
parent 1f3c5058f2
commit 9e5e4c0c84
18 changed files with 38 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tools/DFBrowser/DFBrowser_ItemBase.hxx
View File

@ -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:

3
tools/DFBrowser/DFBrowser_SearchView.cxx
View File

@ -35,8 +35,7 @@
#include <QWidget>
#include <Standard_WarningsRestore.hxx>
const int DEFAULT_COLUMN_WIDTH = 500;
const int DEFAULT_ICON_SIZE = 40;
static const int DEFAULT_ICON_SIZE = 40;
// =======================================================================
// function : Constructor

2
tools/DFBrowserPane/DFBrowserPane_AttributePaneModel.hxx
View File

@ -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:

2
tools/DFBrowserPane/DFBrowserPane_TDataStdTreeNodeItem.hxx
View File

@ -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;

6
tools/DFBrowserPane/DFBrowserPane_TNamingNamedShape.cxx
View File

@ -49,11 +49,7 @@
#include <QWidget>
#include <Standard_WarningsRestore.hxx>
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

2
tools/DFBrowserPane/DFBrowserPane_TNamingNamedShape.hxx
View File

@ -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

2
tools/DFBrowserPane/DFBrowserPane_TNamingUsedShapes.hxx
View File

@ -58,7 +58,7 @@ public:
protected:
//! Defines widths of table columns
//! \return container of widths
Standard_EXPORT virtual QMap<int, int> getTableColumnWidths() const;
Standard_EXPORT virtual QMap<int, int> getTableColumnWidths() const Standard_OVERRIDE;
};

2
tools/DFBrowserPane/DFBrowserPane_TableView.cxx
View File

@ -27,8 +27,6 @@
#include <QWidget>
#include <Standard_WarningsRestore.hxx>
static const int DEFAULT_ROW_HEIGHT = 30;
// =======================================================================
// function : Constructor
// purpose :

2
tools/ShapeView/ShapeView_ItemRoot.hxx
View File

@ -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(); }

2
tools/ShapeView/ShapeView_ItemShape.hxx
View File

@ -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;

11
tools/ShapeView/ShapeView_OpenFileDialog.cxx
View File

@ -37,14 +37,13 @@
#include <QToolButton>
#include <Standard_WarningsRestore.hxx>
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

22
tools/ShapeView/ShapeView_Window.cxx
View File

@ -62,22 +62,16 @@
#include <QVBoxLayout>
#include <Standard_WarningsRestore.hxx>
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

13
tools/TInspector/TInspector_OpenFileDialog.cxx
View File

@ -40,16 +40,15 @@
#include <QWidget>
#include <Standard_WarningsRestore.hxx>
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;

4
tools/TInspector/TInspector_Preferences.cxx
View File

@ -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();
}

2
tools/TreeModel/TreeModel_ItemStream.hxx
View File

@ -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

4
tools/TreeModel/TreeModel_ModelBase.cxx
View File

@ -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;
}

4
tools/ViewControl/ViewControl_ColorSelector.cxx
View File

@ -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);

2
tools/ViewControl/ViewControl_TableModel.hxx
View File

@ -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: