0029025: TInspector include files are not installed to inc directory by CMake

TInspector headers are collected in 'inc/tools' directory. Extending DRAW Commands; Eliminating warnings; Improve Export to ShapeView dialog; Avoid crash with QML using;
2025-04-03 17:56:21 +03:00 · 2017-08-24 08:25:47 +03:00 · 2017-08-24 08:25:47 +03:00 · 0cb512c013
commit 0cb512c013
parent 340054e17a
272 changed files with 1980 additions and 903 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -789,8 +789,7 @@ else()
  # collect all the headers to <binary dir>/inc folder
  string(TIMESTAMP CURRENT_TIME "%H:%M:%S")
  message (STATUS "\nInfo: \(${CURRENT_TIME}\) Start collecting all OCCT tool header files into ${CMAKE_BINARY_DIR}/tools/inc ...")
-  COLLECT_AND_INSTALL_OCCT_HEADER_FILES ("${CMAKE_BINARY_DIR}/${INSTALL_DIR_INCLUDE}" "${BUILD_TOOL_TOOLKITS}" "${CMAKE_SOURCE_DIR}/tools" "tools")
-  include_directories (${CMAKE_BINARY_DIR}/${INSTALL_DIR_INCLUDE}/tools)
+  COLLECT_AND_INSTALL_OCCT_HEADER_FILES ("${CMAKE_BINARY_DIR}" "${BUILD_TOOL_TOOLKITS}" "${CMAKE_SOURCE_DIR}/tools" "${INSTALL_DIR_INCLUDE}/inspector")


  # check qt 3rdparty path
