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.

diff --git a/src/Standard/FILES b/src/Standard/FILES
index a8c48a1745f053ad03d8c67e33216832674325ee..4710604718be1fec55e8e7558b99e1a46f82a0dc 100755 (executable)
--- 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 (file)
index 0000000..199d746
--- /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 (file)
index 0000000..f03cc66
--- /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 541f7a1116b117c8fdf4eec12c8c1433d3a06240..ebc2d1b3675ee8fc2e4564b0344445b01bc3b85c 100644 (file)
--- 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 e54c39b67009f664a063bbb4f45a3a643799acb5..24d5f73599bca96abbb94d0cccb7b0d80bc3ce30 100644 (file)
--- 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 548e9553314fe70d26fb62ccc0465187e978e320..3f27eb7a2e7241a962bc2698ea7505fa48a2032c 100644 (file)
--- 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 405aacbf079f11783a8cc8db9b6a1722ed98af8b..c7e957105c3fcaef25890440b4377214d83a8857 100644 (file)
--- 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 395458d5c05c8066976cbe7af9f02378cef86b11..95c35f86f327cd16945d41461fe7eb9720fff9cf 100644 (file)
--- 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 3d7b55e69277b272ea7ad0b7ad91bff9e3fe321a..5fd811c24a5784c25d5df21994e269b69c7dd600 100644 (file)
--- 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 00b740ad7d45321e4231400e8f208376b3efee40..5106821b9cf6271dcc4dfd3858309a93cf65a27c 100644 (file)
--- 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 b5b6fc8e49aac1a46709dbe15b3884aca4d8712f..82b63b3033dce1b0281758510bebfa6be96d6876 100644 (file)
--- 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 5c10ac1c05ac912c1835af0603bc35841302faab..5b9220ceb47c4cc934b7cc3d84f156214086d6da 100644 (file)
--- 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 f6555fc13bff02f8163ba1034be29b840a68c636..4fa7ec824c29f070587a959e718127bb27226edc 100644 (file)
--- 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 9cbd59639d127e315954d1d3461ffd4150c5357e..89d58b98bd1de51363bcf792799adcadbd4ae033 100644 (file)
--- 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 37029caa97c9318b49a30052cfe4f8307cd44834..915b1d368f605eb22e9ea7b93955bca91b85b6f3 100644 (file)
--- 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 d06f24d7920081f0dbba583dfb232164dd39133d..3d3b62d61175ac6a8bc18f76dff2f58b54d9a863 100644 (file)
--- 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 0a04c64621dccc4d7084e05cae8199f08e4ca42b..2aff65e7f1ddf7600c7b13ea03ed64e6dffa34ff 100644 (file)
--- 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 d3e2748555812c0cd13ed37f6deb111a37d6616b..e75fbb0f34193bdf3740c210f0630072d67ff91a 100644 (file)
--- 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 52545a384509ff64aa9c6e2179edfba15d956521..66cdcdf5c09ca992192b98a00ab6d7f7c0a6df9a 100644 (file)
--- 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 8bfba4b18cf8fe9e45b40890fc8598ab394295a6..1a55af76f88d31bf3a0974287fce7febe6d875a8 100644 (file)
--- 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 e6e62e8ff9d35486ee7b3ea4a175dfdff93bf054..fb9a153975ea577d3795a112456ef192feeb3a8c 100644 (file)
--- 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 d0981894ed2b55271ac259297d40dbc92e39c417..740caf544bb74fa6585b359267e7a0c607cd9450 100644 (file)
--- 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 ac8438613ce6131626c5b72fd9dcef7168367a2a..54c3ae15d3b5976675eea619d8ed88b0674f4c07 100644 (file)
--- 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 362b258ac9fa6482acab2b6bdcd02a305c6bed91..a4d7fbed601c3bbb9c124497fe2d214091d5fbfc 100644 (file)
--- 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 cfc8e9b6991b229329ada36f7e71f0b2cb17929f..3aeb9eae7cde0a424b020878c31ec9b80bdb5282 100644 (file)
--- 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 54d694dcaa4ec31f32cccd1b8e7eff3e54e0e60e..437eac222816a8f535f65e88d86cef535122ecb9 100644 (file)
--- 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 44fc17728abf000836a4994d0fd0ffe13ccc1a2e..dd5b482143bcfa9f2488b0333518bbab53fd912d 100644 (file)
--- 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 2f644c5aa1380fa31fa46d342c0e27c3e36245a8..1908eb72bb512ede7c96d7fdbd417f3437d5bc94 100644 (file)
--- 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 26c0d813463aee2f8f9865dfb0256d58a8b09729..977b4517dbbb11542d870ece00a999b12d082b2e 100644 (file)
--- 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 a6ed15493e17f5dfe6e60c6a7557ef8432e53d33..2e33bdccfc10e4abeea44a8357a0fff6e2d09852 100644 (file)
--- 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 56cf9c661c3cec399d1cd23ac62bd731e330e5e1..361c808f1cb911423f8d3e01a25559f3e5da9862 100644 (file)
--- 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 b734ba1589fa48f3030cd59268998bac655c0ba8..6a605ee28ba494e7b71b00e89fe7e025a3e78071 100644 (file)
--- 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 b1112d1a0045e70bd47d8a66115a5171093ba492..5b73d2b635284c2b27a2b3b16c1c79983f0bdb65 100644 (file)
--- 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 21ecd201387b42faa911f66f7801593bf2b61065..8418d954b522a1d3bb821b1477c3f4c282659c6d 100644 (file)
--- 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 950ff0e05565e51bda773416509089805b977ee7..b586261f762faaed0b13700686eae5aecb53cf89 100644 (file)
--- 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 65658a3b7c2361e346bef58e6da32e2b4d0cd622..e8cbc19337031b1a1249c078e77b5ac1743ec547 100644 (file)
--- 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 24ed7d294b072898f48e10ec938359e3a834760e..288f831de68817b8ffed63be829ae2ca1bcfd598 100644 (file)
--- 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 d24bd27464c5dad2a1bc812c969a9e80410f4221..2de8bfe3e6fd555238e3de05e4563261a7e0f6ba 100644 (file)
--- 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 1b1be9f4baa175884e63df2a0e844cb3c46a77b1..a8aa5944639e104306f7d34676099a74ad3e21fd 100644 (file)
--- 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 d8b0cf17cfd376b02f9d579161d838b51d07a84e..c97c078a339727c2fdd2ece3fd65323d6151766a 100644 (file)
--- 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 acdb76368fd996460175f2a839857589bef369d7..16e29642329e0e5576c90031ce04b19b74500ef4 100644 (file)
--- 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 e79467ee603ea87efca8413909b333e5e8f596e2..667f208d8b7d9fb9c30be27517d92211aaffae3d 100644 (file)
--- 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 855aacdf2bc18059157ba9118874160503f3115c..0d1f6b8bcb1c7e293e6106b1eb09a50eec5720da 100644 (file)
--- 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 6b9118accb1167463b7a5b6e55ce30d98eff8ede..ae961a9644646e378d1237bf7ddc6405e4aaa790 100644 (file)
--- 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 9f442d061d902d6850340c48283351fb4d97a3c5..63802ba1aaa10c2d8d4cb235c07fb9e864d6270c 100644 (file)
--- 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 705d09c798b714a0234a63ff5945a279d82c1c1c..5c564f348f3f136b1c3d79cb3cbb81dba2c6e829 100644 (file)
--- 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 c23a43f4131a36e31ec67fe6efbd769424d6f537..e4c4255e7864e813035eab3cb2c46767d04cf8c7 100644 (file)
--- 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 1bc3b4b654052a7d659d258792f606eea81ec84e..91afa8161d9765058ba3016baf23a29745326daf 100644 (file)
--- 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 1e1f6d4ec576d59b60b2c964c80c9ae4613967d9..8dbc17d7c1d2be3dffef7d258154403b0aec888a 100644 (file)
--- 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 452ef756959537a569d4dda47367f857e1541782..2336f74fcff17b68c6f7bcf257fcf29b625bf1c0 100644 (file)
--- 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 8eb8e603d71993bd199cbdf43fdc8963776b3d20..d22484d6b582beeec9338e2a7d9f2acf68c4b784 100644 (file)
--- 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 1b1326efc58a9d0053bdb4e7141750ad3ab18586..9468629a8b18b7f9188ccf1c072fa4151cc4b270 100644 (file)
--- 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 8ad949d290fa9485b913da72f4cb22eb4ddc5455..c312d15668a3a0c2ffea5d2af894c89ee6901d44 100644 (file)
--- 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 3b306b4224ba700f0212549e5e3e476f7258c3be..07064ae4214f5b489bbb4431b7a81f8be8f41439 100644 (file)
--- 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 047ea67d21fd6d0807cc4afd24a400f20c21a230..a5780527945acbe87161201cda0607d9a697416b 100644 (file)
--- 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 212368975744bee228639de5d6d44a215471e331..ea9fe79b3bdc67244fed9e9d7b69da7749252095 100644 (file)
--- 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 f52bbd446be71d87b228a70fd96ec9090cbab4ce..3109647c92e3b3eb4a99b3317e0fcfe12fb472c8 100644 (file)
--- 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 071a1bd33de84e261adc69ad2f3f1dd00f1619c2..bc331d32a007fbaebbb4c9a77a4ee91892df50bd 100644 (file)
--- 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 aa00516b180b44b899388c96da36596b35fa0bbb..b07ab40bba9e01b5f553df2f7526f87e1e0ee70a 100644 (file)
--- 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 2760592458a08dc90f8f835d475d6f8ec65ec5c5..dac03024a34d3ca0913017ee4e61bde3b8d0d1ff 100644 (file)
--- 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 4c8652017da68eef53764679470914b29425a7e9..39ede2c6029c77a1b68ca58fd2adc9fff5a3af77 100644 (file)
--- 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 086594409bc08d2130331859d3be78c74465f7bd..3b77bf3ad66cf47573003f8a9abe0c8c6a124f38 100644 (file)
--- 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 757b884e510c9db967b50027ec5332b11c52f0dd..d57c161cd90e925973f991365a11804062278ebc 100644 (file)
--- 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 653c72c9c37c845bee672c1ee7eded3f21e5dd7f..fa0d1a198d086945ef3a08f24950278335a8311d 100644 (file)
--- 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 502c6c14807deec30d0ba5b00c0d9858772031bc..991f9fb86fd75967d01a05bd69eef115ed08c7f1 100644 (file)
--- 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 64b30c60a2047aa175da6e6e34b3f4b514377775..3e6e49d957a58f2d4c0d688b15459f40fab7a527 100644 (file)
--- 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 261131f007f3be72ad374fd7f997e158b844d3ae..57006af2bcbd9e30735419797a57c99818c8f5e2 100644 (file)
--- 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 94d5ad9c164bb8f5d3788361d6e51550816d1a91..e442a07ba29c6058356cb8fbcae010c618264493 100644 (file)
--- 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 a60a75cda0f0c516d227b20ee6bb0c7e29367c7e..74cc65d87f4fec8804c0acd42938c56a2ae0f38b 100644 (file)
--- 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 23d1ddfccb1e152bbdc17c61eb25ef7da28fdb5c..94b3b790789d4c11bd4955b04da8349329e7eabf 100644 (file)
--- 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 6437bad91a59c91e14c02ed66d9ff86cf1943e65..248a592569855d1c333e5de0f8268ea812dbe163 100644 (file)
--- 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 772742fc4eb2cddab1362ebc6ad3dac15153f66c..bea27d3494be0c629d9d3cf2d68fd6f94e669650 100644 (file)
--- 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 23a2aa5da8f140fab643934a106ee9c4c8251fb1..5bae00061b8edd107ad0ab9c06d8a3185ad7bae2 100644 (file)
--- 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 bbd47fadc9455e145768059454a9643cd0265b0f..7d652c0aa638e888894ef170603434570471ac61 100644 (file)
--- 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 09fcbcf39e302bc07b06d30e9282b26bf7dac82a..2b2381ee0fd13efc745c2fde147319dd8a28625e 100644 (file)
--- 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 2164e4855db4000c224a6f12f1b3177c9b8972ce..18bbeb57afc41542d3f84313d6d90552a98686e4 100644 (file)
--- 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 bf03586c9f6e6d08dcd7cb51601198d74007040a..da404bf5b7ae004549905447209babf292c924de 100644 (file)
--- 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 26c1c0cc4c0920158510c44b19f1b87f366f118b..06a3ec1e31a7017e97ee289c228918754c17b272 100644 (file)
--- 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 43f77f1ad9fb1d1c4320afd8e2b6b5650a56df41..1f1a0d367726b905556911bd7c100f9f36559af9 100644 (file)
--- 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 958652d0dd93475c8a90ab7f4b22364688450e95..155147d68b0ac6fdd7fef736833ed960e25691c5 100644 (file)
--- 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 8f904902e14441f197fc716b4699dd5cbc161cbb..d8aab88a1ca03bbe9426f4b05fd9d1daaec6d9a7 100644 (file)
--- 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 cfe8da69ac1e453a701222b3612453a22029cc9f..27f4b822ad199315daf480dbccdacb57dad88f9e 100644 (file)
--- 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 5523478e59f021203929a9cecf9192efbf18b05a..1a00c23e6aea57a9d3877096466848cfe4d3d363 100644 (file)
--- 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 0fb9e84b4b2bd1a9a4970fa740d94b0e0692850c..eeed59bfc43e3f44c0f523a760224e2d8b8fc318 100644 (file)
--- 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 268e4798022714ee836ce229507f18e7efcd9b4f..8a6311b54334acfc4bfb9670dc014e89d1bbe492 100644 (file)
--- 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 c3ed2af4244bc9969550f5783d91251351d867db..908c25e5b0c65f0eb99130b9d76248b2b354aa75 100644 (file)
--- 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 05529ab19ba8e1786ba3e8711b86ff57247f7169..d963d5d583b27f25ae1797bbc1cb154033b8d6b1 100644 (file)
--- 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 d956d4e4dd42afdb4a74ccf025070b4625eb061f..075051e1b43e0f3cf2dce8f2dff3e7e23e9a7a6e 100644 (file)
--- 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 ba31c011a3dccd8082cfd0b44f5bb9e7729b8b4b..0e7982911408238308f7be225888af94dc025573 100644 (file)
--- 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 024386dac354dee561ef2649c80343ddfea47892..c8fc5dd51ff9e402496288644b656008200b70c8 100644 (file)
--- 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 29dcd9c200a8a624bd8767c72be1c99aec73a215..2c3818f9cd1f79bca2475881d96f13a2de74e1b9 100644 (file)
--- 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 8dba19d69f2ec0f9560e88cb73d0da5af530a9df..310544cbed9ad5cd3dc52fe10db7139a47af0d92 100644 (file)
--- 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 9f6fdc07b3e8cbe57c0a2a6a5508bdc14a463cff..835a79f7adb0e97fab04b19d9654f72a806fa26c 100644 (file)
--- 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 6cd7819ebae3f6c2efe931a41773f20d3ce9ff68..af4ada095698f262bebc822eb0c50d2b05db3760 100644 (file)
--- 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 e23d3b88f1d4ac8f64cfb596a6cf93e09cdba83f..f711313908641ce1ba07de87fd34631b23036fd5 100644 (file)
--- 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 f2fdcff8ce091b33c2eac02fc97d779648c1a8d1..3ef0e87291b5c4859a34f85941b26845f4ad5e7d 100644 (file)
--- 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 6c783439422a8170c85bd6ddfc9889e455ce5cc2..e392c441871505717967b5702fba88434b613ef3 100644 (file)
--- 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 c7fb4fd0cb998118102458ab7f30b48bd370c983..d1f2421181fd0b689a6c4751238d6a1a7afaf63f 100644 (file)
--- 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 c9cb50c0628c88ae3003b68d23f52773880f56cf..76833bb2e48f9c6e5c98fb1ae9df9263def9dde0 100644 (file)
--- 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 4539e2a1ea67616815a5e96ce212c08ebf9b4a47..81703883860246d16630b5504cad1c28b3027413 100644 (file)
--- 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 1b659fc127cf0db5124268b5d9763884af18234f..381b19773218e68f7f6973156ee6d6532da0d655 100644 (file)
--- 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 6a754518c89115d129d287a187033b6d4369daed..57e8ffd1b001f00b39b488c1e96a78ab8324e09b 100644 (file)
--- 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 31e46a222ff58093888d64f25df835815f612dc3..ee6ab872ad8352c3eef6dfb94d098ae33cc3498b 100644 (file)
--- 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 4efe150296d6e6a0c78f6074dccd51c98942d879..aabbc0174ddc62c4f6893522ba9cc0a6bbd54d9f 100644 (file)
--- 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 2a8e64b29abe763434e45f1ef6acf875546d4f38..a70d5f2e6f70aa7551f33c1a07f7128a5019abf2 100644 (file)
--- 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 2cf6d60bb86d636f30270c0ddf584e43b28e21cb..00e7041b57450dc9d9ba903153d05180512e8f92 100644 (file)
--- 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 abe0b3dbcc3c189a4bfc46544f82bfe0f90478ee..3b210443a4eb0fed6125e24e2073067cd3ae08fd 100644 (file)
--- 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 7ebbc7c82607344909fcf41e50569ce57d4644b6..6037bb2d82e22219fdc4a3a9c513faebe6149610 100644 (file)
--- 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 346d54648dcf8467edcea5f48a3cb5c2c01c79c9..6edaa104f34d5113caf4f97244d570b8dc16ce8c 100644 (file)
--- 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 edcd67357864935b28410813295f6fd69c7d9be2..34894b7a15f8a73d12c3747d3edc1a46381b6d66 100644 (file)
--- 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 4568b46e1cfb1e91a3780159b30a96e7b10d1b16..3deb0ba70f974396abb3cbef717abbfd4bb52c36 100644 (file)
--- 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 4e108250be9fd9e36de980ac5824a8bc44856812..bf19319bcb87199ffec57f5e32552e84cd5c8233 100644 (file)
--- 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 26465b23b860c44b0d3f6a7ca603e834d58c19ff..4959b408dbeb4fbbf2eaef1bbd60970070e5ba3a 100644 (file)
--- 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 64adc76aa1a1d3eb24f8d0bbccc86095e06f4f5e..adb7689750700a8e018dcf009e7385583727d1cd 100644 (file)
--- 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 aaf47327dde96493de35e24b53ec9ce702232ecb..524664917a58485b6b885e7d0c749cdb95f0b83b 100644 (file)
--- 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 f3fc0b7bddc4f0b68db848af48c193d780598b2e..926f890a6c2902c03ad71bd7d5c57ca0d3a3b49b 100644 (file)
--- 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 e7fa7ab7c07f86c5e58851efadcd556c47ad32e7..7fc6cef64c97e96f3532b0177a68540d828ec8ff 100644 (file)
--- 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 c1d89ecd41278a8c832f210ac72251062e9976f2..6ba86e5c7b8d37f42c3ddaf095e332a447debcf7 100644 (file)
--- 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 88bf5f098515898e86c45feb9518fc21f284ffe0..be3a623b3fa9ba56e3f37f9730b0e72bbfdaf922 100644 (file)
--- 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 eaac8337725cad712b77969670b075a28b202633..b04076956e9b2fd502f1dae0ba80a33c21e09d24 100644 (file)
--- 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 06cad9da18eb45aac338184022e8e0b70385f8dd..3ea9b1fb337514025ef006dfad12daf7c078df4c 100644 (file)
--- 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 09fba195df7069020cd4777c08a5f473fd2c02af..306326b4f9f83bfb900525615a304b2760ff054d 100644 (file)
--- 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 12db8132b839be7fba7968f666d7b1b8dee7a696..848b21d2f6a8125060a3dbfa502612a60e535535 100644 (file)
--- 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 9eb4338b7147431f5d5f2595b6bdb01f2179426c..5a2847da17b286cefa3776104fe8e89d0ff2c26c 100644 (file)
--- 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 210e8bb882391b1b42d8aec006506d7727cf3b2f..6983570182cee20e9bd3a1c4002e956d456b17c5 100644 (file)
--- 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 f4291c57a9ea91fd42bfe8e1204ebdab90b44422..8c05fe1d86836052617eb54bb4d7f1a2ed290306 100644 (file)
--- 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 31cd1d38ce03b506f487149ed91655eb7a5cda04..a7014bd6e19b5f28970aa9c1bf8ee492c6eebced 100644 (file)
--- 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 41790a1c66d2c136f385cb5f7bd36eae67f78de6..72771c13f0c34d9c38b1e7613b6cb653e097d566 100644 (file)
--- 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 9f49e6d7e1b74d56cb75bf3b283a41114534400f..0c777d1cf56dbab0b10e3a04705573bb9461916c 100644 (file)
--- 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 ecac17cd166a6168fba1da2c9632920bba50d7c7..10048c5d828458feb71678891c3f1e28804b5079 100644 (file)
--- 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 75a3957284fc9a5b400b8d0d79a5f7d8ba4d0357..42acea066ea5f646475cb75a08c42743d689a315 100644 (file)
--- 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 57f4000a3c33da33c0fcba79eb3b7f51705bf29a..09498b3f6210afa5f7e5ad52304c028460694fe9 100644 (file)
--- 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 169dff7b1068499b2a551f3b3a744226d7468784..e498ce37f2d24d56af53ecf48a8fe2961c992600 100644 (file)
--- 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 8eda4669cb29cd1a4304bf7991febcebe49f6873..c952678e0974e219a2dd9a8428a700bee2b77804 100644 (file)
--- 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 433acc1b83cadeb2f81a3cb37481740a5dc3a862..3669b4a0624a30fbcf398b381de6f5b483a482f2 100644 (file)
--- 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 38b98d5a300f2f0dc66765f526f193ac1554358f..597cd472cb3d0995496e73eecd905924b7f5af3e 100644 (file)
--- 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 ffbf64013ad00edd6728971aa1e693ecc985afbc..481ec6f6b23c17f6c49d46bf35de3199bd5ebb41 100644 (file)
--- 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 654dc939c239d4708cac727270ef6b77bd043dba..b68f66664fc988fbaab8a896410838d0275daeac 100644 (file)
--- 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 9a8a91cc77ecb740c872e7ca75e1baf2686c243b..c2d49ee32524cb1a34255b72fc3c42dcb6bd8f43 100644 (file)
--- 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 b2ea7a4e3eb9bc0a6619eb0382412be6983f1a52..4542c097e78e3b8afc417251972a9d082854af04 100644 (file)
--- 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 f5df73350a6caf9e72e81f8936521980ac70a4ac..ddb8dcb9e2269b06a6c9cbf45d8f6ded565b5ede 100644 (file)
--- 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 4a4f79fed54a6cec20df6f16bf9ef87d5c3e94be..6a42cd513632735d4a8ca2a7898e3bdc4e22d0be 100644 (file)
--- 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 c3ecbac90ff8a9a5dedf64cca8cb02de231603b3..19f6ac95b03481d1cf99009ce815b209460e5745 100644 (file)
--- 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 adcdeb68997d1c5b8f2d9cc616709ed50219cc22..819a8856c3366a5e56dc16fac4874909a157c252 100644 (file)
--- 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 5e8257eaf1fd3091cd2ba433afa161f15f45bb6f..97ddbaeee4291b1567e6a17c2377bed98ebffb90 100644 (file)
--- 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 6f7c307e1bc029611f660a23eeaa3106dc2821ea..8cf0289a5a33885d18c66e9d84b48eef974e48da 100644 (file)
--- 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 a3bd96a6e4ba1b2867d09cc8167f7e95c4cfbae7..e22ff5d539c84286ecb18d83ee78ed90cb0a7a4f 100644 (file)
--- 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 86a406031714e1686b773d1a06b770ea8e4367af..cb3c281a79483302823abc949c7b33dca015ab1f 100644 (file)
--- 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 f73f063d30a3fb49b6c9d2608487a884e7300148..e5da7d1dba25c5918703323792f255a840f0aba9 100644 (file)
--- 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 77839f2b67c5722809727f354bc40cb72a070ebc..244128cfe1f1d3433eff7ba04384db31a3cdfea2 100644 (file)
--- 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 76b6f2f634c5f8b0bdab46c1e5cbc82266e0a95a..556b5faa8c82e123f4d0ae27c9b76dee6a2e306b 100644 (file)
--- 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 778748e93a2d32f0e2bdd85ff31bfc5a844a199d..62a58c47d82c6d42700cc11900af63b6aad281bd 100644 (file)
--- 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 7fa4664abac380c367f9cc0fb61b0e39b3a002a1..3732113b832397ff49d4dba99c2d21cd9dacedfb 100644 (file)
--- 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 2373a35813eb93c782f8dc542100a165f9f7952c..06c7e81246d84a236c393717c30e083726ea23f7 100644 (file)
--- 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 a4fcd5db49a9212c304402550141396e4fccaba7..99d888f0837dfa2d3c2b1bf3a310163e623bdd76 100644 (file)
--- 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 a72d90834243814e9158090455a55dcc2d33482f..295a9c991539ee561aabd6362172e624f7cde355 100644 (file)
--- 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 06d6ccbba99862657ec6544c097e334721d86ed9..a84ff72d7ab15ce798d14cb526ac302427bfd3c4 100644 (file)
--- 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 e6939689c4cde6c23f1f6736a5b2a656c381f728..fa17b55f0f98a2c2ee8ea7952859cfca7796f9a7 100644 (file)
--- 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 61556f4d4222b0b2eb93c0d0081f84afee81f480..48c487255b552d656a1c952021b0cf7c5d8c7389 100644 (file)
--- 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;