Improve build system: install each module's header files to the sub-directory of ${prefix}/include/salome/${module_name}

This commit is contained in:
adv 2010-02-18 11:55:09 +00:00
parent af9f05e2cf
commit dd4ba5bbc9
613 changed files with 1346 additions and 1345 deletions

View File

@ -69,7 +69,7 @@ if test -f ${GEOM_DIR}/bin/salome/geompy.py ; then
AC_SUBST(GEOM_ROOT_DIR)
GEOM_LDFLAGS=-L${GEOM_DIR}/lib${LIB_LOCATION_SUFFIX}/salome
GEOM_CXXFLAGS=-I${GEOM_DIR}/include/salome
GEOM_CXXFLAGS="-I${GEOM_DIR}/include/salome -I${GEOM_DIR}/include/salome/skel"
AC_SUBST(GEOM_LDFLAGS)
AC_SUBST(GEOM_CXXFLAGS)

View File

@ -74,7 +74,7 @@ else
GUI_ROOT_DIR=${SALOME_GUI_DIR}
GUI_LDFLAGS=-L${SALOME_GUI_DIR}/lib${LIB_LOCATION_SUFFIX}/salome
GUI_CXXFLAGS=-I${SALOME_GUI_DIR}/include/salome
GUI_CXXFLAGS="-I${SALOME_GUI_DIR}/include/salome -I${SALOME_GUI_DIR}/include/salome/skel"
AC_CHECKING(for full GUI)
if test -f ${SALOME_GUI_DIR}/bin/salome/SALOME_Session_Server ; then

View File

@ -34,7 +34,8 @@ AM_CPPFLAGS = @KERNEL_CXXFLAGS@ -include SALOMEconfig.h
# ============================================================
# Standard directory for installation
#
salomeincludedir = $(includedir)/salome
salomeincludedir = $(includedir)/salome/@MODULE_NAME@
salomeskeldir = $(includedir)/salome/skel
libdir = $(prefix)/lib@LIB_LOCATION_SUFFIX@/salome
bindir = $(prefix)/bin/salome
salomescriptdir = $(bindir)

View File

@ -38,7 +38,7 @@ lib_LTLIBRARIES = libSalomeIDLGEOM.la
nodist_libSalomeIDLGEOM_la_SOURCES = GEOM_GenSK.cc GEOM_SupervSK.cc
# header files must be exported: other modules have to use this library
nodist_salomeinclude_HEADERS = $(BASEIDL_FILES:%.idl=%.hh)
nodist_salomeskel_HEADERS = $(BASEIDL_FILES:%.idl=%.hh)
libSalomeIDLGEOM_la_CPPFLAGS = \
-I$(top_builddir)/idl \

View File

@ -26,7 +26,7 @@
// $Header$
//
#include "Archimede_VolumeSection.hxx"
#include "utilities.h"
#include <kernel/utilities.h>
#include <BRepMesh_IncrementalMesh.hxx>
#include <TopExp_Explorer.hxx>

View File

@ -24,7 +24,7 @@
// Author: Pavel TELKOV
// <ptv@mutex.nnov.opencascade.com>
//
#include "utilities.h"
#include <kernel/utilities.h>
#include <BRepTools.hxx>

View File

@ -24,7 +24,7 @@
// Author: Pavel TELKOV
// <ptv@mutex.nnov.opencascade.com>
//
#include "utilities.h"
#include <kernel/utilities.h>
#include <BRepTools.hxx>
#include <BRep_Builder.hxx>

View File

@ -38,13 +38,13 @@
#include <GeometryGUI.h>
#include <SUIT_Session.h>
#include <SUIT_Desktop.h>
#include <SUIT_ViewWindow.h>
#include <OCCViewer_ViewWindow.h>
#include <OCCViewer_ViewModel.h>
#include <OCCViewer_ViewManager.h>
#include <OCCViewer_ViewPort3d.h>
#include <gui/SUIT_Session.h>
#include <gui/SUIT_Desktop.h>
#include <gui/SUIT_ViewWindow.h>
#include <gui/OCCViewer_ViewWindow.h>
#include <gui/OCCViewer_ViewModel.h>
#include <gui/OCCViewer_ViewManager.h>
#include <gui/OCCViewer_ViewPort3d.h>
#include <BRep_Tool.hxx>
#include <ProjLib.hxx>

View File

@ -26,7 +26,7 @@
#ifndef BASICGUI_H
#define BASICGUI_H
#include <GEOMGUI.h>
#include "GEOMGUI.h"
#include <V3d_View.hxx>
//=================================================================================

View File

@ -29,10 +29,10 @@
#include <GeometryGUI.h>
#include <GEOMBase.h>
#include <SUIT_ResourceMgr.h>
#include <SUIT_Session.h>
#include <SalomeApp_Application.h>
#include <LightApp_SelectionMgr.h>
#include <gui/SUIT_ResourceMgr.h>
#include <gui/SUIT_Session.h>
#include <gui/SalomeApp_Application.h>
#include <gui/LightApp_SelectionMgr.h>
#include <TColStd_IndexedMapOfInteger.hxx>
#include <TopTools_IndexedMapOfShape.hxx>

View File

@ -26,7 +26,7 @@
#ifndef BASICGUI_ARCDLG_H
#define BASICGUI_ARCDLG_H
#include <GEOMBase_Skeleton.h>
#include "GEOMBase_Skeleton.h"
class DlgRef_3Sel;
class DlgRef_3Sel1Check;

View File

@ -30,10 +30,10 @@
#include <GeometryGUI.h>
#include <GEOMBase.h>
#include <SUIT_ResourceMgr.h>
#include <SUIT_Session.h>
#include <SalomeApp_Application.h>
#include <LightApp_SelectionMgr.h>
#include <gui/SUIT_ResourceMgr.h>
#include <gui/SUIT_Session.h>
#include <gui/SalomeApp_Application.h>
#include <gui/LightApp_SelectionMgr.h>
#include <TColStd_IndexedMapOfInteger.hxx>
#include <TopTools_IndexedMapOfShape.hxx>