--- a/adm/cmake/occt_macros.cmake
+++ b/adm/cmake/occt_macros.cmake
@ -340,7 +340,7 @@ macro (COLLECT_AND_INSTALL_OCCT_HEADER_FILES ROOT_TARGET_OCCT_DIR OCCT_BUILD_TOO
  string(TIMESTAMP CURRENT_TIME "%H:%M:%S")
  message (STATUS "Info: \(${CURRENT_TIME}\) Checking headers in inc folder...")
    
-  file (GLOB OCCT_HEADER_FILES_OLD "${ROOT_TARGET_OCCT_DIR}/inc/*")
+  file (GLOB OCCT_HEADER_FILES_OLD "${ROOT_TARGET_OCCT_DIR}/${OCCT_INSTALL_DIR_PREFIX}/*")
  foreach (OCCT_HEADER_FILE_OLD ${OCCT_HEADER_FILES_OLD})
    get_filename_component (HEADER_FILE_NAME ${OCCT_HEADER_FILE_OLD} NAME)
    string (REGEX MATCH "^[a-zA-Z0-9]+" PACKAGE_NAME "${HEADER_FILE_NAME}")
--- a/samples/tools/TInspectorEXE/TInspectorEXE.cxx
+++ b/samples/tools/TInspectorEXE/TInspectorEXE.cxx
@ -14,9 +14,11 @@
 // commercial license or contractual agreement. 


-#include <OSD_Environment.hxx>
 #include <TInspectorEXE_OpenFileDialog.hxx>
-#include <TInspector_Communicator.hxx>
+
+#include <inspector/TInspector_Communicator.hxx>
+
+#include <OSD_Environment.hxx>

 #include <QAction>
 #include <QApplication>
--- a/samples/tools/TInspectorEXE/TInspectorEXE_OpenFileDialog.cxx
+++ b/samples/tools/TInspectorEXE/TInspectorEXE_OpenFileDialog.cxx
@ -14,10 +14,10 @@
 // commercial license or contractual agreement. 

 #include <TInspectorEXE_OpenFileDialog.hxx>
-
-#include <TInspector_Communicator.hxx>
 #include <TInspectorEXE_OpenFileViewModel.hxx>

+#include <inspector/TInspector_Communicator.hxx>
+
 #include <QApplication>
 #include <QCompleter>
 #include <QDir>
--- a/tests/tools/dfbrowser/A1
+++ b/tests/tools/dfbrowser/A1
@ -7,6 +7,6 @@ set aSetAttr1 100
 set aLabel 0:2
 SetInteger Doc ${aLabel} ${aSetAttr1}

-tinspector -dfbrowser
+tinspector -plugins dfbrowser
 tinspector -update

--- a/tests/tools/dfbrowser/A2
+++ b/tests/tools/dfbrowser/A2
@ -5,7 +5,7 @@ pload INSPECTOR
 chrono qat start
 # Create a new document and set UndoLimit
 NewDocument D BinOcaf
-tinspector -dfbrowser
+tinspector -plugins dfbrowser

 #NewDocument D
 cpulimit 300
--- a/tools/DFBrowser/DFBrowser_AttributePaneStack.cxx
+++ b/tools/DFBrowser/DFBrowser_AttributePaneStack.cxx
@ -13,17 +13,17 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement. 

-#include <DFBrowser_AttributePaneStack.hxx>
+#include <inspector/DFBrowser_AttributePaneStack.hxx>

-#include <DFBrowserPane_AttributePaneAPI.hxx>
-#include <DFBrowserPane_AttributePaneSelector.hxx>
-#include <DFBrowser_Item.hxx>
-#include <DFBrowser_Module.hxx>
-#include <DFBrowser_Tools.hxx>
-#include <DFBrowser_TreeLevelView.hxx>
-#include <DFBrowser_TreeModel.hxx>
-#include <DFBrowser_SearchView.hxx>
-#include <DFBrowser_Window.hxx>
+#include <inspector/DFBrowserPane_AttributePaneAPI.hxx>
+#include <inspector/DFBrowserPane_AttributePaneSelector.hxx>
+#include <inspector/DFBrowser_Item.hxx>
+#include <inspector/DFBrowser_Module.hxx>
+#include <inspector/DFBrowser_Tools.hxx>
+#include <inspector/DFBrowser_TreeLevelView.hxx>
+#include <inspector/DFBrowser_TreeModel.hxx>
+#include <inspector/DFBrowser_SearchView.hxx>
+#include <inspector/DFBrowser_Window.hxx>

 #include <TDF_Attribute.hxx>

--- a/tools/DFBrowser/DFBrowser_AttributePaneStack.hxx
+++ b/tools/DFBrowser/DFBrowser_AttributePaneStack.hxx
@ -16,9 +16,10 @@
 #ifndef DFBrowser_AttributePaneStack_H
 #define DFBrowser_AttributePaneStack_H

-#include <DFBrowser_AttributePaneType.hxx>
+#include <inspector/DFBrowser_AttributePaneType.hxx>
+#include <inspector/TreeModel_ItemBase.hxx>
+
 #include <Standard.hxx>
-#include <TreeModel_ItemBase.hxx>

 #include <QMap>
 #include <QItemSelection>
--- a/tools/DFBrowser/DFBrowser_Communicator.cxx
+++ b/tools/DFBrowser/DFBrowser_Communicator.cxx
@ -14,11 +14,11 @@
 // commercial license or contractual agreement. 


-#include <DFBrowser_Communicator.hxx>
+#include <inspector/DFBrowser_Communicator.hxx>

 #include <CDF_Session.hxx>
-#include <DFBrowser_Module.hxx>
-#include <DFBrowser_Window.hxx>
+#include <inspector/DFBrowser_Module.hxx>
+#include <inspector/DFBrowser_Window.hxx>

 // =======================================================================
 // function : CreateCommunicator
--- a/tools/DFBrowser/DFBrowser_Communicator.hxx
+++ b/tools/DFBrowser/DFBrowser_Communicator.hxx
@ -16,10 +16,11 @@
 #ifndef DFBrowser_Communicator_H
 #define DFBrowser_Communicator_H

-#include <DFBrowser_Window.hxx>
+#include <inspector/DFBrowser_Window.hxx>
+#include <inspector/TInspectorAPI_Communicator.hxx>
+
 #include <Standard.hxx>
 #include <Standard_Macro.hxx>
-#include <TInspectorAPI_Communicator.hxx>

 #include <QObject>

--- a/tools/DFBrowser/DFBrowser_DumpView.cxx
+++ b/tools/DFBrowser/DFBrowser_DumpView.cxx
@ -13,13 +13,13 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement. 

-#include <DFBrowser_DumpView.hxx>
+#include <inspector/DFBrowser_DumpView.hxx>

-#include <DFBrowser_Item.hxx>
-#include <DFBrowser_Window.hxx>
-#include <DFBrowser_TreeLevelView.hxx>
+#include <inspector/DFBrowser_Item.hxx>
+#include <inspector/DFBrowser_Window.hxx>
+#include <inspector/DFBrowser_TreeLevelView.hxx>
 #include <OSD_OpenFile.hxx>
-#include <TreeModel_ModelBase.hxx>
+#include <inspector/TreeModel_ModelBase.hxx>

 #include <QAbstractItemModel>
 #include <QDir>
@ -52,7 +52,6 @@ void DFBrowser_DumpView::OnTreeViewSelectionChanged (const QItemSelection& theSe
  QString aDumpInfo;
  const QModelIndex& anIndex = aFirstColumnSelectedIndices.first();
  TreeModel_ItemBasePtr anItemBase = TreeModel_ModelBase::GetItemByIndex (anIndex);
-//#define REQUIRE_OCAF_REVIEW:18 : start
  DFBrowser_ItemPtr anItem;
  if (anItemBase)
    anItem = itemDynamicCast<DFBrowser_Item> (anItemBase);
@ -87,7 +86,6 @@ void DFBrowser_DumpView::OnTreeViewSelectionChanged (const QItemSelection& theSe
  aFile.close();
  QDir aDir;
  aDir.remove (aFileName.ToCString());
-//#define REQUIRE_OCAF_REVIEW:18 : end
  if (!aDumpInfo.isEmpty())
  {
    myTextEdit->setVisible (true);
--- a/tools/DFBrowser/DFBrowser_HighlightDelegate.cxx
+++ b/tools/DFBrowser/DFBrowser_HighlightDelegate.cxx
@ -13,9 +13,9 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement. 

-#include <DFBrowser_HighlightDelegate.hxx>
+#include <inspector/DFBrowser_HighlightDelegate.hxx>

-#include <DFBrowser_Window.hxx>
+#include <inspector/DFBrowser_Window.hxx>
 #include <QPainter>

 // =======================================================================
--- a/tools/DFBrowser/DFBrowser_Item.cxx
+++ b/tools/DFBrowser/DFBrowser_Item.cxx
@ -13,15 +13,15 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement. 

-#include <DFBrowser_Item.hxx>
+#include <inspector/DFBrowser_Item.hxx>

-#include <DFBrowser_ItemRole.hxx>
-#include <DFBrowser_Module.hxx>
-#include <DFBrowser_Tools.hxx>
+#include <inspector/DFBrowser_ItemRole.hxx>
+#include <inspector/DFBrowser_Module.hxx>
+#include <inspector/DFBrowser_Tools.hxx>

-#include <DFBrowserPane_AttributePane.hxx>
-#include <DFBrowserPane_ItemRole.hxx>
-#include <DFBrowserPane_Tools.hxx>
+#include <inspector/DFBrowserPane_AttributePane.hxx>
+#include <inspector/DFBrowserPane_ItemRole.hxx>
+#include <inspector/DFBrowserPane_Tools.hxx>

 #include <TDF_AttributeIterator.hxx>
 #include <TDF_ChildIterator.hxx>
@ -31,7 +31,6 @@

 const int INFO_LENGHT = 60;

-//#define REQUIRE_OCAF_REVIEW:23
 // =======================================================================
 // function : hasAttribute
 // purpose :
--- a/tools/DFBrowser/DFBrowser_Item.hxx
+++ b/tools/DFBrowser/DFBrowser_Item.hxx
@ -16,7 +16,7 @@
 #ifndef DFBrowser_Item_H
 #define DFBrowser_Item_H

-#include <DFBrowser_ItemBase.hxx>
+#include <inspector/DFBrowser_ItemBase.hxx>

 #include <TDF_Attribute.hxx>
 #include <Standard.hxx>
--- a/tools/DFBrowser/DFBrowser_ItemApplication.cxx
+++ b/tools/DFBrowser/DFBrowser_ItemApplication.cxx
@ -13,20 +13,18 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement. 

-#include <DFBrowser_ItemApplication.hxx>
+#include <inspector/DFBrowser_ItemApplication.hxx>

-#include <DFBrowser_Item.hxx>
-#include <DFBrowser_ItemDocument.hxx>
-#include <DFBrowser_Module.hxx>
-#include <DFBrowser_Tools.hxx>
+#include <inspector/DFBrowser_Item.hxx>
+#include <inspector/DFBrowser_ItemDocument.hxx>
+#include <inspector/DFBrowser_Module.hxx>
+#include <inspector/DFBrowser_Tools.hxx>

-#include <DFBrowserPane_AttributePane.hxx>
-#include <DFBrowserPane_ItemRole.hxx>
+#include <inspector/DFBrowserPane_AttributePane.hxx>
+#include <inspector/DFBrowserPane_ItemRole.hxx>

 #include <QObject>

-//#define REQUIRE_OCAF_REVIEW:21
-
 // =======================================================================
 // function : createChild
 // purpose :
--- a/tools/DFBrowser/DFBrowser_ItemApplication.hxx
+++ b/tools/DFBrowser/DFBrowser_ItemApplication.hxx
@ -16,7 +16,8 @@
 #ifndef DFBrowser_ItemApplication_H
 #define DFBrowser_ItemApplication_H

-#include <DFBrowser_ItemBase.hxx>
+#include <inspector/DFBrowser_ItemBase.hxx>
+
 #include <TDocStd_Application.hxx>

 class DFBrowser_ItemApplication;
--- a/tools/DFBrowser/DFBrowser_ItemBase.cxx
+++ b/tools/DFBrowser/DFBrowser_ItemBase.cxx
@ -13,15 +13,15 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement. 

-#include <DFBrowser_ItemBase.hxx>
+#include <inspector/DFBrowser_ItemBase.hxx>

-#include <DFBrowser_Item.hxx>
-#include <DFBrowser_Module.hxx>
-#include <DFBrowser_Tools.hxx>
+#include <inspector/DFBrowser_Item.hxx>
+#include <inspector/DFBrowser_Module.hxx>
+#include <inspector/DFBrowser_Tools.hxx>

-#include <DFBrowserPane_AttributePane.hxx>
-#include <DFBrowserPane_ItemRole.hxx>
-#include <DFBrowserPane_Tools.hxx>
+#include <inspector/DFBrowserPane_AttributePane.hxx>
+#include <inspector/DFBrowserPane_ItemRole.hxx>
+#include <inspector/DFBrowserPane_Tools.hxx>

 #include <TDataStd_Name.hxx>
 #include <TDF_ChildIterator.hxx>
@ -30,7 +30,6 @@
 #include <QIcon>
 #include <QVariant>

-//#define REQUIRE_OCAF_REVIEW:20
 // =======================================================================
 // function : Constructor
 // purpose :
--- a/tools/DFBrowser/DFBrowser_ItemBase.hxx
+++ b/tools/DFBrowser/DFBrowser_ItemBase.hxx
@ -17,9 +17,10 @@
 #define DFBrowser_ItemBase_H

 #include <Standard.hxx>
-#include <TreeModel_ItemBase.hxx>
 #include <TDF_Label.hxx>

+#include <inspector/TreeModel_ItemBase.hxx>
+
 class DFBrowser_ItemBase;
 class DFBrowser_Module;
 typedef QExplicitlySharedDataPointer<DFBrowser_ItemBase> DFBrowser_ItemBasePtr;
--- a/tools/DFBrowser/DFBrowser_ItemDocument.cxx
+++ b/tools/DFBrowser/DFBrowser_ItemDocument.cxx
@ -13,22 +13,20 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement. 

-#include <DFBrowser_ItemDocument.hxx>
+#include <inspector/DFBrowser_ItemDocument.hxx>

-#include <DFBrowser_Item.hxx>
-#include <DFBrowser_ItemApplication.hxx>
-#include <DFBrowser_ItemDocument.hxx>
-#include <DFBrowser_Tools.hxx>
+#include <inspector/DFBrowser_Item.hxx>
+#include <inspector/DFBrowser_ItemApplication.hxx>
+#include <inspector/DFBrowser_ItemDocument.hxx>
+#include <inspector/DFBrowser_Tools.hxx>

-#include <DFBrowserPane_AttributePane.hxx>
-#include <DFBrowserPane_ItemRole.hxx>
+#include <inspector/DFBrowserPane_AttributePane.hxx>
+#include <inspector/DFBrowserPane_ItemRole.hxx>

 #include <QIcon>
 #include <QLabel>
 #include <QObject>

-//#define REQUIRE_OCAF_REVIEW:22
-
 // =======================================================================
 // function : GetLabel
 // purpose :
--- a/tools/DFBrowser/DFBrowser_ItemDocument.hxx
+++ b/tools/DFBrowser/DFBrowser_ItemDocument.hxx
@ -16,7 +16,8 @@
 #ifndef DFBrowser_ItemDocument_H
 #define DFBrowser_ItemDocument_H

-#include <DFBrowser_ItemBase.hxx>
+#include <inspector/DFBrowser_ItemBase.hxx>
+
 #include <Standard.hxx>
 #include <TDocStd_Document.hxx>

--- a/tools/DFBrowser/DFBrowser_Module.cxx
+++ b/tools/DFBrowser/DFBrowser_Module.cxx
@ -13,22 +13,22 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement. 

-#include <DFBrowser_Module.hxx>
+#include <inspector/DFBrowser_Module.hxx>

-#include <DFBrowser_Item.hxx>
-#include <DFBrowser_ItemApplication.hxx>
-#include <DFBrowser_ItemBase.hxx>
-#include <DFBrowser_ItemRole.hxx>
-#include <DFBrowser_Tools.hxx>
-#include <DFBrowser_TreeModel.hxx>
+#include <inspector/DFBrowser_Item.hxx>
+#include <inspector/DFBrowser_ItemApplication.hxx>
+#include <inspector/DFBrowser_ItemBase.hxx>
+#include <inspector/DFBrowser_ItemRole.hxx>
+#include <inspector/DFBrowser_Tools.hxx>
+#include <inspector/DFBrowser_TreeModel.hxx>

-#include <DFBrowserPane_AttributePane.hxx>
-#include <DFBrowserPane_AttributePaneCreator.hxx>
-#include <DFBrowserPane_ItemRole.hxx>
-#include <DFBrowserPane_Tools.hxx>
+#include <inspector/DFBrowserPane_AttributePane.hxx>
+#include <inspector/DFBrowserPane_AttributePaneCreator.hxx>
+#include <inspector/DFBrowserPane_ItemRole.hxx>
+#include <inspector/DFBrowserPane_Tools.hxx>

-#include <DFBrowserPaneXDE_AttributePaneCreator.hxx>
-#include <DFBrowserPaneXDE_Tools.hxx>
+#include <inspector/DFBrowserPaneXDE_AttributePaneCreator.hxx>
+#include <inspector/DFBrowserPaneXDE_Tools.hxx>

 #include <XCAFApp_Application.hxx>

--- a/tools/DFBrowser/DFBrowser_Module.hxx
+++ b/tools/DFBrowser/DFBrowser_Module.hxx
@ -16,15 +16,16 @@
 #ifndef DFBrowser_Module_H
 #define DFBrowser_Module_H

+#include <inspector/DFBrowser_TreeModel.hxx>
+#include <inspector/TreeModel_ItemBase.hxx>
+
 #include <AIS_InteractiveContext.hxx>
-#include <DFBrowser_TreeModel.hxx>
 #include <NCollection_Map.hxx>
 #include <Standard.hxx>
 #include <TCollection_AsciiString.hxx>
 #include <TDF_Attribute.hxx>
 #include <TDocStd_Application.hxx>
 #include <TopoDS_Shape.hxx>
-#include <TreeModel_ItemBase.hxx>

 #include <QObject>

--- a/tools/DFBrowser/DFBrowser_OpenApplication.cxx
+++ b/tools/DFBrowser/DFBrowser_OpenApplication.cxx
@ -13,7 +13,7 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement. 

-#include <DFBrowser_OpenApplication.hxx>
+#include <inspector/DFBrowser_OpenApplication.hxx>

 #include <BinDrivers.hxx>
 #include <BinLDrivers.hxx>
@ -32,7 +32,6 @@
 #include <XmlXCAFDrivers.hxx>
 #include <UTL.hxx>

-//#define REQUIRE_OCAF_REVIEW:24
 namespace DFBrowser_OpenApplication
 {

--- a/tools/DFBrowser/DFBrowser_PropertyPanel.cxx
+++ b/tools/DFBrowser/DFBrowser_PropertyPanel.cxx
@ -13,13 +13,13 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement. 

-#include <DFBrowser_PropertyPanel.hxx>
+#include <inspector/DFBrowser_PropertyPanel.hxx>

-#include <DFBrowser_AttributePaneStack.hxx>
-#include <DFBrowser_Item.hxx>
-#include <DFBrowser_SearchView.hxx>
-#include <DFBrowser_Window.hxx>
-#include <DFBrowser_TreeLevelView.hxx>
+#include <inspector/DFBrowser_AttributePaneStack.hxx>
+#include <inspector/DFBrowser_Item.hxx>
+#include <inspector/DFBrowser_SearchView.hxx>
+#include <inspector/DFBrowser_Window.hxx>
+#include <inspector/DFBrowser_TreeLevelView.hxx>

 #include <QAbstractItemModel>
 #include <QGridLayout>
--- a/tools/DFBrowser/DFBrowser_PropertyPanel.hxx
+++ b/tools/DFBrowser/DFBrowser_PropertyPanel.hxx
@ -16,8 +16,9 @@
 #ifndef DFBrowser_PropertyPanel_H
 #define DFBrowser_PropertyPanel_H

+#include <inspector/TreeModel_ItemBase.hxx>
+
 #include <Standard.hxx>
-#include <TreeModel_ItemBase.hxx>

 #include <QItemSelection>
 #include <QObject>
--- a/tools/DFBrowser/DFBrowser_SearchLine.cxx
+++ b/tools/DFBrowser/DFBrowser_SearchLine.cxx
@ -13,12 +13,12 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement. 

-#include <DFBrowser_SearchLine.hxx>
-#include <DFBrowser_SearchLineModel.hxx>
-#include <DFBrowser_Window.hxx>
+#include <inspector/DFBrowser_SearchLine.hxx>
+#include <inspector/DFBrowser_SearchLineModel.hxx>
+#include <inspector/DFBrowser_Window.hxx>

-#include <DFBrowserPane_Tools.hxx>
-#include <DFBrowser_Module.hxx>
+#include <inspector/DFBrowserPane_Tools.hxx>
+#include <inspector/DFBrowser_Module.hxx>

 #include <TDocStd_Application.hxx>
 #include <TDocStd_Document.hxx>
--- a/tools/DFBrowser/DFBrowser_SearchLine.hxx
+++ b/tools/DFBrowser/DFBrowser_SearchLine.hxx
@ -16,7 +16,8 @@
 #ifndef DFBrowser_SearchLine_H
 #define DFBrowser_SearchLine_H

-#include <DFBrowser_SearchLineModel.hxx> // to include DFBrowser_SearchItemInfo
+#include <inspector/DFBrowser_SearchLineModel.hxx> // to include DFBrowser_SearchItemInfo
+
 #include <Standard.hxx>
 #include <TDocStd_Application.hxx>
 #include <TDF_Label.hxx>
--- a/tools/DFBrowser/DFBrowser_SearchLineModel.cxx
+++ b/tools/DFBrowser/DFBrowser_SearchLineModel.cxx
@ -13,14 +13,14 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement. 

-#include <DFBrowser_SearchLineModel.hxx>
+#include <inspector/DFBrowser_SearchLineModel.hxx>

-#include <DFBrowser_Module.hxx>
-#include <DFBrowser_Tools.hxx>
+#include <inspector/DFBrowser_Module.hxx>
+#include <inspector/DFBrowser_Tools.hxx>

-#include <DFBrowserPane_AttributePane.hxx>
-#include <DFBrowserPane_ItemRole.hxx>
-#include <DFBrowserPane_Tools.hxx>
+#include <inspector/DFBrowserPane_AttributePane.hxx>
+#include <inspector/DFBrowserPane_ItemRole.hxx>
+#include <inspector/DFBrowserPane_Tools.hxx>

 #include <QDir>
 #include <QIcon>
@ -139,6 +139,8 @@ QVariant DFBrowser_SearchLineModel::data (const QModelIndex& theIndex, int theRo
          anIcon = DFBrowser_Module::GetAttributeInfo (anAttributeName.toUtf8().data(),
                                                       myModule, DFBrowserPane_ItemRole_Decoration_40x40, 0);
        }
+        else
+          anIcon = DFBrowser_Tools::GetLabelIcon (TDF_Label(), false);
        return anIcon;
      }
      if (theRole == Qt::SizeHintRole) return QSize (80, 80);
--- a/tools/DFBrowser/DFBrowser_SearchLineModel.hxx
+++ b/tools/DFBrowser/DFBrowser_SearchLineModel.hxx
@ -16,11 +16,12 @@
 #ifndef DFBrowser_SearchLineModel_H
 #define DFBrowser_SearchLineModel_H

-#include <DFBrowser_SearchItemInfo.hxx>
+#include <inspector/DFBrowser_SearchItemInfo.hxx>
+#include <inspector/TreeModel_ItemBase.hxx>
+
 #include <Standard.hxx>
 #include <TDF_Attribute.hxx>
 #include <TDF_Label.hxx>
-#include <TreeModel_ItemBase.hxx>

 #ifdef _MSC_VER
 #pragma warning(disable : 4127) // conditional expression is constant
--- a/tools/DFBrowser/DFBrowser_SearchView.cxx
+++ b/tools/DFBrowser/DFBrowser_SearchView.cxx
@ -13,14 +13,14 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement. 

-#include <DFBrowser_SearchView.hxx>
+#include <inspector/DFBrowser_SearchView.hxx>

-#include <DFBrowser_HighlightDelegate.hxx>
-#include <DFBrowser_SearchLine.hxx>
-#include <DFBrowser_SearchLineModel.hxx>
-#include <DFBrowser_Window.hxx>
+#include <inspector/DFBrowser_HighlightDelegate.hxx>
+#include <inspector/DFBrowser_SearchLine.hxx>
+#include <inspector/DFBrowser_SearchLineModel.hxx>
+#include <inspector/DFBrowser_Window.hxx>

-#include <DFBrowserPane_Tools.hxx>
+#include <inspector/DFBrowserPane_Tools.hxx>

 #include <QAbstractProxyModel>
 #include <QGridLayout>
--- a/tools/DFBrowser/DFBrowser_SearchView.hxx
+++ b/tools/DFBrowser/DFBrowser_SearchView.hxx
@ -16,9 +16,10 @@
 #ifndef DFBrowser_SearchView_H
 #define DFBrowser_SearchView_H

-#include <DFBrowser_SearchLine.hxx>
+#include <inspector/DFBrowser_SearchLine.hxx>
+#include <inspector/TreeModel_ItemBase.hxx>
+
 #include <Standard.hxx>
-#include <TreeModel_ItemBase.hxx>

 #include <QItemSelection>
 #include <QObject>
--- a/tools/DFBrowser/DFBrowser_Shortcut.cxx
+++ b/tools/DFBrowser/DFBrowser_Shortcut.cxx
@ -13,9 +13,9 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement. 

-#include <DFBrowser_Shortcut.hxx>
+#include <inspector/DFBrowser_Shortcut.hxx>

-#include <DFBrowser_Module.hxx>
+#include <inspector/DFBrowser_Module.hxx>

 #include <QApplication>
 #include <QKeyEvent>
--- a/tools/DFBrowser/DFBrowser_Thread.cxx
+++ b/tools/DFBrowser/DFBrowser_Thread.cxx
@ -13,13 +13,13 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement. 

-#include <DFBrowser_Thread.hxx>
-#include <DFBrowser_ThreadItemSearch.hxx>
-#include <DFBrowser_ThreadItemUsedShapesMap.hxx>
-#include <DFBrowser_TreeLevelLine.hxx>
-#include <DFBrowser_SearchLine.hxx>
+#include <inspector/DFBrowser_Thread.hxx>
+#include <inspector/DFBrowser_ThreadItemSearch.hxx>
+#include <inspector/DFBrowser_ThreadItemUsedShapesMap.hxx>
+#include <inspector/DFBrowser_TreeLevelLine.hxx>
+#include <inspector/DFBrowser_SearchLine.hxx>

-#include <DFBrowser_Window.hxx>
+#include <inspector/DFBrowser_Window.hxx>

 #include <QThread>

--- a/tools/DFBrowser/DFBrowser_ThreadItemSearch.cxx
+++ b/tools/DFBrowser/DFBrowser_ThreadItemSearch.cxx
@ -13,13 +13,13 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement. 

-#include <DFBrowser_ThreadItemSearch.hxx>
+#include <inspector/DFBrowser_ThreadItemSearch.hxx>

-#include <DFBrowser_Module.hxx>
-#include <DFBrowser_Tools.hxx>
-#include <DFBrowser_TreeModel.hxx>
-#include <DFBrowser_SearchLine.hxx>
-#include <DFBrowserPane_Tools.hxx>
+#include <inspector/DFBrowser_Module.hxx>
+#include <inspector/DFBrowser_Tools.hxx>
+#include <inspector/DFBrowser_TreeModel.hxx>
+#include <inspector/DFBrowser_SearchLine.hxx>
+#include <inspector/DFBrowserPane_Tools.hxx>

 #include <TDataStd_Comment.hxx>
 #include <TDataStd_Name.hxx>
@ -43,7 +43,6 @@ void DFBrowser_ThreadItemSearch::Run()
  myDocumentValues.clear();
  myDocumentInfoValues.clear();

-  //#define REQUIRE_OCAF_REVIEW:25 : start
  QMap<QString, DFBrowser_SearchItemInfo> anAdditionalValues;
  QStringList anInfoValues;
  QStringList aCurrentPath;
@ -62,7 +61,6 @@ void DFBrowser_ThreadItemSearch::Run()
    myDocumentValues[aDocId] = anAdditionalValues;
    myDocumentInfoValues[aDocId] = anInfoValues;
  }
-  //#define REQUIRE_OCAF_REVIEW:25 : end
 }

 // =======================================================================
@ -116,8 +114,7 @@ void DFBrowser_ThreadItemSearch::addLabel (const TDF_Label& theLabel, const QStr
  if (!theValues.contains (anEntry))
  {
    theInfoValues.append (anEntry);
-    theValues[anEntry] = DFBrowser_SearchItemInfo (DFBrowser_Tools::GetLabelIcon (theLabel, false),
-                                                   anEntry, theCurrentPath, QDir::separator());
+    theValues[anEntry] = DFBrowser_SearchItemInfo ("40x40_label_icon", anEntry, theCurrentPath, QDir::separator());
  }
 }

--- a/tools/DFBrowser/DFBrowser_ThreadItemSearch.hxx
+++ b/tools/DFBrowser/DFBrowser_ThreadItemSearch.hxx
@ -16,8 +16,9 @@
 #ifndef DFBrowser_ThreadItemSearch_H
 #define DFBrowser_ThreadItemSearch_H

-#include <DFBrowser_ThreadItem.hxx>
-#include <DFBrowser_SearchLineModel.hxx> // to include DFBrowser_SearchItemInfo
+#include <inspector/DFBrowser_ThreadItem.hxx>
+#include <inspector/DFBrowser_SearchLineModel.hxx> // to include DFBrowser_SearchItemInfo
+
 #include <Standard.hxx>
 #include <TDF_Label.hxx>

--- a/tools/DFBrowser/DFBrowser_ThreadItemUsedShapesMap.cxx
+++ b/tools/DFBrowser/DFBrowser_ThreadItemUsedShapesMap.cxx
@ -13,14 +13,14 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement. 

-#include <DFBrowser_ThreadItemUsedShapesMap.hxx>
+#include <inspector/DFBrowser_ThreadItemUsedShapesMap.hxx>

-#include <DFBrowser_Module.hxx>
-#include <DFBrowser_Tools.hxx>
-#include <DFBrowser_TreeModel.hxx>
+#include <inspector/DFBrowser_Module.hxx>
+#include <inspector/DFBrowser_Tools.hxx>
+#include <inspector/DFBrowser_TreeModel.hxx>

-#include <DFBrowserPane_TNamingUsedShapes.hxx>
-#include <DFBrowserPane_Tools.hxx>
+#include <inspector/DFBrowserPane_TNamingUsedShapes.hxx>
+#include <inspector/DFBrowserPane_Tools.hxx>

 #include <TNaming_DataMapIteratorOfDataMapOfShapePtrRefShape.hxx>
 #include <TNaming_PtrRefShape.hxx>
@ -89,7 +89,10 @@ void DFBrowser_ThreadItemUsedShapesMap::ApplyValues()
    TreeModel_ItemBasePtr anItemBase = TreeModel_ModelBase::GetItemByIndex
                                                   (aDFBrowserModel->FindIndexByAttribute (aRefIt.Key()));
    if (anItemBase)
+    {
+      anItemBase->Reset();
      anItemBase->Init();
+    }
  }
  // clear cache
  myAttributeRefs.Clear();
@ -205,7 +208,6 @@ void DFBrowser_ThreadItemUsedShapesMap::addValue (const TCollection_AsciiString&
 // function : findReferences
 // purpose :
 // =======================================================================
-//#define REQUIRE_OCAF_REVIEW:26 : start
 void DFBrowser_ThreadItemUsedShapesMap::findReferences (Handle(TDF_Attribute) theAttribute,
                                                        std::list<TCollection_AsciiString>& theReferences)
 {
@ -219,4 +221,3 @@ void DFBrowser_ThreadItemUsedShapesMap::findReferences (Handle(TDF_Attribute) th
       anEntryIt != anEntries.end(); anEntryIt++)
    theReferences.push_back (anEntryIt->first);
 }
-//#define REQUIRE_OCAF_REVIEW:26 : end
--- a/tools/DFBrowser/DFBrowser_ThreadItemUsedShapesMap.hxx
+++ b/tools/DFBrowser/DFBrowser_ThreadItemUsedShapesMap.hxx
@ -16,7 +16,8 @@
 #ifndef DFBROWSER_ThreadItemUsedShapesMap_H
 #define DFBROWSER_ThreadItemUsedShapesMap_H

-#include <DFBrowser_ThreadItem.hxx>
+#include <inspector/DFBrowser_ThreadItem.hxx>
+
 #include <NCollection_DataMap.hxx>
 #include <Standard.hxx>
 #include <TCollection_AsciiString.hxx>
--- a/tools/DFBrowser/DFBrowser_Tools.cxx
+++ b/tools/DFBrowser/DFBrowser_Tools.cxx
@ -13,12 +13,12 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement. 

-#include <DFBrowser_Tools.hxx>
+#include <inspector/DFBrowser_Tools.hxx>

-#include <DFBrowser_ItemBase.hxx>
+#include <inspector/DFBrowser_ItemBase.hxx>

-#include <DFBrowserPane_AttributePaneCreator.hxx>
-#include <DFBrowserPane_Tools.hxx>
+#include <inspector/DFBrowserPane_AttributePaneCreator.hxx>
+#include <inspector/DFBrowserPane_Tools.hxx>

 #include <TCollection_AsciiString.hxx>
 #include <TDF_Tool.hxx>
@ -33,8 +33,6 @@
 #include <QPalette>
 #include <QWidget>

-//#define REQUIRE_OCAF_REVIEW:27
-
 namespace DFBrowser_Tools
 {
  // =======================================================================
--- a/tools/DFBrowser/DFBrowser_Tools.hxx
+++ b/tools/DFBrowser/DFBrowser_Tools.hxx
@ -16,9 +16,10 @@
 #ifndef DFBrowser_Tools_H
 #define DFBrowser_Tools_H

+#include <inspector/TreeModel_ItemBase.hxx>
+
 #include <Standard.hxx>
 #include <Standard_GUID.hxx>
-#include <TreeModel_ItemBase.hxx>
 #include <TDocStd_Document.hxx>
 #include <TDF_Label.hxx>
 #include <TDF_Attribute.hxx>
--- a/tools/DFBrowser/DFBrowser_TreeLevelLine.cxx
+++ b/tools/DFBrowser/DFBrowser_TreeLevelLine.cxx
@ -13,14 +13,14 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement. 

-#include <DFBrowser_TreeLevelLine.hxx>
+#include <inspector/DFBrowser_TreeLevelLine.hxx>

-#include <DFBrowser_SearchLine.hxx>
-#include <DFBrowser_Window.hxx>
-#include <DFBrowser_TreeLevelLineDelegate.hxx>
-#include <DFBrowser_TreeLevelLineModel.hxx>
+#include <inspector/DFBrowser_SearchLine.hxx>
+#include <inspector/DFBrowser_Window.hxx>
+#include <inspector/DFBrowser_TreeLevelLineDelegate.hxx>
+#include <inspector/DFBrowser_TreeLevelLineModel.hxx>

-#include <DFBrowserPane_Tools.hxx>
+#include <inspector/DFBrowserPane_Tools.hxx>

 #include <QAbstractItemModel>
 #include <QFrame>
--- a/tools/DFBrowser/DFBrowser_TreeLevelLine.hxx
+++ b/tools/DFBrowser/DFBrowser_TreeLevelLine.hxx
@ -16,8 +16,9 @@
 #ifndef DFBrowser_TreeLevelLine_H
 #define DFBrowser_TreeLevelLine_H

+#include <inspector/TreeModel_ItemBase.hxx>
+
 #include <Standard.hxx>
-#include <TreeModel_ItemBase.hxx>

 #include <QItemSelection>
 #include <QObject>
--- a/tools/DFBrowser/DFBrowser_TreeLevelLineDelegate.cxx
+++ b/tools/DFBrowser/DFBrowser_TreeLevelLineDelegate.cxx
@ -13,8 +13,8 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement. 

-#include <DFBrowser_TreeLevelLineDelegate.hxx>
-#include <DFBrowser_Window.hxx>
+#include <inspector/DFBrowser_TreeLevelLineDelegate.hxx>
+#include <inspector/DFBrowser_Window.hxx>

 #include <QPainter>

--- a/tools/DFBrowser/DFBrowser_TreeLevelLineModel.cxx
+++ b/tools/DFBrowser/DFBrowser_TreeLevelLineModel.cxx
@ -13,10 +13,10 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement. 

-#include <DFBrowser_TreeLevelLineModel.hxx>
+#include <inspector/DFBrowser_TreeLevelLineModel.hxx>

-#include <DFBrowser_ItemBase.hxx>
-#include <TreeModel_ModelBase.hxx>
+#include <inspector/DFBrowser_ItemBase.hxx>
+#include <inspector/TreeModel_ModelBase.hxx>

 #include <QIcon>
 #include <QWidget>
--- a/tools/DFBrowser/DFBrowser_TreeLevelLineModel.hxx
+++ b/tools/DFBrowser/DFBrowser_TreeLevelLineModel.hxx
@ -16,8 +16,9 @@
 #ifndef DFBrowser_TreeLevelLineModel_H
 #define DFBrowser_TreeLevelLineModel_H

+#include <inspector/TreeModel_ItemBase.hxx>
+
 #include <Standard.hxx>
-#include <TreeModel_ItemBase.hxx>

 #include <QAbstractTableModel>
 #include <QObject>
--- a/tools/DFBrowser/DFBrowser_TreeLevelView.cxx
+++ b/tools/DFBrowser/DFBrowser_TreeLevelView.cxx
@ -13,13 +13,13 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement. 

-#include <DFBrowser_TreeLevelView.hxx>
+#include <inspector/DFBrowser_TreeLevelView.hxx>

-#include <DFBrowser_Item.hxx>
-#include <DFBrowser_TreeLevelViewModel.hxx>
-#include <DFBrowser_Window.hxx>
-#include <DFBrowserPane_Tools.hxx>
-#include <TreeModel_ModelBase.hxx>
+#include <inspector/DFBrowser_Item.hxx>
+#include <inspector/DFBrowser_TreeLevelViewModel.hxx>
+#include <inspector/DFBrowser_Window.hxx>
+#include <inspector/DFBrowserPane_Tools.hxx>
+#include <inspector/TreeModel_ModelBase.hxx>

 #include <QItemSelectionModel>

--- a/tools/DFBrowser/DFBrowser_TreeLevelView.hxx
+++ b/tools/DFBrowser/DFBrowser_TreeLevelView.hxx
@ -16,8 +16,9 @@
 #ifndef DFBrowser_TreeLevelView_H
 #define DFBrowser_TreeLevelView_H

+#include <inspector/TreeModel_ItemBase.hxx>
+
 #include <Standard.hxx>
-#include <TreeModel_ItemBase.hxx>

 #include <QObject>
 #include <QItemSelection>
--- a/tools/DFBrowser/DFBrowser_TreeLevelViewModel.cxx
+++ b/tools/DFBrowser/DFBrowser_TreeLevelViewModel.cxx
@ -13,18 +13,18 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement. 

-#include <DFBrowser_TreeLevelViewModel.hxx>
+#include <inspector/DFBrowser_TreeLevelViewModel.hxx>

-#include <DFBrowser_Item.hxx>
-#include <DFBrowser_ItemRole.hxx>
-#include <DFBrowser_Module.hxx>
-#include <DFBrowser_Tools.hxx>
-#include <DFBrowser_TreeLevelView.hxx>
+#include <inspector/DFBrowser_Item.hxx>
+#include <inspector/DFBrowser_ItemRole.hxx>
+#include <inspector/DFBrowser_Module.hxx>
+#include <inspector/DFBrowser_Tools.hxx>
+#include <inspector/DFBrowser_TreeLevelView.hxx>

 #include <TDF_AttributeIterator.hxx>
 #include <TDF_ChildIterator.hxx>
 #include <TDF_Label.hxx>
-#include <TreeModel_ModelBase.hxx>
+#include <inspector/TreeModel_ModelBase.hxx>

 #include <QIcon>

--- a/tools/DFBrowser/DFBrowser_TreeModel.cxx
+++ b/tools/DFBrowser/DFBrowser_TreeModel.cxx
@ -13,14 +13,14 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement. 

-#include <DFBrowser_TreeModel.hxx>
+#include <inspector/DFBrowser_TreeModel.hxx>

-#include <DFBrowser_Item.hxx>
-#include <DFBrowser_ItemApplication.hxx>
-#include <DFBrowser_ItemDocument.hxx>
-#include <DFBrowser_Module.hxx>
-#include <DFBrowser_Window.hxx>
-#include <DFBrowserPane_Tools.hxx>
+#include <inspector/DFBrowser_Item.hxx>
+#include <inspector/DFBrowser_ItemApplication.hxx>
+#include <inspector/DFBrowser_ItemDocument.hxx>
+#include <inspector/DFBrowser_Module.hxx>
+#include <inspector/DFBrowser_Window.hxx>
+#include <inspector/DFBrowserPane_Tools.hxx>
 #include <NCollection_List.hxx>

 #include <TDocStd_Application.hxx>
@ -30,7 +30,6 @@

 #include <QAbstractItemModel>

-//#define REQUIRE_OCAF_REVIEW:19
 // =======================================================================
 // function : Constructor
 // purpose :
@ -71,7 +70,6 @@ Handle(TDocStd_Application) DFBrowser_TreeModel::GetTDocStdApplication() const
 // =======================================================================
 QModelIndex DFBrowser_TreeModel::FindIndex (const TDF_Label& theLabel) const
 {
-//#define REQUIRE_OCAF_REVIEW:10 : start (GetReferences)
  TDF_Label aRoot = theLabel.Root();

  NCollection_List<TDF_Label> aLabels;
@ -124,7 +122,6 @@ QModelIndex DFBrowser_TreeModel::FindIndex (const TDF_Label& theLabel) const
      }
    }
  }
-  //#define REQUIRE_OCAF_REVIEW:10 : end
  return aParentIndex;
 }

