diff --git a/src/Standard/FILES b/src/Standard/FILES index a8c48a1745..4710604718 100755 --- a/src/Standard/FILES +++ b/src/Standard/FILES @@ -95,3 +95,5 @@ Standard_Underflow.hxx Standard_UUID.hxx Standard_values.h Standard_Version.hxx +Standard_WarningsDisable.hxx +Standard_WarningsRestore.hxx \ No newline at end of file diff --git a/src/Standard/Standard_WarningsDisable.hxx b/src/Standard/Standard_WarningsDisable.hxx new file mode 100644 index 0000000000..199d746ca4 --- /dev/null +++ b/src/Standard/Standard_WarningsDisable.hxx @@ -0,0 +1,30 @@ +// Copyright (c) 2018 OPEN CASCADE SAS +// +// This file is part of Open CASCADE Technology software library. +// +// This library is free software; you can redistribute it and/or modify it under +// the terms of the GNU Lesser General Public License version 2.1 as published +// by the Free Software Foundation, with special exception defined in the file +// OCCT_LGPL_EXCEPTION.txt. Consult the file LICENSE_LGPL_21.txt included in OCCT +// distribution for complete text of the license and disclaimer of any warranty. +// +// Alternatively, this file may be used under the terms of Open CASCADE +// commercial license or contractual agreement. + +//!@file Supresses compiler warnings. +//! +//! Standard_WarningsDisable.hxx disables all compiler warnings. +//! Standard_WarningsRestore.hxx restore the previous state of warnings. +//! +//! Use these headers to wrap include directive containing external (non-OCCT) +//! header files to avoid compiler warnings to be generated for these files. +//! They should always be used in pair: +//! +//! #include +//! #include // some header that can generate warnings +//! #include + +#ifdef _MSC_VER +#pragma warning(push, 0) +#endif + diff --git a/src/Standard/Standard_WarningsRestore.hxx b/src/Standard/Standard_WarningsRestore.hxx new file mode 100644 index 0000000000..f03cc66429 --- /dev/null +++ b/src/Standard/Standard_WarningsRestore.hxx @@ -0,0 +1,30 @@ +// Copyright (c) 2018 OPEN CASCADE SAS +// +// This file is part of Open CASCADE Technology software library. +// +// This library is free software; you can redistribute it and/or modify it under +// the terms of the GNU Lesser General Public License version 2.1 as published +// by the Free Software Foundation, with special exception defined in the file +// OCCT_LGPL_EXCEPTION.txt. Consult the file LICENSE_LGPL_21.txt included in OCCT +// distribution for complete text of the license and disclaimer of any warranty. +// +// Alternatively, this file may be used under the terms of Open CASCADE +// commercial license or contractual agreement. + +//!@file Restores compiler warnings suppressed by inclusion of Standard_WarningsDisable.hxx. +//! +//! Standard_WarningsDisable.hxx disables all compiler warnings. +//! Standard_WarningsRestore.hxx restore the previous state of warnings. +//! +//! Use these headers to wrap include directive containing external (non-OCCT) +//! header files to avoid compiler warnings to be generated for these files. +//! They should always be used in pair: +//! +//! #include +//! #include // some header that can generate warnings +//! #include + +#ifdef _MSC_VER +#pragma warning(pop) +#endif + diff --git a/tools/DFBrowser/DFBrowser_AttributePaneStack.cxx b/tools/DFBrowser/DFBrowser_AttributePaneStack.cxx index 541f7a1116..ebc2d1b367 100644 --- a/tools/DFBrowser/DFBrowser_AttributePaneStack.cxx +++ b/tools/DFBrowser/DFBrowser_AttributePaneStack.cxx @@ -27,9 +27,11 @@ #include +#include #include #include #include +#include // ======================================================================= // function : Constructor diff --git a/tools/DFBrowser/DFBrowser_AttributePaneStack.hxx b/tools/DFBrowser/DFBrowser_AttributePaneStack.hxx index e54c39b670..24d5f73599 100644 --- a/tools/DFBrowser/DFBrowser_AttributePaneStack.hxx +++ b/tools/DFBrowser/DFBrowser_AttributePaneStack.hxx @@ -21,10 +21,12 @@ #include +#include #include #include #include #include +#include class DFBrowserPane_AttributePaneAPI; class DFBrowserPane_AttributePaneSelector; diff --git a/tools/DFBrowser/DFBrowser_Communicator.hxx b/tools/DFBrowser/DFBrowser_Communicator.hxx index 548e955331..3f27eb7a2e 100644 --- a/tools/DFBrowser/DFBrowser_Communicator.hxx +++ b/tools/DFBrowser/DFBrowser_Communicator.hxx @@ -22,7 +22,9 @@ #include #include +#include #include +#include class DFBrowser_Window; diff --git a/tools/DFBrowser/DFBrowser_DumpView.cxx b/tools/DFBrowser/DFBrowser_DumpView.cxx index 405aacbf07..c7e957105c 100644 --- a/tools/DFBrowser/DFBrowser_DumpView.cxx +++ b/tools/DFBrowser/DFBrowser_DumpView.cxx @@ -21,12 +21,14 @@ #include #include +#include #include #include #include #include #include #include +#include // ======================================================================= // function : onSelectionChanged diff --git a/tools/DFBrowser/DFBrowser_DumpView.hxx b/tools/DFBrowser/DFBrowser_DumpView.hxx index 395458d5c0..95c35f86f3 100644 --- a/tools/DFBrowser/DFBrowser_DumpView.hxx +++ b/tools/DFBrowser/DFBrowser_DumpView.hxx @@ -19,12 +19,11 @@ #include #include -#ifdef _MSC_VER -#pragma warning(disable : 4127) // conditional expression is constant -#endif +#include #include #include #include +#include class QWidget; diff --git a/tools/DFBrowser/DFBrowser_HighlightDelegate.cxx b/tools/DFBrowser/DFBrowser_HighlightDelegate.cxx index 3d7b55e692..5fd811c24a 100644 --- a/tools/DFBrowser/DFBrowser_HighlightDelegate.cxx +++ b/tools/DFBrowser/DFBrowser_HighlightDelegate.cxx @@ -14,9 +14,11 @@ // commercial license or contractual agreement. #include - #include + +#include #include +#include // ======================================================================= // function : paint diff --git a/tools/DFBrowser/DFBrowser_HighlightDelegate.hxx b/tools/DFBrowser/DFBrowser_HighlightDelegate.hxx index 00b740ad7d..5106821b9c 100644 --- a/tools/DFBrowser/DFBrowser_HighlightDelegate.hxx +++ b/tools/DFBrowser/DFBrowser_HighlightDelegate.hxx @@ -19,10 +19,9 @@ #include #include -#ifdef _MSC_VER -#pragma warning(disable : 4127) // conditional expression is constant -#endif +#include #include +#include //! \class DFBrowser_HighlightDelegate //! \brief An item delegate to paint in highlight color the cell when the mouse cursor is over it diff --git a/tools/DFBrowser/DFBrowser_Item.cxx b/tools/DFBrowser/DFBrowser_Item.cxx index b5b6fc8e49..82b63b3033 100644 --- a/tools/DFBrowser/DFBrowser_Item.cxx +++ b/tools/DFBrowser/DFBrowser_Item.cxx @@ -26,8 +26,10 @@ #include #include +#include #include #include +#include const int INFO_LENGHT = 60; diff --git a/tools/DFBrowser/DFBrowser_Item.hxx b/tools/DFBrowser/DFBrowser_Item.hxx index 5c10ac1c05..5b9220ceb4 100644 --- a/tools/DFBrowser/DFBrowser_Item.hxx +++ b/tools/DFBrowser/DFBrowser_Item.hxx @@ -22,9 +22,11 @@ #include #include +#include #include #include #include +#include class DFBrowser_Item; typedef QExplicitlySharedDataPointer DFBrowser_ItemPtr; diff --git a/tools/DFBrowser/DFBrowser_ItemApplication.cxx b/tools/DFBrowser/DFBrowser_ItemApplication.cxx index f6555fc13b..4fa7ec824c 100644 --- a/tools/DFBrowser/DFBrowser_ItemApplication.cxx +++ b/tools/DFBrowser/DFBrowser_ItemApplication.cxx @@ -23,7 +23,9 @@ #include #include +#include #include +#include // ======================================================================= // function : createChild diff --git a/tools/DFBrowser/DFBrowser_ItemBase.cxx b/tools/DFBrowser/DFBrowser_ItemBase.cxx index 9cbd59639d..89d58b98bd 100644 --- a/tools/DFBrowser/DFBrowser_ItemBase.cxx +++ b/tools/DFBrowser/DFBrowser_ItemBase.cxx @@ -26,9 +26,11 @@ #include #include +#include #include #include #include +#include // ======================================================================= // function : Constructor diff --git a/tools/DFBrowser/DFBrowser_ItemDocument.cxx b/tools/DFBrowser/DFBrowser_ItemDocument.cxx index 37029caa97..915b1d368f 100644 --- a/tools/DFBrowser/DFBrowser_ItemDocument.cxx +++ b/tools/DFBrowser/DFBrowser_ItemDocument.cxx @@ -23,9 +23,11 @@ #include #include +#include #include #include #include +#include // ======================================================================= // function : GetLabel diff --git a/tools/DFBrowser/DFBrowser_ItemRole.hxx b/tools/DFBrowser/DFBrowser_ItemRole.hxx index d06f24d792..3d3b62d611 100644 --- a/tools/DFBrowser/DFBrowser_ItemRole.hxx +++ b/tools/DFBrowser/DFBrowser_ItemRole.hxx @@ -18,7 +18,9 @@ #include +#include #include +#include //! Additional data item role for DFBrowser tree item enum DFBrowser_ItemRole diff --git a/tools/DFBrowser/DFBrowser_Module.cxx b/tools/DFBrowser/DFBrowser_Module.cxx index 0a04c64621..2aff65e7f1 100644 --- a/tools/DFBrowser/DFBrowser_Module.cxx +++ b/tools/DFBrowser/DFBrowser_Module.cxx @@ -32,8 +32,10 @@ #include +#include #include #include +#include // ======================================================================= // function : Constructor diff --git a/tools/DFBrowser/DFBrowser_Module.hxx b/tools/DFBrowser/DFBrowser_Module.hxx index d3e2748555..e75fbb0f34 100644 --- a/tools/DFBrowser/DFBrowser_Module.hxx +++ b/tools/DFBrowser/DFBrowser_Module.hxx @@ -27,7 +27,9 @@ #include #include +#include #include +#include class DFBrowserPane_AttributePaneAPI; class DFBrowserPane_AttributePaneCreatorAPI; diff --git a/tools/DFBrowser/DFBrowser_PropertyPanel.cxx b/tools/DFBrowser/DFBrowser_PropertyPanel.cxx index 52545a3845..66cdcdf5c0 100644 --- a/tools/DFBrowser/DFBrowser_PropertyPanel.cxx +++ b/tools/DFBrowser/DFBrowser_PropertyPanel.cxx @@ -21,10 +21,12 @@ #include #include +#include #include #include #include #include +#include // ======================================================================= // function : Constructor diff --git a/tools/DFBrowser/DFBrowser_PropertyPanel.hxx b/tools/DFBrowser/DFBrowser_PropertyPanel.hxx index 8bfba4b18c..1a55af76f8 100644 --- a/tools/DFBrowser/DFBrowser_PropertyPanel.hxx +++ b/tools/DFBrowser/DFBrowser_PropertyPanel.hxx @@ -20,8 +20,10 @@ #include +#include #include #include +#include class DFBrowser_AttributePaneStack; diff --git a/tools/DFBrowser/DFBrowser_SearchItemInfo.hxx b/tools/DFBrowser/DFBrowser_SearchItemInfo.hxx index e6e62e8ff9..fb9a153975 100644 --- a/tools/DFBrowser/DFBrowser_SearchItemInfo.hxx +++ b/tools/DFBrowser/DFBrowser_SearchItemInfo.hxx @@ -16,12 +16,11 @@ #ifndef DFBrowser_SearchItemInfo_H #define DFBrowser_SearchItemInfo_H -#ifdef _MSC_VER -#pragma warning(disable : 4127) // conditional expression is constant -#endif +#include #include #include #include +#include //! \class DFBrowser_SearchItemInfo //! Information of item in search model diff --git a/tools/DFBrowser/DFBrowser_SearchLine.cxx b/tools/DFBrowser/DFBrowser_SearchLine.cxx index d0981894ed..740caf544b 100644 --- a/tools/DFBrowser/DFBrowser_SearchLine.cxx +++ b/tools/DFBrowser/DFBrowser_SearchLine.cxx @@ -25,6 +25,7 @@ #include #include +#include #include #include #include @@ -35,6 +36,7 @@ #include #include #include +#include //! class DFBrowser_LineEdit //! Extension of Qt line edit to visualize help text until the line edit control has not been filled yet diff --git a/tools/DFBrowser/DFBrowser_SearchLine.hxx b/tools/DFBrowser/DFBrowser_SearchLine.hxx index ac8438613c..54c3ae15d3 100644 --- a/tools/DFBrowser/DFBrowser_SearchLine.hxx +++ b/tools/DFBrowser/DFBrowser_SearchLine.hxx @@ -22,9 +22,11 @@ #include #include +#include #include #include #include +#include class DFBrowser_Module; class DFBrowser_SearchLineModel; diff --git a/tools/DFBrowser/DFBrowser_SearchLineModel.cxx b/tools/DFBrowser/DFBrowser_SearchLineModel.cxx index 362b258ac9..a4d7fbed60 100644 --- a/tools/DFBrowser/DFBrowser_SearchLineModel.cxx +++ b/tools/DFBrowser/DFBrowser_SearchLineModel.cxx @@ -22,8 +22,10 @@ #include #include +#include #include #include +#include // ======================================================================= // function : Constructor diff --git a/tools/DFBrowser/DFBrowser_SearchLineModel.hxx b/tools/DFBrowser/DFBrowser_SearchLineModel.hxx index cfc8e9b699..3aeb9eae7c 100644 --- a/tools/DFBrowser/DFBrowser_SearchLineModel.hxx +++ b/tools/DFBrowser/DFBrowser_SearchLineModel.hxx @@ -23,13 +23,12 @@ #include #include -#ifdef _MSC_VER -#pragma warning(disable : 4127) // conditional expression is constant -#endif +#include #include #include #include #include +#include class QObject; class DFBrowser_Module; diff --git a/tools/DFBrowser/DFBrowser_SearchView.cxx b/tools/DFBrowser/DFBrowser_SearchView.cxx index 54d694dcaa..437eac2228 100644 --- a/tools/DFBrowser/DFBrowser_SearchView.cxx +++ b/tools/DFBrowser/DFBrowser_SearchView.cxx @@ -22,11 +22,13 @@ #include +#include #include #include #include #include #include +#include const int DEFAULT_COLUMN_WIDTH = 500; const int DEFAULT_ICON_SIZE = 40; diff --git a/tools/DFBrowser/DFBrowser_SearchView.hxx b/tools/DFBrowser/DFBrowser_SearchView.hxx index 44fc17728a..dd5b482143 100644 --- a/tools/DFBrowser/DFBrowser_SearchView.hxx +++ b/tools/DFBrowser/DFBrowser_SearchView.hxx @@ -21,8 +21,10 @@ #include +#include #include #include +#include class DFBrowser_SearchLine; class QTableView; diff --git a/tools/DFBrowser/DFBrowser_Shortcut.cxx b/tools/DFBrowser/DFBrowser_Shortcut.cxx index 2f644c5aa1..1908eb72bb 100644 --- a/tools/DFBrowser/DFBrowser_Shortcut.cxx +++ b/tools/DFBrowser/DFBrowser_Shortcut.cxx @@ -17,8 +17,10 @@ #include +#include #include #include +#include // ======================================================================= // function : Constructor diff --git a/tools/DFBrowser/DFBrowser_Shortcut.hxx b/tools/DFBrowser/DFBrowser_Shortcut.hxx index 26c0d81346..977b4517db 100644 --- a/tools/DFBrowser/DFBrowser_Shortcut.hxx +++ b/tools/DFBrowser/DFBrowser_Shortcut.hxx @@ -19,10 +19,9 @@ #include #include -#ifdef _MSC_VER -#pragma warning(disable : 4127) // conditional expression is constant -#endif +#include #include +#include class DFBrowser_Module; class QEvent; diff --git a/tools/DFBrowser/DFBrowser_Thread.cxx b/tools/DFBrowser/DFBrowser_Thread.cxx index a6ed15493e..2e33bdccfc 100644 --- a/tools/DFBrowser/DFBrowser_Thread.cxx +++ b/tools/DFBrowser/DFBrowser_Thread.cxx @@ -21,7 +21,9 @@ #include +#include #include +#include //! \class DFBrowser_QThread //! Internal class to cover QThread in order to process ThreadItem. diff --git a/tools/DFBrowser/DFBrowser_Thread.hxx b/tools/DFBrowser/DFBrowser_Thread.hxx index 56cf9c661c..361c808f1c 100644 --- a/tools/DFBrowser/DFBrowser_Thread.hxx +++ b/tools/DFBrowser/DFBrowser_Thread.hxx @@ -18,11 +18,10 @@ #include -#ifdef _MSC_VER -#pragma warning(disable : 4127) // conditional expression is constant -#endif +#include #include #include +#include class DFBrowser_Module; class DFBrowser_ThreadItem; diff --git a/tools/DFBrowser/DFBrowser_ThreadItemSearch.cxx b/tools/DFBrowser/DFBrowser_ThreadItemSearch.cxx index b734ba1589..6a605ee28b 100644 --- a/tools/DFBrowser/DFBrowser_ThreadItemSearch.cxx +++ b/tools/DFBrowser/DFBrowser_ThreadItemSearch.cxx @@ -27,7 +27,9 @@ #include #include +#include #include +#include // ======================================================================= // function : Run diff --git a/tools/DFBrowser/DFBrowser_ThreadItemSearch.hxx b/tools/DFBrowser/DFBrowser_ThreadItemSearch.hxx index b1112d1a00..5b73d2b635 100644 --- a/tools/DFBrowser/DFBrowser_ThreadItemSearch.hxx +++ b/tools/DFBrowser/DFBrowser_ThreadItemSearch.hxx @@ -22,9 +22,11 @@ #include #include +#include #include #include #include +#include class DFBrowser_Module; class DFBrowser_SearchLine; diff --git a/tools/DFBrowser/DFBrowser_ThreadItemUsedShapesMap.hxx b/tools/DFBrowser/DFBrowser_ThreadItemUsedShapesMap.hxx index 21ecd20138..8418d954b5 100644 --- a/tools/DFBrowser/DFBrowser_ThreadItemUsedShapesMap.hxx +++ b/tools/DFBrowser/DFBrowser_ThreadItemUsedShapesMap.hxx @@ -23,11 +23,10 @@ #include #include -#ifdef _MSC_VER -#pragma warning(disable : 4127) // conditional expression is constant -#endif +#include #include #include +#include class DFBrowser_Module; diff --git a/tools/DFBrowser/DFBrowser_Tools.cxx b/tools/DFBrowser/DFBrowser_Tools.cxx index 950ff0e055..b586261f76 100644 --- a/tools/DFBrowser/DFBrowser_Tools.cxx +++ b/tools/DFBrowser/DFBrowser_Tools.cxx @@ -28,10 +28,12 @@ #include #include +#include #include #include #include #include +#include namespace DFBrowser_Tools { diff --git a/tools/DFBrowser/DFBrowser_Tools.hxx b/tools/DFBrowser/DFBrowser_Tools.hxx index 65658a3b7c..e8cbc19337 100644 --- a/tools/DFBrowser/DFBrowser_Tools.hxx +++ b/tools/DFBrowser/DFBrowser_Tools.hxx @@ -25,6 +25,7 @@ #include #include +#include #include #include #include @@ -32,6 +33,7 @@ #include #include #include +#include class DFBrowserPane_AttributePaneAPI; diff --git a/tools/DFBrowser/DFBrowser_TreeLevelLine.cxx b/tools/DFBrowser/DFBrowser_TreeLevelLine.cxx index 24ed7d294b..288f831de6 100644 --- a/tools/DFBrowser/DFBrowser_TreeLevelLine.cxx +++ b/tools/DFBrowser/DFBrowser_TreeLevelLine.cxx @@ -22,6 +22,7 @@ #include +#include #include #include #include @@ -32,6 +33,7 @@ #include #include #include +#include const int HISTORY_SIZE = 10; const int MARGIN_SIZE = 2; diff --git a/tools/DFBrowser/DFBrowser_TreeLevelLine.hxx b/tools/DFBrowser/DFBrowser_TreeLevelLine.hxx index d24bd27464..2de8bfe3e6 100644 --- a/tools/DFBrowser/DFBrowser_TreeLevelLine.hxx +++ b/tools/DFBrowser/DFBrowser_TreeLevelLine.hxx @@ -20,10 +20,12 @@ #include +#include #include #include #include #include +#include class DFBrowser_SearchLine; diff --git a/tools/DFBrowser/DFBrowser_TreeLevelLineDelegate.cxx b/tools/DFBrowser/DFBrowser_TreeLevelLineDelegate.cxx index 1b1be9f4ba..a8aa594463 100644 --- a/tools/DFBrowser/DFBrowser_TreeLevelLineDelegate.cxx +++ b/tools/DFBrowser/DFBrowser_TreeLevelLineDelegate.cxx @@ -16,7 +16,9 @@ #include #include +#include #include +#include // ======================================================================= // function : Constructor diff --git a/tools/DFBrowser/DFBrowser_TreeLevelLineDelegate.hxx b/tools/DFBrowser/DFBrowser_TreeLevelLineDelegate.hxx index d8b0cf17cf..c97c078a33 100644 --- a/tools/DFBrowser/DFBrowser_TreeLevelLineDelegate.hxx +++ b/tools/DFBrowser/DFBrowser_TreeLevelLineDelegate.hxx @@ -19,10 +19,9 @@ #include #include -#ifdef _MSC_VER -#pragma warning(disable : 4127) // conditional expression is constant -#endif +#include #include +#include //! \class DFBrowser_TreeLevelLineDelegate //! Extending standard item delegate by: diff --git a/tools/DFBrowser/DFBrowser_TreeLevelLineModel.cxx b/tools/DFBrowser/DFBrowser_TreeLevelLineModel.cxx index acdb76368f..16e2964232 100644 --- a/tools/DFBrowser/DFBrowser_TreeLevelLineModel.cxx +++ b/tools/DFBrowser/DFBrowser_TreeLevelLineModel.cxx @@ -18,8 +18,10 @@ #include #include +#include #include #include +#include // ======================================================================= // function : Init diff --git a/tools/DFBrowser/DFBrowser_TreeLevelLineModel.hxx b/tools/DFBrowser/DFBrowser_TreeLevelLineModel.hxx index e79467ee60..667f208d8b 100644 --- a/tools/DFBrowser/DFBrowser_TreeLevelLineModel.hxx +++ b/tools/DFBrowser/DFBrowser_TreeLevelLineModel.hxx @@ -20,9 +20,11 @@ #include +#include #include #include #include +#include //! \class DFBrowser_TreeLevelLineModel //! Tree Model of tree line items. It is initialized by OCAF tree model index. Each element of the current model diff --git a/tools/DFBrowser/DFBrowser_TreeLevelView.cxx b/tools/DFBrowser/DFBrowser_TreeLevelView.cxx index 855aacdf2b..0d1f6b8bcb 100644 --- a/tools/DFBrowser/DFBrowser_TreeLevelView.cxx +++ b/tools/DFBrowser/DFBrowser_TreeLevelView.cxx @@ -21,12 +21,13 @@ #include #include +#include #include - #include #include #include #include +#include const int LABEL_OR_ATTRIBUTECOLUMN_WIDTH = 160; diff --git a/tools/DFBrowser/DFBrowser_TreeLevelView.hxx b/tools/DFBrowser/DFBrowser_TreeLevelView.hxx index 6b9118accb..ae961a9644 100644 --- a/tools/DFBrowser/DFBrowser_TreeLevelView.hxx +++ b/tools/DFBrowser/DFBrowser_TreeLevelView.hxx @@ -20,8 +20,10 @@ #include +#include #include #include +#include class QWidget; class QTableView; diff --git a/tools/DFBrowser/DFBrowser_TreeLevelViewModel.cxx b/tools/DFBrowser/DFBrowser_TreeLevelViewModel.cxx index 9f442d061d..63802ba1aa 100644 --- a/tools/DFBrowser/DFBrowser_TreeLevelViewModel.cxx +++ b/tools/DFBrowser/DFBrowser_TreeLevelViewModel.cxx @@ -26,10 +26,12 @@ #include #include +#include #include #include #include #include +#include // ======================================================================= // function : Init diff --git a/tools/DFBrowser/DFBrowser_TreeLevelViewModel.hxx b/tools/DFBrowser/DFBrowser_TreeLevelViewModel.hxx index 705d09c798..5c564f348f 100644 --- a/tools/DFBrowser/DFBrowser_TreeLevelViewModel.hxx +++ b/tools/DFBrowser/DFBrowser_TreeLevelViewModel.hxx @@ -19,11 +19,10 @@ #include #include -#ifdef _MSC_VER -#pragma warning(disable : 4127) // conditional expression is constant -#endif +#include #include #include +#include class QObject; diff --git a/tools/DFBrowser/DFBrowser_TreeModel.cxx b/tools/DFBrowser/DFBrowser_TreeModel.cxx index c23a43f413..e4c4255e78 100644 --- a/tools/DFBrowser/DFBrowser_TreeModel.cxx +++ b/tools/DFBrowser/DFBrowser_TreeModel.cxx @@ -28,7 +28,9 @@ #include #include +#include #include +#include // ======================================================================= // function : Constructor diff --git a/tools/DFBrowser/DFBrowser_TreeModel.hxx b/tools/DFBrowser/DFBrowser_TreeModel.hxx index 1bc3b4b654..91afa8161d 100644 --- a/tools/DFBrowser/DFBrowser_TreeModel.hxx +++ b/tools/DFBrowser/DFBrowser_TreeModel.hxx @@ -24,9 +24,11 @@ #include #include +#include #include #include #include +#include class DFBrowser_Module; class DFBrowser_TreeModel; diff --git a/tools/DFBrowser/DFBrowser_TreeView.hxx b/tools/DFBrowser/DFBrowser_TreeView.hxx index 1e1f6d4ec5..8dbc17d7c1 100644 --- a/tools/DFBrowser/DFBrowser_TreeView.hxx +++ b/tools/DFBrowser/DFBrowser_TreeView.hxx @@ -19,10 +19,9 @@ #include #include -#ifdef _MSC_VER -#pragma warning(disable : 4127) // conditional expression is constant -#endif +#include #include +#include //! \class DFBrowser_TreeView //! Extended tree view control with possibility to set predefined size. diff --git a/tools/DFBrowser/DFBrowser_Window.cxx b/tools/DFBrowser/DFBrowser_Window.cxx index 452ef75695..2336f74fcf 100644 --- a/tools/DFBrowser/DFBrowser_Window.cxx +++ b/tools/DFBrowser/DFBrowser_Window.cxx @@ -60,6 +60,7 @@ #include #include +#include #include #include #include @@ -81,6 +82,7 @@ #else #include #endif +#include const int DFBROWSER_DEFAULT_WIDTH = 650; const int DFBROWSER_DEFAULT_HEIGHT = 350; diff --git a/tools/DFBrowser/DFBrowser_Window.hxx b/tools/DFBrowser/DFBrowser_Window.hxx index 8eb8e603d7..d22484d6b5 100644 --- a/tools/DFBrowser/DFBrowser_Window.hxx +++ b/tools/DFBrowser/DFBrowser_Window.hxx @@ -25,13 +25,12 @@ #include #include -#ifdef _MSC_VER -#pragma warning(disable : 4127) // conditional expression is constant -#endif +#include #include #include #include #include +#include class DFBrowser_DumpView; class DFBrowser_Module; diff --git a/tools/DFBrowserPane/DFBrowserPane_AttributePane.cxx b/tools/DFBrowserPane/DFBrowserPane_AttributePane.cxx index 1b1326efc5..9468629a8b 100644 --- a/tools/DFBrowserPane/DFBrowserPane_AttributePane.cxx +++ b/tools/DFBrowserPane/DFBrowserPane_AttributePane.cxx @@ -21,11 +21,13 @@ #include +#include #include #include #include #include #include +#include // ======================================================================= // function : Constructor diff --git a/tools/DFBrowserPane/DFBrowserPane_AttributePane.hxx b/tools/DFBrowserPane/DFBrowserPane_AttributePane.hxx index 8ad949d290..c312d15668 100644 --- a/tools/DFBrowserPane/DFBrowserPane_AttributePane.hxx +++ b/tools/DFBrowserPane/DFBrowserPane_AttributePane.hxx @@ -22,11 +22,10 @@ #include #include -#ifdef _MSC_VER -#pragma warning(disable : 4127) // conditional expression is constant -#endif +#include #include #include +#include class DFBrowserPane_AttributePaneModel; class DFBrowserPane_TableView; diff --git a/tools/DFBrowserPane/DFBrowserPane_AttributePaneModel.cxx b/tools/DFBrowserPane/DFBrowserPane_AttributePaneModel.cxx index 3b306b4224..07064ae421 100644 --- a/tools/DFBrowserPane/DFBrowserPane_AttributePaneModel.cxx +++ b/tools/DFBrowserPane/DFBrowserPane_AttributePaneModel.cxx @@ -15,9 +15,11 @@ #include +#include #include #include #include +#include // ======================================================================= // function : Constructor diff --git a/tools/DFBrowserPane/DFBrowserPane_AttributePaneModel.hxx b/tools/DFBrowserPane/DFBrowserPane_AttributePaneModel.hxx index 047ea67d21..a578052794 100644 --- a/tools/DFBrowserPane/DFBrowserPane_AttributePaneModel.hxx +++ b/tools/DFBrowserPane/DFBrowserPane_AttributePaneModel.hxx @@ -19,12 +19,11 @@ #include #include -#ifdef _MSC_VER -#pragma warning(disable : 4127) // conditional expression is constant -#endif +#include #include #include #include +#include //! \class DFBrowserPane_AttributePaneModel //! \brief This is an extension of table model to visualize a container of values diff --git a/tools/DFBrowserPane/DFBrowserPane_AttributePaneSelector.hxx b/tools/DFBrowserPane/DFBrowserPane_AttributePaneSelector.hxx index 2123689757..ea9fe79b3b 100644 --- a/tools/DFBrowserPane/DFBrowserPane_AttributePaneSelector.hxx +++ b/tools/DFBrowserPane/DFBrowserPane_AttributePaneSelector.hxx @@ -18,12 +18,11 @@ #include -#ifdef _MSC_VER -#pragma warning(disable : 4127) // conditional expression is constant -#endif - +#include #include #include +#include + #include class QItemSelectionModel; diff --git a/tools/DFBrowserPane/DFBrowserPane_HelperArray.cxx b/tools/DFBrowserPane/DFBrowserPane_HelperArray.cxx index f52bbd446b..3109647c92 100644 --- a/tools/DFBrowserPane/DFBrowserPane_HelperArray.cxx +++ b/tools/DFBrowserPane/DFBrowserPane_HelperArray.cxx @@ -18,12 +18,14 @@ #include -#include +#include +#include #include #include #include #include #include +#include // ======================================================================= // function : Constructor diff --git a/tools/DFBrowserPane/DFBrowserPane_HelperArray.hxx b/tools/DFBrowserPane/DFBrowserPane_HelperArray.hxx index 071a1bd33d..bc331d32a0 100644 --- a/tools/DFBrowserPane/DFBrowserPane_HelperArray.hxx +++ b/tools/DFBrowserPane/DFBrowserPane_HelperArray.hxx @@ -24,11 +24,10 @@ class DFBrowserPane_TableView; class QWidget; -#ifdef _MSC_VER -#pragma warning(disable : 4127) // conditional expression is constant -#endif +#include #include #include +#include //! \class DFBrowserPane_HelperArray //! \brief Class that is used for list and array attributes. Two tables, the first for bounds, the second for values. diff --git a/tools/DFBrowserPane/DFBrowserPane_HelperExport.cxx b/tools/DFBrowserPane/DFBrowserPane_HelperExport.cxx index aa00516b18..b07ab40bba 100644 --- a/tools/DFBrowserPane/DFBrowserPane_HelperExport.cxx +++ b/tools/DFBrowserPane/DFBrowserPane_HelperExport.cxx @@ -18,8 +18,10 @@ #include #include +#include #include #include +#include // ======================================================================= // function : AddShape diff --git a/tools/DFBrowserPane/DFBrowserPane_HelperExport.hxx b/tools/DFBrowserPane/DFBrowserPane_HelperExport.hxx index 2760592458..dac03024a3 100644 --- a/tools/DFBrowserPane/DFBrowserPane_HelperExport.hxx +++ b/tools/DFBrowserPane/DFBrowserPane_HelperExport.hxx @@ -19,11 +19,10 @@ #include #include -#ifdef _MSC_VER -#pragma warning(disable : 4127) // conditional expression is constant -#endif +#include #include #include +#include //! \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' needs to have dll-interface... +#endif QMap myShapes; //!< a container of shapes +#ifdef _MSC_VER +#pragma warning(pop) +#endif }; #endif diff --git a/tools/DFBrowserPane/DFBrowserPane_ItemDelegateButton.cxx b/tools/DFBrowserPane/DFBrowserPane_ItemDelegateButton.cxx index 4c8652017d..39ede2c602 100644 --- a/tools/DFBrowserPane/DFBrowserPane_ItemDelegateButton.cxx +++ b/tools/DFBrowserPane/DFBrowserPane_ItemDelegateButton.cxx @@ -15,9 +15,11 @@ #include +#include #include #include #include +#include // ======================================================================= // function : Constructor diff --git a/tools/DFBrowserPane/DFBrowserPane_ItemDelegateButton.hxx b/tools/DFBrowserPane/DFBrowserPane_ItemDelegateButton.hxx index 086594409b..3b77bf3ad6 100644 --- a/tools/DFBrowserPane/DFBrowserPane_ItemDelegateButton.hxx +++ b/tools/DFBrowserPane/DFBrowserPane_ItemDelegateButton.hxx @@ -19,14 +19,13 @@ #include #include -#ifdef _MSC_VER -#pragma warning(disable : 4127) // conditional expression is constant -#endif +#include #include #include #include #include #include +#include class QObject; class QPainter; diff --git a/tools/DFBrowserPane/DFBrowserPane_TDFReference.cxx b/tools/DFBrowserPane/DFBrowserPane_TDFReference.cxx index 757b884e51..d57c161cd9 100644 --- a/tools/DFBrowserPane/DFBrowserPane_TDFReference.cxx +++ b/tools/DFBrowserPane/DFBrowserPane_TDFReference.cxx @@ -20,8 +20,11 @@ #include +#include #include #include +#include + // ======================================================================= // function : GetValues // purpose : diff --git a/tools/DFBrowserPane/DFBrowserPane_TDFTagSource.cxx b/tools/DFBrowserPane/DFBrowserPane_TDFTagSource.cxx index 653c72c9c3..fa0d1a198d 100644 --- a/tools/DFBrowserPane/DFBrowserPane_TDFTagSource.cxx +++ b/tools/DFBrowserPane/DFBrowserPane_TDFTagSource.cxx @@ -17,8 +17,10 @@ #include +#include #include #include +#include // ======================================================================= // function : GetValues diff --git a/tools/DFBrowserPane/DFBrowserPane_TDataStdAsciiString.cxx b/tools/DFBrowserPane/DFBrowserPane_TDataStdAsciiString.cxx index 502c6c1480..991f9fb86f 100644 --- a/tools/DFBrowserPane/DFBrowserPane_TDataStdAsciiString.cxx +++ b/tools/DFBrowserPane/DFBrowserPane_TDataStdAsciiString.cxx @@ -17,8 +17,10 @@ #include +#include #include #include +#include // ======================================================================= // function : GetValues diff --git a/tools/DFBrowserPane/DFBrowserPane_TDataStdBooleanArray.cxx b/tools/DFBrowserPane/DFBrowserPane_TDataStdBooleanArray.cxx index 64b30c60a2..3e6e49d957 100644 --- a/tools/DFBrowserPane/DFBrowserPane_TDataStdBooleanArray.cxx +++ b/tools/DFBrowserPane/DFBrowserPane_TDataStdBooleanArray.cxx @@ -20,13 +20,11 @@ #include -#ifdef _MSC_VER -#pragma warning(disable : 4127) // conditional expression is constant -#endif - +#include #include #include #include +#include // ======================================================================= // function : CreateWidget diff --git a/tools/DFBrowserPane/DFBrowserPane_TDataStdBooleanList.cxx b/tools/DFBrowserPane/DFBrowserPane_TDataStdBooleanList.cxx index 261131f007..57006af2bc 100644 --- a/tools/DFBrowserPane/DFBrowserPane_TDataStdBooleanList.cxx +++ b/tools/DFBrowserPane/DFBrowserPane_TDataStdBooleanList.cxx @@ -18,11 +18,10 @@ #include #include -#ifdef _MSC_VER -#pragma warning(disable : 4127) // conditional expression is constant -#endif +#include #include #include +#include // ======================================================================= // function : GetValues diff --git a/tools/DFBrowserPane/DFBrowserPane_TDataStdByteArray.cxx b/tools/DFBrowserPane/DFBrowserPane_TDataStdByteArray.cxx index 94d5ad9c16..e442a07ba2 100644 --- a/tools/DFBrowserPane/DFBrowserPane_TDataStdByteArray.cxx +++ b/tools/DFBrowserPane/DFBrowserPane_TDataStdByteArray.cxx @@ -20,8 +20,10 @@ #include +#include #include #include +#include // ======================================================================= // function : CreateWidget diff --git a/tools/DFBrowserPane/DFBrowserPane_TDataStdComment.cxx b/tools/DFBrowserPane/DFBrowserPane_TDataStdComment.cxx index a60a75cda0..74cc65d87f 100644 --- a/tools/DFBrowserPane/DFBrowserPane_TDataStdComment.cxx +++ b/tools/DFBrowserPane/DFBrowserPane_TDataStdComment.cxx @@ -18,8 +18,10 @@ #include +#include #include #include +#include // ======================================================================= // function : GetValues diff --git a/tools/DFBrowserPane/DFBrowserPane_TDataStdCurrent.cxx b/tools/DFBrowserPane/DFBrowserPane_TDataStdCurrent.cxx index 23d1ddfccb..94b3b79078 100644 --- a/tools/DFBrowserPane/DFBrowserPane_TDataStdCurrent.cxx +++ b/tools/DFBrowserPane/DFBrowserPane_TDataStdCurrent.cxx @@ -18,8 +18,10 @@ #include +#include #include #include +#include // ======================================================================= // function : GetValues diff --git a/tools/DFBrowserPane/DFBrowserPane_TDataStdDirectory.cxx b/tools/DFBrowserPane/DFBrowserPane_TDataStdDirectory.cxx index 6437bad91a..248a592569 100644 --- a/tools/DFBrowserPane/DFBrowserPane_TDataStdDirectory.cxx +++ b/tools/DFBrowserPane/DFBrowserPane_TDataStdDirectory.cxx @@ -17,7 +17,9 @@ #include +#include #include +#include // ======================================================================= // function : GetValues diff --git a/tools/DFBrowserPane/DFBrowserPane_TDataStdExpression.cxx b/tools/DFBrowserPane/DFBrowserPane_TDataStdExpression.cxx index 772742fc4e..bea27d3494 100644 --- a/tools/DFBrowserPane/DFBrowserPane_TDataStdExpression.cxx +++ b/tools/DFBrowserPane/DFBrowserPane_TDataStdExpression.cxx @@ -17,7 +17,10 @@ #include #include + +#include #include +#include // ======================================================================= // function : GetValues diff --git a/tools/DFBrowserPane/DFBrowserPane_TDataStdExtStringArray.cxx b/tools/DFBrowserPane/DFBrowserPane_TDataStdExtStringArray.cxx index 23a2aa5da8..5bae00061b 100644 --- a/tools/DFBrowserPane/DFBrowserPane_TDataStdExtStringArray.cxx +++ b/tools/DFBrowserPane/DFBrowserPane_TDataStdExtStringArray.cxx @@ -21,8 +21,10 @@ #include +#include #include #include +#include // ======================================================================= // function : CreateWidget diff --git a/tools/DFBrowserPane/DFBrowserPane_TDataStdExtStringList.cxx b/tools/DFBrowserPane/DFBrowserPane_TDataStdExtStringList.cxx index bbd47fadc9..7d652c0aa6 100644 --- a/tools/DFBrowserPane/DFBrowserPane_TDataStdExtStringList.cxx +++ b/tools/DFBrowserPane/DFBrowserPane_TDataStdExtStringList.cxx @@ -19,8 +19,10 @@ #include #include +#include #include #include +#include // ======================================================================= // function : GetValues diff --git a/tools/DFBrowserPane/DFBrowserPane_TDataStdIntPackedMap.cxx b/tools/DFBrowserPane/DFBrowserPane_TDataStdIntPackedMap.cxx index 09fcbcf39e..2b2381ee0f 100644 --- a/tools/DFBrowserPane/DFBrowserPane_TDataStdIntPackedMap.cxx +++ b/tools/DFBrowserPane/DFBrowserPane_TDataStdIntPackedMap.cxx @@ -18,8 +18,10 @@ #include #include +#include #include #include +#include // ======================================================================= // function : GetValues diff --git a/tools/DFBrowserPane/DFBrowserPane_TDataStdInteger.cxx b/tools/DFBrowserPane/DFBrowserPane_TDataStdInteger.cxx index 2164e4855d..18bbeb57af 100644 --- a/tools/DFBrowserPane/DFBrowserPane_TDataStdInteger.cxx +++ b/tools/DFBrowserPane/DFBrowserPane_TDataStdInteger.cxx @@ -17,7 +17,9 @@ #include +#include #include +#include // ======================================================================= // function : GetValues diff --git a/tools/DFBrowserPane/DFBrowserPane_TDataStdIntegerArray.cxx b/tools/DFBrowserPane/DFBrowserPane_TDataStdIntegerArray.cxx index bf03586c9f..da404bf5b7 100644 --- a/tools/DFBrowserPane/DFBrowserPane_TDataStdIntegerArray.cxx +++ b/tools/DFBrowserPane/DFBrowserPane_TDataStdIntegerArray.cxx @@ -20,8 +20,10 @@ #include +#include #include #include +#include // ======================================================================= // function : CreateWidget diff --git a/tools/DFBrowserPane/DFBrowserPane_TDataStdIntegerList.cxx b/tools/DFBrowserPane/DFBrowserPane_TDataStdIntegerList.cxx index 26c1c0cc4c..06a3ec1e31 100644 --- a/tools/DFBrowserPane/DFBrowserPane_TDataStdIntegerList.cxx +++ b/tools/DFBrowserPane/DFBrowserPane_TDataStdIntegerList.cxx @@ -18,8 +18,10 @@ #include #include +#include #include #include +#include // ======================================================================= // function : GetValues diff --git a/tools/DFBrowserPane/DFBrowserPane_TDataStdName.cxx b/tools/DFBrowserPane/DFBrowserPane_TDataStdName.cxx index 43f77f1ad9..1f1a0d3677 100644 --- a/tools/DFBrowserPane/DFBrowserPane_TDataStdName.cxx +++ b/tools/DFBrowserPane/DFBrowserPane_TDataStdName.cxx @@ -18,7 +18,9 @@ #include +#include #include +#include // ======================================================================= // function : GetValues diff --git a/tools/DFBrowserPane/DFBrowserPane_TDataStdNamedData.cxx b/tools/DFBrowserPane/DFBrowserPane_TDataStdNamedData.cxx index 958652d0dd..155147d68b 100644 --- a/tools/DFBrowserPane/DFBrowserPane_TDataStdNamedData.cxx +++ b/tools/DFBrowserPane/DFBrowserPane_TDataStdNamedData.cxx @@ -36,11 +36,13 @@ #include #include +#include #include #include #include #include #include +#include static const QString VALUES_INTEGER = "values_integer"; static const QString VALUES_REAL = "values_real"; diff --git a/tools/DFBrowserPane/DFBrowserPane_TDataStdNoteBook.cxx b/tools/DFBrowserPane/DFBrowserPane_TDataStdNoteBook.cxx index 8f904902e1..d8aab88a1c 100644 --- a/tools/DFBrowserPane/DFBrowserPane_TDataStdNoteBook.cxx +++ b/tools/DFBrowserPane/DFBrowserPane_TDataStdNoteBook.cxx @@ -17,7 +17,9 @@ #include +#include #include +#include // ======================================================================= // function : GetValues diff --git a/tools/DFBrowserPane/DFBrowserPane_TDataStdReal.cxx b/tools/DFBrowserPane/DFBrowserPane_TDataStdReal.cxx index cfe8da69ac..27f4b822ad 100644 --- a/tools/DFBrowserPane/DFBrowserPane_TDataStdReal.cxx +++ b/tools/DFBrowserPane/DFBrowserPane_TDataStdReal.cxx @@ -17,7 +17,9 @@ #include +#include #include +#include // ======================================================================= // function : GetValues diff --git a/tools/DFBrowserPane/DFBrowserPane_TDataStdRealArray.cxx b/tools/DFBrowserPane/DFBrowserPane_TDataStdRealArray.cxx index 5523478e59..1a00c23e6a 100644 --- a/tools/DFBrowserPane/DFBrowserPane_TDataStdRealArray.cxx +++ b/tools/DFBrowserPane/DFBrowserPane_TDataStdRealArray.cxx @@ -21,8 +21,10 @@ #include +#include #include #include +#include // ======================================================================= // function : CreateWidget diff --git a/tools/DFBrowserPane/DFBrowserPane_TDataStdRealList.cxx b/tools/DFBrowserPane/DFBrowserPane_TDataStdRealList.cxx index 0fb9e84b4b..eeed59bfc4 100644 --- a/tools/DFBrowserPane/DFBrowserPane_TDataStdRealList.cxx +++ b/tools/DFBrowserPane/DFBrowserPane_TDataStdRealList.cxx @@ -18,8 +18,10 @@ #include #include +#include #include #include +#include // ======================================================================= // function : GetValues diff --git a/tools/DFBrowserPane/DFBrowserPane_TDataStdReferenceArray.cxx b/tools/DFBrowserPane/DFBrowserPane_TDataStdReferenceArray.cxx index 268e479802..8a6311b543 100644 --- a/tools/DFBrowserPane/DFBrowserPane_TDataStdReferenceArray.cxx +++ b/tools/DFBrowserPane/DFBrowserPane_TDataStdReferenceArray.cxx @@ -22,11 +22,13 @@ #include +#include #include #include #include #include #include +#include // ======================================================================= // function : CreateWidget diff --git a/tools/DFBrowserPane/DFBrowserPane_TDataStdReferenceList.cxx b/tools/DFBrowserPane/DFBrowserPane_TDataStdReferenceList.cxx index c3ed2af424..908c25e5b0 100644 --- a/tools/DFBrowserPane/DFBrowserPane_TDataStdReferenceList.cxx +++ b/tools/DFBrowserPane/DFBrowserPane_TDataStdReferenceList.cxx @@ -21,8 +21,10 @@ #include #include +#include #include #include +#include // ======================================================================= // function : GetValues diff --git a/tools/DFBrowserPane/DFBrowserPane_TDataStdRelation.cxx b/tools/DFBrowserPane/DFBrowserPane_TDataStdRelation.cxx index 05529ab19b..d963d5d583 100644 --- a/tools/DFBrowserPane/DFBrowserPane_TDataStdRelation.cxx +++ b/tools/DFBrowserPane/DFBrowserPane_TDataStdRelation.cxx @@ -17,8 +17,10 @@ #include +#include #include #include +#include // ======================================================================= // function : GetValues diff --git a/tools/DFBrowserPane/DFBrowserPane_TDataStdTick.cxx b/tools/DFBrowserPane/DFBrowserPane_TDataStdTick.cxx index d956d4e4dd..075051e1b4 100644 --- a/tools/DFBrowserPane/DFBrowserPane_TDataStdTick.cxx +++ b/tools/DFBrowserPane/DFBrowserPane_TDataStdTick.cxx @@ -17,8 +17,10 @@ #include +#include #include #include +#include // ======================================================================= // function : GetValues diff --git a/tools/DFBrowserPane/DFBrowserPane_TDataStdTreeNode.cxx b/tools/DFBrowserPane/DFBrowserPane_TDataStdTreeNode.cxx index ba31c011a3..0e79829114 100644 --- a/tools/DFBrowserPane/DFBrowserPane_TDataStdTreeNode.cxx +++ b/tools/DFBrowserPane/DFBrowserPane_TDataStdTreeNode.cxx @@ -23,6 +23,7 @@ #include +#include #include #include #include @@ -30,6 +31,7 @@ #include #include #include +#include // ======================================================================= // function : Constructor diff --git a/tools/DFBrowserPane/DFBrowserPane_TDataStdTreeNodeItem.cxx b/tools/DFBrowserPane/DFBrowserPane_TDataStdTreeNodeItem.cxx index 024386dac3..c8fc5dd51f 100644 --- a/tools/DFBrowserPane/DFBrowserPane_TDataStdTreeNodeItem.cxx +++ b/tools/DFBrowserPane/DFBrowserPane_TDataStdTreeNodeItem.cxx @@ -27,8 +27,10 @@ #include #include +#include #include #include +#include // ======================================================================= // function : Init diff --git a/tools/DFBrowserPane/DFBrowserPane_TDataStdTreeNodeItem.hxx b/tools/DFBrowserPane/DFBrowserPane_TDataStdTreeNodeItem.hxx index 29dcd9c200..2c3818f9cd 100644 --- a/tools/DFBrowserPane/DFBrowserPane_TDataStdTreeNodeItem.hxx +++ b/tools/DFBrowserPane/DFBrowserPane_TDataStdTreeNodeItem.hxx @@ -21,9 +21,11 @@ #include #include +#include #include #include #include +#include class DFBrowserPane_TDataStdTreeNodeItem; typedef QExplicitlySharedDataPointer DFBrowserPane_TDataStdTreeNodeItemPtr; diff --git a/tools/DFBrowserPane/DFBrowserPane_TDataStdTreeNodeModel.cxx b/tools/DFBrowserPane/DFBrowserPane_TDataStdTreeNodeModel.cxx index 8dba19d69f..310544cbed 100644 --- a/tools/DFBrowserPane/DFBrowserPane_TDataStdTreeNodeModel.cxx +++ b/tools/DFBrowserPane/DFBrowserPane_TDataStdTreeNodeModel.cxx @@ -18,7 +18,9 @@ #include +#include #include +#include // ======================================================================= // function : Constructor diff --git a/tools/DFBrowserPane/DFBrowserPane_TDataStdTreeNodeModel.hxx b/tools/DFBrowserPane/DFBrowserPane_TDataStdTreeNodeModel.hxx index 9f6fdc07b3..835a79f7ad 100644 --- a/tools/DFBrowserPane/DFBrowserPane_TDataStdTreeNodeModel.hxx +++ b/tools/DFBrowserPane/DFBrowserPane_TDataStdTreeNodeModel.hxx @@ -21,9 +21,11 @@ #include #include +#include #include #include #include +#include //! \class DFBrowserPane_TDataStdTreeNodeModel //! \brief It builds a tree of items for the given tree node attribute. diff --git a/tools/DFBrowserPane/DFBrowserPane_TDataStdUAttribute.cxx b/tools/DFBrowserPane/DFBrowserPane_TDataStdUAttribute.cxx index 6cd7819eba..af4ada0956 100644 --- a/tools/DFBrowserPane/DFBrowserPane_TDataStdUAttribute.cxx +++ b/tools/DFBrowserPane/DFBrowserPane_TDataStdUAttribute.cxx @@ -18,7 +18,9 @@ #include +#include #include +#include // ======================================================================= // function : GetValues diff --git a/tools/DFBrowserPane/DFBrowserPane_TDataStdVariable.cxx b/tools/DFBrowserPane/DFBrowserPane_TDataStdVariable.cxx index e23d3b88f1..f711313908 100644 --- a/tools/DFBrowserPane/DFBrowserPane_TDataStdVariable.cxx +++ b/tools/DFBrowserPane/DFBrowserPane_TDataStdVariable.cxx @@ -17,7 +17,10 @@ #include +#include #include +#include + // ======================================================================= // function : GetValues // purpose : diff --git a/tools/DFBrowserPane/DFBrowserPane_TDocStdModified.cxx b/tools/DFBrowserPane/DFBrowserPane_TDocStdModified.cxx index f2fdcff8ce..3ef0e87291 100644 --- a/tools/DFBrowserPane/DFBrowserPane_TDocStdModified.cxx +++ b/tools/DFBrowserPane/DFBrowserPane_TDocStdModified.cxx @@ -17,7 +17,10 @@ #include +#include #include +#include + // ======================================================================= // function : GetValues // purpose : diff --git a/tools/DFBrowserPane/DFBrowserPane_TDocStdOwner.cxx b/tools/DFBrowserPane/DFBrowserPane_TDocStdOwner.cxx index 6c78343942..e392c44187 100644 --- a/tools/DFBrowserPane/DFBrowserPane_TDocStdOwner.cxx +++ b/tools/DFBrowserPane/DFBrowserPane_TDocStdOwner.cxx @@ -25,12 +25,13 @@ #include #include -#include -#include - +#include #include #include #include +#include +#include +#include // ======================================================================= // function : Constructor @@ -105,7 +106,7 @@ void DFBrowserPane_TDocStdOwner::GetValues (const Handle(TDF_Attribute)& theAttr << aSeparationStr.ToCString() << aSeparationStr.ToCString() << "IsSaved" << DFBrowserPane_Tools::BoolToStr (aDocument->IsSaved()) << "IsChanged" << DFBrowserPane_Tools::BoolToStr (aDocument->IsChanged()) - << "GetSavedTime" << DFBrowserPane_Tools::BoolToStr (aDocument->GetSavedTime()) + << "GetSavedTime" << aDocument->GetSavedTime() << "GetName" << (aDocument->IsSaved() ? DFBrowserPane_Tools::ToString (aDocument->GetName()) : "") << "GetPath" << (aDocument->IsSaved() ? DFBrowserPane_Tools::ToString (aDocument->GetPath()) : "") << "GetData" << aDocumentDataInfo.ToCString() diff --git a/tools/DFBrowserPane/DFBrowserPane_TDocStdXLink.cxx b/tools/DFBrowserPane/DFBrowserPane_TDocStdXLink.cxx index c7fb4fd0cb..d1f2421181 100644 --- a/tools/DFBrowserPane/DFBrowserPane_TDocStdXLink.cxx +++ b/tools/DFBrowserPane/DFBrowserPane_TDocStdXLink.cxx @@ -17,7 +17,10 @@ #include +#include #include +#include + // ======================================================================= // function : GetValues // purpose : diff --git a/tools/DFBrowserPane/DFBrowserPane_TDocStdXLinkRoot.cxx b/tools/DFBrowserPane/DFBrowserPane_TDocStdXLinkRoot.cxx index c9cb50c062..76833bb2e4 100644 --- a/tools/DFBrowserPane/DFBrowserPane_TDocStdXLinkRoot.cxx +++ b/tools/DFBrowserPane/DFBrowserPane_TDocStdXLinkRoot.cxx @@ -17,7 +17,10 @@ #include +#include #include +#include + // ======================================================================= // function : GetValues // purpose : diff --git a/tools/DFBrowserPane/DFBrowserPane_TFunctionFunction.cxx b/tools/DFBrowserPane/DFBrowserPane_TFunctionFunction.cxx index 4539e2a1ea..8170388386 100644 --- a/tools/DFBrowserPane/DFBrowserPane_TFunctionFunction.cxx +++ b/tools/DFBrowserPane/DFBrowserPane_TFunctionFunction.cxx @@ -18,7 +18,10 @@ #include +#include #include +#include + // ======================================================================= // function : GetValues // purpose : diff --git a/tools/DFBrowserPane/DFBrowserPane_TFunctionGraphNode.cxx b/tools/DFBrowserPane/DFBrowserPane_TFunctionGraphNode.cxx index 1b659fc127..381b197732 100644 --- a/tools/DFBrowserPane/DFBrowserPane_TFunctionGraphNode.cxx +++ b/tools/DFBrowserPane/DFBrowserPane_TFunctionGraphNode.cxx @@ -17,7 +17,10 @@ #include +#include #include +#include + // ======================================================================= // function : GetValues // purpose : diff --git a/tools/DFBrowserPane/DFBrowserPane_TFunctionScope.cxx b/tools/DFBrowserPane/DFBrowserPane_TFunctionScope.cxx index 6a754518c8..57e8ffd1b0 100644 --- a/tools/DFBrowserPane/DFBrowserPane_TFunctionScope.cxx +++ b/tools/DFBrowserPane/DFBrowserPane_TFunctionScope.cxx @@ -17,7 +17,9 @@ #include +#include #include +#include // ======================================================================= // function : GetValues diff --git a/tools/DFBrowserPane/DFBrowserPane_TNamingNamedShape.cxx b/tools/DFBrowserPane/DFBrowserPane_TNamingNamedShape.cxx index 31e46a222f..ee6ab872ad 100644 --- a/tools/DFBrowserPane/DFBrowserPane_TNamingNamedShape.cxx +++ b/tools/DFBrowserPane/DFBrowserPane_TNamingNamedShape.cxx @@ -34,6 +34,7 @@ #include #include +#include #include #include #include @@ -45,6 +46,7 @@ #include #include #include +#include const int COLUMN_EXPORT_WIDTH = 20; const int COLUMN_TYPE_WIDTH = 70; diff --git a/tools/DFBrowserPane/DFBrowserPane_TNamingNamedShape.hxx b/tools/DFBrowserPane/DFBrowserPane_TNamingNamedShape.hxx index 4efe150296..aabbc0174d 100644 --- a/tools/DFBrowserPane/DFBrowserPane_TNamingNamedShape.hxx +++ b/tools/DFBrowserPane/DFBrowserPane_TNamingNamedShape.hxx @@ -24,8 +24,10 @@ #include #include +#include #include #include +#include class DFBrowserPane_TableView; class DFBrowserPane_AttributePaneModel; diff --git a/tools/DFBrowserPane/DFBrowserPane_TNamingNaming.cxx b/tools/DFBrowserPane/DFBrowserPane_TNamingNaming.cxx index 2a8e64b29a..a70d5f2e6f 100644 --- a/tools/DFBrowserPane/DFBrowserPane_TNamingNaming.cxx +++ b/tools/DFBrowserPane/DFBrowserPane_TNamingNaming.cxx @@ -30,11 +30,13 @@ #include +#include #include #include #include #include #include +#include // ======================================================================= // function : Constructor diff --git a/tools/DFBrowserPane/DFBrowserPane_TNamingUsedShapes.cxx b/tools/DFBrowserPane/DFBrowserPane_TNamingUsedShapes.cxx index 2cf6d60bb8..00e7041b57 100644 --- a/tools/DFBrowserPane/DFBrowserPane_TNamingUsedShapes.cxx +++ b/tools/DFBrowserPane/DFBrowserPane_TNamingUsedShapes.cxx @@ -34,10 +34,12 @@ #include #include +#include #include #include #include #include +#include const int COLUMN_TYPE_WIDTH = 70; const int COLUMN_POINTER_WIDTH = 90; diff --git a/tools/DFBrowserPane/DFBrowserPane_TPrsStdAISPresentation.cxx b/tools/DFBrowserPane/DFBrowserPane_TPrsStdAISPresentation.cxx index abe0b3dbcc..3b210443a4 100644 --- a/tools/DFBrowserPane/DFBrowserPane_TPrsStdAISPresentation.cxx +++ b/tools/DFBrowserPane/DFBrowserPane_TPrsStdAISPresentation.cxx @@ -20,8 +20,10 @@ #include +#include #include #include +#include // ======================================================================= // function : Constructor diff --git a/tools/DFBrowserPane/DFBrowserPane_TPrsStdAISViewer.cxx b/tools/DFBrowserPane/DFBrowserPane_TPrsStdAISViewer.cxx index 7ebbc7c826..6037bb2d82 100644 --- a/tools/DFBrowserPane/DFBrowserPane_TPrsStdAISViewer.cxx +++ b/tools/DFBrowserPane/DFBrowserPane_TPrsStdAISViewer.cxx @@ -19,7 +19,9 @@ #include #include +#include #include +#include // ======================================================================= // function : diff --git a/tools/DFBrowserPane/DFBrowserPane_TableView.cxx b/tools/DFBrowserPane/DFBrowserPane_TableView.cxx index 346d54648d..6edaa104f3 100644 --- a/tools/DFBrowserPane/DFBrowserPane_TableView.cxx +++ b/tools/DFBrowserPane/DFBrowserPane_TableView.cxx @@ -16,12 +16,14 @@ #include #include +#include #include #include #include #include #include #include +#include static const int DEFAULT_ROW_HEIGHT = 30; @@ -68,7 +70,7 @@ void DFBrowserPane_TableView::SetModel (QAbstractTableModel* theModel) // ======================================================================= void DFBrowserPane_TableView::SetFixedRowCount (const int theCount, QTableView* theView, const bool theScroll) { - double aHeight = theView->verticalHeader()->defaultSectionSize()*theCount + DFBrowserPane_Tools::HeaderSectionMargin(); + int aHeight = theView->verticalHeader()->defaultSectionSize() * theCount + DFBrowserPane_Tools::HeaderSectionMargin(); if (theScroll) aHeight += theView->horizontalScrollBar()->sizeHint().height(); diff --git a/tools/DFBrowserPane/DFBrowserPane_TableView.hxx b/tools/DFBrowserPane/DFBrowserPane_TableView.hxx index edcd673578..34894b7a15 100644 --- a/tools/DFBrowserPane/DFBrowserPane_TableView.hxx +++ b/tools/DFBrowserPane/DFBrowserPane_TableView.hxx @@ -18,11 +18,10 @@ #include -#ifdef _MSC_VER -#pragma warning(disable : 4127) // conditional expression is constant -#endif +#include #include #include +#include class QTableView; class QAbstractTableModel; diff --git a/tools/DFBrowserPane/DFBrowserPane_Tools.cxx b/tools/DFBrowserPane/DFBrowserPane_Tools.cxx index 4568b46e1c..3deb0ba70f 100644 --- a/tools/DFBrowserPane/DFBrowserPane_Tools.cxx +++ b/tools/DFBrowserPane/DFBrowserPane_Tools.cxx @@ -34,11 +34,13 @@ #include #include +#include #include #include #include #include #include +#include #include diff --git a/tools/DFBrowserPane/DFBrowserPane_Tools.hxx b/tools/DFBrowserPane/DFBrowserPane_Tools.hxx index 4e108250be..bf19319bcb 100644 --- a/tools/DFBrowserPane/DFBrowserPane_Tools.hxx +++ b/tools/DFBrowserPane/DFBrowserPane_Tools.hxx @@ -24,14 +24,13 @@ #include #include -#ifdef _MSC_VER -#pragma warning(disable : 4127) // conditional expression is constant -#endif +#include #include #include #include #include #include +#include #define PROPERTY_TABLE_ROW_COUNT 200 @@ -70,7 +69,7 @@ public: //! Returns "true" or "false" text for the given boolean state //! \param theValue a boolean value //! \return string value - Standard_EXPORT static QString BoolToStr (const bool theValue) { return theValue ? "true" : "false"; } + Standard_EXPORT static QString BoolToStr (const Standard_Boolean theValue) { return theValue ? "true" : "false"; } //! Converts a Qt string to OCCT extended string //! \param theValue a converted string diff --git a/tools/DFBrowserPaneXDE/DFBrowserPaneXDE_AttributeCommonPane.cxx b/tools/DFBrowserPaneXDE/DFBrowserPaneXDE_AttributeCommonPane.cxx index 26465b23b8..4959b408db 100644 --- a/tools/DFBrowserPaneXDE/DFBrowserPaneXDE_AttributeCommonPane.cxx +++ b/tools/DFBrowserPaneXDE/DFBrowserPaneXDE_AttributeCommonPane.cxx @@ -32,7 +32,9 @@ #include +#include #include +#include static std::set AttributeTypes; diff --git a/tools/DFBrowserPaneXDE/DFBrowserPaneXDE_AttributeCommonPane.hxx b/tools/DFBrowserPaneXDE/DFBrowserPaneXDE_AttributeCommonPane.hxx index 64adc76aa1..adb7689750 100644 --- a/tools/DFBrowserPaneXDE/DFBrowserPaneXDE_AttributeCommonPane.hxx +++ b/tools/DFBrowserPaneXDE/DFBrowserPaneXDE_AttributeCommonPane.hxx @@ -21,7 +21,9 @@ #include #include +#include #include +#include class QWidget; class QItemSelectionModel; diff --git a/tools/DFBrowserPaneXDE/DFBrowserPaneXDE_Tools.hxx b/tools/DFBrowserPaneXDE/DFBrowserPaneXDE_Tools.hxx index aaf47327dd..524664917a 100644 --- a/tools/DFBrowserPaneXDE/DFBrowserPaneXDE_Tools.hxx +++ b/tools/DFBrowserPaneXDE/DFBrowserPaneXDE_Tools.hxx @@ -21,12 +21,11 @@ #include #include -#ifdef _MSC_VER -#pragma warning(disable:4127) // conditional expression is constant -#endif +#include #include #include #include +#include class DFBrowserPane_AttributePaneAPI; diff --git a/tools/DFBrowserPaneXDE/DFBrowserPaneXDE_XCAFDocColor.cxx b/tools/DFBrowserPaneXDE/DFBrowserPaneXDE_XCAFDocColor.cxx index f3fc0b7bdd..926f890a6c 100644 --- a/tools/DFBrowserPaneXDE/DFBrowserPaneXDE_XCAFDocColor.cxx +++ b/tools/DFBrowserPaneXDE/DFBrowserPaneXDE_XCAFDocColor.cxx @@ -20,7 +20,10 @@ #include +#include #include +#include + // ======================================================================= // function : Constructor // purpose : diff --git a/tools/DFBrowserPaneXDE/DFBrowserPaneXDE_XCAFDocShapeMapTool.cxx b/tools/DFBrowserPaneXDE/DFBrowserPaneXDE_XCAFDocShapeMapTool.cxx index e7fa7ab7c0..7fc6cef64c 100644 --- a/tools/DFBrowserPaneXDE/DFBrowserPaneXDE_XCAFDocShapeMapTool.cxx +++ b/tools/DFBrowserPaneXDE/DFBrowserPaneXDE_XCAFDocShapeMapTool.cxx @@ -28,6 +28,7 @@ #include #include +#include #include #include #include @@ -39,6 +40,7 @@ #include #include #include +#include const int COLUMN_EXPORT_WIDTH = 20; const int COLUMN_TYPE_WIDTH = 70; diff --git a/tools/ShapeView/ShapeView_Communicator.cxx b/tools/ShapeView/ShapeView_Communicator.cxx index c1d89ecd41..6ba86e5c7b 100644 --- a/tools/ShapeView/ShapeView_Communicator.cxx +++ b/tools/ShapeView/ShapeView_Communicator.cxx @@ -21,9 +21,11 @@ #include #include +#include #include #include #include +#include // ======================================================================= // function : CreateCommunicator diff --git a/tools/ShapeView/ShapeView_ItemShape.cxx b/tools/ShapeView/ShapeView_ItemShape.cxx index 88bf5f0985..be3a623b3f 100644 --- a/tools/ShapeView/ShapeView_ItemShape.cxx +++ b/tools/ShapeView/ShapeView_ItemShape.cxx @@ -31,8 +31,10 @@ #include #include +#include #include #include +#include // ======================================================================= // function : ToString diff --git a/tools/ShapeView/ShapeView_ItemShape.hxx b/tools/ShapeView/ShapeView_ItemShape.hxx index eaac833772..b04076956e 100644 --- a/tools/ShapeView/ShapeView_ItemShape.hxx +++ b/tools/ShapeView/ShapeView_ItemShape.hxx @@ -21,8 +21,10 @@ #include #include +#include #include #include +#include class ShapeView_ItemShape; typedef QExplicitlySharedDataPointer ShapeView_ItemShapePtr; diff --git a/tools/ShapeView/ShapeView_OpenFileDialog.cxx b/tools/ShapeView/ShapeView_OpenFileDialog.cxx index 06cad9da18..3ea9b1fb33 100644 --- a/tools/ShapeView/ShapeView_OpenFileDialog.cxx +++ b/tools/ShapeView/ShapeView_OpenFileDialog.cxx @@ -16,6 +16,7 @@ #include #include +#include #include #include #include @@ -34,6 +35,7 @@ #include #include #include +#include const int FONT_POINT_SIZE = 18; const int ICON_SIZE = 40; diff --git a/tools/ShapeView/ShapeView_OpenFileDialog.hxx b/tools/ShapeView/ShapeView_OpenFileDialog.hxx index 09fba195df..306326b4f9 100644 --- a/tools/ShapeView/ShapeView_OpenFileDialog.hxx +++ b/tools/ShapeView/ShapeView_OpenFileDialog.hxx @@ -20,12 +20,11 @@ #include #include -#ifdef _MSC_VER -#pragma warning(disable : 4127) // conditional expression is constant -#endif +#include #include #include #include +#include #include diff --git a/tools/ShapeView/ShapeView_OpenFileViewModel.cxx b/tools/ShapeView/ShapeView_OpenFileViewModel.cxx index 12db8132b8..848b21d2f6 100644 --- a/tools/ShapeView/ShapeView_OpenFileViewModel.cxx +++ b/tools/ShapeView/ShapeView_OpenFileViewModel.cxx @@ -15,10 +15,12 @@ #include +#include #include #include #include #include +#include const int ICON_SIZE = 40; // ======================================================================= @@ -35,11 +37,9 @@ void ShapeView_OpenFileItemDelegate::paint (QPainter* thePainter, const QStyleOp // action icon for all indices before the last one QIcon anIcon (":/icons/folder_import.png"); QSize anIconSize (ICON_SIZE, ICON_SIZE); - int aWidth = theOption.rect.width(); - int aCenter = aWidth / 2.; - int aHalf = anIconSize.width() / 2.; + int aDX = (theOption.rect.width() - anIconSize.width()) / 2; int aMargin = qApp->style()->pixelMetric (QStyle::PM_HeaderMargin); - thePainter->drawPixmap (QRect (theOption.rect.left() + (aCenter - aHalf), + thePainter->drawPixmap (QRect (theOption.rect.left() + aDX, theOption.rect.top() + aMargin, anIconSize.width(), anIconSize.height()), diff --git a/tools/ShapeView/ShapeView_OpenFileViewModel.hxx b/tools/ShapeView/ShapeView_OpenFileViewModel.hxx index 9eb4338b71..5a2847da17 100644 --- a/tools/ShapeView/ShapeView_OpenFileViewModel.hxx +++ b/tools/ShapeView/ShapeView_OpenFileViewModel.hxx @@ -19,12 +19,11 @@ #include #include -#ifdef _MSC_VER -#pragma warning(disable : 4127) // conditional expression is constant -#endif +#include #include #include #include +#include class QObject; class QPainter; diff --git a/tools/ShapeView/ShapeView_TreeModel.hxx b/tools/ShapeView/ShapeView_TreeModel.hxx index 210e8bb882..6983570182 100644 --- a/tools/ShapeView/ShapeView_TreeModel.hxx +++ b/tools/ShapeView/ShapeView_TreeModel.hxx @@ -21,8 +21,10 @@ #include #include +#include #include #include +#include class ShapeView_TreeModel; diff --git a/tools/ShapeView/ShapeView_Window.cxx b/tools/ShapeView/ShapeView_Window.cxx index f4291c57a9..8c05fe1d86 100644 --- a/tools/ShapeView/ShapeView_Window.cxx +++ b/tools/ShapeView/ShapeView_Window.cxx @@ -33,6 +33,7 @@ #include #include +#include #include #include #include @@ -51,6 +52,7 @@ #include #include #include +#include const int FIRST_COLUMN_WIDTH = 190; const int SIZE_COLUMN_WIDTH = 30; diff --git a/tools/ShapeView/ShapeView_Window.hxx b/tools/ShapeView/ShapeView_Window.hxx index 31cd1d38ce..a7014bd6e1 100644 --- a/tools/ShapeView/ShapeView_Window.hxx +++ b/tools/ShapeView/ShapeView_Window.hxx @@ -21,9 +21,7 @@ #include #include -#ifdef _MSC_VER -#pragma warning(disable : 4127) // conditional expression is constant -#endif +#include #include #include #include @@ -31,6 +29,7 @@ #include #include #include +#include class View_Displayer; class View_Window; diff --git a/tools/TInspector/TInspector_Communicator.cxx b/tools/TInspector/TInspector_Communicator.cxx index 41790a1c66..72771c13f0 100644 --- a/tools/TInspector/TInspector_Communicator.cxx +++ b/tools/TInspector/TInspector_Communicator.cxx @@ -19,10 +19,12 @@ #include #include +#include #include #include #include #include +#include // ======================================================================= // function : Constructor diff --git a/tools/TInspector/TInspector_Window.cxx b/tools/TInspector/TInspector_Window.cxx index 9f49e6d7e1..0c777d1cf5 100644 --- a/tools/TInspector/TInspector_Window.cxx +++ b/tools/TInspector/TInspector_Window.cxx @@ -19,6 +19,7 @@ #include #include +#include #include #include #include @@ -26,6 +27,7 @@ #include #include #include +#include const int TINSPECTOR_DEFAULT_WIDTH = 650; const int TINSPECTOR_DEFAULT_HEIGHT = 500;//350; diff --git a/tools/TInspector/TInspector_Window.hxx b/tools/TInspector/TInspector_Window.hxx index ecac17cd16..10048c5d82 100644 --- a/tools/TInspector/TInspector_Window.hxx +++ b/tools/TInspector/TInspector_Window.hxx @@ -22,12 +22,11 @@ #include #include -#ifdef _MSC_VER -#pragma warning(disable : 4127) // conditional expression is constant -#endif +#include #include #include #include +#include class TInspectorAPI_Communicator; diff --git a/tools/TreeModel/TreeModel_ItemBase.cxx b/tools/TreeModel/TreeModel_ItemBase.cxx index 75a3957284..42acea066e 100644 --- a/tools/TreeModel/TreeModel_ItemBase.cxx +++ b/tools/TreeModel/TreeModel_ItemBase.cxx @@ -14,10 +14,11 @@ // commercial license or contractual agreement. #include - #include +#include #include +#include // ======================================================================= // function : Constructor diff --git a/tools/TreeModel/TreeModel_ItemBase.hxx b/tools/TreeModel/TreeModel_ItemBase.hxx index 57f4000a3c..09498b3f62 100644 --- a/tools/TreeModel/TreeModel_ItemBase.hxx +++ b/tools/TreeModel/TreeModel_ItemBase.hxx @@ -20,9 +20,7 @@ #include #include -#ifdef _MSC_VER -#pragma warning(disable : 4127) // conditional expression is constant -#endif +#include #include #include #include @@ -31,6 +29,7 @@ #include #include #include +#include class TreeModel_ItemBase; diff --git a/tools/TreeModel/TreeModel_ItemRole.hxx b/tools/TreeModel/TreeModel_ItemRole.hxx index 169dff7b10..e498ce37f2 100644 --- a/tools/TreeModel/TreeModel_ItemRole.hxx +++ b/tools/TreeModel/TreeModel_ItemRole.hxx @@ -16,7 +16,9 @@ #ifndef TreeModel_ItemRole_H #define TreeModel_ItemRole_H +#include #include +#include //! Sets custom item role of Tree view wmodel enum TreeModel_ItemRole diff --git a/tools/TreeModel/TreeModel_MessageDialog.cxx b/tools/TreeModel/TreeModel_MessageDialog.cxx index 8eda4669cb..c952678e09 100644 --- a/tools/TreeModel/TreeModel_MessageDialog.cxx +++ b/tools/TreeModel/TreeModel_MessageDialog.cxx @@ -15,12 +15,14 @@ #include +#include #include #include #include #include #include #include +#include // ======================================================================= // function : Constructor diff --git a/tools/TreeModel/TreeModel_MessageDialog.hxx b/tools/TreeModel/TreeModel_MessageDialog.hxx index 433acc1b83..3669b4a062 100644 --- a/tools/TreeModel/TreeModel_MessageDialog.hxx +++ b/tools/TreeModel/TreeModel_MessageDialog.hxx @@ -19,14 +19,13 @@ #include #include -#ifdef _MSC_VER -#pragma warning(disable : 4127) // conditional expression is constant -#endif +#include #include #include #include #include #include +#include class DFBrowser_Module; class QWidget; diff --git a/tools/TreeModel/TreeModel_ModelBase.hxx b/tools/TreeModel/TreeModel_ModelBase.hxx index 38b98d5a30..597cd472cb 100644 --- a/tools/TreeModel/TreeModel_ModelBase.hxx +++ b/tools/TreeModel/TreeModel_ModelBase.hxx @@ -19,10 +19,12 @@ #include #include +#include #include #include #include #include +#include //! \class TreeModel_ModelBase //! \brief Implementation of the tree item based model of QAbstractItemModel. diff --git a/tools/VInspector/VInspector_CallBack.cxx b/tools/VInspector/VInspector_CallBack.cxx index ffbf64013a..481ec6f6b2 100644 --- a/tools/VInspector/VInspector_CallBack.cxx +++ b/tools/VInspector/VInspector_CallBack.cxx @@ -25,8 +25,6 @@ #include #include -#include - #if OCC_VERSION_HEX <= 0x060901 IMPLEMENT_STANDARD_HANDLE(VInspector_CallBack, Standard_Transient) IMPLEMENT_STANDARD_RTTIEXT(VInspector_CallBack, VInspectorAPI_CallBack) diff --git a/tools/VInspector/VInspector_Communicator.cxx b/tools/VInspector/VInspector_Communicator.cxx index 654dc939c2..b68f66664f 100644 --- a/tools/VInspector/VInspector_Communicator.cxx +++ b/tools/VInspector/VInspector_Communicator.cxx @@ -20,11 +20,13 @@ #include +#include #include #include #include #include #include +#include // ======================================================================= // function : CreateCommunicator diff --git a/tools/VInspector/VInspector_ItemContext.cxx b/tools/VInspector/VInspector_ItemContext.cxx index 9a8a91cc77..c2d49ee325 100644 --- a/tools/VInspector/VInspector_ItemContext.cxx +++ b/tools/VInspector/VInspector_ItemContext.cxx @@ -20,8 +20,6 @@ #include #include -#include - //#define DEBUG_FREE_OWNERS // ======================================================================= diff --git a/tools/VInspector/VInspector_ItemEntityOwner.cxx b/tools/VInspector/VInspector_ItemEntityOwner.cxx index b2ea7a4e3e..4542c097e7 100644 --- a/tools/VInspector/VInspector_ItemEntityOwner.cxx +++ b/tools/VInspector/VInspector_ItemEntityOwner.cxx @@ -23,8 +23,10 @@ #include #include +#include #include #include +#include // ======================================================================= // function : initValue diff --git a/tools/VInspector/VInspector_ItemPresentableObject.cxx b/tools/VInspector/VInspector_ItemPresentableObject.cxx index f5df73350a..ddb8dcb9e2 100644 --- a/tools/VInspector/VInspector_ItemPresentableObject.cxx +++ b/tools/VInspector/VInspector_ItemPresentableObject.cxx @@ -31,8 +31,10 @@ #include #include +#include #include #include +#include // ======================================================================= // function : initValue diff --git a/tools/VInspector/VInspector_ItemSelection.cxx b/tools/VInspector/VInspector_ItemSelection.cxx index 4a4f79fed5..6a42cd5136 100644 --- a/tools/VInspector/VInspector_ItemSelection.cxx +++ b/tools/VInspector/VInspector_ItemSelection.cxx @@ -24,9 +24,10 @@ #include #include -#include - +#include #include +#include +#include // ======================================================================= // function : getSelection diff --git a/tools/VInspector/VInspector_ItemSensitiveEntity.cxx b/tools/VInspector/VInspector_ItemSensitiveEntity.cxx index c3ecbac90f..19f6ac95b0 100644 --- a/tools/VInspector/VInspector_ItemSensitiveEntity.cxx +++ b/tools/VInspector/VInspector_ItemSensitiveEntity.cxx @@ -29,8 +29,10 @@ #include #include +#include #include #include +#include // ======================================================================= // function : GetSensitiveEntity diff --git a/tools/VInspector/VInspector_ToolBar.cxx b/tools/VInspector/VInspector_ToolBar.cxx index adcdeb6899..819a8856c3 100644 --- a/tools/VInspector/VInspector_ToolBar.cxx +++ b/tools/VInspector/VInspector_ToolBar.cxx @@ -15,10 +15,11 @@ #include +#include #include #include #include - +#include // ======================================================================= // function : Constructor diff --git a/tools/VInspector/VInspector_ToolBar.hxx b/tools/VInspector/VInspector_ToolBar.hxx index 5e8257eaf1..97ddbaeee4 100644 --- a/tools/VInspector/VInspector_ToolBar.hxx +++ b/tools/VInspector/VInspector_ToolBar.hxx @@ -20,11 +20,10 @@ #include #include -#ifdef _MSC_VER - #pragma warning(disable : 4127 4718) // conditional expression is constant, recursive call has no side effects -#endif +#include #include #include +#include class QWidget; class QPushButton; diff --git a/tools/VInspector/VInspector_Tools.cxx b/tools/VInspector/VInspector_Tools.cxx index 6f7c307e1b..8cf0289a5a 100644 --- a/tools/VInspector/VInspector_Tools.cxx +++ b/tools/VInspector/VInspector_Tools.cxx @@ -29,7 +29,9 @@ #include #include +#include #include +#include #include diff --git a/tools/VInspector/VInspector_Tools.hxx b/tools/VInspector/VInspector_Tools.hxx index a3bd96a6e4..e22ff5d539 100644 --- a/tools/VInspector/VInspector_Tools.hxx +++ b/tools/VInspector/VInspector_Tools.hxx @@ -28,12 +28,10 @@ #include #include -#ifdef _MSC_VER -#pragma warning(disable : 4127) // conditional expression is constant -#endif - +#include #include #include +#include //! \class VInspector_Tools //! The class that gives auxiliary methods for Visualization elements manipulation diff --git a/tools/VInspector/VInspector_ViewModel.cxx b/tools/VInspector/VInspector_ViewModel.cxx index 86a4060317..cb3c281a79 100644 --- a/tools/VInspector/VInspector_ViewModel.cxx +++ b/tools/VInspector/VInspector_ViewModel.cxx @@ -21,8 +21,10 @@ #include #include +#include #include #include +#include // ======================================================================= // function : Constructor diff --git a/tools/VInspector/VInspector_ViewModel.hxx b/tools/VInspector/VInspector_ViewModel.hxx index f73f063d30..e5da7d1dba 100644 --- a/tools/VInspector/VInspector_ViewModel.hxx +++ b/tools/VInspector/VInspector_ViewModel.hxx @@ -23,10 +23,12 @@ #include #include +#include #include #include #include #include +#include class OCAFSampleAPI_Module; class OCAFSampleModel_DocumentMgr; diff --git a/tools/VInspector/VInspector_ViewModelHistory.cxx b/tools/VInspector/VInspector_ViewModelHistory.cxx index 77839f2b67..244128cfe1 100644 --- a/tools/VInspector/VInspector_ViewModelHistory.cxx +++ b/tools/VInspector/VInspector_ViewModelHistory.cxx @@ -19,7 +19,9 @@ #include #include +#include #include +#include // ======================================================================= // function : Constructor diff --git a/tools/VInspector/VInspector_ViewModelHistory.hxx b/tools/VInspector/VInspector_ViewModelHistory.hxx index 76b6f2f634..556b5faa8c 100644 --- a/tools/VInspector/VInspector_ViewModelHistory.hxx +++ b/tools/VInspector/VInspector_ViewModelHistory.hxx @@ -20,10 +20,12 @@ #include #include +#include #include #include #include #include +#include #include diff --git a/tools/VInspector/VInspector_Window.cxx b/tools/VInspector/VInspector_Window.cxx index 778748e93a..62a58c47d8 100644 --- a/tools/VInspector/VInspector_Window.cxx +++ b/tools/VInspector/VInspector_Window.cxx @@ -36,6 +36,7 @@ #include #include +#include #include #include #include @@ -47,6 +48,7 @@ #include #include #include +#include const int FIRST_COLUMN_WIDTH = 230; diff --git a/tools/VInspector/VInspector_Window.hxx b/tools/VInspector/VInspector_Window.hxx index 7fa4664aba..3732113b83 100644 --- a/tools/VInspector/VInspector_Window.hxx +++ b/tools/VInspector/VInspector_Window.hxx @@ -23,9 +23,11 @@ #include #include +#include #include #include #include +#include class TreeModel_MessageDialog; diff --git a/tools/View/View_ToolBar.cxx b/tools/View/View_ToolBar.cxx index 2373a35813..06c7e81246 100644 --- a/tools/View/View_ToolBar.cxx +++ b/tools/View/View_ToolBar.cxx @@ -16,11 +16,13 @@ #include +#include #include #include #include #include #include +#include const int DEFAULT_COMBO_WIDTH_MINIMUM = 80; const int DEFAULT_SPACING = 3; diff --git a/tools/View/View_ToolBar.hxx b/tools/View/View_ToolBar.hxx index a4fcd5db49..99d888f083 100644 --- a/tools/View/View_ToolBar.hxx +++ b/tools/View/View_ToolBar.hxx @@ -21,11 +21,10 @@ #include #include -#ifdef _MSC_VER - #pragma warning(disable : 4127 4718) // conditional expression is constant, recursive call has no side effects -#endif +#include #include #include +#include class QComboBox; class QToolButton; diff --git a/tools/View/View_Widget.cxx b/tools/View/View_Widget.cxx index a72d908342..295a9c9915 100644 --- a/tools/View/View_Widget.cxx +++ b/tools/View/View_Widget.cxx @@ -24,6 +24,7 @@ #include #include +#include #include #include #include @@ -35,6 +36,7 @@ #include #include #include +#include #include diff --git a/tools/View/View_Widget.hxx b/tools/View/View_Widget.hxx index 06d6ccbba9..a84ff72d7a 100644 --- a/tools/View/View_Widget.hxx +++ b/tools/View/View_Widget.hxx @@ -21,13 +21,12 @@ #include #include -#ifdef _MSC_VER - #pragma warning(disable : 4127 4718) // conditional expression is constant, recursive call has no side effects -#endif +#include #include #include #include #include +#include class View_Viewer; diff --git a/tools/View/View_Window.cxx b/tools/View/View_Window.cxx index e6939689c4..fa17b55f0f 100644 --- a/tools/View/View_Window.cxx +++ b/tools/View/View_Window.cxx @@ -24,10 +24,12 @@ #include #include +#include #include #include #include #include +#include const int DEFAULT_SPACING = 3; diff --git a/tools/View/View_Window.hxx b/tools/View/View_Window.hxx index 61556f4d42..48c487255b 100644 --- a/tools/View/View_Window.hxx +++ b/tools/View/View_Window.hxx @@ -19,10 +19,9 @@ #include #include -#ifdef _MSC_VER -#pragma warning(disable : 4127) // conditional expression is constant -#endif +#include #include +#include class View_Displayer; class View_ToolBar;