View File

@ -26,7 +26,7 @@
#ifndef BASICGUI_CIRCLEDLG_H
#define BASICGUI_CIRCLEDLG_H
#include <GEOMBase_Skeleton.h>
#include "GEOMBase_Skeleton.h"
class DlgRef_3Sel;
class DlgRef_2Sel1Spin;

View File

@ -29,14 +29,14 @@
#include <GeometryGUI.h>
#include <GEOMBase.h>
#include <SUIT_ResourceMgr.h>
#include <SUIT_Session.h>
#include <SalomeApp_Application.h>
#include <SalomeApp_Study.h>
#include <LightApp_SelectionMgr.h>
#include <gui/SUIT_ResourceMgr.h>
#include <gui/SUIT_Session.h>
#include <gui/SalomeApp_Application.h>
#include <gui/SalomeApp_Study.h>
#include <gui/LightApp_SelectionMgr.h>
#include <SALOME_ListIteratorOfListIO.hxx>
#include <SALOME_ListIO.hxx>
#include <gui/SALOME_ListIteratorOfListIO.hxx>
#include <gui/SALOME_ListIO.hxx>
#include <TopoDS_Shape.hxx>
#include <TopoDS.hxx>

View File

@ -26,7 +26,7 @@
#ifndef BASICGUI_CURVEDLG_H
#define BASICGUI_CURVEDLG_H
#include <GEOMBase_Skeleton.h>
#include "GEOMBase_Skeleton.h"
#include <list>

View File

@ -30,10 +30,10 @@
#include <GeometryGUI.h>
#include <GEOMBase.h>
#include <SUIT_ResourceMgr.h>
#include <SUIT_Session.h>
#include <SalomeApp_Application.h>
#include <LightApp_SelectionMgr.h>
#include <gui/SUIT_ResourceMgr.h>
#include <gui/SUIT_Session.h>
#include <gui/SalomeApp_Application.h>
#include <gui/LightApp_SelectionMgr.h>
#include <TColStd_IndexedMapOfInteger.hxx>
#include <TopTools_IndexedMapOfShape.hxx>

View File

@ -26,7 +26,7 @@
#ifndef BASICGUI_ELLIPSEDLG_H
#define BASICGUI_ELLIPSEDLG_H
#include <GEOMBase_Skeleton.h>
#include "GEOMBase_Skeleton.h"
class DlgRef_3Sel2Spin;

View File

@ -29,10 +29,10 @@
#include <GeometryGUI.h>
#include <GEOMBase.h>
#include <SUIT_ResourceMgr.h>
#include <SUIT_Session.h>
#include <SalomeApp_Application.h>
#include <LightApp_SelectionMgr.h>
#include <gui/SUIT_ResourceMgr.h>
#include <gui/SUIT_Session.h>
#include <gui/SalomeApp_Application.h>
#include <gui/LightApp_SelectionMgr.h>
#include <TopoDS_Shape.hxx>
#include <TopoDS.hxx>

View File

@ -26,7 +26,7 @@
#ifndef BASICGUI_LINEDLG_H
#define BASICGUI_LINEDLG_H
#include <GEOMBase_Skeleton.h>
#include "GEOMBase_Skeleton.h"
class DlgRef_2Sel;

View File

@ -29,10 +29,10 @@
#include <GeometryGUI.h>
#include <GEOMBase.h>
#include <SUIT_ResourceMgr.h>
#include <SUIT_Session.h>
#include <SalomeApp_Application.h>
#include <LightApp_SelectionMgr.h>
#include <gui/SUIT_ResourceMgr.h>
#include <gui/SUIT_Session.h>
#include <gui/SalomeApp_Application.h>
#include <gui/LightApp_SelectionMgr.h>
#include <QLabel>

View File

@ -26,7 +26,7 @@
#ifndef BASICGUI_MARKERDLG_H
#define BASICGUI_MARKERDLG_H
#include <GEOMBase_Skeleton.h>
#include "GEOMBase_Skeleton.h"
#include <QMap>

View File

@ -30,10 +30,10 @@
#include <GeometryGUI.h>
#include <GEOMBase.h>
#include <SUIT_ResourceMgr.h>
#include <SUIT_Session.h>
#include <SalomeApp_Application.h>
#include <LightApp_SelectionMgr.h>
#include <gui/SUIT_ResourceMgr.h>
#include <gui/SUIT_Session.h>
#include <gui/SalomeApp_Application.h>
#include <gui/LightApp_SelectionMgr.h>
#include <TColStd_MapOfInteger.hxx>
#include <TopoDS_Shape.hxx>

View File

@ -26,7 +26,7 @@
#ifndef BASICGUI_PLANEDLG_H
#define BASICGUI_PLANEDLG_H
#include <GEOMBase_Skeleton.h>
#include "GEOMBase_Skeleton.h"
class DlgRef_1Sel1Spin;
class DlgRef_2Sel1Spin;

View File

@ -25,10 +25,10 @@
#include "BasicGUI_PointDlg.h"
#include <SUIT_ResourceMgr.h>
#include <SUIT_Session.h>
#include <SalomeApp_Application.h>
#include <LightApp_SelectionMgr.h>
#include <gui/SUIT_ResourceMgr.h>
#include <gui/SUIT_Session.h>
#include <gui/SalomeApp_Application.h>
#include <gui/LightApp_SelectionMgr.h>
#include <GeometryGUI.h>
#include <GEOMBase.h>

View File