@ -233,10 +230,8 @@ QModelIndex DFBrowser_TreeModel::FindIndexByAttribute (Handle(TDF_Attribute) the
 void DFBrowser_TreeModel::ConvertToIndices (const NCollection_List<TDF_Label>& theReferences,
                                            QModelIndexList& theIndices)
 {
-//#define REQUIRE_OCAF_REVIEW:10 : start (GetReferences)
  for (NCollection_List<TDF_Label>::Iterator aLabelItr (theReferences); aLabelItr.More(); aLabelItr.Next())
    theIndices.append (FindIndex (aLabelItr.Value()));
-//#define REQUIRE_OCAF_REVIEW:10 : end
 }

 // =======================================================================
--- a/tools/DFBrowser/DFBrowser_TreeModel.hxx
+++ b/tools/DFBrowser/DFBrowser_TreeModel.hxx
@ -16,12 +16,13 @@
 #ifndef DFBrowser_TreeModel_H
 #define DFBrowser_TreeModel_H

-#include <DFBrowser_ItemBase.hxx>
+#include <inspector/DFBrowser_ItemBase.hxx>
+#include <inspector/TreeModel_ModelBase.hxx>
+
 #include <NCollection_List.hxx>
 #include <Standard.hxx>
 #include <TDF_Label.hxx>
 #include <TDocStd_Application.hxx>
-#include <TreeModel_ModelBase.hxx>

 #include <QByteArray>
 #include <QHash>
--- a/tools/DFBrowser/DFBrowser_TreeView.cxx
+++ b/tools/DFBrowser/DFBrowser_TreeView.cxx
@ -13,7 +13,7 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement. 

-#include <DFBrowser_TreeView.hxx>
+#include <inspector/DFBrowser_TreeView.hxx>

 // =======================================================================
 // function : SetPredefinedSize
--- a/tools/DFBrowser/DFBrowser_Window.cxx
+++ b/tools/DFBrowser/DFBrowser_Window.cxx
@ -13,7 +13,7 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement. 

-#include <DFBrowser_Window.hxx>
+#include <inspector/DFBrowser_Window.hxx>

 #include <AIS_InteractiveContext.hxx>
 #include <AIS_InteractiveObject.hxx>
@ -21,40 +21,44 @@

 #include <CDF_Session.hxx>

-#include <DFBrowserPane_AttributePaneAPI.hxx>
+#include <inspector/DFBrowserPane_AttributePaneAPI.hxx>

-#include <DFBrowser_AttributePaneStack.hxx>
-#include <DFBrowser_AttributePaneType.hxx>
-#include <DFBrowser_DumpView.hxx>
-#include <DFBrowser_Item.hxx>
-#include <DFBrowser_Module.hxx>
-#include <DFBrowser_OpenApplication.hxx>
-#include <DFBrowser_PropertyPanel.hxx>
-#include <DFBrowser_SearchLine.hxx>
-#include <DFBrowser_SearchView.hxx>
-#include <DFBrowser_Shortcut.hxx>
-#include <DFBrowser_Thread.hxx>
-#include <DFBrowser_ThreadItemSearch.hxx>
-#include <DFBrowser_ThreadItemUsedShapesMap.hxx>
-#include <DFBrowser_Tools.hxx>
-#include <DFBrowser_TreeLevelLine.hxx>
-#include <DFBrowser_TreeLevelView.hxx>
-#include <DFBrowser_TreeModel.hxx>
-#include <DFBrowser_TreeView.hxx>
+#include <inspector/DFBrowser_AttributePaneStack.hxx>
+#include <inspector/DFBrowser_AttributePaneType.hxx>
+#include <inspector/DFBrowser_DumpView.hxx>
+#include <inspector/DFBrowser_Item.hxx>
+#include <inspector/DFBrowser_ItemApplication.hxx>
+#include <inspector/DFBrowser_Module.hxx>
+#include <inspector/DFBrowser_OpenApplication.hxx>
+#include <inspector/DFBrowser_PropertyPanel.hxx>
+#include <inspector/DFBrowser_SearchLine.hxx>
+#include <inspector/DFBrowser_SearchView.hxx>
+#include <inspector/DFBrowser_Shortcut.hxx>
+#include <inspector/DFBrowser_Thread.hxx>
+#include <inspector/DFBrowser_ThreadItemSearch.hxx>
+#include <inspector/DFBrowser_ThreadItemUsedShapesMap.hxx>
+#include <inspector/DFBrowser_Tools.hxx>
+#include <inspector/DFBrowser_TreeLevelLine.hxx>
+#include <inspector/DFBrowser_TreeLevelView.hxx>
+#include <inspector/DFBrowser_TreeModel.hxx>
+#include <inspector/DFBrowser_TreeView.hxx>

-#include <DFBrowserPane_AttributePaneSelector.hxx>
-#include <DFBrowserPane_SelectionKind.hxx>
-#include <DFBrowserPane_Tools.hxx>
+#include <inspector/DFBrowserPane_AttributePaneSelector.hxx>
+#include <inspector/DFBrowserPane_SelectionKind.hxx>
+#include <inspector/DFBrowserPane_Tools.hxx>

 #include <OSD_Directory.hxx>
 #include <OSD_Environment.hxx>
 #include <OSD_Protection.hxx>

-#include <View_Displayer.hxx>
-#include <View_ToolBar.hxx>
-#include <View_Viewer.hxx>
-#include <View_Widget.hxx>
-#include <View_Window.hxx>
+#include <inspector/View_Displayer.hxx>
+#include <inspector/View_ToolBar.hxx>
+#include <inspector/View_Viewer.hxx>
+#include <inspector/View_Widget.hxx>
+#include <inspector/View_Window.hxx>
+
+#include <TDF_Tool.hxx>
+#include <inspector/TreeModel_MessageDialog.hxx>

 #include <QAction>
 #include <QApplication>
@ -100,7 +104,7 @@ const int DEFAULT_BROWSER_HEIGHT = 800;
 // purpose :
 // =======================================================================
 DFBrowser_Window::DFBrowser_Window()
-: myModule (0), myParent (0), myPropertyPanel (0)
+: myModule (0), myParent (0), myPropertyPanel (0), myExportToShapeViewDialog (0)
 {
  myMainWindow = new QMainWindow (0);

@ -237,6 +241,72 @@ void DFBrowser_Window::UpdateContent()
    myParameters->SetFileNames(aName, NCollection_List<TCollection_AsciiString>());
  }
  onUpdateClicked();
+
+  // make parameter items selected if defined
+  if (myParameters->FindSelectedNames(aName))
+  {
+    const NCollection_List<TCollection_AsciiString>& aSelected = myParameters->GetSelectedNames (aName);
+
+    DFBrowser_TreeModel* aTreeModel = dynamic_cast<DFBrowser_TreeModel*> (myTreeView->model());
+    Handle(TDocStd_Application) anApplication = aTreeModel->GetTDocStdApplication();
+
+    QItemSelectionModel* aSelectionModel = myTreeView->selectionModel();
+    aSelectionModel->clear();
+
+    NCollection_List<TCollection_AsciiString>::Iterator aSelectedIt (aSelected);
+    if (aSelectedIt.More())
+    {
+      TCollection_AsciiString aLabelEntry = aSelectedIt.Value();
+
+      TDF_Label aLabel;
+      for (Standard_Integer aDocId = 1, aNbDoc = anApplication->NbDocuments(); aDocId <= aNbDoc; aDocId++)
+      {
+        Handle(TDocStd_Document) aDocument;
+        anApplication->GetDocument (aDocId, aDocument);
+
+        TDF_Tool::Label(aDocument->GetData(), aLabelEntry.ToCString(), aLabel, Standard_False);
+        if (!aLabel.IsNull())
+          break;
+      }
+      if (!aLabel.IsNull())
+      {
+        QModelIndex anIndexToBeSelected = aTreeModel->FindIndex (aLabel);
+
+        TCollection_AsciiString anAttributeType;
+        aSelectedIt.Next();
+        // find attribute by attribute type on the given label
+        if  (aSelectedIt.More())
+        {
+          anAttributeType = aSelectedIt.Value();
+
+          TreeModel_ItemBasePtr aLabelItem = TreeModel_ModelBase::GetItemByIndex (anIndexToBeSelected);
+          //DFBrowser_ItemPtr anItem = itemDynamicCast<DFBrowser_Item> (anItemBase);
+          for (int aChildId = 0, aNbChildren = aLabelItem->rowCount(); aChildId < aNbChildren; aChildId++)
+          {
+            QModelIndex anIndex = aTreeModel->index (aChildId, 0, anIndexToBeSelected);
+            TreeModel_ItemBasePtr anItemBase = TreeModel_ModelBase::GetItemByIndex (anIndex);
+            DFBrowser_ItemPtr anItem = itemDynamicCast<DFBrowser_Item> (anItemBase);
+            if (anItem->HasAttribute())
+            {
+              // processing attribute in theValue
+              DFBrowser_ItemApplicationPtr aRootAppItem = itemDynamicCast<DFBrowser_ItemApplication>(aTreeModel->RootItem (0));
+              QString anAttributeInfo = DFBrowser_Module::GetAttributeInfo (anItem->GetAttribute(), aRootAppItem->GetModule(),
+                                                      Qt::DisplayRole, 0).toString();
+              if (anAttributeInfo == anAttributeType.ToCString())
+              {
+                anIndexToBeSelected = anIndex;
+                break;
+              }
+            }
+          }
+        }
+        aSelectionModel->select (anIndexToBeSelected, QItemSelectionModel::Select);
+        myTreeView->scrollTo (anIndexToBeSelected);
+      }
+    }
+
+    myParameters->SetSelectedNames(aName, NCollection_List<TCollection_AsciiString>());
+  }
 }

 // =======================================================================
