From 130eb1140590a048577d05df746f77a91305f159 Mon Sep 17 00:00:00 2001
From: nds <nds@opencascade.com>
Date: Sun, 4 Mar 2018 19:10:56 +0300
Subject: [PATCH] 0029310: Coding - multiple compiler warnings in Inspectors
1. Added specific header files to disable and restore compiler warnings: Standard_WarningsDisable.hxx, Standard_WarningsRestore.hxx.
(Currently only MSVC compiler is handled.)
2. Inspector: compiler warnings are disabled for all includes of Qt headers.
3. Inspector: minor code correction to avoid warning due to use of floating point values in integer calculations.
---
src/Standard/FILES | 2 ++
src/Standard/Standard_WarningsDisable.hxx | 30 +++++++++++++++++++
src/Standard/Standard_WarningsRestore.hxx | 30 +++++++++++++++++++
.../DFBrowser_AttributePaneStack.cxx | 2 ++
.../DFBrowser_AttributePaneStack.hxx | 2 ++
tools/DFBrowser/DFBrowser_Communicator.hxx | 2 ++
tools/DFBrowser/DFBrowser_DumpView.cxx | 2 ++
tools/DFBrowser/DFBrowser_DumpView.hxx | 5 ++--
.../DFBrowser/DFBrowser_HighlightDelegate.cxx | 4 ++-
.../DFBrowser/DFBrowser_HighlightDelegate.hxx | 5 ++--
tools/DFBrowser/DFBrowser_Item.cxx | 2 ++
tools/DFBrowser/DFBrowser_Item.hxx | 2 ++
tools/DFBrowser/DFBrowser_ItemApplication.cxx | 2 ++
tools/DFBrowser/DFBrowser_ItemBase.cxx | 2 ++
tools/DFBrowser/DFBrowser_ItemDocument.cxx | 2 ++
tools/DFBrowser/DFBrowser_ItemRole.hxx | 2 ++
tools/DFBrowser/DFBrowser_Module.cxx | 2 ++
tools/DFBrowser/DFBrowser_Module.hxx | 2 ++
tools/DFBrowser/DFBrowser_PropertyPanel.cxx | 2 ++
tools/DFBrowser/DFBrowser_PropertyPanel.hxx | 2 ++
tools/DFBrowser/DFBrowser_SearchItemInfo.hxx | 5 ++--
tools/DFBrowser/DFBrowser_SearchLine.cxx | 2 ++
tools/DFBrowser/DFBrowser_SearchLine.hxx | 2 ++
tools/DFBrowser/DFBrowser_SearchLineModel.cxx | 2 ++
tools/DFBrowser/DFBrowser_SearchLineModel.hxx | 5 ++--
tools/DFBrowser/DFBrowser_SearchView.cxx | 2 ++
tools/DFBrowser/DFBrowser_SearchView.hxx | 2 ++
tools/DFBrowser/DFBrowser_Shortcut.cxx | 2 ++
tools/DFBrowser/DFBrowser_Shortcut.hxx | 5 ++--
tools/DFBrowser/DFBrowser_Thread.cxx | 2 ++
tools/DFBrowser/DFBrowser_Thread.hxx | 5 ++--
.../DFBrowser/DFBrowser_ThreadItemSearch.cxx | 2 ++
.../DFBrowser/DFBrowser_ThreadItemSearch.hxx | 2 ++
.../DFBrowser_ThreadItemUsedShapesMap.hxx | 5 ++--
tools/DFBrowser/DFBrowser_Tools.cxx | 2 ++
tools/DFBrowser/DFBrowser_Tools.hxx | 2 ++
tools/DFBrowser/DFBrowser_TreeLevelLine.cxx | 2 ++
tools/DFBrowser/DFBrowser_TreeLevelLine.hxx | 2 ++
.../DFBrowser_TreeLevelLineDelegate.cxx | 2 ++
.../DFBrowser_TreeLevelLineDelegate.hxx | 5 ++--
.../DFBrowser_TreeLevelLineModel.cxx | 2 ++
.../DFBrowser_TreeLevelLineModel.hxx | 2 ++
tools/DFBrowser/DFBrowser_TreeLevelView.cxx | 3 +-
tools/DFBrowser/DFBrowser_TreeLevelView.hxx | 2 ++
.../DFBrowser_TreeLevelViewModel.cxx | 2 ++
.../DFBrowser_TreeLevelViewModel.hxx | 5 ++--
tools/DFBrowser/DFBrowser_TreeModel.cxx | 2 ++
tools/DFBrowser/DFBrowser_TreeModel.hxx | 2 ++
tools/DFBrowser/DFBrowser_TreeView.hxx | 5 ++--
tools/DFBrowser/DFBrowser_Window.cxx | 2 ++
tools/DFBrowser/DFBrowser_Window.hxx | 5 ++--
.../DFBrowserPane_AttributePane.cxx | 2 ++
.../DFBrowserPane_AttributePane.hxx | 5 ++--
.../DFBrowserPane_AttributePaneModel.cxx | 2 ++
.../DFBrowserPane_AttributePaneModel.hxx | 5 ++--
.../DFBrowserPane_AttributePaneSelector.hxx | 7 ++---
.../DFBrowserPane_HelperArray.cxx | 4 ++-
.../DFBrowserPane_HelperArray.hxx | 5 ++--
.../DFBrowserPane_HelperExport.cxx | 2 ++
.../DFBrowserPane_HelperExport.hxx | 11 +++++--
.../DFBrowserPane_ItemDelegateButton.cxx | 2 ++
.../DFBrowserPane_ItemDelegateButton.hxx | 5 ++--
.../DFBrowserPane_TDFReference.cxx | 3 ++
.../DFBrowserPane_TDFTagSource.cxx | 2 ++
.../DFBrowserPane_TDataStdAsciiString.cxx | 2 ++
.../DFBrowserPane_TDataStdBooleanArray.cxx | 6 ++--
.../DFBrowserPane_TDataStdBooleanList.cxx | 5 ++--
.../DFBrowserPane_TDataStdByteArray.cxx | 2 ++
.../DFBrowserPane_TDataStdComment.cxx | 2 ++
.../DFBrowserPane_TDataStdCurrent.cxx | 2 ++
.../DFBrowserPane_TDataStdDirectory.cxx | 2 ++
.../DFBrowserPane_TDataStdExpression.cxx | 3 ++
.../DFBrowserPane_TDataStdExtStringArray.cxx | 2 ++
.../DFBrowserPane_TDataStdExtStringList.cxx | 2 ++
.../DFBrowserPane_TDataStdIntPackedMap.cxx | 2 ++
.../DFBrowserPane_TDataStdInteger.cxx | 2 ++
.../DFBrowserPane_TDataStdIntegerArray.cxx | 2 ++
.../DFBrowserPane_TDataStdIntegerList.cxx | 2 ++
.../DFBrowserPane_TDataStdName.cxx | 2 ++
.../DFBrowserPane_TDataStdNamedData.cxx | 2 ++
.../DFBrowserPane_TDataStdNoteBook.cxx | 2 ++
.../DFBrowserPane_TDataStdReal.cxx | 2 ++
.../DFBrowserPane_TDataStdRealArray.cxx | 2 ++
.../DFBrowserPane_TDataStdRealList.cxx | 2 ++
.../DFBrowserPane_TDataStdReferenceArray.cxx | 2 ++
.../DFBrowserPane_TDataStdReferenceList.cxx | 2 ++
.../DFBrowserPane_TDataStdRelation.cxx | 2 ++
.../DFBrowserPane_TDataStdTick.cxx | 2 ++
.../DFBrowserPane_TDataStdTreeNode.cxx | 2 ++
.../DFBrowserPane_TDataStdTreeNodeItem.cxx | 2 ++
.../DFBrowserPane_TDataStdTreeNodeItem.hxx | 2 ++
.../DFBrowserPane_TDataStdTreeNodeModel.cxx | 2 ++
.../DFBrowserPane_TDataStdTreeNodeModel.hxx | 2 ++
.../DFBrowserPane_TDataStdUAttribute.cxx | 2 ++
.../DFBrowserPane_TDataStdVariable.cxx | 3 ++
.../DFBrowserPane_TDocStdModified.cxx | 3 ++
.../DFBrowserPane_TDocStdOwner.cxx | 9 +++---
.../DFBrowserPane_TDocStdXLink.cxx | 3 ++
.../DFBrowserPane_TDocStdXLinkRoot.cxx | 3 ++
.../DFBrowserPane_TFunctionFunction.cxx | 3 ++
.../DFBrowserPane_TFunctionGraphNode.cxx | 3 ++
.../DFBrowserPane_TFunctionScope.cxx | 2 ++
.../DFBrowserPane_TNamingNamedShape.cxx | 2 ++
.../DFBrowserPane_TNamingNamedShape.hxx | 2 ++
.../DFBrowserPane_TNamingNaming.cxx | 2 ++
.../DFBrowserPane_TNamingUsedShapes.cxx | 2 ++
.../DFBrowserPane_TPrsStdAISPresentation.cxx | 2 ++
.../DFBrowserPane_TPrsStdAISViewer.cxx | 2 ++
.../DFBrowserPane/DFBrowserPane_TableView.cxx | 4 ++-
.../DFBrowserPane/DFBrowserPane_TableView.hxx | 5 ++--
tools/DFBrowserPane/DFBrowserPane_Tools.cxx | 2 ++
tools/DFBrowserPane/DFBrowserPane_Tools.hxx | 7 ++---
.../DFBrowserPaneXDE_AttributeCommonPane.cxx | 2 ++
.../DFBrowserPaneXDE_AttributeCommonPane.hxx | 2 ++
.../DFBrowserPaneXDE_Tools.hxx | 5 ++--
.../DFBrowserPaneXDE_XCAFDocColor.cxx | 3 ++
.../DFBrowserPaneXDE_XCAFDocShapeMapTool.cxx | 2 ++
tools/ShapeView/ShapeView_Communicator.cxx | 2 ++
tools/ShapeView/ShapeView_ItemShape.cxx | 2 ++
tools/ShapeView/ShapeView_ItemShape.hxx | 2 ++
tools/ShapeView/ShapeView_OpenFileDialog.cxx | 2 ++
tools/ShapeView/ShapeView_OpenFileDialog.hxx | 5 ++--
.../ShapeView/ShapeView_OpenFileViewModel.cxx | 8 ++---
.../ShapeView/ShapeView_OpenFileViewModel.hxx | 5 ++--
tools/ShapeView/ShapeView_TreeModel.hxx | 2 ++
tools/ShapeView/ShapeView_Window.cxx | 2 ++
tools/ShapeView/ShapeView_Window.hxx | 5 ++--
tools/TInspector/TInspector_Communicator.cxx | 2 ++
tools/TInspector/TInspector_Window.cxx | 2 ++
tools/TInspector/TInspector_Window.hxx | 5 ++--
tools/TreeModel/TreeModel_ItemBase.cxx | 3 +-
tools/TreeModel/TreeModel_ItemBase.hxx | 5 ++--
tools/TreeModel/TreeModel_ItemRole.hxx | 2 ++
tools/TreeModel/TreeModel_MessageDialog.cxx | 2 ++
tools/TreeModel/TreeModel_MessageDialog.hxx | 5 ++--
tools/TreeModel/TreeModel_ModelBase.hxx | 2 ++
tools/VInspector/VInspector_CallBack.cxx | 2 --
tools/VInspector/VInspector_Communicator.cxx | 2 ++
tools/VInspector/VInspector_ItemContext.cxx | 2 --
.../VInspector/VInspector_ItemEntityOwner.cxx | 2 ++
.../VInspector_ItemPresentableObject.cxx | 2 ++
tools/VInspector/VInspector_ItemSelection.cxx | 5 ++--
.../VInspector_ItemSensitiveEntity.cxx | 2 ++
tools/VInspector/VInspector_ToolBar.cxx | 3 +-
tools/VInspector/VInspector_ToolBar.hxx | 5 ++--
tools/VInspector/VInspector_Tools.cxx | 2 ++
tools/VInspector/VInspector_Tools.hxx | 6 ++--
tools/VInspector/VInspector_ViewModel.cxx | 2 ++
tools/VInspector/VInspector_ViewModel.hxx | 2 ++
.../VInspector_ViewModelHistory.cxx | 2 ++
.../VInspector_ViewModelHistory.hxx | 2 ++
tools/VInspector/VInspector_Window.cxx | 2 ++
tools/VInspector/VInspector_Window.hxx | 2 ++
tools/View/View_ToolBar.cxx | 2 ++
tools/View/View_ToolBar.hxx | 5 ++--
tools/View/View_Widget.cxx | 2 ++
tools/View/View_Widget.hxx | 5 ++--
tools/View/View_Window.cxx | 2 ++
tools/View/View_Window.hxx | 5 ++--
159 files changed, 396 insertions(+), 123 deletions(-)
create mode 100644 src/Standard/Standard_WarningsDisable.hxx
create mode 100644 src/Standard/Standard_WarningsRestore.hxx
diff --git a/src/Standard/FILES b/src/Standard/FILES
index a8c48a1745..4710604718 100755
--- a/src/Standard/FILES
+++ b/src/Standard/FILES
@@ -95,3 +95,5 @@ Standard_Underflow.hxx
Standard_UUID.hxx
Standard_values.h
Standard_Version.hxx
+Standard_WarningsDisable.hxx
+Standard_WarningsRestore.hxx
\ No newline at end of file
diff --git a/src/Standard/Standard_WarningsDisable.hxx b/src/Standard/Standard_WarningsDisable.hxx
new file mode 100644
index 0000000000..199d746ca4
--- /dev/null
+++ b/src/Standard/Standard_WarningsDisable.hxx
@@ -0,0 +1,30 @@
+// Copyright (c) 2018 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.
+
+//!@file Supresses compiler warnings.
+//!
+//! Standard_WarningsDisable.hxx disables all compiler warnings.
+//! Standard_WarningsRestore.hxx restore the previous state of warnings.
+//!
+//! Use these headers to wrap include directive containing external (non-OCCT)
+//! header files to avoid compiler warnings to be generated for these files.
+//! They should always be used in pair:
+//!
+//! #include <Standard_WarningsDisable.hxx>
+//! #include <dirty_header.h> // some header that can generate warnings
+//! #include <Standard_WarningsRestore.hxx>
+
+#ifdef _MSC_VER
+#pragma warning(push, 0)
+#endif
+
diff --git a/src/Standard/Standard_WarningsRestore.hxx b/src/Standard/Standard_WarningsRestore.hxx
new file mode 100644
index 0000000000..f03cc66429
--- /dev/null
+++ b/src/Standard/Standard_WarningsRestore.hxx
@@ -0,0 +1,30 @@
+// Copyright (c) 2018 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.
+
+//!@file Restores compiler warnings suppressed by inclusion of Standard_WarningsDisable.hxx.
+//!
+//! Standard_WarningsDisable.hxx disables all compiler warnings.
+//! Standard_WarningsRestore.hxx restore the previous state of warnings.
+//!
+//! Use these headers to wrap include directive containing external (non-OCCT)
+//! header files to avoid compiler warnings to be generated for these files.
+//! They should always be used in pair:
+//!
+//! #include <Standard_WarningsDisable.hxx>
+//! #include <dirty_header.h> // some header that can generate warnings
+//! #include <Standard_WarningsRestore.hxx>
+
+#ifdef _MSC_VER
+#pragma warning(pop)
+#endif
+
diff --git a/tools/DFBrowser/DFBrowser_AttributePaneStack.cxx b/tools/DFBrowser/DFBrowser_AttributePaneStack.cxx
index 541f7a1116..ebc2d1b367 100644
--- a/tools/DFBrowser/DFBrowser_AttributePaneStack.cxx
+++ b/tools/DFBrowser/DFBrowser_AttributePaneStack.cxx
@@ -27,9 +27,11 @@
#include <TDF_Attribute.hxx>
+#include <Standard_WarningsDisable.hxx>
#include <QItemSelectionModel>
#include <QMap>
#include <QStackedWidget>
+#include <Standard_WarningsRestore.hxx>
// =======================================================================
// function : Constructor
diff --git a/tools/DFBrowser/DFBrowser_AttributePaneStack.hxx b/tools/DFBrowser/DFBrowser_AttributePaneStack.hxx
index e54c39b670..24d5f73599 100644
--- a/tools/DFBrowser/DFBrowser_AttributePaneStack.hxx
+++ b/tools/DFBrowser/DFBrowser_AttributePaneStack.hxx
@@ -21,10 +21,12 @@
#include <Standard.hxx>
+#include <Standard_WarningsDisable.hxx>
#include <QMap>
#include <QItemSelection>
#include <QStackedWidget>
#include <QWidget>
+#include <Standard_WarningsRestore.hxx>
class DFBrowserPane_AttributePaneAPI;
class DFBrowserPane_AttributePaneSelector;
diff --git a/tools/DFBrowser/DFBrowser_Communicator.hxx b/tools/DFBrowser/DFBrowser_Communicator.hxx
index 548e955331..3f27eb7a2e 100644
--- a/tools/DFBrowser/DFBrowser_Communicator.hxx
+++ b/tools/DFBrowser/DFBrowser_Communicator.hxx
@@ -22,7 +22,9 @@
#include <Standard.hxx>
#include <Standard_Macro.hxx>
+#include <Standard_WarningsDisable.hxx>
#include <QObject>
+#include <Standard_WarningsRestore.hxx>
class DFBrowser_Window;
diff --git a/tools/DFBrowser/DFBrowser_DumpView.cxx b/tools/DFBrowser/DFBrowser_DumpView.cxx
index 405aacbf07..c7e957105c 100644
--- a/tools/DFBrowser/DFBrowser_DumpView.cxx
+++ b/tools/DFBrowser/DFBrowser_DumpView.cxx
@@ -21,12 +21,14 @@
#include <OSD_OpenFile.hxx>
#include <inspector/TreeModel_ModelBase.hxx>
+#include <Standard_WarningsDisable.hxx>
#include <QAbstractItemModel>
#include <QDir>
#include <QFile>
#include <QPlainTextEdit>
#include <QTextStream>
#include <QWidget>
+#include <Standard_WarningsRestore.hxx>
// =======================================================================
// function : onSelectionChanged
diff --git a/tools/DFBrowser/DFBrowser_DumpView.hxx b/tools/DFBrowser/DFBrowser_DumpView.hxx
index 395458d5c0..95c35f86f3 100644
--- a/tools/DFBrowser/DFBrowser_DumpView.hxx
+++ b/tools/DFBrowser/DFBrowser_DumpView.hxx
@@ -19,12 +19,11 @@
#include <Standard.hxx>
#include <Standard_Macro.hxx>
-#ifdef _MSC_VER
-#pragma warning(disable : 4127) // conditional expression is constant
-#endif
+#include <Standard_WarningsDisable.hxx>
#include <QObject>
#include <QItemSelection>
#include <QPlainTextEdit>
+#include <Standard_WarningsRestore.hxx>
class QWidget;
diff --git a/tools/DFBrowser/DFBrowser_HighlightDelegate.cxx b/tools/DFBrowser/DFBrowser_HighlightDelegate.cxx
index 3d7b55e692..5fd811c24a 100644
--- a/tools/DFBrowser/DFBrowser_HighlightDelegate.cxx
+++ b/tools/DFBrowser/DFBrowser_HighlightDelegate.cxx
@@ -14,9 +14,11 @@
// commercial license or contractual agreement.
#include <inspector/DFBrowser_HighlightDelegate.hxx>
-
#include <inspector/DFBrowserPane_Tools.hxx>
+
+#include <Standard_WarningsDisable.hxx>
#include <QPainter>
+#include <Standard_WarningsRestore.hxx>
// =======================================================================
// function : paint
diff --git a/tools/DFBrowser/DFBrowser_HighlightDelegate.hxx b/tools/DFBrowser/DFBrowser_HighlightDelegate.hxx
index 00b740ad7d..5106821b9c 100644
--- a/tools/DFBrowser/DFBrowser_HighlightDelegate.hxx
+++ b/tools/DFBrowser/DFBrowser_HighlightDelegate.hxx
@@ -19,10 +19,9 @@
#include <Standard.hxx>
#include <Standard_Macro.hxx>
-#ifdef _MSC_VER
-#pragma warning(disable : 4127) // conditional expression is constant
-#endif
+#include <Standard_WarningsDisable.hxx>
#include <QItemDelegate>
+#include <Standard_WarningsRestore.hxx>
//! \class DFBrowser_HighlightDelegate
//! \brief An item delegate to paint in highlight color the cell when the mouse cursor is over it
diff --git a/tools/DFBrowser/DFBrowser_Item.cxx b/tools/DFBrowser/DFBrowser_Item.cxx
index b5b6fc8e49..82b63b3033 100644
--- a/tools/DFBrowser/DFBrowser_Item.cxx
+++ b/tools/DFBrowser/DFBrowser_Item.cxx
@@ -26,8 +26,10 @@
#include <TDF_AttributeIterator.hxx>
#include <TDF_ChildIterator.hxx>
+#include <Standard_WarningsDisable.hxx>
#include <QIcon>
#include <QObject>
+#include <Standard_WarningsRestore.hxx>
const int INFO_LENGHT = 60;
diff --git a/tools/DFBrowser/DFBrowser_Item.hxx b/tools/DFBrowser/DFBrowser_Item.hxx
index 5c10ac1c05..5b9220ceb4 100644
--- a/tools/DFBrowser/DFBrowser_Item.hxx
+++ b/tools/DFBrowser/DFBrowser_Item.hxx
@@ -22,9 +22,11 @@
#include <Standard.hxx>
#include <Standard_GUID.hxx>
+#include <Standard_WarningsDisable.hxx>
#include <QMap>
#include <QList>
#include <QVariant>
+#include <Standard_WarningsRestore.hxx>
class DFBrowser_Item;
typedef QExplicitlySharedDataPointer<DFBrowser_Item> DFBrowser_ItemPtr;
diff --git a/tools/DFBrowser/DFBrowser_ItemApplication.cxx b/tools/DFBrowser/DFBrowser_ItemApplication.cxx
index f6555fc13b..4fa7ec824c 100644
--- a/tools/DFBrowser/DFBrowser_ItemApplication.cxx
+++ b/tools/DFBrowser/DFBrowser_ItemApplication.cxx
@@ -23,7 +23,9 @@
#include <inspector/DFBrowserPane_AttributePane.hxx>
#include <inspector/DFBrowserPane_ItemRole.hxx>
+#include <Standard_WarningsDisable.hxx>
#include <QObject>
+#include <Standard_WarningsRestore.hxx>
// =======================================================================
// function : createChild
diff --git a/tools/DFBrowser/DFBrowser_ItemBase.cxx b/tools/DFBrowser/DFBrowser_ItemBase.cxx
index 9cbd59639d..89d58b98bd 100644
--- a/tools/DFBrowser/DFBrowser_ItemBase.cxx
+++ b/tools/DFBrowser/DFBrowser_ItemBase.cxx
@@ -26,9 +26,11 @@
#include <TDataStd_Name.hxx>
#include <TDF_ChildIterator.hxx>
+#include <Standard_WarningsDisable.hxx>
#include <QColor>
#include <QIcon>
#include <QVariant>
+#include <Standard_WarningsRestore.hxx>
// =======================================================================
// function : Constructor
diff --git a/tools/DFBrowser/DFBrowser_ItemDocument.cxx b/tools/DFBrowser/DFBrowser_ItemDocument.cxx
index 37029caa97..915b1d368f 100644
--- a/tools/DFBrowser/DFBrowser_ItemDocument.cxx
+++ b/tools/DFBrowser/DFBrowser_ItemDocument.cxx
@@ -23,9 +23,11 @@
#include <inspector/DFBrowserPane_AttributePane.hxx>
#include <inspector/DFBrowserPane_ItemRole.hxx>
+#include <Standard_WarningsDisable.hxx>
#include <QIcon>
#include <QLabel>
#include <QObject>
+#include <Standard_WarningsRestore.hxx>
// =======================================================================
// function : GetLabel
diff --git a/tools/DFBrowser/DFBrowser_ItemRole.hxx b/tools/DFBrowser/DFBrowser_ItemRole.hxx
index d06f24d792..3d3b62d611 100644
--- a/tools/DFBrowser/DFBrowser_ItemRole.hxx
+++ b/tools/DFBrowser/DFBrowser_ItemRole.hxx
@@ -18,7 +18,9 @@
#include <inspector/DFBrowserPane_ItemRole.hxx>
+#include <Standard_WarningsDisable.hxx>
#include <Qt>
+#include <Standard_WarningsRestore.hxx>
//! Additional data item role for DFBrowser tree item
enum DFBrowser_ItemRole
diff --git a/tools/DFBrowser/DFBrowser_Module.cxx b/tools/DFBrowser/DFBrowser_Module.cxx
index 0a04c64621..2aff65e7f1 100644
--- a/tools/DFBrowser/DFBrowser_Module.cxx
+++ b/tools/DFBrowser/DFBrowser_Module.cxx
@@ -32,8 +32,10 @@
#include <XCAFApp_Application.hxx>
+#include <Standard_WarningsDisable.hxx>
#include <QItemSelectionModel>
#include <QMessageBox>
+#include <Standard_WarningsRestore.hxx>
// =======================================================================
// function : Constructor
diff --git a/tools/DFBrowser/DFBrowser_Module.hxx b/tools/DFBrowser/DFBrowser_Module.hxx
index d3e2748555..e75fbb0f34 100644
--- a/tools/DFBrowser/DFBrowser_Module.hxx
+++ b/tools/DFBrowser/DFBrowser_Module.hxx
@@ -27,7 +27,9 @@
#include <TDocStd_Application.hxx>
#include <TopoDS_Shape.hxx>
+#include <Standard_WarningsDisable.hxx>
#include <QObject>
+#include <Standard_WarningsRestore.hxx>
class DFBrowserPane_AttributePaneAPI;
class DFBrowserPane_AttributePaneCreatorAPI;
diff --git a/tools/DFBrowser/DFBrowser_PropertyPanel.cxx b/tools/DFBrowser/DFBrowser_PropertyPanel.cxx
index 52545a3845..66cdcdf5c0 100644
--- a/tools/DFBrowser/DFBrowser_PropertyPanel.cxx
+++ b/tools/DFBrowser/DFBrowser_PropertyPanel.cxx
@@ -21,10 +21,12 @@
#include <inspector/DFBrowser_Window.hxx>
#include <inspector/DFBrowser_TreeLevelView.hxx>
+#include <Standard_WarningsDisable.hxx>
#include <QAbstractItemModel>
#include <QGridLayout>
#include <QItemSelectionModel>
#include <QWidget>
+#include <Standard_WarningsRestore.hxx>
// =======================================================================
// function : Constructor
diff --git a/tools/DFBrowser/DFBrowser_PropertyPanel.hxx b/tools/DFBrowser/DFBrowser_PropertyPanel.hxx
index 8bfba4b18c..1a55af76f8 100644
--- a/tools/DFBrowser/DFBrowser_PropertyPanel.hxx
+++ b/tools/DFBrowser/DFBrowser_PropertyPanel.hxx
@@ -20,8 +20,10 @@
#include <Standard.hxx>
+#include <Standard_WarningsDisable.hxx>
#include <QItemSelection>
#include <QObject>
+#include <Standard_WarningsRestore.hxx>
class DFBrowser_AttributePaneStack;
diff --git a/tools/DFBrowser/DFBrowser_SearchItemInfo.hxx b/tools/DFBrowser/DFBrowser_SearchItemInfo.hxx
index e6e62e8ff9..fb9a153975 100644
--- a/tools/DFBrowser/DFBrowser_SearchItemInfo.hxx
+++ b/tools/DFBrowser/DFBrowser_SearchItemInfo.hxx
@@ -16,12 +16,11 @@
#ifndef DFBrowser_SearchItemInfo_H
#define DFBrowser_SearchItemInfo_H
-#ifdef _MSC_VER
-#pragma warning(disable : 4127) // conditional expression is constant
-#endif
+#include <Standard_WarningsDisable.hxx>
#include <QVariant>
#include <QStringList>
#include <QString>
+#include <Standard_WarningsRestore.hxx>
//! \class DFBrowser_SearchItemInfo
//! Information of item in search model
diff --git a/tools/DFBrowser/DFBrowser_SearchLine.cxx b/tools/DFBrowser/DFBrowser_SearchLine.cxx
index d0981894ed..740caf544b 100644
--- a/tools/DFBrowser/DFBrowser_SearchLine.cxx
+++ b/tools/DFBrowser/DFBrowser_SearchLine.cxx
@@ -25,6 +25,7 @@
#include <TDF_AttributeIterator.hxx>
#include <TDF_ChildIterator.hxx>
+#include <Standard_WarningsDisable.hxx>
#include <QStringList>
#include <QWidget>
#include <QHBoxLayout>
@@ -35,6 +36,7 @@
#include <QPaintEvent>
#include <QPainter>
#include <QStyle>
+#include <Standard_WarningsRestore.hxx>
//! class DFBrowser_LineEdit
//! Extension of Qt line edit to visualize help text until the line edit control has not been filled yet
diff --git a/tools/DFBrowser/DFBrowser_SearchLine.hxx b/tools/DFBrowser/DFBrowser_SearchLine.hxx
index ac8438613c..54c3ae15d3 100644
--- a/tools/DFBrowser/DFBrowser_SearchLine.hxx
+++ b/tools/DFBrowser/DFBrowser_SearchLine.hxx
@@ -22,9 +22,11 @@
#include <TDocStd_Application.hxx>
#include <TDF_Label.hxx>
+#include <Standard_WarningsDisable.hxx>
#include <QCompleter>
#include <QFrame>
#include <QLineEdit>
+#include <Standard_WarningsRestore.hxx>
class DFBrowser_Module;
class DFBrowser_SearchLineModel;
diff --git a/tools/DFBrowser/DFBrowser_SearchLineModel.cxx b/tools/DFBrowser/DFBrowser_SearchLineModel.cxx
index 362b258ac9..a4d7fbed60 100644
--- a/tools/DFBrowser/DFBrowser_SearchLineModel.cxx
+++ b/tools/DFBrowser/DFBrowser_SearchLineModel.cxx
@@ -22,8 +22,10 @@
#include <inspector/DFBrowserPane_ItemRole.hxx>
#include <inspector/DFBrowserPane_Tools.hxx>
+#include <Standard_WarningsDisable.hxx>
#include <QDir>
#include <QIcon>
+#include <Standard_WarningsRestore.hxx>
// =======================================================================
// function : Constructor
diff --git a/tools/DFBrowser/DFBrowser_SearchLineModel.hxx b/tools/DFBrowser/DFBrowser_SearchLineModel.hxx
index cfc8e9b699..3aeb9eae7c 100644
--- a/tools/DFBrowser/DFBrowser_SearchLineModel.hxx
+++ b/tools/DFBrowser/DFBrowser_SearchLineModel.hxx
@@ -23,13 +23,12 @@
#include <TDF_Attribute.hxx>
#include <TDF_Label.hxx>
-#ifdef _MSC_VER
-#pragma warning(disable : 4127) // conditional expression is constant
-#endif
+#include <Standard_WarningsDisable.hxx>
#include <QAbstractTableModel>
#include <QMap>
#include <QStringList>
#include <QVariant>
+#include <Standard_WarningsRestore.hxx>
class QObject;
class DFBrowser_Module;
diff --git a/tools/DFBrowser/DFBrowser_SearchView.cxx b/tools/DFBrowser/DFBrowser_SearchView.cxx
index 54d694dcaa..437eac2228 100644
--- a/tools/DFBrowser/DFBrowser_SearchView.cxx
+++ b/tools/DFBrowser/DFBrowser_SearchView.cxx
@@ -22,11 +22,13 @@
#include <inspector/DFBrowserPane_Tools.hxx>
+#include <Standard_WarningsDisable.hxx>
#include <QAbstractProxyModel>
#include <QGridLayout>
#include <QHeaderView>
#include <QTableView>
#include <QWidget>
+#include <Standard_WarningsRestore.hxx>
const int DEFAULT_COLUMN_WIDTH = 500;
const int DEFAULT_ICON_SIZE = 40;
diff --git a/tools/DFBrowser/DFBrowser_SearchView.hxx b/tools/DFBrowser/DFBrowser_SearchView.hxx
index 44fc17728a..dd5b482143 100644
--- a/tools/DFBrowser/DFBrowser_SearchView.hxx
+++ b/tools/DFBrowser/DFBrowser_SearchView.hxx
@@ -21,8 +21,10 @@
#include <Standard.hxx>
+#include <Standard_WarningsDisable.hxx>
#include <QItemSelection>
#include <QObject>
+#include <Standard_WarningsRestore.hxx>
class DFBrowser_SearchLine;
class QTableView;
diff --git a/tools/DFBrowser/DFBrowser_Shortcut.cxx b/tools/DFBrowser/DFBrowser_Shortcut.cxx
index 2f644c5aa1..1908eb72bb 100644
--- a/tools/DFBrowser/DFBrowser_Shortcut.cxx
+++ b/tools/DFBrowser/DFBrowser_Shortcut.cxx
@@ -17,8 +17,10 @@
#include <inspector/DFBrowser_Module.hxx>
+#include <Standard_WarningsDisable.hxx>
#include <QApplication>
#include <QKeyEvent>
+#include <Standard_WarningsRestore.hxx>
// =======================================================================
// function : Constructor
diff --git a/tools/DFBrowser/DFBrowser_Shortcut.hxx b/tools/DFBrowser/DFBrowser_Shortcut.hxx
index 26c0d81346..977b4517db 100644
--- a/tools/DFBrowser/DFBrowser_Shortcut.hxx
+++ b/tools/DFBrowser/DFBrowser_Shortcut.hxx
@@ -19,10 +19,9 @@
#include <Standard.hxx>
#include <Standard_Macro.hxx>
-#ifdef _MSC_VER
-#pragma warning(disable : 4127) // conditional expression is constant
-#endif
+#include <Standard_WarningsDisable.hxx>
#include <QObject>
+#include <Standard_WarningsRestore.hxx>
class DFBrowser_Module;
class QEvent;
diff --git a/tools/DFBrowser/DFBrowser_Thread.cxx b/tools/DFBrowser/DFBrowser_Thread.cxx
index a6ed15493e..2e33bdccfc 100644
--- a/tools/DFBrowser/DFBrowser_Thread.cxx
+++ b/tools/DFBrowser/DFBrowser_Thread.cxx
@@ -21,7 +21,9 @@
#include <inspector/DFBrowser_Window.hxx>
+#include <Standard_WarningsDisable.hxx>
#include <QThread>
+#include <Standard_WarningsRestore.hxx>
//! \class DFBrowser_QThread
//! Internal class to cover QThread in order to process ThreadItem.
diff --git a/tools/DFBrowser/DFBrowser_Thread.hxx b/tools/DFBrowser/DFBrowser_Thread.hxx
index 56cf9c661c..361c808f1c 100644
--- a/tools/DFBrowser/DFBrowser_Thread.hxx
+++ b/tools/DFBrowser/DFBrowser_Thread.hxx
@@ -18,11 +18,10 @@
#include <Standard.hxx>
-#ifdef _MSC_VER
-#pragma warning(disable : 4127) // conditional expression is constant
-#endif
+#include <Standard_WarningsDisable.hxx>
#include <QList>
#include <QObject>
+#include <Standard_WarningsRestore.hxx>
class DFBrowser_Module;
class DFBrowser_ThreadItem;
diff --git a/tools/DFBrowser/DFBrowser_ThreadItemSearch.cxx b/tools/DFBrowser/DFBrowser_ThreadItemSearch.cxx
index b734ba1589..6a605ee28b 100644
--- a/tools/DFBrowser/DFBrowser_ThreadItemSearch.cxx
+++ b/tools/DFBrowser/DFBrowser_ThreadItemSearch.cxx
@@ -27,7 +27,9 @@
#include <TDF_AttributeIterator.hxx>
#include <TDF_ChildIterator.hxx>
+#include <Standard_WarningsDisable.hxx>
#include <QDir>
+#include <Standard_WarningsRestore.hxx>
// =======================================================================
// function : Run
diff --git a/tools/DFBrowser/DFBrowser_ThreadItemSearch.hxx b/tools/DFBrowser/DFBrowser_ThreadItemSearch.hxx
index b1112d1a00..5b73d2b635 100644
--- a/tools/DFBrowser/DFBrowser_ThreadItemSearch.hxx
+++ b/tools/DFBrowser/DFBrowser_ThreadItemSearch.hxx
@@ -22,9 +22,11 @@
#include <Standard.hxx>
#include <TDF_Label.hxx>
+#include <Standard_WarningsDisable.hxx>
#include <QAbstractItemModel>
#include <QMap>
#include <QStringList>
+#include <Standard_WarningsRestore.hxx>
class DFBrowser_Module;
class DFBrowser_SearchLine;
diff --git a/tools/DFBrowser/DFBrowser_ThreadItemUsedShapesMap.hxx b/tools/DFBrowser/DFBrowser_ThreadItemUsedShapesMap.hxx
index 21ecd20138..8418d954b5 100644
--- a/tools/DFBrowser/DFBrowser_ThreadItemUsedShapesMap.hxx
+++ b/tools/DFBrowser/DFBrowser_ThreadItemUsedShapesMap.hxx
@@ -23,11 +23,10 @@
#include <TCollection_AsciiString.hxx>
#include <TDF_Attribute.hxx>
-#ifdef _MSC_VER
-#pragma warning(disable : 4127) // conditional expression is constant
-#endif
+#include <Standard_WarningsDisable.hxx>
#include <QStringList>
#include <QPair>
+#include <Standard_WarningsRestore.hxx>
class DFBrowser_Module;
diff --git a/tools/DFBrowser/DFBrowser_Tools.cxx b/tools/DFBrowser/DFBrowser_Tools.cxx
index 950ff0e055..b586261f76 100644
--- a/tools/DFBrowser/DFBrowser_Tools.cxx
+++ b/tools/DFBrowser/DFBrowser_Tools.cxx
@@ -28,10 +28,12 @@
#include <TDataStd_Real.hxx>
#include <TDataStd_Name.hxx>
+#include <Standard_WarningsDisable.hxx>
#include <QColor>
#include <QDir>
#include <QPalette>
#include <QWidget>
+#include <Standard_WarningsRestore.hxx>
namespace DFBrowser_Tools
{
diff --git a/tools/DFBrowser/DFBrowser_Tools.hxx b/tools/DFBrowser/DFBrowser_Tools.hxx
index 65658a3b7c..e8cbc19337 100644
--- a/tools/DFBrowser/DFBrowser_Tools.hxx
+++ b/tools/DFBrowser/DFBrowser_Tools.hxx
@@ -25,6 +25,7 @@
#include <TDF_Attribute.hxx>
#include <TopoDS_Shape.hxx>
+#include <Standard_WarningsDisable.hxx>
#include <QAbstractItemModel>
#include <QColor>
#include <QMap>
@@ -32,6 +33,7 @@
#include <QPixmap>
#include <QString>
#include <QIcon>
+#include <Standard_WarningsRestore.hxx>
class DFBrowserPane_AttributePaneAPI;
diff --git a/tools/DFBrowser/DFBrowser_TreeLevelLine.cxx b/tools/DFBrowser/DFBrowser_TreeLevelLine.cxx
index 24ed7d294b..288f831de6 100644
--- a/tools/DFBrowser/DFBrowser_TreeLevelLine.cxx
+++ b/tools/DFBrowser/DFBrowser_TreeLevelLine.cxx
@@ -22,6 +22,7 @@
#include <inspector/DFBrowserPane_Tools.hxx>
+#include <Standard_WarningsDisable.hxx>
#include <QAbstractItemModel>
#include <QFrame>
#include <QGridLayout>
@@ -32,6 +33,7 @@
#include <QTableView>
#include <QToolButton>
#include <QWidget>
+#include <Standard_WarningsRestore.hxx>
const int HISTORY_SIZE = 10;
const int MARGIN_SIZE = 2;
diff --git a/tools/DFBrowser/DFBrowser_TreeLevelLine.hxx b/tools/DFBrowser/DFBrowser_TreeLevelLine.hxx
index d24bd27464..2de8bfe3e6 100644
--- a/tools/DFBrowser/DFBrowser_TreeLevelLine.hxx
+++ b/tools/DFBrowser/DFBrowser_TreeLevelLine.hxx
@@ -20,10 +20,12 @@
#include <Standard.hxx>
+#include <Standard_WarningsDisable.hxx>
#include <QItemSelection>
#include <QObject>
#include <QMap>
#include <QModelIndex>
+#include <Standard_WarningsRestore.hxx>
class DFBrowser_SearchLine;
diff --git a/tools/DFBrowser/DFBrowser_TreeLevelLineDelegate.cxx b/tools/DFBrowser/DFBrowser_TreeLevelLineDelegate.cxx
index 1b1be9f4ba..a8aa594463 100644
--- a/tools/DFBrowser/DFBrowser_TreeLevelLineDelegate.cxx
+++ b/tools/DFBrowser/DFBrowser_TreeLevelLineDelegate.cxx
@@ -16,7 +16,9 @@
#include <inspector/DFBrowser_TreeLevelLineDelegate.hxx>
#include <inspector/DFBrowserPane_Tools.hxx>
+#include <Standard_WarningsDisable.hxx>
#include <QPainter>
+#include <Standard_WarningsRestore.hxx>
// =======================================================================
// function : Constructor
diff --git a/tools/DFBrowser/DFBrowser_TreeLevelLineDelegate.hxx b/tools/DFBrowser/DFBrowser_TreeLevelLineDelegate.hxx
index d8b0cf17cf..c97c078a33 100644
--- a/tools/DFBrowser/DFBrowser_TreeLevelLineDelegate.hxx
+++ b/tools/DFBrowser/DFBrowser_TreeLevelLineDelegate.hxx
@@ -19,10 +19,9 @@
#include <Standard.hxx>
#include <Standard_Macro.hxx>
-#ifdef _MSC_VER
-#pragma warning(disable : 4127) // conditional expression is constant
-#endif
+#include <Standard_WarningsDisable.hxx>
#include <QItemDelegate>
+#include <Standard_WarningsRestore.hxx>
//! \class DFBrowser_TreeLevelLineDelegate
//! Extending standard item delegate by:
diff --git a/tools/DFBrowser/DFBrowser_TreeLevelLineModel.cxx b/tools/DFBrowser/DFBrowser_TreeLevelLineModel.cxx
index acdb76368f..16e2964232 100644
--- a/tools/DFBrowser/DFBrowser_TreeLevelLineModel.cxx
+++ b/tools/DFBrowser/DFBrowser_TreeLevelLineModel.cxx
@@ -18,8 +18,10 @@
#include <inspector/DFBrowser_ItemBase.hxx>
#include <inspector/TreeModel_ModelBase.hxx>
+#include <Standard_WarningsDisable.hxx>
#include <QIcon>
#include <QWidget>
+#include <Standard_WarningsRestore.hxx>
// =======================================================================
// function : Init
diff --git a/tools/DFBrowser/DFBrowser_TreeLevelLineModel.hxx b/tools/DFBrowser/DFBrowser_TreeLevelLineModel.hxx
index e79467ee60..667f208d8b 100644
--- a/tools/DFBrowser/DFBrowser_TreeLevelLineModel.hxx
+++ b/tools/DFBrowser/DFBrowser_TreeLevelLineModel.hxx
@@ -20,9 +20,11 @@
#include <Standard.hxx>
+#include <Standard_WarningsDisable.hxx>
#include <QAbstractTableModel>
#include <QObject>
#include <QList>
+#include <Standard_WarningsRestore.hxx>
//! \class DFBrowser_TreeLevelLineModel
//! Tree Model of tree line items. It is initialized by OCAF tree model index. Each element of the current model
diff --git a/tools/DFBrowser/DFBrowser_TreeLevelView.cxx b/tools/DFBrowser/DFBrowser_TreeLevelView.cxx
index 855aacdf2b..0d1f6b8bcb 100644
--- a/tools/DFBrowser/DFBrowser_TreeLevelView.cxx
+++ b/tools/DFBrowser/DFBrowser_TreeLevelView.cxx
@@ -21,12 +21,13 @@
#include <inspector/DFBrowserPane_Tools.hxx>
#include <inspector/TreeModel_ModelBase.hxx>
+#include <Standard_WarningsDisable.hxx>
#include <QItemSelectionModel>
-
#include <QGridLayout>
#include <QHeaderView>
#include <QTableView>
#include <QWidget>
+#include <Standard_WarningsRestore.hxx>
const int LABEL_OR_ATTRIBUTECOLUMN_WIDTH = 160;
diff --git a/tools/DFBrowser/DFBrowser_TreeLevelView.hxx b/tools/DFBrowser/DFBrowser_TreeLevelView.hxx
index 6b9118accb..ae961a9644 100644
--- a/tools/DFBrowser/DFBrowser_TreeLevelView.hxx
+++ b/tools/DFBrowser/DFBrowser_TreeLevelView.hxx
@@ -20,8 +20,10 @@
#include <Standard.hxx>
+#include <Standard_WarningsDisable.hxx>
#include <QObject>
#include <QItemSelection>
+#include <Standard_WarningsRestore.hxx>
class QWidget;
class QTableView;
diff --git a/tools/DFBrowser/DFBrowser_TreeLevelViewModel.cxx b/tools/DFBrowser/DFBrowser_TreeLevelViewModel.cxx
index 9f442d061d..63802ba1aa 100644
--- a/tools/DFBrowser/DFBrowser_TreeLevelViewModel.cxx
+++ b/tools/DFBrowser/DFBrowser_TreeLevelViewModel.cxx
@@ -26,10 +26,12 @@
#include <TDF_Label.hxx>
#include <inspector/TreeModel_ModelBase.hxx>
+#include <Standard_WarningsDisable.hxx>
#include <QApplication>
#include <QColor>
#include <QFont>
#include <QIcon>
+#include <Standard_WarningsRestore.hxx>
// =======================================================================
// function : Init
diff --git a/tools/DFBrowser/DFBrowser_TreeLevelViewModel.hxx b/tools/DFBrowser/DFBrowser_TreeLevelViewModel.hxx
index 705d09c798..5c564f348f 100644
--- a/tools/DFBrowser/DFBrowser_TreeLevelViewModel.hxx
+++ b/tools/DFBrowser/DFBrowser_TreeLevelViewModel.hxx
@@ -19,11 +19,10 @@
#include <Standard.hxx>
#include <Standard_Macro.hxx>
-#ifdef _MSC_VER
-#pragma warning(disable : 4127) // conditional expression is constant
-#endif
+#include <Standard_WarningsDisable.hxx>
#include <QAbstractTableModel>
#include <QVariant>
+#include <Standard_WarningsRestore.hxx>
class QObject;
diff --git a/tools/DFBrowser/DFBrowser_TreeModel.cxx b/tools/DFBrowser/DFBrowser_TreeModel.cxx
index c23a43f413..e4c4255e78 100644
--- a/tools/DFBrowser/DFBrowser_TreeModel.cxx
+++ b/tools/DFBrowser/DFBrowser_TreeModel.cxx
@@ -28,7 +28,9 @@
#include <TNaming_Builder.hxx>
#include <TNaming_NamedShape.hxx>
+#include <Standard_WarningsDisable.hxx>
#include <QAbstractItemModel>
+#include <Standard_WarningsRestore.hxx>
// =======================================================================
// function : Constructor
diff --git a/tools/DFBrowser/DFBrowser_TreeModel.hxx b/tools/DFBrowser/DFBrowser_TreeModel.hxx
index 1bc3b4b654..91afa8161d 100644
--- a/tools/DFBrowser/DFBrowser_TreeModel.hxx
+++ b/tools/DFBrowser/DFBrowser_TreeModel.hxx
@@ -24,9 +24,11 @@
#include <TDF_Label.hxx>
#include <TDocStd_Application.hxx>
+#include <Standard_WarningsDisable.hxx>
#include <QByteArray>
#include <QHash>
#include <QObject>
+#include <Standard_WarningsRestore.hxx>
class DFBrowser_Module;
class DFBrowser_TreeModel;
diff --git a/tools/DFBrowser/DFBrowser_TreeView.hxx b/tools/DFBrowser/DFBrowser_TreeView.hxx
index 1e1f6d4ec5..8dbc17d7c1 100644
--- a/tools/DFBrowser/DFBrowser_TreeView.hxx
+++ b/tools/DFBrowser/DFBrowser_TreeView.hxx
@@ -19,10 +19,9 @@
#include <Standard.hxx>
#include <Standard_Macro.hxx>
-#ifdef _MSC_VER
-#pragma warning(disable : 4127) // conditional expression is constant
-#endif
+#include <Standard_WarningsDisable.hxx>
#include <QTreeView>
+#include <Standard_WarningsRestore.hxx>
//! \class DFBrowser_TreeView
//! Extended tree view control with possibility to set predefined size.
diff --git a/tools/DFBrowser/DFBrowser_Window.cxx b/tools/DFBrowser/DFBrowser_Window.cxx
index 452ef75695..2336f74fcf 100644
--- a/tools/DFBrowser/DFBrowser_Window.cxx
+++ b/tools/DFBrowser/DFBrowser_Window.cxx
@@ -60,6 +60,7 @@
#include <TDF_Tool.hxx>
#include <inspector/TreeModel_MessageDialog.hxx>
+#include <Standard_WarningsDisable.hxx>
#include <QAction>
#include <QApplication>
#include <QComboBox>
@@ -81,6 +82,7 @@
#else
#include <QStyleFactory>
#endif
+#include <Standard_WarningsRestore.hxx>
const int DFBROWSER_DEFAULT_WIDTH = 650;
const int DFBROWSER_DEFAULT_HEIGHT = 350;
diff --git a/tools/DFBrowser/DFBrowser_Window.hxx b/tools/DFBrowser/DFBrowser_Window.hxx
index 8eb8e603d7..d22484d6b5 100644
--- a/tools/DFBrowser/DFBrowser_Window.hxx
+++ b/tools/DFBrowser/DFBrowser_Window.hxx
@@ -25,13 +25,12 @@
#include <TCollection_AsciiString.hxx>
#include <TDF_Label.hxx>
-#ifdef _MSC_VER
-#pragma warning(disable : 4127) // conditional expression is constant
-#endif
+#include <Standard_WarningsDisable.hxx>
#include <QObject>
#include <QItemSelection>
#include <QMainWindow>
#include <QModelIndexList>
+#include <Standard_WarningsRestore.hxx>
class DFBrowser_DumpView;
class DFBrowser_Module;
diff --git a/tools/DFBrowserPane/DFBrowserPane_AttributePane.cxx b/tools/DFBrowserPane/DFBrowserPane_AttributePane.cxx
index 1b1326efc5..9468629a8b 100644
--- a/tools/DFBrowserPane/DFBrowserPane_AttributePane.cxx
+++ b/tools/DFBrowserPane/DFBrowserPane_AttributePane.cxx
@@ -21,11 +21,13 @@
#include <AIS_InteractiveObject.hxx>
+#include <Standard_WarningsDisable.hxx>
#include <QGridLayout>
#include <QHeaderView>
#include <QItemSelectionModel>
#include <QTableView>
#include <QWidget>
+#include <Standard_WarningsRestore.hxx>
// =======================================================================
// function : Constructor
diff --git a/tools/DFBrowserPane/DFBrowserPane_AttributePane.hxx b/tools/DFBrowserPane/DFBrowserPane_AttributePane.hxx
index 8ad949d290..c312d15668 100644
--- a/tools/DFBrowserPane/DFBrowserPane_AttributePane.hxx
+++ b/tools/DFBrowserPane/DFBrowserPane_AttributePane.hxx
@@ -22,11 +22,10 @@
#include <TDF_Label.hxx>
#include <Standard.hxx>
-#ifdef _MSC_VER
-#pragma warning(disable : 4127) // conditional expression is constant
-#endif
+#include <Standard_WarningsDisable.hxx>
#include <QList>
#include <QVariant>
+#include <Standard_WarningsRestore.hxx>
class DFBrowserPane_AttributePaneModel;
class DFBrowserPane_TableView;
diff --git a/tools/DFBrowserPane/DFBrowserPane_AttributePaneModel.cxx b/tools/DFBrowserPane/DFBrowserPane_AttributePaneModel.cxx
index 3b306b4224..07064ae421 100644
--- a/tools/DFBrowserPane/DFBrowserPane_AttributePaneModel.cxx
+++ b/tools/DFBrowserPane/DFBrowserPane_AttributePaneModel.cxx
@@ -15,9 +15,11 @@
#include <inspector/DFBrowserPane_AttributePaneModel.hxx>
+#include <Standard_WarningsDisable.hxx>
#include <QApplication>
#include <QFont>
#include <QColor>
+#include <Standard_WarningsRestore.hxx>
// =======================================================================
// function : Constructor
diff --git a/tools/DFBrowserPane/DFBrowserPane_AttributePaneModel.hxx b/tools/DFBrowserPane/DFBrowserPane_AttributePaneModel.hxx
index 047ea67d21..a578052794 100644
--- a/tools/DFBrowserPane/DFBrowserPane_AttributePaneModel.hxx
+++ b/tools/DFBrowserPane/DFBrowserPane_AttributePaneModel.hxx
@@ -19,12 +19,11 @@
#include <Standard.hxx>
#include <TDocStd_Document.hxx>
-#ifdef _MSC_VER
-#pragma warning(disable : 4127) // conditional expression is constant
-#endif
+#include <Standard_WarningsDisable.hxx>
#include <QAbstractTableModel>
#include <QList>
#include <QVariant>
+#include <Standard_WarningsRestore.hxx>
//! \class DFBrowserPane_AttributePaneModel
//! \brief This is an extension of table model to visualize a container of values
diff --git a/tools/DFBrowserPane/DFBrowserPane_AttributePaneSelector.hxx b/tools/DFBrowserPane/DFBrowserPane_AttributePaneSelector.hxx
index 2123689757..ea9fe79b3b 100644
--- a/tools/DFBrowserPane/DFBrowserPane_AttributePaneSelector.hxx
+++ b/tools/DFBrowserPane/DFBrowserPane_AttributePaneSelector.hxx
@@ -18,12 +18,11 @@
#include <Standard.hxx>
-#ifdef _MSC_VER
-#pragma warning(disable : 4127) // conditional expression is constant
-#endif
-
+#include <Standard_WarningsDisable.hxx>
#include <QObject>
#include <QItemSelection>
+#include <Standard_WarningsRestore.hxx>
+
#include <list>
class QItemSelectionModel;
diff --git a/tools/DFBrowserPane/DFBrowserPane_HelperArray.cxx b/tools/DFBrowserPane/DFBrowserPane_HelperArray.cxx
index f52bbd446b..3109647c92 100644
--- a/tools/DFBrowserPane/DFBrowserPane_HelperArray.cxx
+++ b/tools/DFBrowserPane/DFBrowserPane_HelperArray.cxx
@@ -18,12 +18,14 @@
#include <inspector/DFBrowserPane_AttributePaneModel.hxx>
-#include <qheaderview.h>
+#include <Standard_WarningsDisable.hxx>
+#include <QHeaderView>
#include <QGridLayout>
#include <QList>
#include <QTableView>
#include <QVariant>
#include <QWidget>
+#include <Standard_WarningsRestore.hxx>
// =======================================================================
// function : Constructor
diff --git a/tools/DFBrowserPane/DFBrowserPane_HelperArray.hxx b/tools/DFBrowserPane/DFBrowserPane_HelperArray.hxx
index 071a1bd33d..bc331d32a0 100644
--- a/tools/DFBrowserPane/DFBrowserPane_HelperArray.hxx
+++ b/tools/DFBrowserPane/DFBrowserPane_HelperArray.hxx
@@ -24,11 +24,10 @@ class DFBrowserPane_TableView;
class QWidget;
-#ifdef _MSC_VER
-#pragma warning(disable : 4127) // conditional expression is constant
-#endif
+#include <Standard_WarningsDisable.hxx>
#include <QList>
#include <QVariant>
+#include <Standard_WarningsRestore.hxx>
//! \class DFBrowserPane_HelperArray
//! \brief Class that is used for list and array attributes. Two tables, the first for bounds, the second for values.
diff --git a/tools/DFBrowserPane/DFBrowserPane_HelperExport.cxx b/tools/DFBrowserPane/DFBrowserPane_HelperExport.cxx
index aa00516b18..b07ab40bba 100644
--- a/tools/DFBrowserPane/DFBrowserPane_HelperExport.cxx
+++ b/tools/DFBrowserPane/DFBrowserPane_HelperExport.cxx
@@ -18,8 +18,10 @@
#include <BRepTools.hxx>
#include <TCollection_AsciiString.hxx>
+#include <Standard_WarningsDisable.hxx>
#include <QApplication>
#include <QFileDialog>
+#include <Standard_WarningsRestore.hxx>
// =======================================================================
// function : AddShape
diff --git a/tools/DFBrowserPane/DFBrowserPane_HelperExport.hxx b/tools/DFBrowserPane/DFBrowserPane_HelperExport.hxx
index 2760592458..dac03024a3 100644
--- a/tools/DFBrowserPane/DFBrowserPane_HelperExport.hxx
+++ b/tools/DFBrowserPane/DFBrowserPane_HelperExport.hxx
@@ -19,11 +19,10 @@
#include <inspector/DFBrowserPane.hxx>
#include <TopoDS_Shape.hxx>
-#ifdef _MSC_VER
-#pragma warning(disable : 4127) // conditional expression is constant
-#endif
+#include <Standard_WarningsDisable.hxx>
#include <QObject>
#include <QModelIndex>
+#include <Standard_WarningsRestore.hxx>
//! \class DFBrowserPane_HelperExport
//! \brief It performs export to BREP of a shape by button is pressed
@@ -65,7 +64,13 @@ public slots:
void OnButtonPressed (const QModelIndex& theIndex);
private:
+#ifdef _MSC_VER
+#pragma warning(push, 0) // 4251: class 'QMap<QModelIndex,TopoDS_Shape>' needs to have dll-interface...
+#endif
QMap<QModelIndex, TopoDS_Shape> myShapes; //!< a container of shapes
+#ifdef _MSC_VER
+#pragma warning(pop)
+#endif
};
#endif
diff --git a/tools/DFBrowserPane/DFBrowserPane_ItemDelegateButton.cxx b/tools/DFBrowserPane/DFBrowserPane_ItemDelegateButton.cxx
index 4c8652017d..39ede2c602 100644
--- a/tools/DFBrowserPane/DFBrowserPane_ItemDelegateButton.cxx
+++ b/tools/DFBrowserPane/DFBrowserPane_ItemDelegateButton.cxx
@@ -15,9 +15,11 @@
#include <inspector/DFBrowserPane_ItemDelegateButton.hxx>
+#include <Standard_WarningsDisable.hxx>
#include <QAbstractItemModel>
#include <QEvent>
#include <QPainter>
+#include <Standard_WarningsRestore.hxx>
// =======================================================================
// function : Constructor
diff --git a/tools/DFBrowserPane/DFBrowserPane_ItemDelegateButton.hxx b/tools/DFBrowserPane/DFBrowserPane_ItemDelegateButton.hxx
index 086594409b..3b77bf3ad6 100644
--- a/tools/DFBrowserPane/DFBrowserPane_ItemDelegateButton.hxx
+++ b/tools/DFBrowserPane/DFBrowserPane_ItemDelegateButton.hxx
@@ -19,14 +19,13 @@
#include <Standard.hxx>
#include <Standard_Macro.hxx>
-#ifdef _MSC_VER
-#pragma warning(disable : 4127) // conditional expression is constant
-#endif
+#include <Standard_WarningsDisable.hxx>
#include <QStyledItemDelegate>
#include <QStyleOptionViewItem>
#include <QModelIndex>
#include <QString>
#include <QIcon>
+#include <Standard_WarningsRestore.hxx>
class QObject;
class QPainter;
diff --git a/tools/DFBrowserPane/DFBrowserPane_TDFReference.cxx b/tools/DFBrowserPane/DFBrowserPane_TDFReference.cxx
index 757b884e51..d57c161cd9 100644
--- a/tools/DFBrowserPane/DFBrowserPane_TDFReference.cxx
+++ b/tools/DFBrowserPane/DFBrowserPane_TDFReference.cxx
@@ -20,8 +20,11 @@
#include <TDF_Reference.hxx>
+#include <Standard_WarningsDisable.hxx>
#include <QVariant>
#include <QTableView>
+#include <Standard_WarningsRestore.hxx>
+
// =======================================================================
// function : GetValues
// purpose :
diff --git a/tools/DFBrowserPane/DFBrowserPane_TDFTagSource.cxx b/tools/DFBrowserPane/DFBrowserPane_TDFTagSource.cxx
index 653c72c9c3..fa0d1a198d 100644
--- a/tools/DFBrowserPane/DFBrowserPane_TDFTagSource.cxx
+++ b/tools/DFBrowserPane/DFBrowserPane_TDFTagSource.cxx
@@ -17,8 +17,10 @@
#include <TDF_TagSource.hxx>
+#include <Standard_WarningsDisable.hxx>
#include <QVariant>
#include <QWidget>
+#include <Standard_WarningsRestore.hxx>
// =======================================================================
// function : GetValues
diff --git a/tools/DFBrowserPane/DFBrowserPane_TDataStdAsciiString.cxx b/tools/DFBrowserPane/DFBrowserPane_TDataStdAsciiString.cxx
index 502c6c1480..991f9fb86f 100644
--- a/tools/DFBrowserPane/DFBrowserPane_TDataStdAsciiString.cxx
+++ b/tools/DFBrowserPane/DFBrowserPane_TDataStdAsciiString.cxx
@@ -17,8 +17,10 @@
#include <TDataStd_AsciiString.hxx>
+#include <Standard_WarningsDisable.hxx>
#include <QVariant>
#include <QIcon>
+#include <Standard_WarningsRestore.hxx>
// =======================================================================
// function : GetValues
diff --git a/tools/DFBrowserPane/DFBrowserPane_TDataStdBooleanArray.cxx b/tools/DFBrowserPane/DFBrowserPane_TDataStdBooleanArray.cxx
index 64b30c60a2..3e6e49d957 100644
--- a/tools/DFBrowserPane/DFBrowserPane_TDataStdBooleanArray.cxx
+++ b/tools/DFBrowserPane/DFBrowserPane_TDataStdBooleanArray.cxx
@@ -20,13 +20,11 @@
#include <TDataStd_BooleanArray.hxx>
-#ifdef _MSC_VER
-#pragma warning(disable : 4127) // conditional expression is constant
-#endif
-
+#include <Standard_WarningsDisable.hxx>
#include <QGridLayout>
#include <QVariant>
#include <QWidget>
+#include <Standard_WarningsRestore.hxx>
// =======================================================================
// function : CreateWidget
diff --git a/tools/DFBrowserPane/DFBrowserPane_TDataStdBooleanList.cxx b/tools/DFBrowserPane/DFBrowserPane_TDataStdBooleanList.cxx
index 261131f007..57006af2bc 100644
--- a/tools/DFBrowserPane/DFBrowserPane_TDataStdBooleanList.cxx
+++ b/tools/DFBrowserPane/DFBrowserPane_TDataStdBooleanList.cxx
@@ -18,11 +18,10 @@
#include <TDataStd_BooleanList.hxx>
#include <TDataStd_ListIteratorOfListOfByte.hxx>
-#ifdef _MSC_VER
-#pragma warning(disable : 4127) // conditional expression is constant
-#endif
+#include <Standard_WarningsDisable.hxx>
#include <QVariant>
#include <QWidget>
+#include <Standard_WarningsRestore.hxx>
// =======================================================================
// function : GetValues
diff --git a/tools/DFBrowserPane/DFBrowserPane_TDataStdByteArray.cxx b/tools/DFBrowserPane/DFBrowserPane_TDataStdByteArray.cxx
index 94d5ad9c16..e442a07ba2 100644
--- a/tools/DFBrowserPane/DFBrowserPane_TDataStdByteArray.cxx
+++ b/tools/DFBrowserPane/DFBrowserPane_TDataStdByteArray.cxx
@@ -20,8 +20,10 @@
#include <TDataStd_ByteArray.hxx>
+#include <Standard_WarningsDisable.hxx>
#include <QVariant>
#include <QWidget>
+#include <Standard_WarningsRestore.hxx>
// =======================================================================
// function : CreateWidget
diff --git a/tools/DFBrowserPane/DFBrowserPane_TDataStdComment.cxx b/tools/DFBrowserPane/DFBrowserPane_TDataStdComment.cxx
index a60a75cda0..74cc65d87f 100644
--- a/tools/DFBrowserPane/DFBrowserPane_TDataStdComment.cxx
+++ b/tools/DFBrowserPane/DFBrowserPane_TDataStdComment.cxx
@@ -18,8 +18,10 @@
#include <TDataStd_Comment.hxx>
+#include <Standard_WarningsDisable.hxx>
#include <QVariant>
#include <QWidget>
+#include <Standard_WarningsRestore.hxx>
// =======================================================================
// function : GetValues
diff --git a/tools/DFBrowserPane/DFBrowserPane_TDataStdCurrent.cxx b/tools/DFBrowserPane/DFBrowserPane_TDataStdCurrent.cxx
index 23d1ddfccb..94b3b79078 100644
--- a/tools/DFBrowserPane/DFBrowserPane_TDataStdCurrent.cxx
+++ b/tools/DFBrowserPane/DFBrowserPane_TDataStdCurrent.cxx
@@ -18,8 +18,10 @@
#include <TDataStd_Current.hxx>
+#include <Standard_WarningsDisable.hxx>
#include <QVariant>
#include <QWidget>
+#include <Standard_WarningsRestore.hxx>
// =======================================================================
// function : GetValues
diff --git a/tools/DFBrowserPane/DFBrowserPane_TDataStdDirectory.cxx b/tools/DFBrowserPane/DFBrowserPane_TDataStdDirectory.cxx
index 6437bad91a..248a592569 100644
--- a/tools/DFBrowserPane/DFBrowserPane_TDataStdDirectory.cxx
+++ b/tools/DFBrowserPane/DFBrowserPane_TDataStdDirectory.cxx
@@ -17,7 +17,9 @@
#include <TDataStd_Directory.hxx>
+#include <Standard_WarningsDisable.hxx>
#include <QVariant>
+#include <Standard_WarningsRestore.hxx>
// =======================================================================
// function : GetValues
diff --git a/tools/DFBrowserPane/DFBrowserPane_TDataStdExpression.cxx b/tools/DFBrowserPane/DFBrowserPane_TDataStdExpression.cxx
index 772742fc4e..bea27d3494 100644
--- a/tools/DFBrowserPane/DFBrowserPane_TDataStdExpression.cxx
+++ b/tools/DFBrowserPane/DFBrowserPane_TDataStdExpression.cxx
@@ -17,7 +17,10 @@
#include <inspector/DFBrowserPane_Tools.hxx>
#include <TDataStd_Expression.hxx>
+
+#include <Standard_WarningsDisable.hxx>
#include <QVariant>
+#include <Standard_WarningsRestore.hxx>
// =======================================================================
// function : GetValues
diff --git a/tools/DFBrowserPane/DFBrowserPane_TDataStdExtStringArray.cxx b/tools/DFBrowserPane/DFBrowserPane_TDataStdExtStringArray.cxx
index 23a2aa5da8..5bae00061b 100644
--- a/tools/DFBrowserPane/DFBrowserPane_TDataStdExtStringArray.cxx
+++ b/tools/DFBrowserPane/DFBrowserPane_TDataStdExtStringArray.cxx
@@ -21,8 +21,10 @@
#include <TDataStd_ExtStringArray.hxx>
+#include <Standard_WarningsDisable.hxx>
#include <QVariant>
#include <QWidget>
+#include <Standard_WarningsRestore.hxx>
// =======================================================================
// function : CreateWidget
diff --git a/tools/DFBrowserPane/DFBrowserPane_TDataStdExtStringList.cxx b/tools/DFBrowserPane/DFBrowserPane_TDataStdExtStringList.cxx
index bbd47fadc9..7d652c0aa6 100644
--- a/tools/DFBrowserPane/DFBrowserPane_TDataStdExtStringList.cxx
+++ b/tools/DFBrowserPane/DFBrowserPane_TDataStdExtStringList.cxx
@@ -19,8 +19,10 @@
#include <TDataStd_ExtStringList.hxx>
#include <TDataStd_ListIteratorOfListOfExtendedString.hxx>
+#include <Standard_WarningsDisable.hxx>
#include <QVariant>
#include <QWidget>
+#include <Standard_WarningsRestore.hxx>
// =======================================================================
// function : GetValues
diff --git a/tools/DFBrowserPane/DFBrowserPane_TDataStdIntPackedMap.cxx b/tools/DFBrowserPane/DFBrowserPane_TDataStdIntPackedMap.cxx
index 09fcbcf39e..2b2381ee0f 100644
--- a/tools/DFBrowserPane/DFBrowserPane_TDataStdIntPackedMap.cxx
+++ b/tools/DFBrowserPane/DFBrowserPane_TDataStdIntPackedMap.cxx
@@ -18,8 +18,10 @@
#include <TDataStd_IntPackedMap.hxx>
#include <TColStd_MapIteratorOfPackedMapOfInteger.hxx>
+#include <Standard_WarningsDisable.hxx>
#include <QVariant>
#include <QWidget>
+#include <Standard_WarningsRestore.hxx>
// =======================================================================
// function : GetValues
diff --git a/tools/DFBrowserPane/DFBrowserPane_TDataStdInteger.cxx b/tools/DFBrowserPane/DFBrowserPane_TDataStdInteger.cxx
index 2164e4855d..18bbeb57af 100644
--- a/tools/DFBrowserPane/DFBrowserPane_TDataStdInteger.cxx
+++ b/tools/DFBrowserPane/DFBrowserPane_TDataStdInteger.cxx
@@ -17,7 +17,9 @@
#include <TDataStd_Integer.hxx>
+#include <Standard_WarningsDisable.hxx>
#include <QVariant>
+#include <Standard_WarningsRestore.hxx>
// =======================================================================
// function : GetValues
diff --git a/tools/DFBrowserPane/DFBrowserPane_TDataStdIntegerArray.cxx b/tools/DFBrowserPane/DFBrowserPane_TDataStdIntegerArray.cxx
index bf03586c9f..da404bf5b7 100644
--- a/tools/DFBrowserPane/DFBrowserPane_TDataStdIntegerArray.cxx
+++ b/tools/DFBrowserPane/DFBrowserPane_TDataStdIntegerArray.cxx
@@ -20,8 +20,10 @@
#include <TDataStd_IntegerArray.hxx>
+#include <Standard_WarningsDisable.hxx>
#include <QVariant>
#include <QWidget>
+#include <Standard_WarningsRestore.hxx>
// =======================================================================
// function : CreateWidget
diff --git a/tools/DFBrowserPane/DFBrowserPane_TDataStdIntegerList.cxx b/tools/DFBrowserPane/DFBrowserPane_TDataStdIntegerList.cxx
index 26c1c0cc4c..06a3ec1e31 100644
--- a/tools/DFBrowserPane/DFBrowserPane_TDataStdIntegerList.cxx
+++ b/tools/DFBrowserPane/DFBrowserPane_TDataStdIntegerList.cxx
@@ -18,8 +18,10 @@
#include <TDataStd_IntegerList.hxx>
#include <TColStd_ListIteratorOfListOfInteger.hxx>
+#include <Standard_WarningsDisable.hxx>
#include <QVariant>
#include <QWidget>
+#include <Standard_WarningsRestore.hxx>
// =======================================================================
// function : GetValues
diff --git a/tools/DFBrowserPane/DFBrowserPane_TDataStdName.cxx b/tools/DFBrowserPane/DFBrowserPane_TDataStdName.cxx
index 43f77f1ad9..1f1a0d3677 100644
--- a/tools/DFBrowserPane/DFBrowserPane_TDataStdName.cxx
+++ b/tools/DFBrowserPane/DFBrowserPane_TDataStdName.cxx
@@ -18,7 +18,9 @@
#include <TDataStd_Name.hxx>
+#include <Standard_WarningsDisable.hxx>
#include <QVariant>
+#include <Standard_WarningsRestore.hxx>
// =======================================================================
// function : GetValues
diff --git a/tools/DFBrowserPane/DFBrowserPane_TDataStdNamedData.cxx b/tools/DFBrowserPane/DFBrowserPane_TDataStdNamedData.cxx
index 958652d0dd..155147d68b 100644
--- a/tools/DFBrowserPane/DFBrowserPane_TDataStdNamedData.cxx
+++ b/tools/DFBrowserPane/DFBrowserPane_TDataStdNamedData.cxx
@@ -36,11 +36,13 @@
#include <TDataStd_HDataMapOfStringHArray1OfInteger.hxx>
#include <TDataStd_NamedData.hxx>
+#include <Standard_WarningsDisable.hxx>
#include <QTableView>
#include <QTabWidget>
#include <QVariant>
#include <QVBoxLayout>
#include <QWidget>
+#include <Standard_WarningsRestore.hxx>
static const QString VALUES_INTEGER = "values_integer";
static const QString VALUES_REAL = "values_real";
diff --git a/tools/DFBrowserPane/DFBrowserPane_TDataStdNoteBook.cxx b/tools/DFBrowserPane/DFBrowserPane_TDataStdNoteBook.cxx
index 8f904902e1..d8aab88a1c 100644
--- a/tools/DFBrowserPane/DFBrowserPane_TDataStdNoteBook.cxx
+++ b/tools/DFBrowserPane/DFBrowserPane_TDataStdNoteBook.cxx
@@ -17,7 +17,9 @@
#include <TDataStd_NoteBook.hxx>
+#include <Standard_WarningsDisable.hxx>
#include <QVariant>
+#include <Standard_WarningsRestore.hxx>
// =======================================================================
// function : GetValues
diff --git a/tools/DFBrowserPane/DFBrowserPane_TDataStdReal.cxx b/tools/DFBrowserPane/DFBrowserPane_TDataStdReal.cxx
index cfe8da69ac..27f4b822ad 100644
--- a/tools/DFBrowserPane/DFBrowserPane_TDataStdReal.cxx
+++ b/tools/DFBrowserPane/DFBrowserPane_TDataStdReal.cxx
@@ -17,7 +17,9 @@
#include <TDataStd_Real.hxx>
+#include <Standard_WarningsDisable.hxx>
#include <QVariant>
+#include <Standard_WarningsRestore.hxx>
// =======================================================================
// function : GetValues
diff --git a/tools/DFBrowserPane/DFBrowserPane_TDataStdRealArray.cxx b/tools/DFBrowserPane/DFBrowserPane_TDataStdRealArray.cxx
index 5523478e59..1a00c23e6a 100644
--- a/tools/DFBrowserPane/DFBrowserPane_TDataStdRealArray.cxx
+++ b/tools/DFBrowserPane/DFBrowserPane_TDataStdRealArray.cxx
@@ -21,8 +21,10 @@
#include <TDataStd_RealArray.hxx>
+#include <Standard_WarningsDisable.hxx>
#include <QVariant>
#include <QWidget>
+#include <Standard_WarningsRestore.hxx>
// =======================================================================
// function : CreateWidget
diff --git a/tools/DFBrowserPane/DFBrowserPane_TDataStdRealList.cxx b/tools/DFBrowserPane/DFBrowserPane_TDataStdRealList.cxx
index 0fb9e84b4b..eeed59bfc4 100644
--- a/tools/DFBrowserPane/DFBrowserPane_TDataStdRealList.cxx
+++ b/tools/DFBrowserPane/DFBrowserPane_TDataStdRealList.cxx
@@ -18,8 +18,10 @@
#include <TColStd_ListIteratorOfListOfReal.hxx>
#include <TDataStd_RealList.hxx>
+#include <Standard_WarningsDisable.hxx>
#include <QVariant>
#include <QWidget>
+#include <Standard_WarningsRestore.hxx>
// =======================================================================
// function : GetValues
diff --git a/tools/DFBrowserPane/DFBrowserPane_TDataStdReferenceArray.cxx b/tools/DFBrowserPane/DFBrowserPane_TDataStdReferenceArray.cxx
index 268e479802..8a6311b543 100644
--- a/tools/DFBrowserPane/DFBrowserPane_TDataStdReferenceArray.cxx
+++ b/tools/DFBrowserPane/DFBrowserPane_TDataStdReferenceArray.cxx
@@ -22,11 +22,13 @@
#include <TDataStd_ReferenceArray.hxx>
+#include <Standard_WarningsDisable.hxx>
#include <QGridLayout>
#include <QItemSelectionModel>
#include <QTableView>
#include <QVariant>
#include <QWidget>
+#include <Standard_WarningsRestore.hxx>
// =======================================================================
// function : CreateWidget
diff --git a/tools/DFBrowserPane/DFBrowserPane_TDataStdReferenceList.cxx b/tools/DFBrowserPane/DFBrowserPane_TDataStdReferenceList.cxx
index c3ed2af424..908c25e5b0 100644
--- a/tools/DFBrowserPane/DFBrowserPane_TDataStdReferenceList.cxx
+++ b/tools/DFBrowserPane/DFBrowserPane_TDataStdReferenceList.cxx
@@ -21,8 +21,10 @@
#include <TDataStd_ReferenceList.hxx>
#include <TDF_ListIteratorOfLabelList.hxx>
+#include <Standard_WarningsDisable.hxx>
#include <QVariant>
#include <QWidget>
+#include <Standard_WarningsRestore.hxx>
// =======================================================================
// function : GetValues
diff --git a/tools/DFBrowserPane/DFBrowserPane_TDataStdRelation.cxx b/tools/DFBrowserPane/DFBrowserPane_TDataStdRelation.cxx
index 05529ab19b..d963d5d583 100644
--- a/tools/DFBrowserPane/DFBrowserPane_TDataStdRelation.cxx
+++ b/tools/DFBrowserPane/DFBrowserPane_TDataStdRelation.cxx
@@ -17,8 +17,10 @@
#include <TDataStd_Relation.hxx>
+#include <Standard_WarningsDisable.hxx>
#include <QVariant>
#include <QWidget>
+#include <Standard_WarningsRestore.hxx>
// =======================================================================
// function : GetValues
diff --git a/tools/DFBrowserPane/DFBrowserPane_TDataStdTick.cxx b/tools/DFBrowserPane/DFBrowserPane_TDataStdTick.cxx
index d956d4e4dd..075051e1b4 100644
--- a/tools/DFBrowserPane/DFBrowserPane_TDataStdTick.cxx
+++ b/tools/DFBrowserPane/DFBrowserPane_TDataStdTick.cxx
@@ -17,8 +17,10 @@
#include <TDataStd_Tick.hxx>
+#include <Standard_WarningsDisable.hxx>
#include <QVariant>
#include <QWidget>
+#include <Standard_WarningsRestore.hxx>
// =======================================================================
// function : GetValues
diff --git a/tools/DFBrowserPane/DFBrowserPane_TDataStdTreeNode.cxx b/tools/DFBrowserPane/DFBrowserPane_TDataStdTreeNode.cxx
index ba31c011a3..0e79829114 100644
--- a/tools/DFBrowserPane/DFBrowserPane_TDataStdTreeNode.cxx
+++ b/tools/DFBrowserPane/DFBrowserPane_TDataStdTreeNode.cxx
@@ -23,6 +23,7 @@
#include <TDataStd_TreeNode.hxx>
+#include <Standard_WarningsDisable.hxx>
#include <QHeaderView>
#include <QVariant>
#include <QTableView>
@@ -30,6 +31,7 @@
#include <QVBoxLayout>
#include <QWidget>
#include <QItemSelectionModel>
+#include <Standard_WarningsRestore.hxx>
// =======================================================================
// function : Constructor
diff --git a/tools/DFBrowserPane/DFBrowserPane_TDataStdTreeNodeItem.cxx b/tools/DFBrowserPane/DFBrowserPane_TDataStdTreeNodeItem.cxx
index 024386dac3..c8fc5dd51f 100644
--- a/tools/DFBrowserPane/DFBrowserPane_TDataStdTreeNodeItem.cxx
+++ b/tools/DFBrowserPane/DFBrowserPane_TDataStdTreeNodeItem.cxx
@@ -27,8 +27,10 @@
#include <TDF_AttributeIterator.hxx>
#include <TDF_ChildIterator.hxx>
+#include <Standard_WarningsDisable.hxx>
#include <QIcon>
#include <QObject>
+#include <Standard_WarningsRestore.hxx>
// =======================================================================
// function : Init
diff --git a/tools/DFBrowserPane/DFBrowserPane_TDataStdTreeNodeItem.hxx b/tools/DFBrowserPane/DFBrowserPane_TDataStdTreeNodeItem.hxx
index 29dcd9c200..2c3818f9cd 100644
--- a/tools/DFBrowserPane/DFBrowserPane_TDataStdTreeNodeItem.hxx
+++ b/tools/DFBrowserPane/DFBrowserPane_TDataStdTreeNodeItem.hxx
@@ -21,9 +21,11 @@
#include <Standard.hxx>
#include <TDF_Attribute.hxx>
+#include <Standard_WarningsDisable.hxx>
#include <QList>
#include <QMap>
#include <QVariant>
+#include <Standard_WarningsRestore.hxx>
class DFBrowserPane_TDataStdTreeNodeItem;
typedef QExplicitlySharedDataPointer<DFBrowserPane_TDataStdTreeNodeItem> DFBrowserPane_TDataStdTreeNodeItemPtr;
diff --git a/tools/DFBrowserPane/DFBrowserPane_TDataStdTreeNodeModel.cxx b/tools/DFBrowserPane/DFBrowserPane_TDataStdTreeNodeModel.cxx
index 8dba19d69f..310544cbed 100644
--- a/tools/DFBrowserPane/DFBrowserPane_TDataStdTreeNodeModel.cxx
+++ b/tools/DFBrowserPane/DFBrowserPane_TDataStdTreeNodeModel.cxx
@@ -18,7 +18,9 @@
#include <TDataStd_TreeNode.hxx>
+#include <Standard_WarningsDisable.hxx>
#include <QAbstractItemModel>
+#include <Standard_WarningsRestore.hxx>
// =======================================================================
// function : Constructor
diff --git a/tools/DFBrowserPane/DFBrowserPane_TDataStdTreeNodeModel.hxx b/tools/DFBrowserPane/DFBrowserPane_TDataStdTreeNodeModel.hxx
index 9f6fdc07b3..835a79f7ad 100644
--- a/tools/DFBrowserPane/DFBrowserPane_TDataStdTreeNodeModel.hxx
+++ b/tools/DFBrowserPane/DFBrowserPane_TDataStdTreeNodeModel.hxx
@@ -21,9 +21,11 @@
#include <Standard.hxx>
#include <TDF_Attribute.hxx>
+#include <Standard_WarningsDisable.hxx>
#include <QObject>
#include <QHash>
#include <QByteArray>
+#include <Standard_WarningsRestore.hxx>
//! \class DFBrowserPane_TDataStdTreeNodeModel
//! \brief It builds a tree of items for the given tree node attribute.
diff --git a/tools/DFBrowserPane/DFBrowserPane_TDataStdUAttribute.cxx b/tools/DFBrowserPane/DFBrowserPane_TDataStdUAttribute.cxx
index 6cd7819eba..af4ada0956 100644
--- a/tools/DFBrowserPane/DFBrowserPane_TDataStdUAttribute.cxx
+++ b/tools/DFBrowserPane/DFBrowserPane_TDataStdUAttribute.cxx
@@ -18,7 +18,9 @@
#include <TDataStd_UAttribute.hxx>
+#include <Standard_WarningsDisable.hxx>
#include <QVariant>
+#include <Standard_WarningsRestore.hxx>
// =======================================================================
// function : GetValues
diff --git a/tools/DFBrowserPane/DFBrowserPane_TDataStdVariable.cxx b/tools/DFBrowserPane/DFBrowserPane_TDataStdVariable.cxx
index e23d3b88f1..f711313908 100644
--- a/tools/DFBrowserPane/DFBrowserPane_TDataStdVariable.cxx
+++ b/tools/DFBrowserPane/DFBrowserPane_TDataStdVariable.cxx
@@ -17,7 +17,10 @@
#include <TDataStd_Variable.hxx>
+#include <Standard_WarningsDisable.hxx>
#include <QVariant>
+#include <Standard_WarningsRestore.hxx>
+
// =======================================================================
// function : GetValues
// purpose :
diff --git a/tools/DFBrowserPane/DFBrowserPane_TDocStdModified.cxx b/tools/DFBrowserPane/DFBrowserPane_TDocStdModified.cxx
index f2fdcff8ce..3ef0e87291 100644
--- a/tools/DFBrowserPane/DFBrowserPane_TDocStdModified.cxx
+++ b/tools/DFBrowserPane/DFBrowserPane_TDocStdModified.cxx
@@ -17,7 +17,10 @@
#include <TDocStd_Modified.hxx>
+#include <Standard_WarningsDisable.hxx>
#include <QVariant>
+#include <Standard_WarningsRestore.hxx>
+
// =======================================================================
// function : GetValues
// purpose :
diff --git a/tools/DFBrowserPane/DFBrowserPane_TDocStdOwner.cxx b/tools/DFBrowserPane/DFBrowserPane_TDocStdOwner.cxx
index 6c78343942..e392c44187 100644
--- a/tools/DFBrowserPane/DFBrowserPane_TDocStdOwner.cxx
+++ b/tools/DFBrowserPane/DFBrowserPane_TDocStdOwner.cxx
@@ -25,12 +25,13 @@
#include <TDF_ListIteratorOfDeltaList.hxx>
#include <Standard_Version.hxx>
-#include <QVariant>
-#include <QWidget>
-
+#include <Standard_WarningsDisable.hxx>
#include <QGridLayout>
#include <QGroupBox>
#include <QTableView>
+#include <QVariant>
+#include <QWidget>
+#include <Standard_WarningsRestore.hxx>
// =======================================================================
// function : Constructor
@@ -105,7 +106,7 @@ void DFBrowserPane_TDocStdOwner::GetValues (const Handle(TDF_Attribute)& theAttr
<< aSeparationStr.ToCString() << aSeparationStr.ToCString()
<< "IsSaved" << DFBrowserPane_Tools::BoolToStr (aDocument->IsSaved())
<< "IsChanged" << DFBrowserPane_Tools::BoolToStr (aDocument->IsChanged())
- << "GetSavedTime" << DFBrowserPane_Tools::BoolToStr (aDocument->GetSavedTime())
+ << "GetSavedTime" << aDocument->GetSavedTime()
<< "GetName" << (aDocument->IsSaved() ? DFBrowserPane_Tools::ToString (aDocument->GetName()) : "")
<< "GetPath" << (aDocument->IsSaved() ? DFBrowserPane_Tools::ToString (aDocument->GetPath()) : "")
<< "GetData" << aDocumentDataInfo.ToCString()
diff --git a/tools/DFBrowserPane/DFBrowserPane_TDocStdXLink.cxx b/tools/DFBrowserPane/DFBrowserPane_TDocStdXLink.cxx
index c7fb4fd0cb..d1f2421181 100644
--- a/tools/DFBrowserPane/DFBrowserPane_TDocStdXLink.cxx
+++ b/tools/DFBrowserPane/DFBrowserPane_TDocStdXLink.cxx
@@ -17,7 +17,10 @@
#include <TDocStd_XLink.hxx>
+#include <Standard_WarningsDisable.hxx>
#include <QVariant>
+#include <Standard_WarningsRestore.hxx>
+
// =======================================================================
// function : GetValues
// purpose :
diff --git a/tools/DFBrowserPane/DFBrowserPane_TDocStdXLinkRoot.cxx b/tools/DFBrowserPane/DFBrowserPane_TDocStdXLinkRoot.cxx
index c9cb50c062..76833bb2e4 100644
--- a/tools/DFBrowserPane/DFBrowserPane_TDocStdXLinkRoot.cxx
+++ b/tools/DFBrowserPane/DFBrowserPane_TDocStdXLinkRoot.cxx
@@ -17,7 +17,10 @@
#include <TDocStd_XLinkRoot.hxx>
+#include <Standard_WarningsDisable.hxx>
#include <QVariant>
+#include <Standard_WarningsRestore.hxx>
+
// =======================================================================
// function : GetValues
// purpose :
diff --git a/tools/DFBrowserPane/DFBrowserPane_TFunctionFunction.cxx b/tools/DFBrowserPane/DFBrowserPane_TFunctionFunction.cxx
index 4539e2a1ea..8170388386 100644
--- a/tools/DFBrowserPane/DFBrowserPane_TFunctionFunction.cxx
+++ b/tools/DFBrowserPane/DFBrowserPane_TFunctionFunction.cxx
@@ -18,7 +18,10 @@
#include <TFunction_Function.hxx>
+#include <Standard_WarningsDisable.hxx>
#include <QVariant>
+#include <Standard_WarningsRestore.hxx>
+
// =======================================================================
// function : GetValues
// purpose :
diff --git a/tools/DFBrowserPane/DFBrowserPane_TFunctionGraphNode.cxx b/tools/DFBrowserPane/DFBrowserPane_TFunctionGraphNode.cxx
index 1b659fc127..381b197732 100644
--- a/tools/DFBrowserPane/DFBrowserPane_TFunctionGraphNode.cxx
+++ b/tools/DFBrowserPane/DFBrowserPane_TFunctionGraphNode.cxx
@@ -17,7 +17,10 @@
#include <TFunction_GraphNode.hxx>
+#include <Standard_WarningsDisable.hxx>
#include <QVariant>
+#include <Standard_WarningsRestore.hxx>
+
// =======================================================================
// function : GetValues
// purpose :
diff --git a/tools/DFBrowserPane/DFBrowserPane_TFunctionScope.cxx b/tools/DFBrowserPane/DFBrowserPane_TFunctionScope.cxx
index 6a754518c8..57e8ffd1b0 100644
--- a/tools/DFBrowserPane/DFBrowserPane_TFunctionScope.cxx
+++ b/tools/DFBrowserPane/DFBrowserPane_TFunctionScope.cxx
@@ -17,7 +17,9 @@
#include <TFunction_Scope.hxx>
+#include <Standard_WarningsDisable.hxx>
#include <QVariant>
+#include <Standard_WarningsRestore.hxx>
// =======================================================================
// function : GetValues
diff --git a/tools/DFBrowserPane/DFBrowserPane_TNamingNamedShape.cxx b/tools/DFBrowserPane/DFBrowserPane_TNamingNamedShape.cxx
index 31e46a222f..ee6ab872ad 100644
--- a/tools/DFBrowserPane/DFBrowserPane_TNamingNamedShape.cxx
+++ b/tools/DFBrowserPane/DFBrowserPane_TNamingNamedShape.cxx
@@ -34,6 +34,7 @@
#include <TopoDS_Shape.hxx>
#include <TopoDS_Compound.hxx>
+#include <Standard_WarningsDisable.hxx>
#include <QFileDialog>
#include <QGridLayout>
#include <QEvent>
@@ -45,6 +46,7 @@
#include <QTableView>
#include <QVariant>
#include <QWidget>
+#include <Standard_WarningsRestore.hxx>
const int COLUMN_EXPORT_WIDTH = 20;
const int COLUMN_TYPE_WIDTH = 70;
diff --git a/tools/DFBrowserPane/DFBrowserPane_TNamingNamedShape.hxx b/tools/DFBrowserPane/DFBrowserPane_TNamingNamedShape.hxx
index 4efe150296..aabbc0174d 100644
--- a/tools/DFBrowserPane/DFBrowserPane_TNamingNamedShape.hxx
+++ b/tools/DFBrowserPane/DFBrowserPane_TNamingNamedShape.hxx
@@ -24,8 +24,10 @@
#include <TNaming_NamedShape.hxx>
#include <TopoDS_Shape.hxx>
+#include <Standard_WarningsDisable.hxx>
#include <QMap>
#include <QModelIndex>
+#include <Standard_WarningsRestore.hxx>
class DFBrowserPane_TableView;
class DFBrowserPane_AttributePaneModel;
diff --git a/tools/DFBrowserPane/DFBrowserPane_TNamingNaming.cxx b/tools/DFBrowserPane/DFBrowserPane_TNamingNaming.cxx
index 2a8e64b29a..a70d5f2e6f 100644
--- a/tools/DFBrowserPane/DFBrowserPane_TNamingNaming.cxx
+++ b/tools/DFBrowserPane/DFBrowserPane_TNamingNaming.cxx
@@ -30,11 +30,13 @@
#include <TopoDS_Compound.hxx>
+#include <Standard_WarningsDisable.hxx>
#include <QGridLayout>
#include <QHeaderView>
#include <QTableView>
#include <QVariant>
#include <QWidget>
+#include <Standard_WarningsRestore.hxx>
// =======================================================================
// function : Constructor
diff --git a/tools/DFBrowserPane/DFBrowserPane_TNamingUsedShapes.cxx b/tools/DFBrowserPane/DFBrowserPane_TNamingUsedShapes.cxx
index 2cf6d60bb8..00e7041b57 100644
--- a/tools/DFBrowserPane/DFBrowserPane_TNamingUsedShapes.cxx
+++ b/tools/DFBrowserPane/DFBrowserPane_TNamingUsedShapes.cxx
@@ -34,10 +34,12 @@
#include <TopoDS_Compound.hxx>
#include <TopoDS_Shape.hxx>
+#include <Standard_WarningsDisable.hxx>
#include <QItemSelectionModel>
#include <QTableView>
#include <QVariant>
#include <QWidget>
+#include <Standard_WarningsRestore.hxx>
const int COLUMN_TYPE_WIDTH = 70;
const int COLUMN_POINTER_WIDTH = 90;
diff --git a/tools/DFBrowserPane/DFBrowserPane_TPrsStdAISPresentation.cxx b/tools/DFBrowserPane/DFBrowserPane_TPrsStdAISPresentation.cxx
index abe0b3dbcc..3b210443a4 100644
--- a/tools/DFBrowserPane/DFBrowserPane_TPrsStdAISPresentation.cxx
+++ b/tools/DFBrowserPane/DFBrowserPane_TPrsStdAISPresentation.cxx
@@ -20,8 +20,10 @@
#include <TPrsStd_AISPresentation.hxx>
+#include <Standard_WarningsDisable.hxx>
#include <QVariant>
#include <QWidget>
+#include <Standard_WarningsRestore.hxx>
// =======================================================================
// function : Constructor
diff --git a/tools/DFBrowserPane/DFBrowserPane_TPrsStdAISViewer.cxx b/tools/DFBrowserPane/DFBrowserPane_TPrsStdAISViewer.cxx
index 7ebbc7c826..6037bb2d82 100644
--- a/tools/DFBrowserPane/DFBrowserPane_TPrsStdAISViewer.cxx
+++ b/tools/DFBrowserPane/DFBrowserPane_TPrsStdAISViewer.cxx
@@ -19,7 +19,9 @@
#include <AIS_InteractiveContext.hxx>
#include <TPrsStd_AISViewer.hxx>
+#include <Standard_WarningsDisable.hxx>
#include <QVariant>
+#include <Standard_WarningsRestore.hxx>
// =======================================================================
// function :
diff --git a/tools/DFBrowserPane/DFBrowserPane_TableView.cxx b/tools/DFBrowserPane/DFBrowserPane_TableView.cxx
index 346d54648d..6edaa104f3 100644
--- a/tools/DFBrowserPane/DFBrowserPane_TableView.cxx
+++ b/tools/DFBrowserPane/DFBrowserPane_TableView.cxx
@@ -16,12 +16,14 @@
#include <inspector/DFBrowserPane_TableView.hxx>
#include <inspector/DFBrowserPane_Tools.hxx>
+#include <Standard_WarningsDisable.hxx>
#include <QAbstractTableModel>
#include <QHeaderView>
#include <QHBoxLayout>
#include <QScrollBar>
#include <QTableView>
#include <QWidget>
+#include <Standard_WarningsRestore.hxx>
static const int DEFAULT_ROW_HEIGHT = 30;
@@ -68,7 +70,7 @@ void DFBrowserPane_TableView::SetModel (QAbstractTableModel* theModel)
// =======================================================================
void DFBrowserPane_TableView::SetFixedRowCount (const int theCount, QTableView* theView, const bool theScroll)
{
- double aHeight = theView->verticalHeader()->defaultSectionSize()*theCount + DFBrowserPane_Tools::HeaderSectionMargin();
+ int aHeight = theView->verticalHeader()->defaultSectionSize() * theCount + DFBrowserPane_Tools::HeaderSectionMargin();
if (theScroll)
aHeight += theView->horizontalScrollBar()->sizeHint().height();
diff --git a/tools/DFBrowserPane/DFBrowserPane_TableView.hxx b/tools/DFBrowserPane/DFBrowserPane_TableView.hxx
index edcd673578..34894b7a15 100644
--- a/tools/DFBrowserPane/DFBrowserPane_TableView.hxx
+++ b/tools/DFBrowserPane/DFBrowserPane_TableView.hxx
@@ -18,11 +18,10 @@
#include <Standard.hxx>
-#ifdef _MSC_VER
-#pragma warning(disable : 4127) // conditional expression is constant
-#endif
+#include <Standard_WarningsDisable.hxx>
#include <QWidget>
#include <QMap>
+#include <Standard_WarningsRestore.hxx>
class QTableView;
class QAbstractTableModel;
diff --git a/tools/DFBrowserPane/DFBrowserPane_Tools.cxx b/tools/DFBrowserPane/DFBrowserPane_Tools.cxx
index 4568b46e1c..3deb0ba70f 100644
--- a/tools/DFBrowserPane/DFBrowserPane_Tools.cxx
+++ b/tools/DFBrowserPane/DFBrowserPane_Tools.cxx
@@ -34,11 +34,13 @@
#include <TopAbs_ShapeEnum.hxx>
#include <TopAbs_Orientation.hxx>
+#include <Standard_WarningsDisable.hxx>
#include <QApplication>
#include <QPalette>
#include <QStringList>
#include <QStyle>
#include <QWidget>
+#include <Standard_WarningsRestore.hxx>
#include <sstream>
diff --git a/tools/DFBrowserPane/DFBrowserPane_Tools.hxx b/tools/DFBrowserPane/DFBrowserPane_Tools.hxx
index 4e108250be..bf19319bcb 100644
--- a/tools/DFBrowserPane/DFBrowserPane_Tools.hxx
+++ b/tools/DFBrowserPane/DFBrowserPane_Tools.hxx
@@ -24,14 +24,13 @@
#include <TopLoc_Location.hxx>
#include <TopoDS_Shape.hxx>
-#ifdef _MSC_VER
-#pragma warning(disable : 4127) // conditional expression is constant
-#endif
+#include <Standard_WarningsDisable.hxx>
#include <QApplication>
#include <QString>
#include <QStyle>
#include <QString>
#include <QVariant>
+#include <Standard_WarningsRestore.hxx>
#define PROPERTY_TABLE_ROW_COUNT 200
@@ -70,7 +69,7 @@ public:
//! Returns "true" or "false" text for the given boolean state
//! \param theValue a boolean value
//! \return string value
- Standard_EXPORT static QString BoolToStr (const bool theValue) { return theValue ? "true" : "false"; }
+ Standard_EXPORT static QString BoolToStr (const Standard_Boolean theValue) { return theValue ? "true" : "false"; }
//! Converts a Qt string to OCCT extended string
//! \param theValue a converted string
diff --git a/tools/DFBrowserPaneXDE/DFBrowserPaneXDE_AttributeCommonPane.cxx b/tools/DFBrowserPaneXDE/DFBrowserPaneXDE_AttributeCommonPane.cxx
index 26465b23b8..4959b408db 100644
--- a/tools/DFBrowserPaneXDE/DFBrowserPaneXDE_AttributeCommonPane.cxx
+++ b/tools/DFBrowserPaneXDE/DFBrowserPaneXDE_AttributeCommonPane.cxx
@@ -32,7 +32,9 @@
#include <set>
+#include <Standard_WarningsDisable.hxx>
#include <QStringList>
+#include <Standard_WarningsRestore.hxx>
static std::set<Standard_CString> AttributeTypes;
diff --git a/tools/DFBrowserPaneXDE/DFBrowserPaneXDE_AttributeCommonPane.hxx b/tools/DFBrowserPaneXDE/DFBrowserPaneXDE_AttributeCommonPane.hxx
index 64adc76aa1..adb7689750 100644
--- a/tools/DFBrowserPaneXDE/DFBrowserPaneXDE_AttributeCommonPane.hxx
+++ b/tools/DFBrowserPaneXDE/DFBrowserPaneXDE_AttributeCommonPane.hxx
@@ -21,7 +21,9 @@
#include <Standard.hxx>
#include <TopoDS_Shape.hxx>
+#include <Standard_WarningsDisable.hxx>
#include <QVariant>
+#include <Standard_WarningsRestore.hxx>
class QWidget;
class QItemSelectionModel;
diff --git a/tools/DFBrowserPaneXDE/DFBrowserPaneXDE_Tools.hxx b/tools/DFBrowserPaneXDE/DFBrowserPaneXDE_Tools.hxx
index aaf47327dd..524664917a 100644
--- a/tools/DFBrowserPaneXDE/DFBrowserPaneXDE_Tools.hxx
+++ b/tools/DFBrowserPaneXDE/DFBrowserPaneXDE_Tools.hxx
@@ -21,12 +21,11 @@
#include <TDF_Label.hxx>
#include <TDocStd_Application.hxx>
-#ifdef _MSC_VER
-#pragma warning(disable:4127) // conditional expression is constant
-#endif
+#include <Standard_WarningsDisable.hxx>
#include <QMap>
#include <QWidget>
#include <QString>
+#include <Standard_WarningsRestore.hxx>
class DFBrowserPane_AttributePaneAPI;
diff --git a/tools/DFBrowserPaneXDE/DFBrowserPaneXDE_XCAFDocColor.cxx b/tools/DFBrowserPaneXDE/DFBrowserPaneXDE_XCAFDocColor.cxx
index f3fc0b7bdd..926f890a6c 100644
--- a/tools/DFBrowserPaneXDE/DFBrowserPaneXDE_XCAFDocColor.cxx
+++ b/tools/DFBrowserPaneXDE/DFBrowserPaneXDE_XCAFDocColor.cxx
@@ -20,7 +20,10 @@
#include <Quantity_Color.hxx>
+#include <Standard_WarningsDisable.hxx>
#include <QColor>
+#include <Standard_WarningsRestore.hxx>
+
// =======================================================================
// function : Constructor
// purpose :
diff --git a/tools/DFBrowserPaneXDE/DFBrowserPaneXDE_XCAFDocShapeMapTool.cxx b/tools/DFBrowserPaneXDE/DFBrowserPaneXDE_XCAFDocShapeMapTool.cxx
index e7fa7ab7c0..7fc6cef64c 100644
--- a/tools/DFBrowserPaneXDE/DFBrowserPaneXDE_XCAFDocShapeMapTool.cxx
+++ b/tools/DFBrowserPaneXDE/DFBrowserPaneXDE_XCAFDocShapeMapTool.cxx
@@ -28,6 +28,7 @@
#include <TopoDS_Compound.hxx>
#include <XCAFDoc_ShapeMapTool.hxx>
+#include <Standard_WarningsDisable.hxx>
#include <QEvent>
#include <QFileDialog>
#include <QGridLayout>
@@ -39,6 +40,7 @@
#include <QTableView>
#include <QVariant>
#include <QWidget>
+#include <Standard_WarningsRestore.hxx>
const int COLUMN_EXPORT_WIDTH = 20;
const int COLUMN_TYPE_WIDTH = 70;
diff --git a/tools/ShapeView/ShapeView_Communicator.cxx b/tools/ShapeView/ShapeView_Communicator.cxx
index c1d89ecd41..6ba86e5c7b 100644
--- a/tools/ShapeView/ShapeView_Communicator.cxx
+++ b/tools/ShapeView/ShapeView_Communicator.cxx
@@ -21,9 +21,11 @@
#include <OSD_Path.hxx>
#include <OSD_Protection.hxx>
+#include <Standard_WarningsDisable.hxx>
#include <QApplication>
#include <QMainWindow>
#include <QDir>
+#include <Standard_WarningsRestore.hxx>
// =======================================================================
// function : CreateCommunicator
diff --git a/tools/ShapeView/ShapeView_ItemShape.cxx b/tools/ShapeView/ShapeView_ItemShape.cxx
index 88bf5f0985..be3a623b3f 100644
--- a/tools/ShapeView/ShapeView_ItemShape.cxx
+++ b/tools/ShapeView/ShapeView_ItemShape.cxx
@@ -31,8 +31,10 @@
#include <TopoDS_Iterator.hxx>
#include <TopoDS_Vertex.hxx>
+#include <Standard_WarningsDisable.hxx>
#include <QObject>
#include <QStringList>
+#include <Standard_WarningsRestore.hxx>
// =======================================================================
// function : ToString
diff --git a/tools/ShapeView/ShapeView_ItemShape.hxx b/tools/ShapeView/ShapeView_ItemShape.hxx
index eaac833772..b04076956e 100644
--- a/tools/ShapeView/ShapeView_ItemShape.hxx
+++ b/tools/ShapeView/ShapeView_ItemShape.hxx
@@ -21,8 +21,10 @@
#include <TCollection_AsciiString.hxx>
#include <TopoDS_Shape.hxx>
+#include <Standard_WarningsDisable.hxx>
#include <QMap>
#include <QVariant>
+#include <Standard_WarningsRestore.hxx>
class ShapeView_ItemShape;
typedef QExplicitlySharedDataPointer<ShapeView_ItemShape> ShapeView_ItemShapePtr;
diff --git a/tools/ShapeView/ShapeView_OpenFileDialog.cxx b/tools/ShapeView/ShapeView_OpenFileDialog.cxx
index 06cad9da18..3ea9b1fb33 100644
--- a/tools/ShapeView/ShapeView_OpenFileDialog.cxx
+++ b/tools/ShapeView/ShapeView_OpenFileDialog.cxx
@@ -16,6 +16,7 @@
#include <inspector/ShapeView_OpenFileDialog.hxx>
#include <inspector/ShapeView_OpenFileViewModel.hxx>
+#include <Standard_WarningsDisable.hxx>
#include <QGroupBox>
#include <QHBoxLayout>
#include <QHeaderView>
@@ -34,6 +35,7 @@
#include <QFileSystemModel>
#include <QPushButton>
#include <QToolButton>
+#include <Standard_WarningsRestore.hxx>
const int FONT_POINT_SIZE = 18;
const int ICON_SIZE = 40;
diff --git a/tools/ShapeView/ShapeView_OpenFileDialog.hxx b/tools/ShapeView/ShapeView_OpenFileDialog.hxx
index 09fba195df..306326b4f9 100644
--- a/tools/ShapeView/ShapeView_OpenFileDialog.hxx
+++ b/tools/ShapeView/ShapeView_OpenFileDialog.hxx
@@ -20,12 +20,11 @@
#include <Standard_Macro.hxx>
#include <TCollection_AsciiString.hxx>
-#ifdef _MSC_VER
-#pragma warning(disable : 4127) // conditional expression is constant
-#endif
+#include <Standard_WarningsDisable.hxx>
#include <QDialog>
#include <QItemSelection>
#include <QStringList>
+#include <Standard_WarningsRestore.hxx>
#include <map>
diff --git a/tools/ShapeView/ShapeView_OpenFileViewModel.cxx b/tools/ShapeView/ShapeView_OpenFileViewModel.cxx
index 12db8132b8..848b21d2f6 100644
--- a/tools/ShapeView/ShapeView_OpenFileViewModel.cxx
+++ b/tools/ShapeView/ShapeView_OpenFileViewModel.cxx
@@ -15,10 +15,12 @@
#include <inspector/ShapeView_OpenFileViewModel.hxx>
+#include <Standard_WarningsDisable.hxx>
#include <QApplication>
#include <QFileInfo>
#include <QIcon>
#include <QPainter>
+#include <Standard_WarningsRestore.hxx>
const int ICON_SIZE = 40;
// =======================================================================
@@ -35,11 +37,9 @@ void ShapeView_OpenFileItemDelegate::paint (QPainter* thePainter, const QStyleOp
// action icon for all indices before the last one
QIcon anIcon (":/icons/folder_import.png");
QSize anIconSize (ICON_SIZE, ICON_SIZE);
- int aWidth = theOption.rect.width();
- int aCenter = aWidth / 2.;
- int aHalf = anIconSize.width() / 2.;
+ int aDX = (theOption.rect.width() - anIconSize.width()) / 2;
int aMargin = qApp->style()->pixelMetric (QStyle::PM_HeaderMargin);
- thePainter->drawPixmap (QRect (theOption.rect.left() + (aCenter - aHalf),
+ thePainter->drawPixmap (QRect (theOption.rect.left() + aDX,
theOption.rect.top() + aMargin,
anIconSize.width(),
anIconSize.height()),
diff --git a/tools/ShapeView/ShapeView_OpenFileViewModel.hxx b/tools/ShapeView/ShapeView_OpenFileViewModel.hxx
index 9eb4338b71..5a2847da17 100644
--- a/tools/ShapeView/ShapeView_OpenFileViewModel.hxx
+++ b/tools/ShapeView/ShapeView_OpenFileViewModel.hxx
@@ -19,12 +19,11 @@
#include <Standard.hxx>
#include <Standard_Macro.hxx>
-#ifdef _MSC_VER
-#pragma warning(disable : 4127) // conditional expression is constant
-#endif
+#include <Standard_WarningsDisable.hxx>
#include <QAbstractTableModel>
#include <QStringList>
#include <QItemDelegate>
+#include <Standard_WarningsRestore.hxx>
class QObject;
class QPainter;
diff --git a/tools/ShapeView/ShapeView_TreeModel.hxx b/tools/ShapeView/ShapeView_TreeModel.hxx
index 210e8bb882..6983570182 100644
--- a/tools/ShapeView/ShapeView_TreeModel.hxx
+++ b/tools/ShapeView/ShapeView_TreeModel.hxx
@@ -21,8 +21,10 @@
#include <TopoDS_Shape.hxx>
#include <inspector/TreeModel_ModelBase.hxx>
+#include <Standard_WarningsDisable.hxx>
#include <QMap>
#include <QObject>
+#include <Standard_WarningsRestore.hxx>
class ShapeView_TreeModel;
diff --git a/tools/ShapeView/ShapeView_Window.cxx b/tools/ShapeView/ShapeView_Window.cxx
index f4291c57a9..8c05fe1d86 100644
--- a/tools/ShapeView/ShapeView_Window.cxx
+++ b/tools/ShapeView/ShapeView_Window.cxx
@@ -33,6 +33,7 @@
#include <BRep_Builder.hxx>
#include <BRepTools.hxx>
+#include <Standard_WarningsDisable.hxx>
#include <QApplication>
#include <QAction>
#include <QComboBox>
@@ -51,6 +52,7 @@
#include <QTreeView>
#include <QWidget>
#include <QVBoxLayout>
+#include <Standard_WarningsRestore.hxx>
const int FIRST_COLUMN_WIDTH = 190;
const int SIZE_COLUMN_WIDTH = 30;
diff --git a/tools/ShapeView/ShapeView_Window.hxx b/tools/ShapeView/ShapeView_Window.hxx
index 31cd1d38ce..a7014bd6e1 100644
--- a/tools/ShapeView/ShapeView_Window.hxx
+++ b/tools/ShapeView/ShapeView_Window.hxx
@@ -21,9 +21,7 @@
#include <inspector/TInspectorAPI_PluginParameters.hxx>
#include <TopoDS_Shape.hxx>
-#ifdef _MSC_VER
-#pragma warning(disable : 4127) // conditional expression is constant
-#endif
+#include <Standard_WarningsDisable.hxx>
#include <QItemSelection>
#include <QList>
#include <QModelIndexList>
@@ -31,6 +29,7 @@
#include <QPoint>
#include <QString>
#include <QTreeView>
+#include <Standard_WarningsRestore.hxx>
class View_Displayer;
class View_Window;
diff --git a/tools/TInspector/TInspector_Communicator.cxx b/tools/TInspector/TInspector_Communicator.cxx
index 41790a1c66..72771c13f0 100644
--- a/tools/TInspector/TInspector_Communicator.cxx
+++ b/tools/TInspector/TInspector_Communicator.cxx
@@ -19,10 +19,12 @@
#include <TCollection_AsciiString.hxx>
#include <inspector/TInspector_Window.hxx>
+#include <Standard_WarningsDisable.hxx>
#include <QApplication>
#include <QDir>
#include <QMainWindow>
#include <QWidget>
+#include <Standard_WarningsRestore.hxx>
// =======================================================================
// function : Constructor
diff --git a/tools/TInspector/TInspector_Window.cxx b/tools/TInspector/TInspector_Window.cxx
index 9f49e6d7e1..0c777d1cf5 100644
--- a/tools/TInspector/TInspector_Window.cxx
+++ b/tools/TInspector/TInspector_Window.cxx
@@ -19,6 +19,7 @@
#include <inspector/TInspectorAPI_Communicator.hxx>
#include <inspector/TInspector_PluginParameters.hxx>
+#include <Standard_WarningsDisable.hxx>
#include <QApplication>
#include <QDockWidget>
#include <QLabel>
@@ -26,6 +27,7 @@
#include <QPushButton>
#include <QStackedWidget>
#include <QVBoxLayout>
+#include <Standard_WarningsRestore.hxx>
const int TINSPECTOR_DEFAULT_WIDTH = 650;
const int TINSPECTOR_DEFAULT_HEIGHT = 500;//350;
diff --git a/tools/TInspector/TInspector_Window.hxx b/tools/TInspector/TInspector_Window.hxx
index ecac17cd16..10048c5d82 100644
--- a/tools/TInspector/TInspector_Window.hxx
+++ b/tools/TInspector/TInspector_Window.hxx
@@ -22,12 +22,11 @@
#include <TCollection_AsciiString.hxx>
#include <inspector/TInspectorAPI_PluginParameters.hxx>
-#ifdef _MSC_VER
-#pragma warning(disable : 4127) // conditional expression is constant
-#endif
+#include <Standard_WarningsDisable.hxx>
#include <QMap>
#include <QObject>
#include <QString>
+#include <Standard_WarningsRestore.hxx>
class TInspectorAPI_Communicator;
diff --git a/tools/TreeModel/TreeModel_ItemBase.cxx b/tools/TreeModel/TreeModel_ItemBase.cxx
index 75a3957284..42acea066e 100644
--- a/tools/TreeModel/TreeModel_ItemBase.cxx
+++ b/tools/TreeModel/TreeModel_ItemBase.cxx
@@ -14,10 +14,11 @@
// commercial license or contractual agreement.
#include <inspector/TreeModel_ItemBase.hxx>
-
#include <inspector/TreeModel_ItemRole.hxx>
+#include <Standard_WarningsDisable.hxx>
#include <QStringList>
+#include <Standard_WarningsRestore.hxx>
// =======================================================================
// function : Constructor
diff --git a/tools/TreeModel/TreeModel_ItemBase.hxx b/tools/TreeModel/TreeModel_ItemBase.hxx
index 57f4000a3c..09498b3f62 100644
--- a/tools/TreeModel/TreeModel_ItemBase.hxx
+++ b/tools/TreeModel/TreeModel_ItemBase.hxx
@@ -20,9 +20,7 @@
#include <Standard_Macro.hxx>
#include <inspector/TreeModel_ItemRole.hxx>
-#ifdef _MSC_VER
-#pragma warning(disable : 4127) // conditional expression is constant
-#endif
+#include <Standard_WarningsDisable.hxx>
#include <QExplicitlySharedDataPointer>
#include <QHash>
#include <QMap>
@@ -31,6 +29,7 @@
#include <QPair>
#include <QSharedData>
#include <QVariant>
+#include <Standard_WarningsRestore.hxx>
class TreeModel_ItemBase;
diff --git a/tools/TreeModel/TreeModel_ItemRole.hxx b/tools/TreeModel/TreeModel_ItemRole.hxx
index 169dff7b10..e498ce37f2 100644
--- a/tools/TreeModel/TreeModel_ItemRole.hxx
+++ b/tools/TreeModel/TreeModel_ItemRole.hxx
@@ -16,7 +16,9 @@
#ifndef TreeModel_ItemRole_H
#define TreeModel_ItemRole_H
+#include <Standard_WarningsDisable.hxx>
#include <Qt>
+#include <Standard_WarningsRestore.hxx>
//! Sets custom item role of Tree view wmodel
enum TreeModel_ItemRole
diff --git a/tools/TreeModel/TreeModel_MessageDialog.cxx b/tools/TreeModel/TreeModel_MessageDialog.cxx
index 8eda4669cb..c952678e09 100644
--- a/tools/TreeModel/TreeModel_MessageDialog.cxx
+++ b/tools/TreeModel/TreeModel_MessageDialog.cxx
@@ -15,12 +15,14 @@
#include <inspector/TreeModel_MessageDialog.hxx>
+#include <Standard_WarningsDisable.hxx>
#include <QCheckBox>
#include <QCursor>
#include <QGridLayout>
#include <QLabel>
#include <QPushButton>
#include <QWidget>
+#include <Standard_WarningsRestore.hxx>
// =======================================================================
// function : Constructor
diff --git a/tools/TreeModel/TreeModel_MessageDialog.hxx b/tools/TreeModel/TreeModel_MessageDialog.hxx
index 433acc1b83..3669b4a062 100644
--- a/tools/TreeModel/TreeModel_MessageDialog.hxx
+++ b/tools/TreeModel/TreeModel_MessageDialog.hxx
@@ -19,14 +19,13 @@
#include <Standard.hxx>
#include <Standard_Macro.hxx>
-#ifdef _MSC_VER
-#pragma warning(disable : 4127) // conditional expression is constant
-#endif
+#include <Standard_WarningsDisable.hxx>
#include <QCheckBox>
#include <QDialog>
#include <QLabel>
#include <QPushButton>
#include <QString>
+#include <Standard_WarningsRestore.hxx>
class DFBrowser_Module;
class QWidget;
diff --git a/tools/TreeModel/TreeModel_ModelBase.hxx b/tools/TreeModel/TreeModel_ModelBase.hxx
index 38b98d5a30..597cd472cb 100644
--- a/tools/TreeModel/TreeModel_ModelBase.hxx
+++ b/tools/TreeModel/TreeModel_ModelBase.hxx
@@ -19,10 +19,12 @@
#include <Standard.hxx>
#include <inspector/TreeModel_ItemBase.hxx>
+#include <Standard_WarningsDisable.hxx>
#include <QAbstractItemModel>
#include <QExplicitlySharedDataPointer>
#include <QModelIndex>
#include <QVariant>
+#include <Standard_WarningsRestore.hxx>
//! \class TreeModel_ModelBase
//! \brief Implementation of the tree item based model of QAbstractItemModel.
diff --git a/tools/VInspector/VInspector_CallBack.cxx b/tools/VInspector/VInspector_CallBack.cxx
index ffbf64013a..481ec6f6b2 100644
--- a/tools/VInspector/VInspector_CallBack.cxx
+++ b/tools/VInspector/VInspector_CallBack.cxx
@@ -25,8 +25,6 @@
#include <inspector/VInspector_Tools.hxx>
#include <inspector/VInspector_ViewModelHistory.hxx>
-#include <QStringList>
-
#if OCC_VERSION_HEX <= 0x060901
IMPLEMENT_STANDARD_HANDLE(VInspector_CallBack, Standard_Transient)
IMPLEMENT_STANDARD_RTTIEXT(VInspector_CallBack, VInspectorAPI_CallBack)
diff --git a/tools/VInspector/VInspector_Communicator.cxx b/tools/VInspector/VInspector_Communicator.cxx
index 654dc939c2..b68f66664f 100644
--- a/tools/VInspector/VInspector_Communicator.cxx
+++ b/tools/VInspector/VInspector_Communicator.cxx
@@ -20,11 +20,13 @@
#include <AIS_InteractiveContext.hxx>
+#include <Standard_WarningsDisable.hxx>
#include <QApplication>
#include <QDir>
#include <QLayout>
#include <QMainWindow>
#include <QWidget>
+#include <Standard_WarningsRestore.hxx>
// =======================================================================
// function : CreateCommunicator
diff --git a/tools/VInspector/VInspector_ItemContext.cxx b/tools/VInspector/VInspector_ItemContext.cxx
index 9a8a91cc77..c2d49ee325 100644
--- a/tools/VInspector/VInspector_ItemContext.cxx
+++ b/tools/VInspector/VInspector_ItemContext.cxx
@@ -20,8 +20,6 @@
#include <inspector/VInspector_ItemPresentableObject.hxx>
#include <inspector/VInspector_Tools.hxx>
-#include <QStringList>
-
//#define DEBUG_FREE_OWNERS
// =======================================================================
diff --git a/tools/VInspector/VInspector_ItemEntityOwner.cxx b/tools/VInspector/VInspector_ItemEntityOwner.cxx
index b2ea7a4e3e..4542c097e7 100644
--- a/tools/VInspector/VInspector_ItemEntityOwner.cxx
+++ b/tools/VInspector/VInspector_ItemEntityOwner.cxx
@@ -23,8 +23,10 @@
#include <Standard_Version.hxx>
#include <StdSelect_BRepOwner.hxx>
+#include <Standard_WarningsDisable.hxx>
#include <QItemSelectionModel>
#include <QColor>
+#include <Standard_WarningsRestore.hxx>
// =======================================================================
// function : initValue
diff --git a/tools/VInspector/VInspector_ItemPresentableObject.cxx b/tools/VInspector/VInspector_ItemPresentableObject.cxx
index f5df73350a..ddb8dcb9e2 100644
--- a/tools/VInspector/VInspector_ItemPresentableObject.cxx
+++ b/tools/VInspector/VInspector_ItemPresentableObject.cxx
@@ -31,8 +31,10 @@
#include <StdSelect_BRepOwner.hxx>
#include <Standard_Version.hxx>
+#include <Standard_WarningsDisable.hxx>
#include <QColor>
#include <QItemSelectionModel>
+#include <Standard_WarningsRestore.hxx>
// =======================================================================
// function : initValue
diff --git a/tools/VInspector/VInspector_ItemSelection.cxx b/tools/VInspector/VInspector_ItemSelection.cxx
index 4a4f79fed5..6a42cd5136 100644
--- a/tools/VInspector/VInspector_ItemSelection.cxx
+++ b/tools/VInspector/VInspector_ItemSelection.cxx
@@ -24,9 +24,10 @@
#include <inspector/VInspector_ItemSensitiveEntity.hxx>
#include <inspector/VInspector_Tools.hxx>
-#include <QStringList>
-
+#include <Standard_WarningsDisable.hxx>
#include <QColor>
+#include <QStringList>
+#include <Standard_WarningsRestore.hxx>
// =======================================================================
// function : getSelection
diff --git a/tools/VInspector/VInspector_ItemSensitiveEntity.cxx b/tools/VInspector/VInspector_ItemSensitiveEntity.cxx
index c3ecbac90f..19f6ac95b0 100644
--- a/tools/VInspector/VInspector_ItemSensitiveEntity.cxx
+++ b/tools/VInspector/VInspector_ItemSensitiveEntity.cxx
@@ -29,8 +29,10 @@
#include <inspector/VInspector_ItemSelection.hxx>
#include <inspector/VInspector_Tools.hxx>
+#include <Standard_WarningsDisable.hxx>
#include <QStringList>
#include <QColor>
+#include <Standard_WarningsRestore.hxx>
// =======================================================================
// function : GetSensitiveEntity
diff --git a/tools/VInspector/VInspector_ToolBar.cxx b/tools/VInspector/VInspector_ToolBar.cxx
index adcdeb6899..819a8856c3 100644
--- a/tools/VInspector/VInspector_ToolBar.cxx
+++ b/tools/VInspector/VInspector_ToolBar.cxx
@@ -15,10 +15,11 @@
#include <inspector/VInspector_ToolBar.hxx>
+#include <Standard_WarningsDisable.hxx>
#include <QHBoxLayout>
#include <QPushButton>
#include <QWidget>
-
+#include <Standard_WarningsRestore.hxx>
// =======================================================================
// function : Constructor
diff --git a/tools/VInspector/VInspector_ToolBar.hxx b/tools/VInspector/VInspector_ToolBar.hxx
index 5e8257eaf1..97ddbaeee4 100644
--- a/tools/VInspector/VInspector_ToolBar.hxx
+++ b/tools/VInspector/VInspector_ToolBar.hxx
@@ -20,11 +20,10 @@
#include <Standard_Macro.hxx>
#include <inspector/VInspector_ToolActionType.hxx>
-#ifdef _MSC_VER
- #pragma warning(disable : 4127 4718) // conditional expression is constant, recursive call has no side effects
-#endif
+#include <Standard_WarningsDisable.hxx>
#include <QMap>
#include <QObject>
+#include <Standard_WarningsRestore.hxx>
class QWidget;
class QPushButton;
diff --git a/tools/VInspector/VInspector_Tools.cxx b/tools/VInspector/VInspector_Tools.cxx
index 6f7c307e1b..8cf0289a5a 100644
--- a/tools/VInspector/VInspector_Tools.cxx
+++ b/tools/VInspector/VInspector_Tools.cxx
@@ -29,7 +29,9 @@
#include <Standard_Version.hxx>
#include <StdSelect_BRepOwner.hxx>
+#include <Standard_WarningsDisable.hxx>
#include <QStringList>
+#include <Standard_WarningsRestore.hxx>
#include <sstream>
diff --git a/tools/VInspector/VInspector_Tools.hxx b/tools/VInspector/VInspector_Tools.hxx
index a3bd96a6e4..e22ff5d539 100644
--- a/tools/VInspector/VInspector_Tools.hxx
+++ b/tools/VInspector/VInspector_Tools.hxx
@@ -28,12 +28,10 @@
#include <inspector/VInspector_CallBackMode.hxx>
#include <inspector/VInspector_SelectionType.hxx>
-#ifdef _MSC_VER
-#pragma warning(disable : 4127) // conditional expression is constant
-#endif
-
+#include <Standard_WarningsDisable.hxx>
#include <QList>
#include <QVariant>
+#include <Standard_WarningsRestore.hxx>
//! \class VInspector_Tools
//! The class that gives auxiliary methods for Visualization elements manipulation
diff --git a/tools/VInspector/VInspector_ViewModel.cxx b/tools/VInspector/VInspector_ViewModel.cxx
index 86a4060317..cb3c281a79 100644
--- a/tools/VInspector/VInspector_ViewModel.cxx
+++ b/tools/VInspector/VInspector_ViewModel.cxx
@@ -21,8 +21,10 @@
#include <inspector/VInspector_ItemSensitiveEntity.hxx>
#include <SelectBasics_EntityOwner.hxx>
+#include <Standard_WarningsDisable.hxx>
#include <QItemSelectionModel>
#include <QStringList>
+#include <Standard_WarningsRestore.hxx>
// =======================================================================
// function : Constructor
diff --git a/tools/VInspector/VInspector_ViewModel.hxx b/tools/VInspector/VInspector_ViewModel.hxx
index f73f063d30..e5da7d1dba 100644
--- a/tools/VInspector/VInspector_ViewModel.hxx
+++ b/tools/VInspector/VInspector_ViewModel.hxx
@@ -23,10 +23,12 @@
#include <inspector/TreeModel_ModelBase.hxx>
#include <inspector/VInspector_ItemBase.hxx>
+#include <Standard_WarningsDisable.hxx>
#include <QByteArray>
#include <QHash>
#include <QMap>
#include <QObject>
+#include <Standard_WarningsRestore.hxx>
class OCAFSampleAPI_Module;
class OCAFSampleModel_DocumentMgr;
diff --git a/tools/VInspector/VInspector_ViewModelHistory.cxx b/tools/VInspector/VInspector_ViewModelHistory.cxx
index 77839f2b67..244128cfe1 100644
--- a/tools/VInspector/VInspector_ViewModelHistory.cxx
+++ b/tools/VInspector/VInspector_ViewModelHistory.cxx
@@ -19,7 +19,9 @@
#include <inspector/VInspector_ItemHistoryRoot.hxx>
#include <inspector/VInspector_ItemHistoryType.hxx>
+#include <Standard_WarningsDisable.hxx>
#include <QStringList>
+#include <Standard_WarningsRestore.hxx>
// =======================================================================
// function : Constructor
diff --git a/tools/VInspector/VInspector_ViewModelHistory.hxx b/tools/VInspector/VInspector_ViewModelHistory.hxx
index 76b6f2f634..556b5faa8c 100644
--- a/tools/VInspector/VInspector_ViewModelHistory.hxx
+++ b/tools/VInspector/VInspector_ViewModelHistory.hxx
@@ -20,10 +20,12 @@
#include <inspector/VInspector_ItemBase.hxx>
#include <inspector/VInspector_CallBackMode.hxx>
+#include <Standard_WarningsDisable.hxx>
#include <QByteArray>
#include <QHash>
#include <QMap>
#include <QObject>
+#include <Standard_WarningsRestore.hxx>
#include <inspector/TreeModel_ModelBase.hxx>
diff --git a/tools/VInspector/VInspector_Window.cxx b/tools/VInspector/VInspector_Window.cxx
index 778748e93a..62a58c47d8 100644
--- a/tools/VInspector/VInspector_Window.cxx
+++ b/tools/VInspector/VInspector_Window.cxx
@@ -36,6 +36,7 @@
#include <inspector/View_Widget.hxx>
#include <inspector/View_Window.hxx>
+#include <Standard_WarningsDisable.hxx>
#include <QApplication>
#include <QDockWidget>
#include <QHeaderView>
@@ -47,6 +48,7 @@
#include <QToolButton>
#include <QTreeView>
#include <QWidget>
+#include <Standard_WarningsRestore.hxx>
const int FIRST_COLUMN_WIDTH = 230;
diff --git a/tools/VInspector/VInspector_Window.hxx b/tools/VInspector/VInspector_Window.hxx
index 7fa4664aba..3732113b83 100644
--- a/tools/VInspector/VInspector_Window.hxx
+++ b/tools/VInspector/VInspector_Window.hxx
@@ -23,9 +23,11 @@
#include <inspector/TInspectorAPI_PluginParameters.hxx>
#include <inspector/VInspector_CallBack.hxx>
+#include <Standard_WarningsDisable.hxx>
#include <QObject>
#include <QItemSelection>
#include <QMainWindow>
+#include <Standard_WarningsRestore.hxx>
class TreeModel_MessageDialog;
diff --git a/tools/View/View_ToolBar.cxx b/tools/View/View_ToolBar.cxx
index 2373a35813..06c7e81246 100644
--- a/tools/View/View_ToolBar.cxx
+++ b/tools/View/View_ToolBar.cxx
@@ -16,11 +16,13 @@
#include <inspector/View_ToolBar.hxx>
+#include <Standard_WarningsDisable.hxx>
#include <QComboBox>
#include <QHBoxLayout>
#include <QLabel>
#include <QToolButton>
#include <QWidget>
+#include <Standard_WarningsRestore.hxx>
const int DEFAULT_COMBO_WIDTH_MINIMUM = 80;
const int DEFAULT_SPACING = 3;
diff --git a/tools/View/View_ToolBar.hxx b/tools/View/View_ToolBar.hxx
index a4fcd5db49..99d888f083 100644
--- a/tools/View/View_ToolBar.hxx
+++ b/tools/View/View_ToolBar.hxx
@@ -21,11 +21,10 @@
#include <inspector/View_ContextType.hxx>
#include <inspector/View_ToolActionType.hxx>
-#ifdef _MSC_VER
- #pragma warning(disable : 4127 4718) // conditional expression is constant, recursive call has no side effects
-#endif
+#include <Standard_WarningsDisable.hxx>
#include <QObject>
#include <QMap>
+#include <Standard_WarningsRestore.hxx>
class QComboBox;
class QToolButton;
diff --git a/tools/View/View_Widget.cxx b/tools/View/View_Widget.cxx
index a72d908342..295a9c9915 100644
--- a/tools/View/View_Widget.cxx
+++ b/tools/View/View_Widget.cxx
@@ -24,6 +24,7 @@
#include <inspector/View_ViewActionType.hxx>
#include <inspector/View_Viewer.hxx>
+#include <Standard_WarningsDisable.hxx>
#include <QColorDialog>
#include <QCursor>
#include <QFileInfo>
@@ -35,6 +36,7 @@
#include <QRubberBand>
#include <QStatusBar>
#include <QStyleFactory>
+#include <Standard_WarningsRestore.hxx>
#include <stdio.h>
diff --git a/tools/View/View_Widget.hxx b/tools/View/View_Widget.hxx
index 06d6ccbba9..a84ff72d7a 100644
--- a/tools/View/View_Widget.hxx
+++ b/tools/View/View_Widget.hxx
@@ -21,13 +21,12 @@
#include <inspector/View_ViewActionType.hxx>
#include <inspector/View_Viewer.hxx>
-#ifdef _MSC_VER
- #pragma warning(disable : 4127 4718) // conditional expression is constant, recursive call has no side effects
-#endif
+#include <Standard_WarningsDisable.hxx>
#include <QAction>
#include <QMap>
#include <QString>
#include <QWidget>
+#include <Standard_WarningsRestore.hxx>
class View_Viewer;
diff --git a/tools/View/View_Window.cxx b/tools/View/View_Window.cxx
index e6939689c4..fa17b55f0f 100644
--- a/tools/View/View_Window.cxx
+++ b/tools/View/View_Window.cxx
@@ -24,10 +24,12 @@
#include <inspector/View_Viewer.hxx>
#include <inspector/View_Widget.hxx>
+#include <Standard_WarningsDisable.hxx>
#include <QComboBox>
#include <QDockWidget>
#include <QGridLayout>
#include <QToolBar>
+#include <Standard_WarningsRestore.hxx>
const int DEFAULT_SPACING = 3;
diff --git a/tools/View/View_Window.hxx b/tools/View/View_Window.hxx
index 61556f4d42..48c487255b 100644
--- a/tools/View/View_Window.hxx
+++ b/tools/View/View_Window.hxx
@@ -19,10 +19,9 @@
#include <AIS_InteractiveContext.hxx>
#include <inspector/View_ContextType.hxx>
-#ifdef _MSC_VER
-#pragma warning(disable : 4127) // conditional expression is constant
-#endif
+#include <Standard_WarningsDisable.hxx>
#include <QWidget>
+#include <Standard_WarningsRestore.hxx>
class View_Displayer;
class View_ToolBar;