@ -26,7 +26,7 @@
#ifndef BASICGUI_POINTDLG_H
#define BASICGUI_POINTDLG_H
#include <GEOMBase_Skeleton.h>
#include "GEOMBase_Skeleton.h"
#include <QMap>
class DlgRef_1Sel1Spin;

View File

@ -29,10 +29,10 @@
#include <GeometryGUI.h>
#include <GEOMBase.h>
#include <SUIT_ResourceMgr.h>
#include <SUIT_Session.h>
#include <SalomeApp_Application.h>
#include <LightApp_SelectionMgr.h>
#include <gui/SUIT_ResourceMgr.h>
#include <gui/SUIT_Session.h>
#include <gui/SalomeApp_Application.h>
#include <gui/LightApp_SelectionMgr.h>
#include <TopoDS_Shape.hxx>
#include <TopoDS.hxx>

View File

@ -26,7 +26,7 @@
#ifndef BASICGUI_VECTORDLG_H
#define BASICGUI_VECTORDLG_H
#include <GEOMBase_Skeleton.h>
#include "GEOMBase_Skeleton.h"
class DlgRef_2Sel;
class DlgRef_3Spin1Check;

View File

@ -29,10 +29,10 @@
#include <GeometryGUI.h>
#include <GEOMBase.h>
#include <SUIT_ResourceMgr.h>
#include <SUIT_Session.h>
#include <SalomeApp_Application.h>
#include <LightApp_SelectionMgr.h>
#include <gui/SUIT_ResourceMgr.h>
#include <gui/SUIT_Session.h>
#include <gui/SalomeApp_Application.h>
#include <gui/LightApp_SelectionMgr.h>
// OCCT Includes
#include <BRep_Tool.hxx>

View File

@ -26,7 +26,7 @@
#ifndef BASICGUI_WORKINGPLANEDLG_H
#define BASICGUI_WORKINGPLANEDLG_H
#include <GEOMBase_Skeleton.h>
#include "GEOMBase_Skeleton.h"
#include <gp_Ax3.hxx>

View File

@ -33,10 +33,10 @@
#include <GeometryGUI.h>
#include <SUIT_Desktop.h>
#include <SUIT_MessageBox.h>
#include <SUIT_Session.h>
#include <SalomeApp_Application.h>
#include <gui/SUIT_Desktop.h>
#include <gui/SUIT_MessageBox.h>
#include <gui/SUIT_Session.h>
#include <gui/SalomeApp_Application.h>
//=======================================================================
// function : BlocksGUI()

View File

@ -26,7 +26,7 @@
#ifndef BLOCKSGUI_H
#define BLOCKSGUI_H
#include <GEOMGUI.h>
#include "GEOMGUI.h"
//=================================================================================
// class : BlocksGUI

View File

@ -29,10 +29,10 @@
#include <GeometryGUI.h>
#include <GEOMBase.h>
#include <SUIT_Session.h>
#include <SUIT_ResourceMgr.h>
#include <SalomeApp_Application.h>
#include <LightApp_SelectionMgr.h>
#include <gui/SUIT_Session.h>
#include <gui/SUIT_ResourceMgr.h>
#include <gui/SalomeApp_Application.h>
#include <gui/LightApp_SelectionMgr.h>
#include <GEOMImpl_Types.hxx>

View File

@ -26,7 +26,7 @@
#ifndef BLOCKSGUI_BLOCKDLG_H
#define BLOCKSGUI_BLOCKDLG_H
#include <GEOMBase_Skeleton.h>
#include "GEOMBase_Skeleton.h"
class DlgRef_2Sel;
class DlgRef_6Sel;

View File

@ -29,16 +29,16 @@
#include <GeometryGUI.h>
#include <GEOMBase.h>
#include <SUIT_Session.h>
#include <SUIT_Desktop.h>
#include <SUIT_ResourceMgr.h>
#include <SUIT_ViewWindow.h>
#include <SUIT_ViewManager.h>
#include <SUIT_MessageBox.h>
#include <SalomeApp_Application.h>
#include <LightApp_SelectionMgr.h>
#include <OCCViewer_ViewModel.h>
#include <SALOME_ListIteratorOfListIO.hxx>
#include <gui/SUIT_Session.h>
#include <gui/SUIT_Desktop.h>
#include <gui/SUIT_ResourceMgr.h>
#include <gui/SUIT_ViewWindow.h>
#include <gui/SUIT_ViewManager.h>
#include <gui/SUIT_MessageBox.h>
#include <gui/SalomeApp_Application.h>
#include <gui/LightApp_SelectionMgr.h>
#include <gui/OCCViewer_ViewModel.h>
#include <gui/SALOME_ListIteratorOfListIO.hxx>
//=================================================================================
// class : BlocksGUI_ExplodeDlg()

View File

@ -26,7 +26,7 @@
#ifndef BLOCKSGUI_EXPLODEDLG_H
#define BLOCKSGUI_EXPLODEDLG_H
#include <GEOMBase_Skeleton.h>
#include "GEOMBase_Skeleton.h"
class DlgRef_1Sel2Spin1View1Check;

View File

@ -30,10 +30,10 @@
#include <GEOMBase.h>
#include <GEOMImpl_Types.hxx>
#include <SUIT_Session.h>
#include <SUIT_ResourceMgr.h>
#include <SalomeApp_Application.h>
#include <LightApp_SelectionMgr.h>
#include <gui/SUIT_Session.h>
#include <gui/SUIT_ResourceMgr.h>
#include <gui/SalomeApp_Application.h>
#include <gui/LightApp_SelectionMgr.h>
#include <TColStd_MapOfInteger.hxx>

View File

@ -26,7 +26,7 @@
#ifndef BLOCKSGUI_PROPAGATEDLG_H
#define BLOCKSGUI_PROPAGATEDLG_H
#include <GEOMBase_Skeleton.h>
#include "GEOMBase_Skeleton.h"
class DlgRef_1Sel;

View File