@ -326,8 +396,6 @@ void DFBrowser_Window::Init (const NCollection_List<Handle(Standard_Transient)>&
 // =======================================================================
 void DFBrowser_Window::OpenFile (const TCollection_AsciiString& theFileName)
 {
-  //#define REQUIRE_OCAF_REVIEW:28 (check that previous application is correctly closed) : start
-
  QApplication::setOverrideCursor (Qt::WaitCursor);
  myThread->TerminateThread();

@ -389,7 +457,6 @@ void DFBrowser_Window::OpenFile (const TCollection_AsciiString& theFileName)
    myModule->SetInitialTreeViewSelection();
    QApplication::restoreOverrideCursor();
  }
-  //#define REQUIRE_OCAF_REVIEW:28 (check that previous application is correctly closed) : end
 }

 // =======================================================================
@ -665,18 +732,27 @@ void DFBrowser_Window::onPaneSelectionChanged (const QItemSelection&,
        return;

      TCollection_AsciiString aPluginName ("TKShapeView");
-      if (!myParameters->FindParameters (aPluginName))
-        return;
+      NCollection_List<Handle(Standard_Transient)> aParameters;
+      if (myParameters->FindParameters (aPluginName))
+        aParameters = myParameters->Parameters (aPluginName);

-      NCollection_List<Handle(Standard_Transient)> aParameters = myParameters->Parameters (aPluginName);
      int aParametersCount = aParameters.Extent();
      anAttributePane->GetSelectionParameters (aSelectionModel, aParameters);
      if (aParametersCount != aParameters.Extent()) // some TShapes are added
      {
-        myParameters->SetParameters (aPluginName, aParameters);
-        QMessageBox::information (0, "Information", QString ("TShape %1 is sent to %2 tool.")
-                                 .arg (DFBrowserPane_Tools::GetPointerInfo (aParameters.Last()).ToCString())
-                                 .arg (aPluginName.ToCString()));
+        TCollection_AsciiString aPluginShortName = aPluginName.SubString (3, aPluginName.Length());
+        QString aMessage = QString ("TShape %1 is sent to %2.")
+          .arg (DFBrowserPane_Tools::GetPointerInfo (aParameters.Last()).ToCString())
+          .arg (aPluginShortName.ToCString());
+        QString aQuestion = QString ("Would you like to activate %1 immediately?\n")
+          .arg (aPluginShortName.ToCString()).toStdString().c_str();
+        if (!myExportToShapeViewDialog)
+          myExportToShapeViewDialog = new TreeModel_MessageDialog (myParent, aMessage, aQuestion);
+        else
+          myExportToShapeViewDialog->SetInformation (aMessage);
+        myExportToShapeViewDialog->Start();
+
+        myParameters->SetParameters (aPluginName, aParameters, myExportToShapeViewDialog->IsAccepted());
      }
      return;
    }