@ -29,10 +29,10 @@
#include <GeometryGUI.h>
#include <GEOMBase.h>
#include <SUIT_Session.h>
#include <SUIT_ResourceMgr.h>
#include <SalomeApp_Application.h>
#include <LightApp_SelectionMgr.h>
#include <gui/SUIT_Session.h>
#include <gui/SUIT_ResourceMgr.h>
#include <gui/SalomeApp_Application.h>
#include <gui/LightApp_SelectionMgr.h>
// QT Includes
#include <qlabel.h>

View File

@ -26,7 +26,7 @@
#ifndef BLOCKSGUI_QUADFACEDLG_H
#define BLOCKSGUI_QUADFACEDLG_H
#include <GEOMBase_Skeleton.h>
#include "GEOMBase_Skeleton.h"
#include <QMap>

View File

@ -29,14 +29,14 @@
#include <GeometryGUI.h>
#include <GEOMBase.h>
#include <SUIT_Session.h>
#include <SUIT_Desktop.h>
#include <SUIT_ResourceMgr.h>
#include <SUIT_ViewWindow.h>
#include <SUIT_ViewManager.h>
#include <SalomeApp_Application.h>
#include <LightApp_SelectionMgr.h>
#include <OCCViewer_ViewModel.h>
#include <gui/SUIT_Session.h>
#include <gui/SUIT_Desktop.h>
#include <gui/SUIT_ResourceMgr.h>
#include <gui/SUIT_ViewWindow.h>
#include <gui/SUIT_ViewManager.h>
#include <gui/SalomeApp_Application.h>
#include <gui/LightApp_SelectionMgr.h>
#include <gui/OCCViewer_ViewModel.h>
// OCCT Includes
#include <TColStd_IndexedMapOfInteger.hxx>

View File

@ -26,7 +26,7 @@
#ifndef BLOCKSGUI_TRSFDLG_H
#define BLOCKSGUI_TRSFDLG_H
#include <GEOMBase_Skeleton.h>
#include "GEOMBase_Skeleton.h"
#include <QMap>

View File

@ -27,7 +27,7 @@
#include "BooleanGUI_Dialog.h"
#include <GeometryGUI.h>
#include <SUIT_Desktop.h>
#include <gui/SUIT_Desktop.h>
//=======================================================================
// function : BooleanGUI()

View File

@ -26,7 +26,7 @@
#ifndef BOOLEANGUI_H
#define BOOLEANGUI_H
#include <GEOMGUI.h>
#include "GEOMGUI.h"
//=================================================================================
// class : BooleanGUI

View File

@ -30,10 +30,10 @@
#include <GeometryGUI.h>
#include <GEOMBase.h>
#include <SUIT_Session.h>
#include <SUIT_ResourceMgr.h>
#include <SalomeApp_Application.h>
#include <LightApp_SelectionMgr.h>
#include <gui/SUIT_Session.h>
#include <gui/SUIT_ResourceMgr.h>
#include <gui/SalomeApp_Application.h>
#include <gui/LightApp_SelectionMgr.h>
//=================================================================================
// class : BooleanGUI_Dialog()

View File

@ -26,7 +26,7 @@
#ifndef BOOLEANGUI_DIALOG_H
#define BOOLEANGUI_DIALOG_H
#include <GEOMBase_Skeleton.h>
#include "GEOMBase_Skeleton.h"
class DlgRef_2Sel;

View File

@ -25,8 +25,8 @@
//
#include "BuildGUI.h"
#include <SUIT_Desktop.h>
#include <SalomeApp_Application.h>
#include <gui/SUIT_Desktop.h>
#include <gui/SalomeApp_Application.h>
#include "BuildGUI_EdgeDlg.h" // Method EDGE
#include "BuildGUI_WireDlg.h" // Method WIRE

View File

@ -26,7 +26,7 @@
#ifndef BUILDGUI_H
#define BUILDGUI_H
#include <GEOMGUI.h>
#include "GEOMGUI.h"
//=================================================================================
// class : BuildGUI

View File

@ -31,10 +31,10 @@
#include <GEOMImpl_Types.hxx>
#include <SUIT_ResourceMgr.h>
#include <SUIT_Session.h>
#include <SalomeApp_Application.h>
#include <LightApp_SelectionMgr.h>
#include <gui/SUIT_ResourceMgr.h>
#include <gui/SUIT_Session.h>
#include <gui/SalomeApp_Application.h>
#include <gui/LightApp_SelectionMgr.h>
//=================================================================================
// class : BuildGUI_CompoundDlg()

View File

@ -26,7 +26,7 @@
#ifndef BUILDGUI_COMPOUNDDLG_H
#define BUILDGUI_COMPOUNDDLG_H
#include <GEOMBase_Skeleton.h>
#include "GEOMBase_Skeleton.h"
class DlgRef_1Sel;

View File

@ -29,10 +29,10 @@
#include <GeometryGUI.h>
#include <GEOMBase.h>
#include <SUIT_Session.h>
#include <SUIT_ResourceMgr.h>
#include <SalomeApp_Application.h>
#include <LightApp_SelectionMgr.h>
#include <gui/SUIT_Session.h>
#include <gui/SUIT_ResourceMgr.h>
#include <gui/SalomeApp_Application.h>
#include <gui/LightApp_SelectionMgr.h>
#include <GEOMImpl_Types.hxx>

View File

@ -26,7 +26,7 @@
#ifndef BUILDGUI_EDGEDLG_H
#define BUILDGUI_EDGEDLG_H
#include <GEOMBase_Skeleton.h>
#include "GEOMBase_Skeleton.h"
class DlgRef_2Sel;

View File

@ -32,10 +32,10 @@
#include <GeometryGUI.h>
#include <GEOMBase.h>
#include <SUIT_ResourceMgr.h>
#include <SUIT_Session.h>
#include <SalomeApp_Application.h>
#include <LightApp_SelectionMgr.h>
#include <gui/SUIT_ResourceMgr.h>
#include <gui/SUIT_Session.h>
#include <gui/SalomeApp_Application.h>
#include <gui/LightApp_SelectionMgr.h>
//=================================================================================
// class : BuildGUI_FaceDlg()

View File

@ -26,7 +26,7 @@
#ifndef BUILDGUI_FACEDLG_H
#define BUILDGUI_FACEDLG_H
#include <GEOMBase_Skeleton.h>
#include "GEOMBase_Skeleton.h"
class DlgRef_1Sel1Check;

View File

@ -31,10 +31,10 @@
#include <GEOMImpl_Types.hxx>
#include <SUIT_ResourceMgr.h>
#include <SUIT_Session.h>
#include <SalomeApp_Application.h>
#include <LightApp_SelectionMgr.h>
#include <gui/SUIT_ResourceMgr.h>
#include <gui/SUIT_Session.h>
#include <gui/SalomeApp_Application.h>
#include <gui/LightApp_SelectionMgr.h>
#include <TColStd_MapOfInteger.hxx>

View File

@ -26,7 +26,7 @@
#ifndef BUILDGUI_SHELLDLG_H
#define BUILDGUI_SHELLDLG_H
#include <GEOMBase_Skeleton.h>
#include "GEOMBase_Skeleton.h"
class DlgRef_1Sel;

View File

@ -31,11 +31,11 @@
#include <GEOMImpl_Types.hxx>
#include <SUIT_ResourceMgr.h>
#include <SUIT_MessageBox.h>
#include <SUIT_Session.h>
#include <SalomeApp_Application.h>
#include <LightApp_SelectionMgr.h>
#include <gui/SUIT_ResourceMgr.h>
#include <gui/SUIT_MessageBox.h>
#include <gui/SUIT_Session.h>
#include <gui/SalomeApp_Application.h>
#include <gui/LightApp_SelectionMgr.h>
//=================================================================================
// class : BuildGUI_SolidDlg()

View File

@ -26,7 +26,7 @@
#ifndef BUILDGUI_SOLIDDLG_H
#define BUILDGUI_SOLIDDLG_H
#include <GEOMBase_Skeleton.h>
#include "GEOMBase_Skeleton.h"
class DlgRef_1Sel1Check;

View File

@ -31,10 +31,10 @@
#include <GeometryGUI.h>
#include <GEOMBase.h>
#include <SUIT_ResourceMgr.h>
#include <SUIT_Session.h>
#include <SalomeApp_Application.h>
#include <LightApp_SelectionMgr.h>
#include <gui/SUIT_ResourceMgr.h>
#include <gui/SUIT_Session.h>
#include <gui/SalomeApp_Application.h>
#include <gui/LightApp_SelectionMgr.h>
#include <TColStd_MapOfInteger.hxx>
#include <Precision.hxx>

View File

@ -26,7 +26,7 @@
#ifndef BUILDGUI_WIREDLG_H
#define BUILDGUI_WIREDLG_H
#include <GEOMBase_Skeleton.h>
#include "GEOMBase_Skeleton.h"
class DlgRef_1Sel1Spin;

View File

@ -29,28 +29,28 @@
#include <GEOM_AISShape.hxx>
#include <GEOM_Actor.h>
#include <SUIT_Desktop.h>
#include <SUIT_ViewWindow.h>
#include <SUIT_OverrideCursor.h>
#include <gui/SUIT_Desktop.h>
#include <gui/SUIT_ViewWindow.h>
#include <gui/SUIT_OverrideCursor.h>
#include <OCCViewer_ViewManager.h>
#include <OCCViewer_ViewModel.h>
#include <gui/OCCViewer_ViewManager.h>
#include <gui/OCCViewer_ViewModel.h>
#include <SALOME_ListIO.hxx>
#include <SALOME_ListIteratorOfListIO.hxx>
#include <gui/SALOME_ListIO.hxx>
#include <gui/SALOME_ListIteratorOfListIO.hxx>
#include <SVTK_ViewWindow.h>
#include <SVTK_View.h>
#include <SVTK_ViewModel.h>
#include <SOCC_ViewModel.h>
#include <SVTK_Prs.h>
#include <SOCC_Prs.h>
#include <gui/SVTK_ViewWindow.h>
#include <gui/SVTK_View.h>
#include <gui/SVTK_ViewModel.h>
#include <gui/SOCC_ViewModel.h>
#include <gui/SVTK_Prs.h>
#include <gui/SOCC_Prs.h>
#include <QtxActionMenuMgr.h>
#include <gui/QtxActionMenuMgr.h>
#include <SalomeApp_Application.h>
#include <LightApp_SelectionMgr.h>
#include <SalomeApp_Study.h>
#include <gui/SalomeApp_Application.h>
#include <gui/LightApp_SelectionMgr.h>
#include <gui/SalomeApp_Study.h>
#include <AIS_ListIteratorOfListOfInteractive.hxx>

View File

@ -124,7 +124,7 @@
<customwidget>
<class>SalomeApp_DoubleSpinBox</class>
<extends>QDoubleSpinBox</extends>
<header location="global" >SalomeApp_DoubleSpinBox.h</header>
<header location="global" >gui/SalomeApp_DoubleSpinBox.h</header>
</customwidget>
</customwidgets>
<tabstops>

View File

@ -117,7 +117,7 @@
<customwidget>
<class>SalomeApp_DoubleSpinBox</class>
<extends>QDoubleSpinBox</extends>
<header location="global" >SalomeApp_DoubleSpinBox.h</header>
<header location="global" >gui/SalomeApp_DoubleSpinBox.h</header>
</customwidget>
</customwidgets>
<tabstops>

View File