@ -700,9 +776,7 @@ void DFBrowser_Window::onPaneSelectionChanged (const QItemSelection&,
  Handle(TDF_Attribute) anAttribute = myModule->FindAttribute (aSelectedIndex);
  NCollection_List<TDF_Label> aReferences;
  Handle(Standard_Transient) aPresentation;
-//#define REQUIRE_OCAF_REVIEW:10 : start (GetReferences)
  anAttributePane->GetReferences (anAttribute, aReferences, aPresentation);
-//#define REQUIRE_OCAF_REVIEW:10 : end
  QModelIndexList anIndices;
  DFBrowser_TreeModel* aTreeModel = dynamic_cast<DFBrowser_TreeModel*> (myTreeView->model());
  if (!aReferences.IsEmpty())
--- a/tools/DFBrowser/DFBrowser_Window.hxx
+++ b/tools/DFBrowser/DFBrowser_Window.hxx
@ -16,13 +16,14 @@
 #ifndef DFBrowser_Window_H
 #define DFBrowser_Window_H

+#include <inspector/TInspectorAPI_PluginParameters.hxx>
+
 #include <AIS_InteractiveObject.hxx>
 #include <AIS_ListOfInteractive.hxx>
 #include <NCollection_List.hxx>
 #include <Standard.hxx>
 #include <TCollection_AsciiString.hxx>
 #include <TDF_Label.hxx>
-#include <TInspectorAPI_PluginParameters.hxx>

 #ifdef _MSC_VER
 #pragma warning(disable : 4127) // conditional expression is constant
@ -39,6 +40,8 @@ class DFBrowser_Shortcut;
 class DFBrowser_Thread;
 class DFBrowser_TreeLevelLine;

+class TreeModel_MessageDialog;
+
 class View_ToolBar;
 class View_Window;

@ -234,6 +237,7 @@ private:
  DFBrowser_DumpView* myDumpView; //!< Text editor where "Dump" method output is shown
  DFBrowser_Thread* myThread; //!< Threads manipulator, starting thread items, listens finalizing
  DFBrowser_Shortcut* myShortcut; //!< Short cut processor, F5 - updates OCAF view model content
+  TreeModel_MessageDialog* myExportToShapeViewDialog; //!< dialog about exporting TopoDS_Shape to ShapeView plugin
  Handle(TInspectorAPI_PluginParameters) myParameters; //!< contains application, context, files that should be opened
 };

--- a/tools/DFBrowserPane/DFBrowserPane_AttributePane.cxx
+++ b/tools/DFBrowserPane/DFBrowserPane_AttributePane.cxx
@ -13,11 +13,11 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement. 

-#include <DFBrowserPane_AttributePane.hxx>
-#include <DFBrowserPane_ItemRole.hxx>
-#include <DFBrowserPane_TableView.hxx>
-#include <DFBrowserPane_Tools.hxx>
-#include <DFBrowserPane_AttributePaneModel.hxx>
+#include <inspector/DFBrowserPane_AttributePane.hxx>
+#include <inspector/DFBrowserPane_ItemRole.hxx>
+#include <inspector/DFBrowserPane_TableView.hxx>
+#include <inspector/DFBrowserPane_Tools.hxx>
+#include <inspector/DFBrowserPane_AttributePaneModel.hxx>

 #include <AIS_InteractiveObject.hxx>

@ -27,8 +27,6 @@
 #include <QTableView>
 #include <QWidget>

-//#define REQUIRE_OCAF_REVIEW:3 : start
-
 // =======================================================================
 // function : Constructor
 // purpose :
@ -154,4 +152,3 @@ QMap<int, int> DFBrowserPane_AttributePane::getTableColumnWidths() const
    aValues.insert (aColumnId, DFBrowserPane_Tools::DefaultPanelColumnWidth (aColumnId));
  return aValues;
 }
-//#define REQUIRE_OCAF_REVIEW:2 : end
--- a/tools/DFBrowserPane/DFBrowserPane_AttributePane.hxx
+++ b/tools/DFBrowserPane/DFBrowserPane_AttributePane.hxx
@ -16,7 +16,7 @@
 #ifndef DFBrowserPane_AttributePane_H
 #define DFBrowserPane_AttributePane_H

-#include <DFBrowserPane_AttributePaneAPI.hxx>
+#include <inspector/DFBrowserPane_AttributePaneAPI.hxx>

 #include <TDF_Attribute.hxx>
 #include <TDF_Label.hxx>
--- a/tools/DFBrowserPane/DFBrowserPane_AttributePaneCreator.cxx
+++ b/tools/DFBrowserPane/DFBrowserPane_AttributePaneCreator.cxx
@ -13,15 +13,15 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement. 

-#include <DFBrowserPane_AttributePaneCreator.hxx>
+#include <inspector/DFBrowserPane_AttributePaneCreator.hxx>

 #include <TDF_Attribute.hxx>

 #include <TDF_Reference.hxx>

 // the types are defined in TDF library