@ -130,7 +130,7 @@
<customwidget>
<class>SalomeApp_IntSpinBox</class>
<extends>QSpinBox</extends>
<header location="global" >SalomeApp_IntSpinBox.h</header>
<header location="global" >gui/SalomeApp_IntSpinBox.h</header>
</customwidget>
</customwidgets>
<tabstops>

View File

@ -136,7 +136,7 @@
<customwidget>
<class>SalomeApp_DoubleSpinBox</class>
<extends>QDoubleSpinBox</extends>
<header location="global" >SalomeApp_DoubleSpinBox.h</header>
<header location="global" >gui/SalomeApp_DoubleSpinBox.h</header>
</customwidget>
</customwidgets>
<tabstops>

View File

@ -162,7 +162,7 @@
<customwidget>
<class>SalomeApp_DoubleSpinBox</class>
<extends>QDoubleSpinBox</extends>
<header location="global" >SalomeApp_DoubleSpinBox.h</header>
<header location="global" >gui/SalomeApp_DoubleSpinBox.h</header>
</customwidget>
</customwidgets>
<tabstops>

View File

@ -155,7 +155,7 @@
<customwidget>
<class>SalomeApp_DoubleSpinBox</class>
<extends>QDoubleSpinBox</extends>
<header location="global" >SalomeApp_DoubleSpinBox.h</header>
<header location="global" >gui/SalomeApp_DoubleSpinBox.h</header>
</customwidget>
</customwidgets>
<tabstops>

View File

@ -198,7 +198,7 @@
<customwidget>
<class>QtxDoubleSpinBox</class>
<extends>QDoubleSpinBox</extends>
<header location="global" >QtxDoubleSpinBox.h</header>
<header location="global" >gui/QtxDoubleSpinBox.h</header>
</customwidget>
</customwidgets>
<tabstops>

View File

@ -178,7 +178,7 @@
<customwidget>
<class>SalomeApp_DoubleSpinBox</class>
<extends>QDoubleSpinBox</extends>
<header location="global" >SalomeApp_DoubleSpinBox.h</header>
<header location="global" >gui/SalomeApp_DoubleSpinBox.h</header>
</customwidget>
</customwidgets>
<tabstops>

View File

@ -215,7 +215,7 @@
<customwidget>
<class>QtxDoubleSpinBox</class>
<extends>QDoubleSpinBox</extends>
<header location="global" >QtxDoubleSpinBox.h</header>
<header location="global" >gui/QtxDoubleSpinBox.h</header>
</customwidget>
</customwidgets>
<tabstops>

View File

@ -85,7 +85,7 @@
<customwidget>
<class>SalomeApp_DoubleSpinBox</class>
<extends>QDoubleSpinBox</extends>
<header location="global" >SalomeApp_DoubleSpinBox.h</header>
<header location="global" >gui/SalomeApp_DoubleSpinBox.h</header>
</customwidget>
</customwidgets>
<resources/>

View File

@ -176,7 +176,7 @@
<customwidget>
<class>SalomeApp_DoubleSpinBox</class>
<extends>QDoubleSpinBox</extends>
<header location="global" >SalomeApp_DoubleSpinBox.h</header>
<header location="global" >gui/SalomeApp_DoubleSpinBox.h</header>
</customwidget>
</customwidgets>
<tabstops>

View File

@ -155,7 +155,7 @@
<customwidget>
<class>SalomeApp_IntSpinBox</class>
<extends>QSpinBox</extends>
<header location="global" >SalomeApp_IntSpinBox.h</header>
<header location="global" >gui/SalomeApp_IntSpinBox.h</header>
</customwidget>
</customwidgets>
<tabstops>

View File

@ -155,7 +155,7 @@
<customwidget>
<class>SalomeApp_DoubleSpinBox</class>
<extends>QDoubleSpinBox</extends>
<header location="global" >SalomeApp_DoubleSpinBox.h</header>
<header location="global" >gui/SalomeApp_DoubleSpinBox.h</header>
</customwidget>
</customwidgets>
<tabstops>

View File

@ -175,12 +175,12 @@
<customwidget>
<class>SalomeApp_DoubleSpinBox</class>
<extends>QDoubleSpinBox</extends>
<header location="global" >SalomeApp_DoubleSpinBox.h</header>
<header location="global" >gui/SalomeApp_DoubleSpinBox.h</header>
</customwidget>
<customwidget>
<class>SalomeApp_IntSpinBox</class>
<extends>QSpinBox</extends>
<header location="global" >SalomeApp_IntSpinBox.h</header>
<header location="global" >gui/SalomeApp_IntSpinBox.h</header>
</customwidget>
</customwidgets>
<tabstops>

View File

@ -168,7 +168,7 @@
<customwidget>
<class>SalomeApp_DoubleSpinBox</class>
<extends>QDoubleSpinBox</extends>
<header location="global" >SalomeApp_DoubleSpinBox.h</header>
<header location="global" >gui/SalomeApp_DoubleSpinBox.h</header>
</customwidget>
</customwidgets>
<tabstops>

View File

@ -192,7 +192,7 @@
<customwidget>
<class>SalomeApp_DoubleSpinBox</class>
<extends>QDoubleSpinBox</extends>
<header location="global" >SalomeApp_DoubleSpinBox.h</header>
<header location="global" >gui/SalomeApp_DoubleSpinBox.h</header>
</customwidget>
</customwidgets>
<tabstops>

View File

@ -187,7 +187,7 @@
<customwidget>
<class>SalomeApp_DoubleSpinBox</class>
<extends>QDoubleSpinBox</extends>
<header location="global" >SalomeApp_DoubleSpinBox.h</header>
<header location="global" >gui/SalomeApp_DoubleSpinBox.h</header>
</customwidget>
</customwidgets>
<tabstops>

View File

@ -213,12 +213,12 @@
<customwidget>
<class>SalomeApp_DoubleSpinBox</class>
<extends>QDoubleSpinBox</extends>
<header location="global" >SalomeApp_DoubleSpinBox.h</header>
<header location="global" >gui/SalomeApp_DoubleSpinBox.h</header>
</customwidget>
<customwidget>
<class>SalomeApp_IntSpinBox</class>
<extends>QSpinBox</extends>
<header location="global" >SalomeApp_IntSpinBox.h</header>
<header location="global" >gui/SalomeApp_IntSpinBox.h</header>
</customwidget>
</customwidgets>
<tabstops>

View File

@ -104,7 +104,7 @@
<customwidget>
<class>SalomeApp_DoubleSpinBox</class>
<extends>QDoubleSpinBox</extends>
<header location="global" >SalomeApp_DoubleSpinBox.h</header>
<header location="global" >gui/SalomeApp_DoubleSpinBox.h</header>
</customwidget>
</customwidgets>
<resources/>

View File

@ -145,7 +145,7 @@
<customwidget>
<class>SalomeApp_DoubleSpinBox</class>
<extends>QDoubleSpinBox</extends>
<header location="global" >SalomeApp_DoubleSpinBox.h</header>
<header location="global" >gui/SalomeApp_DoubleSpinBox.h</header>
</customwidget>
</customwidgets>
<tabstops>

View File

@ -193,7 +193,7 @@
<customwidget>
<class>SalomeApp_DoubleSpinBox</class>
<extends>QDoubleSpinBox</extends>
<header location="global" >SalomeApp_DoubleSpinBox.h</header>
<header location="global" >gui/SalomeApp_DoubleSpinBox.h</header>
</customwidget>
</customwidgets>
<tabstops>

View File

@ -182,7 +182,7 @@
<customwidget>
<class>SalomeApp_DoubleSpinBox</class>
<extends>QDoubleSpinBox</extends>
<header location="global" >SalomeApp_DoubleSpinBox.h</header>
<header location="global" >gui/SalomeApp_DoubleSpinBox.h</header>
</customwidget>
</customwidgets>
<tabstops>

View File

@ -238,7 +238,7 @@
<customwidget>
<class>QtxDoubleSpinBox</class>
<extends>QDoubleSpinBox</extends>
<header location="global" >QtxDoubleSpinBox.h</header>
<header location="global" >gui/QtxDoubleSpinBox.h</header>
</customwidget>
</customwidgets>
<tabstops>

View File

@ -209,7 +209,7 @@
<customwidget>
<class>SalomeApp_DoubleSpinBox</class>
<extends>QDoubleSpinBox</extends>
<header location="global" >SalomeApp_DoubleSpinBox.h</header>
<header location="global" >gui/SalomeApp_DoubleSpinBox.h</header>
</customwidget>
</customwidgets>
<tabstops>

View File

@ -252,12 +252,12 @@
<customwidget>
<class>SalomeApp_DoubleSpinBox</class>
<extends>QDoubleSpinBox</extends>
<header location="global" >SalomeApp_DoubleSpinBox.h</header>
<header location="global" >gui/SalomeApp_DoubleSpinBox.h</header>
</customwidget>
<customwidget>
<class>SalomeApp_IntSpinBox</class>
<extends>QSpinBox</extends>
<header location="global" >SalomeApp_IntSpinBox.h</header>
<header location="global" >gui/SalomeApp_IntSpinBox.h</header>
</customwidget>
</customwidgets>
<tabstops>

View File

@ -130,7 +130,7 @@
<customwidget>
<class>SalomeApp_DoubleSpinBox</class>
<extends>QDoubleSpinBox</extends>
<header location="global" >SalomeApp_DoubleSpinBox.h</header>
<header location="global" >gui/SalomeApp_DoubleSpinBox.h</header>
</customwidget>
</customwidgets>
<tabstops>

View File

@ -123,7 +123,7 @@
<customwidget>
<class>SalomeApp_DoubleSpinBox</class>
<extends>QDoubleSpinBox</extends>
<header location="global" >SalomeApp_DoubleSpinBox.h</header>
<header location="global" >gui/SalomeApp_DoubleSpinBox.h</header>
</customwidget>
</customwidgets>
<tabstops>

View File

@ -232,7 +232,7 @@
<customwidget>
<class>SalomeApp_DoubleSpinBox</class>
<extends>QDoubleSpinBox</extends>
<header location="global" >SalomeApp_DoubleSpinBox.h</header>
<header location="global" >gui/SalomeApp_DoubleSpinBox.h</header>
</customwidget>
</customwidgets>
<tabstops>

View File

@ -245,7 +245,7 @@
<customwidget>
<class>SalomeApp_DoubleSpinBox</class>
<extends>QDoubleSpinBox</extends>
<header location="global" >SalomeApp_DoubleSpinBox.h</header>
<header location="global" >gui/SalomeApp_DoubleSpinBox.h</header>
</customwidget>
</customwidgets>
<tabstops>

View File

@ -27,12 +27,12 @@
#include <GeometryGUI.h>
#include <SUIT_Desktop.h>
#include <SUIT_ViewWindow.h>
#include <OCCViewer_ViewModel.h>
#include <OCCViewer_ViewManager.h>
#include <SalomeApp_Study.h>
#include <SalomeApp_Application.h>
#include <gui/SUIT_Desktop.h>
#include <gui/SUIT_ViewWindow.h>
#include <gui/OCCViewer_ViewModel.h>
#include <gui/OCCViewer_ViewManager.h>
#include <gui/SalomeApp_Study.h>
#include <gui/SalomeApp_Application.h>
#include <TopoDS_Shape.hxx>

View File

@ -26,9 +26,9 @@
#ifndef ENTITYGUI_H
#define ENTITYGUI_H
#include <GEOMGUI.h>
#include "GEOMGUI.h"
#include <SALOMEDSClient.hxx>
#include <kernel/SALOMEDSClient.hxx>
#include <AIS_Shape.hxx>