-#include <DFBrowserPane_TDFReference.hxx>
-#include <DFBrowserPane_TDFTagSource.hxx>
+#include <inspector/DFBrowserPane_TDFReference.hxx>
+#include <inspector/DFBrowserPane_TDFTagSource.hxx>

 #include <TDataStd_Current.hxx>
 #include <TDataStd_Name.hxx>
@ -68,61 +68,60 @@

 // the types are defined in TDataStd.cdl
 // Basic  attributes
-#include <DFBrowserPane_TDataStdCurrent.hxx>
-#include <DFBrowserPane_TDataStdName.hxx>
-#include <DFBrowserPane_TDataStdComment.hxx>
-#include <DFBrowserPane_TDataStdInteger.hxx>
-#include <DFBrowserPane_TDataStdIntegerArray.hxx>
-#include <DFBrowserPane_TDataStdReal.hxx>
-#include <DFBrowserPane_TDataStdRealArray.hxx>
-#include <DFBrowserPane_TDataStdExtStringArray.hxx>
-#include <DFBrowserPane_TDataStdUAttribute.hxx>
+#include <inspector/DFBrowserPane_TDataStdCurrent.hxx>
+#include <inspector/DFBrowserPane_TDataStdName.hxx>
+#include <inspector/DFBrowserPane_TDataStdComment.hxx>
+#include <inspector/DFBrowserPane_TDataStdInteger.hxx>
+#include <inspector/DFBrowserPane_TDataStdIntegerArray.hxx>
+#include <inspector/DFBrowserPane_TDataStdReal.hxx>
+#include <inspector/DFBrowserPane_TDataStdRealArray.hxx>
+#include <inspector/DFBrowserPane_TDataStdExtStringArray.hxx>
+#include <inspector/DFBrowserPane_TDataStdUAttribute.hxx>

-#include <DFBrowserPane_TDataStdTreeNode.hxx>
-#include <DFBrowserPane_TDataStdDirectory.hxx>
-#include <DFBrowserPane_TDataStdNoteBook.hxx>
-#include <DFBrowserPane_TDataStdExpression.hxx>
-#include <DFBrowserPane_TDataStdRelation.hxx>
-#include <DFBrowserPane_TDataStdVariable.hxx>
+#include <inspector/DFBrowserPane_TDataStdTreeNode.hxx>
+#include <inspector/DFBrowserPane_TDataStdDirectory.hxx>
+#include <inspector/DFBrowserPane_TDataStdNoteBook.hxx>
+#include <inspector/DFBrowserPane_TDataStdExpression.hxx>
+#include <inspector/DFBrowserPane_TDataStdRelation.hxx>
+#include <inspector/DFBrowserPane_TDataStdVariable.hxx>

 //Extension
-#include <DFBrowserPane_TDataStdTick.hxx>
-#include <DFBrowserPane_TDataStdAsciiString.hxx>
-#include <DFBrowserPane_TDataStdIntPackedMap.hxx>
+#include <inspector/DFBrowserPane_TDataStdTick.hxx>
+#include <inspector/DFBrowserPane_TDataStdAsciiString.hxx>
+#include <inspector/DFBrowserPane_TDataStdIntPackedMap.hxx>
 // Lists:
-#include <DFBrowserPane_TDataStdIntegerList.hxx>
-#include <DFBrowserPane_TDataStdRealList.hxx>
-#include <DFBrowserPane_TDataStdExtStringList.hxx>
-#include <DFBrowserPane_TDataStdBooleanList.hxx>
-#include <DFBrowserPane_TDataStdReferenceList.hxx>
+#include <inspector/DFBrowserPane_TDataStdIntegerList.hxx>
+#include <inspector/DFBrowserPane_TDataStdRealList.hxx>
+#include <inspector/DFBrowserPane_TDataStdExtStringList.hxx>
+#include <inspector/DFBrowserPane_TDataStdBooleanList.hxx>
+#include <inspector/DFBrowserPane_TDataStdReferenceList.hxx>

 // Arrays:
-#include <DFBrowserPane_TDataStdBooleanArray.hxx>
-#include <DFBrowserPane_TDataStdReferenceArray.hxx>
-#include <DFBrowserPane_TDataStdByteArray.hxx>
-#include <DFBrowserPane_TDataStdNamedData.hxx>
+#include <inspector/DFBrowserPane_TDataStdBooleanArray.hxx>
+#include <inspector/DFBrowserPane_TDataStdReferenceArray.hxx>
+#include <inspector/DFBrowserPane_TDataStdByteArray.hxx>
+#include <inspector/DFBrowserPane_TDataStdNamedData.hxx>

 // TDocStd attributes
-#include <DFBrowserPane_TDocStdModified.hxx>
-#include <DFBrowserPane_TDocStdOwner.hxx>
-#include <DFBrowserPane_TDocStdXLink.hxx>
-#include <DFBrowserPane_TDocStdXLinkRoot.hxx>
+#include <inspector/DFBrowserPane_TDocStdModified.hxx>
+#include <inspector/DFBrowserPane_TDocStdOwner.hxx>
+#include <inspector/DFBrowserPane_TDocStdXLink.hxx>
+#include <inspector/DFBrowserPane_TDocStdXLinkRoot.hxx>

 // TPrsStd attributes
-#include <DFBrowserPane_TPrsStdAISViewer.hxx>
-#include <DFBrowserPane_TPrsStdAISPresentation.hxx>
+#include <inspector/DFBrowserPane_TPrsStdAISViewer.hxx>
+#include <inspector/DFBrowserPane_TPrsStdAISPresentation.hxx>

 // TNaming attributes
-#include <DFBrowserPane_TNamingNamedShape.hxx>
-#include <DFBrowserPane_TNamingNaming.hxx>
-#include <DFBrowserPane_TNamingUsedShapes.hxx>
+#include <inspector/DFBrowserPane_TNamingNamedShape.hxx>
+#include <inspector/DFBrowserPane_TNamingNaming.hxx>
+#include <inspector/DFBrowserPane_TNamingUsedShapes.hxx>

 // TFunction attributes
-#include <DFBrowserPane_TFunctionFunction.hxx>
-#include <DFBrowserPane_TFunctionGraphNode.hxx>
-#include <DFBrowserPane_TFunctionScope.hxx>
+#include <inspector/DFBrowserPane_TFunctionFunction.hxx>
+#include <inspector/DFBrowserPane_TFunctionGraphNode.hxx>
+#include <inspector/DFBrowserPane_TFunctionScope.hxx>

-//#define REQUIRE_OCAF_REVIEW:1 : start
 // =======================================================================
 // function : Constructor
 // purpose :
@ -216,5 +215,3 @@ DFBrowserPane_AttributePaneAPI* DFBrowserPane_AttributePaneCreator::CreateAttrib

  return aPane;
 }
-
-//#define REQUIRE_OCAF_REVIEW : end
--- a/tools/DFBrowserPane/DFBrowserPane_AttributePaneCreator.hxx
+++ b/tools/DFBrowserPane/DFBrowserPane_AttributePaneCreator.hxx
@ -16,8 +16,9 @@
 #ifndef DFBrowserPane_AttributePaneCreator_H
 #define DFBrowserPane_AttributePaneCreator_H

-#include <DFBrowserPane_AttributePaneAPI.hxx>
-#include <DFBrowserPane_AttributePaneCreatorAPI.hxx>
+#include <inspector/DFBrowserPane_AttributePaneAPI.hxx>
+#include <inspector/DFBrowserPane_AttributePaneCreatorAPI.hxx>
+
 #include <Standard.hxx>

 //! \class DFBrowserPane_AttributePaneCreator
--- a/tools/DFBrowserPane/DFBrowserPane_AttributePaneModel.cxx
+++ b/tools/DFBrowserPane/DFBrowserPane_AttributePaneModel.cxx
@ -13,7 +13,7 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement. 

-#include <DFBrowserPane_AttributePaneModel.hxx>
+#include <inspector/DFBrowserPane_AttributePaneModel.hxx>

 // =======================================================================
 // function : Constructor
--- a/tools/DFBrowserPane/DFBrowserPane_AttributePaneSelector.cxx
+++ b/tools/DFBrowserPane/DFBrowserPane_AttributePaneSelector.cxx
@ -13,7 +13,7 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement. 

-#include <DFBrowserPane_AttributePaneSelector.hxx>
+#include <inspector/DFBrowserPane_AttributePaneSelector.hxx>

 #include <QItemSelectionModel>

--- a/tools/DFBrowserPane/DFBrowserPane_HelperArray.cxx
+++ b/tools/DFBrowserPane/DFBrowserPane_HelperArray.cxx
@ -13,17 +13,16 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement. 

-#include <DFBrowserPane_HelperArray.hxx>
-#include <DFBrowserPane_TableView.hxx>
+#include <inspector/DFBrowserPane_HelperArray.hxx>
+#include <inspector/DFBrowserPane_TableView.hxx>

-#include <DFBrowserPane_AttributePaneModel.hxx>
+#include <inspector/DFBrowserPane_AttributePaneModel.hxx>

 #include <QList>
 #include <QVariant>
 #include <QGridLayout>
 #include <QWidget>

-//#define REQUIRE_OCAF_REVIEW:6 : start
 // =======================================================================
 // function : Constructor
 // purpose :
@ -86,4 +85,3 @@ void DFBrowserPane_HelperArray::GetShortAttributeInfo (const Handle(TDF_Attribut
  for (int aRowId = 0, aRows = myValuesModel->rowCount(); aRowId < aRows; aRowId++)
    theValues.append (myValuesModel->data (myValuesModel->index (aRowId, 0)));
 }
-//#define REQUIRE_OCAF_REVIEW:6 : end
--- a/tools/DFBrowserPane/DFBrowserPane_HelperExport.cxx
+++ b/tools/DFBrowserPane/DFBrowserPane_HelperExport.cxx
@ -13,7 +13,7 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement. 

-#include <DFBrowserPane_HelperExport.hxx>
+#include <inspector/DFBrowserPane_HelperExport.hxx>

 #include <BRepTools.hxx>
 #include <TCollection_AsciiString.hxx>
--- a/tools/DFBrowserPane/DFBrowserPane_HelperExport.hxx
+++ b/tools/DFBrowserPane/DFBrowserPane_HelperExport.hxx
@ -16,7 +16,7 @@
 #ifndef DFBrowserPane_HelperExport_H
 #define DFBrowserPane_HelperExport_H

-#include <DFBrowserPane.hxx>
+#include <inspector/DFBrowserPane.hxx>
 #include <TopoDS_Shape.hxx>

 #ifdef _MSC_VER
--- a/tools/DFBrowserPane/DFBrowserPane_HelperGroupContent.cxx
+++ b/tools/DFBrowserPane/DFBrowserPane_HelperGroupContent.cxx
@ -13,7 +13,7 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement. 

-#include <DFBrowserPane_HelperGroupContent.hxx>
+#include <inspector/DFBrowserPane_HelperGroupContent.hxx>

 #include <QHBoxLayout>
 #include <QWidget>
--- a/tools/DFBrowserPane/DFBrowserPane_ItemDelegateButton.cxx
+++ b/tools/DFBrowserPane/DFBrowserPane_ItemDelegateButton.cxx
@ -13,7 +13,7 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement. 

-#include <DFBrowserPane_ItemDelegateButton.hxx>
+#include <inspector/DFBrowserPane_ItemDelegateButton.hxx>

 #include <QAbstractItemModel>
 #include <QEvent>
--- a/tools/DFBrowserPane/DFBrowserPane_TDFReference.cxx
+++ b/tools/DFBrowserPane/DFBrowserPane_TDFReference.cxx
@ -13,10 +13,10 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement. 

-#include <DFBrowserPane_TDFReference.hxx>
+#include <inspector/DFBrowserPane_TDFReference.hxx>

-#include <DFBrowserPane_TableView.hxx>
-#include <DFBrowserPane_Tools.hxx>
+#include <inspector/DFBrowserPane_TableView.hxx>
+#include <inspector/DFBrowserPane_Tools.hxx>

 #include <TDF_Reference.hxx>

--- a/tools/DFBrowserPane/DFBrowserPane_TDFReference.hxx
+++ b/tools/DFBrowserPane/DFBrowserPane_TDFReference.hxx
@ -16,7 +16,8 @@
 #ifndef DFBrowserPane_TDFReference_H
 #define DFBrowserPane_TDFReference_H

-#include <DFBrowserPane_AttributePane.hxx>
+#include <inspector/DFBrowserPane_AttributePane.hxx>
+
 #include <Standard.hxx>

 //! \class DFBrowserPane_TDFReference
--- a/tools/DFBrowserPane/DFBrowserPane_TDFTagSource.cxx
+++ b/tools/DFBrowserPane/DFBrowserPane_TDFTagSource.cxx
@ -13,7 +13,7 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement. 

-#include <DFBrowserPane_TDFTagSource.hxx>
+#include <inspector/DFBrowserPane_TDFTagSource.hxx>

 #include <TDF_TagSource.hxx>

--- a/tools/DFBrowserPane/DFBrowserPane_TDFTagSource.hxx
+++ b/tools/DFBrowserPane/DFBrowserPane_TDFTagSource.hxx
@ -16,7 +16,8 @@
 #ifndef DFBrowserPane_TDFTagSource_H
 #define DFBrowserPane_TDFTagSource_H

-#include <DFBrowserPane_AttributePane.hxx>
+#include <inspector/DFBrowserPane_AttributePane.hxx>
+
 #include <Standard.hxx>

 //! \class DFBrowserPane_TDFTagSource
--- a/tools/DFBrowserPane/DFBrowserPane_TDataStdAsciiString.cxx
+++ b/tools/DFBrowserPane/DFBrowserPane_TDataStdAsciiString.cxx
@ -13,14 +13,13 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement. 

-#include <DFBrowserPane_TDataStdAsciiString.hxx>
+#include <inspector/DFBrowserPane_TDataStdAsciiString.hxx>

 #include <TDataStd_AsciiString.hxx>

 #include <QVariant>
 #include <QIcon>

-//#define REQUIRE_OCAF_REVIEW:4 : start
 // =======================================================================
 // function : GetValues
 // purpose :
@ -32,4 +31,3 @@ void DFBrowserPane_TDataStdAsciiString::GetValues (const Handle(TDF_Attribute)&
  if (!anAttribute.IsNull())
    theValues.append (anAttribute->Get().ToCString());
 }
-//#define REQUIRE_OCAF_REVIEW:4 : end
--- a/tools/DFBrowserPane/DFBrowserPane_TDataStdAsciiString.hxx
+++ b/tools/DFBrowserPane/DFBrowserPane_TDataStdAsciiString.hxx
@ -16,7 +16,8 @@
 #ifndef DFBrowserPane_TDataStdAsciiString_H
 #define DFBrowserPane_TDataStdAsciiString_H

-#include <DFBrowserPane_AttributePane.hxx>
+#include <inspector/DFBrowserPane_AttributePane.hxx>
+
 #include <Standard.hxx>

 //! \class DFBrowserPane_TDataStdAsciiString
--- a/tools/DFBrowserPane/DFBrowserPane_TDataStdBooleanArray.cxx
+++ b/tools/DFBrowserPane/DFBrowserPane_TDataStdBooleanArray.cxx
@ -13,10 +13,10 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement. 

-#include <DFBrowserPane_TDataStdBooleanArray.hxx>
-#include <DFBrowserPane_TableView.hxx>
-#include <DFBrowserPane_AttributePaneModel.hxx>
-#include <DFBrowserPane_HelperArray.hxx>
+#include <inspector/DFBrowserPane_TDataStdBooleanArray.hxx>
+#include <inspector/DFBrowserPane_TableView.hxx>
+#include <inspector/DFBrowserPane_AttributePaneModel.hxx>
+#include <inspector/DFBrowserPane_HelperArray.hxx>

 #include <TDataStd_BooleanArray.hxx>

@ -28,7 +28,6 @@
 #include <QWidget>
 #include <QGridLayout>

-//#define REQUIRE_OCAF_REVIEW:5 : start
 // =======================================================================
 // function : CreateWidget
 // purpose :
@ -84,4 +83,3 @@ void DFBrowserPane_TDataStdBooleanArray::GetShortAttributeInfo (const Handle(TDF
  myArrayTableHelper.Init (aValues);
  return myArrayTableHelper.GetShortAttributeInfo (theAttribute, theValues);
 }
-//#define REQUIRE_OCAF_REVIEW:5 : end
--- a/tools/DFBrowserPane/DFBrowserPane_TDataStdBooleanArray.hxx
+++ b/tools/DFBrowserPane/DFBrowserPane_TDataStdBooleanArray.hxx
@ -16,10 +16,10 @@
 #ifndef DFBrowserPane_TDataStdBooleanArray_H
 #define DFBrowserPane_TDataStdBooleanArray_H

-#include <DFBrowserPane_AttributePane.hxx>
-#include <Standard.hxx>
+#include <inspector/DFBrowserPane_AttributePane.hxx>
+#include <inspector/DFBrowserPane_HelperArray.hxx>

-#include <DFBrowserPane_HelperArray.hxx>
+#include <Standard.hxx>

 //! \class DFBrowserPane_TDataStdBooleanArray
 //! \brief The class to manipulate of TDataStd_BooleanArray attribute
--- a/tools/DFBrowserPane/DFBrowserPane_TDataStdBooleanList.cxx
+++ b/tools/DFBrowserPane/DFBrowserPane_TDataStdBooleanList.cxx
@ -13,7 +13,7 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement. 

-#include <DFBrowserPane_TDataStdBooleanList.hxx>
+#include <inspector/DFBrowserPane_TDataStdBooleanList.hxx>

 #include <TDataStd_BooleanList.hxx>
 #include <TDataStd_ListIteratorOfListOfByte.hxx>
--- a/tools/DFBrowserPane/DFBrowserPane_TDataStdBooleanList.hxx
+++ b/tools/DFBrowserPane/DFBrowserPane_TDataStdBooleanList.hxx
@ -16,7 +16,8 @@
 #ifndef DFBrowserPane_TDataStdBooleanList_H
 #define DFBrowserPane_TDataStdBooleanList_H

-#include <DFBrowserPane_AttributePane.hxx>
+#include <inspector/DFBrowserPane_AttributePane.hxx>
+
 #include <Standard.hxx>

 //! \class DFBrowserPane_TDataStdBooleanList
--- a/tools/DFBrowserPane/DFBrowserPane_TDataStdByteArray.cxx
+++ b/tools/DFBrowserPane/DFBrowserPane_TDataStdByteArray.cxx
@ -13,10 +13,10 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement. 

-#include <DFBrowserPane_TDataStdByteArray.hxx>
-#include <DFBrowserPane_TableView.hxx>
-#include <DFBrowserPane_AttributePaneModel.hxx>
-#include <DFBrowserPane_HelperArray.hxx>
+#include <inspector/DFBrowserPane_TDataStdByteArray.hxx>
+#include <inspector/DFBrowserPane_TableView.hxx>
+#include <inspector/DFBrowserPane_AttributePaneModel.hxx>
+#include <inspector/DFBrowserPane_HelperArray.hxx>

 #include <TDataStd_ByteArray.hxx>

--- a/tools/DFBrowserPane/DFBrowserPane_TDataStdByteArray.hxx
+++ b/tools/DFBrowserPane/DFBrowserPane_TDataStdByteArray.hxx
@ -16,10 +16,10 @@
 #ifndef DFBrowserPane_TDataStdByteArray_H
 #define DFBrowserPane_TDataStdByteArray_H

-#include <DFBrowserPane_AttributePane.hxx>
-#include <Standard.hxx>
+#include <inspector/DFBrowserPane_AttributePane.hxx>
+#include <inspector/DFBrowserPane_HelperArray.hxx>

-#include <DFBrowserPane_HelperArray.hxx>
+#include <Standard.hxx>

 //! \class DFBrowserPane_TDataStdByteArray
 //! \brief The class to manipulate of TDataStd_ByteArra attribute
--- a/tools/DFBrowserPane/DFBrowserPane_TDataStdComment.cxx
+++ b/tools/DFBrowserPane/DFBrowserPane_TDataStdComment.cxx
@ -13,8 +13,8 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement. 

-#include <DFBrowserPane_TDataStdComment.hxx>
-#include <DFBrowserPane_Tools.hxx>
+#include <inspector/DFBrowserPane_TDataStdComment.hxx>
+#include <inspector/DFBrowserPane_Tools.hxx>

 #include <TDataStd_Comment.hxx>

--- a/tools/DFBrowserPane/DFBrowserPane_TDataStdComment.hxx
+++ b/tools/DFBrowserPane/DFBrowserPane_TDataStdComment.hxx
@ -16,7 +16,8 @@
 #ifndef DFBrowserPane_TDataStdComment_H
 #define DFBrowserPane_TDataStdComment_H

-#include <DFBrowserPane_AttributePane.hxx>
+#include <inspector/DFBrowserPane_AttributePane.hxx>
+
 #include <Standard.hxx>

 //! \class DFBrowserPane_TDataStdComment
--- a/tools/DFBrowserPane/DFBrowserPane_TDataStdCurrent.cxx
+++ b/tools/DFBrowserPane/DFBrowserPane_TDataStdCurrent.cxx
@ -13,8 +13,8 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement. 

-#include <DFBrowserPane_TDataStdCurrent.hxx>
-#include <DFBrowserPane_Tools.hxx>
+#include <inspector/DFBrowserPane_TDataStdCurrent.hxx>
+#include <inspector/DFBrowserPane_Tools.hxx>

 #include <TDataStd_Current.hxx>

--- a/tools/DFBrowserPane/DFBrowserPane_TDataStdCurrent.hxx
+++ b/tools/DFBrowserPane/DFBrowserPane_TDataStdCurrent.hxx
@ -16,7 +16,8 @@
 #ifndef DFBrowserPane_TDataStdCurrent_H
 #define DFBrowserPane_TDataStdCurrent_H

-#include <DFBrowserPane_AttributePane.hxx>
+#include <inspector/DFBrowserPane_AttributePane.hxx>
+
 #include <Standard.hxx>

 //! \class DFBrowserPane_TDataStdCurrent
--- a/tools/DFBrowserPane/DFBrowserPane_TDataStdDirectory.cxx
+++ b/tools/DFBrowserPane/DFBrowserPane_TDataStdDirectory.cxx
@ -13,7 +13,7 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement. 

-#include <DFBrowserPane_TDataStdDirectory.hxx>
+#include <inspector/DFBrowserPane_TDataStdDirectory.hxx>

 #include <TDataStd_Directory.hxx>

--- a/tools/DFBrowserPane/DFBrowserPane_TDataStdDirectory.hxx
+++ b/tools/DFBrowserPane/DFBrowserPane_TDataStdDirectory.hxx
@ -16,7 +16,8 @@
 #ifndef DFBrowserPane_TDataStdDirectory_H
 #define DFBrowserPane_TDataStdDirectory_H

-#include <DFBrowserPane_AttributePane.hxx>
+#include <inspector/DFBrowserPane_AttributePane.hxx>
+
 #include <Standard.hxx>

 //! \class DFBrowserPane_TDataStdDirectory
--- a/tools/DFBrowserPane/DFBrowserPane_TDataStdExpression.cxx
+++ b/tools/DFBrowserPane/DFBrowserPane_TDataStdExpression.cxx
@ -13,8 +13,8 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement. 

-#include <DFBrowserPane_TDataStdExpression.hxx>
-#include <DFBrowserPane_Tools.hxx>
+#include <inspector/DFBrowserPane_TDataStdExpression.hxx>
+#include <inspector/DFBrowserPane_Tools.hxx>

 #include <TDataStd_Expression.hxx>
 #include <QVariant>
--- a/tools/DFBrowserPane/DFBrowserPane_TDataStdExpression.hxx
+++ b/tools/DFBrowserPane/DFBrowserPane_TDataStdExpression.hxx
@ -16,7 +16,8 @@
 #ifndef DFBrowserPane_TDataStdExpression_H
 #define DFBrowserPane_TDataStdExpression_H

-#include <DFBrowserPane_AttributePane.hxx>
+#include <inspector/DFBrowserPane_AttributePane.hxx>
+
 #include <Standard.hxx>

 //! \class DFBrowserPane_TDataStdExpression
--- a/tools/DFBrowserPane/DFBrowserPane_TDataStdExtStringArray.cxx
+++ b/tools/DFBrowserPane/DFBrowserPane_TDataStdExtStringArray.cxx
@ -13,11 +13,11 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement. 

-#include <DFBrowserPane_TDataStdExtStringArray.hxx>
-#include <DFBrowserPane_Tools.hxx>
-#include <DFBrowserPane_TableView.hxx>
-#include <DFBrowserPane_AttributePaneModel.hxx>
-#include <DFBrowserPane_HelperArray.hxx>
+#include <inspector/DFBrowserPane_TDataStdExtStringArray.hxx>
+#include <inspector/DFBrowserPane_Tools.hxx>
+#include <inspector/DFBrowserPane_TableView.hxx>
+#include <inspector/DFBrowserPane_AttributePaneModel.hxx>
+#include <inspector/DFBrowserPane_HelperArray.hxx>

 #include <TDataStd_ExtStringArray.hxx>

--- a/tools/DFBrowserPane/DFBrowserPane_TDataStdExtStringArray.hxx
+++ b/tools/DFBrowserPane/DFBrowserPane_TDataStdExtStringArray.hxx
@ -16,10 +16,10 @@
 #ifndef DFBrowserPane_TDataStdExtStringArray_H
 #define DFBrowserPane_TDataStdExtStringArray_H

-#include <DFBrowserPane_AttributePane.hxx>
-#include <Standard.hxx>
+#include <inspector/DFBrowserPane_AttributePane.hxx>
+#include <inspector/DFBrowserPane_HelperArray.hxx>

-#include <DFBrowserPane_HelperArray.hxx>
+#include <Standard.hxx>

 //! \class DFBrowserPane_TDataStdExtStringArray
 //! \brief The class to manipulate of TDataStd_ExtStringArray attribute
--- a/tools/DFBrowserPane/DFBrowserPane_TDataStdExtStringList.cxx
+++ b/tools/DFBrowserPane/DFBrowserPane_TDataStdExtStringList.cxx
@ -13,8 +13,8 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement. 

-#include <DFBrowserPane_TDataStdExtStringList.hxx>
-#include <DFBrowserPane_Tools.hxx>
+#include <inspector/DFBrowserPane_TDataStdExtStringList.hxx>
+#include <inspector/DFBrowserPane_Tools.hxx>

 #include <TDataStd_ExtStringList.hxx>
 #include <TDataStd_ListIteratorOfListOfExtendedString.hxx>
@ -22,7 +22,6 @@
 #include <QVariant>
 #include <QWidget>

-//#define REQUIRE_OCAF_REVIEW:7 : start (DFBrowserPane_Tools)
 // =======================================================================
 // function : GetValues
 // purpose :
@ -36,4 +35,3 @@ void DFBrowserPane_TDataStdExtStringList::GetValues (const Handle(TDF_Attribute)
  for (TDataStd_ListIteratorOfListOfExtendedString aValuesIt(anAttribute->List()); aValuesIt.More(); aValuesIt.Next())
    theValues.append (DFBrowserPane_Tools::ToString (aValuesIt.Value()));
 }
-//#define REQUIRE_OCAF_REVIEW:7 : end
--- a/tools/DFBrowserPane/DFBrowserPane_TDataStdExtStringList.hxx
+++ b/tools/DFBrowserPane/DFBrowserPane_TDataStdExtStringList.hxx
@ -16,7 +16,8 @@
 #ifndef DFBrowserPane_TDataStdExtStringList_H
 #define DFBrowserPane_TDataStdExtStringList_H

-#include <DFBrowserPane_AttributePane.hxx>
+#include <inspector/DFBrowserPane_AttributePane.hxx>
+
 #include <Standard.hxx>

 //! \class DFBrowserPane_TDataStdExtStringList
--- a/tools/DFBrowserPane/DFBrowserPane_TDataStdIntPackedMap.cxx
+++ b/tools/DFBrowserPane/DFBrowserPane_TDataStdIntPackedMap.cxx
@ -13,7 +13,7 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement. 

-#include <DFBrowserPane_TDataStdIntPackedMap.hxx>
+#include <inspector/DFBrowserPane_TDataStdIntPackedMap.hxx>

 #include <TDataStd_IntPackedMap.hxx>
 #include <TColStd_MapIteratorOfPackedMapOfInteger.hxx>
--- a/tools/DFBrowserPane/DFBrowserPane_TDataStdIntPackedMap.hxx
+++ b/tools/DFBrowserPane/DFBrowserPane_TDataStdIntPackedMap.hxx
@ -16,7 +16,8 @@
 #ifndef DFBrowserPane_TDataStdIntPackedMap_H
 #define DFBrowserPane_TDataStdIntPackedMap_H

-#include <DFBrowserPane_AttributePane.hxx>
+#include <inspector/DFBrowserPane_AttributePane.hxx>
+
 #include <Standard.hxx>

 //! \class DFBrowserPane_TDataStdIntPackedMap
--- a/tools/DFBrowserPane/DFBrowserPane_TDataStdInteger.cxx
+++ b/tools/DFBrowserPane/DFBrowserPane_TDataStdInteger.cxx
@ -13,7 +13,7 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement. 

-#include <DFBrowserPane_TDataStdInteger.hxx>
+#include <inspector/DFBrowserPane_TDataStdInteger.hxx>

 #include <TDataStd_Integer.hxx>

--- a/tools/DFBrowserPane/DFBrowserPane_TDataStdInteger.hxx
+++ b/tools/DFBrowserPane/DFBrowserPane_TDataStdInteger.hxx
@ -16,7 +16,8 @@
 #ifndef DFBrowserPane_TDataStdInteger_H
 #define DFBrowserPane_TDataStdInteger_H

-#include <DFBrowserPane_AttributePane.hxx>
+#include <inspector/DFBrowserPane_AttributePane.hxx>
+
 #include <Standard.hxx>

 //! \class DFBrowserPane_TDataStdInteger
--- a/tools/DFBrowserPane/DFBrowserPane_TDataStdIntegerArray.cxx
+++ b/tools/DFBrowserPane/DFBrowserPane_TDataStdIntegerArray.cxx
@ -13,10 +13,10 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement. 

-#include <DFBrowserPane_TDataStdIntegerArray.hxx>
-#include <DFBrowserPane_TableView.hxx>
-#include <DFBrowserPane_AttributePaneModel.hxx>
-#include <DFBrowserPane_HelperArray.hxx>
+#include <inspector/DFBrowserPane_TDataStdIntegerArray.hxx>
+#include <inspector/DFBrowserPane_TableView.hxx>
+#include <inspector/DFBrowserPane_AttributePaneModel.hxx>
+#include <inspector/DFBrowserPane_HelperArray.hxx>

 #include <TDataStd_IntegerArray.hxx>

--- a/tools/DFBrowserPane/DFBrowserPane_TDataStdIntegerArray.hxx
+++ b/tools/DFBrowserPane/DFBrowserPane_TDataStdIntegerArray.hxx
@ -16,10 +16,10 @@
 #ifndef DFBrowserPane_TDataStdIntegerArray_H
 #define DFBrowserPane_TDataStdIntegerArray_H

-#include <DFBrowserPane_AttributePane.hxx>
-#include <Standard.hxx>
+#include <inspector/DFBrowserPane_AttributePane.hxx>
+#include <inspector/DFBrowserPane_HelperArray.hxx>

-#include <DFBrowserPane_HelperArray.hxx>
+#include <Standard.hxx>

 //! \class DFBrowserPane_TDataStdIntegerArray
 //! \brief The class to manipulate of TDataStd_IntegerArray attribute
--- a/tools/DFBrowserPane/DFBrowserPane_TDataStdIntegerList.cxx
+++ b/tools/DFBrowserPane/DFBrowserPane_TDataStdIntegerList.cxx
@ -13,7 +13,7 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement. 

-#include <DFBrowserPane_TDataStdIntegerList.hxx>
+#include <inspector/DFBrowserPane_TDataStdIntegerList.hxx>

 #include <TDataStd_IntegerList.hxx>
 #include <TColStd_ListIteratorOfListOfInteger.hxx>
--- a/tools/DFBrowserPane/DFBrowserPane_TDataStdIntegerList.hxx
+++ b/tools/DFBrowserPane/DFBrowserPane_TDataStdIntegerList.hxx
@ -16,7 +16,8 @@
 #ifndef DFBrowserPane_TDataStdIntegerList_H
 #define DFBrowserPane_TDataStdIntegerList_H

-#include <DFBrowserPane_AttributePane.hxx>
+#include <inspector/DFBrowserPane_AttributePane.hxx>
+
 #include <Standard.hxx>

 //! \class DFBrowserPane_TDataStdIntegerList
--- a/tools/DFBrowserPane/DFBrowserPane_TDataStdName.cxx
+++ b/tools/DFBrowserPane/DFBrowserPane_TDataStdName.cxx
@ -13,8 +13,8 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement. 

-#include <DFBrowserPane_TDataStdName.hxx>
-#include <DFBrowserPane_Tools.hxx>
+#include <inspector/DFBrowserPane_TDataStdName.hxx>
+#include <inspector/DFBrowserPane_Tools.hxx>

 #include <TDataStd_Name.hxx>

--- a/tools/DFBrowserPane/DFBrowserPane_TDataStdName.hxx
+++ b/tools/DFBrowserPane/DFBrowserPane_TDataStdName.hxx
@ -16,7 +16,8 @@
 #ifndef DFBrowserPane_TDataStdName_H
 #define DFBrowserPane_TDataStdName_H

-#include <DFBrowserPane_AttributePane.hxx>
+#include <inspector/DFBrowserPane_AttributePane.hxx>
+
 #include <Standard.hxx>

 //! \class DFBrowserPane_TDataStdName
--- a/tools/DFBrowserPane/DFBrowserPane_TDataStdNamedData.cxx
+++ b/tools/DFBrowserPane/DFBrowserPane_TDataStdNamedData.cxx
@ -13,12 +13,12 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement. 

-#include <DFBrowserPane_TDataStdNamedData.hxx>
+#include <inspector/DFBrowserPane_TDataStdNamedData.hxx>

-#include <DFBrowserPane_AttributePaneModel.hxx>
-#include <DFBrowserPane_HelperGroupContent.hxx>
-#include <DFBrowserPane_TableView.hxx>
-#include <DFBrowserPane_Tools.hxx>
+#include <inspector/DFBrowserPane_AttributePaneModel.hxx>
+#include <inspector/DFBrowserPane_HelperGroupContent.hxx>
+#include <inspector/DFBrowserPane_TableView.hxx>
+#include <inspector/DFBrowserPane_Tools.hxx>

 #include <TColStd_DataMapOfStringInteger.hxx>
 #include <TColStd_DataMapIteratorOfDataMapOfStringInteger.hxx>
@ -48,7 +48,6 @@ static const QString VALUES_BYTE =       "values_byte";
 static const QString VALUES_INT_ARRAY =  "values_int_array";
 static const QString VALUES_REAL_ARRAY = "values_real_array";

-//#define REQUIRE_OCAF_REVIEW:9 : start
 // =======================================================================
 // function : Constructor
 // purpose :
@ -236,4 +235,3 @@ QList<QVariant> DFBrowserPane_TDataStdNamedData::getPartOfValues (const QString&
  }
  return aValues;
 }
-//#define REQUIRE_OCAF_REVIEW:9 : end
--- a/tools/DFBrowserPane/DFBrowserPane_TDataStdNamedData.hxx
+++ b/tools/DFBrowserPane/DFBrowserPane_TDataStdNamedData.hxx
@ -16,7 +16,8 @@
 #ifndef DFBrowserPane_TDataStdNamedData_H
 #define DFBrowserPane_TDataStdNamedData_H

-#include <DFBrowserPane_AttributePane.hxx>
+#include <inspector/DFBrowserPane_AttributePane.hxx>
+
 #include <Standard.hxx>

 class DFBrowserPane_AttributePaneModel;
--- a/tools/DFBrowserPane/DFBrowserPane_TDataStdNoteBook.cxx
+++ b/tools/DFBrowserPane/DFBrowserPane_TDataStdNoteBook.cxx
@ -13,7 +13,7 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement. 

-#include <DFBrowserPane_TDataStdNoteBook.hxx>
+#include <inspector/DFBrowserPane_TDataStdNoteBook.hxx>

 #include <TDataStd_NoteBook.hxx>

--- a/Show More
+++ b/Show More