View File

@ -94,7 +94,7 @@
<customwidget>
<class>SalomeApp_DoubleSpinBox</class>
<extends>QDoubleSpinBox</extends>
<header location="global" >SalomeApp_DoubleSpinBox.h</header>
<header location="global" >gui/SalomeApp_DoubleSpinBox.h</header>
</customwidget>
</customwidgets>
<tabstops>

View File

@ -115,7 +115,7 @@
<customwidget>
<class>SalomeApp_DoubleSpinBox</class>
<extends>QDoubleSpinBox</extends>
<header location="global" >SalomeApp_DoubleSpinBox.h</header>
<header location="global" >gui/SalomeApp_DoubleSpinBox.h</header>
</customwidget>
</customwidgets>
<tabstops>

View File

@ -25,7 +25,7 @@
#include "EntityGUI_3DSketcherDlg.h"
#include "EntityGUI_Widgets.h"
#include <QtxDoubleSpinBox.h>
#include <gui/QtxDoubleSpinBox.h>
#include <GEOMBase.h>
#include <GeometryGUI.h>
@ -33,13 +33,13 @@
#include <Precision.hxx>
#include <DlgRef.h>
#include <SUIT_Desktop.h>
#include <SUIT_Session.h>
#include <SUIT_MessageBox.h>
#include <SUIT_ResourceMgr.h>
#include <SalomeApp_Application.h>
#include <LightApp_Application.h>
#include <LightApp_SelectionMgr.h>
#include <gui/SUIT_Desktop.h>
#include <gui/SUIT_Session.h>
#include <gui/SUIT_MessageBox.h>
#include <gui/SUIT_ResourceMgr.h>
#include <gui/SalomeApp_Application.h>
#include <gui/LightApp_Application.h>
#include <gui/LightApp_SelectionMgr.h>
#include <BRep_Tool.hxx>
#include <TopExp.hxx>

View File

@ -26,7 +26,7 @@
#ifndef ENTITYGUI_3DSKETCHERDLG_H
#define ENTITYGUI_3DSKETCHERDLG_H
#include <GEOMBase_Skeleton.h>
#include "GEOMBase_Skeleton.h"
class QDoubleSpinBox;
class EntityGUI_3Spin;

View File

@ -136,7 +136,7 @@
<customwidget>
<class>SalomeApp_DoubleSpinBox</class>
<extends>QDoubleSpinBox</extends>
<header location="global" >SalomeApp_DoubleSpinBox.h</header>
<header location="global" >gui/SalomeApp_DoubleSpinBox.h</header>
</customwidget>
</customwidgets>
<tabstops>

View File

@ -157,7 +157,7 @@
<customwidget>
<class>SalomeApp_DoubleSpinBox</class>
<extends>QDoubleSpinBox</extends>
<header location="global" >SalomeApp_DoubleSpinBox.h</header>
<header location="global" >gui/SalomeApp_DoubleSpinBox.h</header>
</customwidget>
</customwidgets>
<tabstops>

View File

@ -25,7 +25,7 @@
//
#include "EntityGUI_SketcherDlg.h"
#include "EntityGUI_Widgets.h"
#include <QtxDoubleSpinBox.h>
#include <gui/QtxDoubleSpinBox.h>
#include <GEOMBase.h>
#include <GeometryGUI.h>
@ -33,13 +33,13 @@
#include <Geom_Surface.hxx>
#include <Geom_Plane.hxx>
#include <SUIT_Desktop.h>
#include <SUIT_Session.h>
#include <SUIT_MessageBox.h>
#include <SUIT_ResourceMgr.h>
#include <SalomeApp_Application.h>
#include <LightApp_Application.h>
#include <LightApp_SelectionMgr.h>
#include <gui/SUIT_Desktop.h>
#include <gui/SUIT_Session.h>
#include <gui/SUIT_MessageBox.h>
#include <gui/SUIT_ResourceMgr.h>
#include <gui/SalomeApp_Application.h>
#include <gui/LightApp_Application.h>
#include <gui/LightApp_SelectionMgr.h>
#include <QKeyEvent>
@ -52,7 +52,7 @@
#include <BRepBuilderAPI_MakeWire.hxx>
#include <Sketcher_Profile.hxx>
#include <SalomeApp_Study.h>
#include <gui/SalomeApp_Study.h>
#include <gp_Pln.hxx>

View File

@ -26,7 +26,7 @@
#ifndef ENTITYGUI_SKETCHERDLG_H
#define ENTITYGUI_SKETCHERDLG_H
#include <GEOMBase_Helper.h>
#include "GEOMBase_Helper.h"
#include <QGroupBox>
#include <QComboBox>

View File

@ -29,14 +29,14 @@
#include <GeometryGUI.h>
#include <GEOMBase.h>
#include <SUIT_Desktop.h>
#include <SUIT_ResourceMgr.h>
#include <SUIT_Session.h>
#include <SUIT_ViewManager.h>
#include <SUIT_ViewWindow.h>
#include <OCCViewer_ViewModel.h>
#include <SalomeApp_Application.h>
#include <LightApp_SelectionMgr.h>
#include <gui/SUIT_Desktop.h>
#include <gui/SUIT_ResourceMgr.h>
#include <gui/SUIT_Session.h>
#include <gui/SUIT_ViewManager.h>
#include <gui/SUIT_ViewWindow.h>
#include <gui/OCCViewer_ViewModel.h>
#include <gui/SalomeApp_Application.h>
#include <gui/LightApp_SelectionMgr.h>
#include <TColStd_IndexedMapOfInteger.hxx>
#include <TopoDS_Iterator.hxx>

Some files were not shown because too many files have changed in this diff Show More