ForkMaster/geom
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/geom.git synced 2025-01-13 10:10:34 +05:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
adm_local/unix/config_files/check_GEOM.m4
View File

@ -69,7 +69,7 @@ if test -f ${GEOM_DIR}/bin/salome/geompy.py ; then
AC_SUBST(GEOM_ROOT_DIR) AC_SUBST(GEOM_ROOT_DIR)
GEOM_LDFLAGS=-L${GEOM_DIR}/lib${LIB_LOCATION_SUFFIX}/salome 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_LDFLAGS)
AC_SUBST(GEOM_CXXFLAGS) AC_SUBST(GEOM_CXXFLAGS)

2
adm_local/unix/config_files/check_GUI.m4
View File

@ -74,7 +74,7 @@ else
GUI_ROOT_DIR=${SALOME_GUI_DIR} GUI_ROOT_DIR=${SALOME_GUI_DIR}
GUI_LDFLAGS=-L${SALOME_GUI_DIR}/lib${LIB_LOCATION_SUFFIX}/salome 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) AC_CHECKING(for full GUI)
if test -f ${SALOME_GUI_DIR}/bin/salome/SALOME_Session_Server ; then if test -f ${SALOME_GUI_DIR}/bin/salome/SALOME_Session_Server ; then

3
adm_local/unix/make_common_starter.am
View File

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

2
idl/Makefile.am
View File

@ -38,7 +38,7 @@ lib_LTLIBRARIES = libSalomeIDLGEOM.la
nodist_libSalomeIDLGEOM_la_SOURCES = GEOM_GenSK.cc GEOM_SupervSK.cc nodist_libSalomeIDLGEOM_la_SOURCES = GEOM_GenSK.cc GEOM_SupervSK.cc
# header files must be exported: other modules have to use this library # 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 = \ libSalomeIDLGEOM_la_CPPFLAGS = \
-I$(top_builddir)/idl \ -I$(top_builddir)/idl \

2
src/ARCHIMEDE/Archimede_VolumeSection.cxx
View File

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

2
src/BREPExport/BREPExport.cxx
View File

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

2
src/BREPImport/BREPImport.cxx
View File

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

14
src/BasicGUI/BasicGUI.cxx
View File

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

2
src/BasicGUI/BasicGUI.h
View File

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

8
src/BasicGUI/BasicGUI_ArcDlg.cxx
View File

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

2
src/BasicGUI/BasicGUI_ArcDlg.h
View File

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

8
src/BasicGUI/BasicGUI_CircleDlg.cxx
View File

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

2
src/BasicGUI/BasicGUI_CircleDlg.h
View File

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

14
src/BasicGUI/BasicGUI_CurveDlg.cxx
View File

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

2
src/BasicGUI/BasicGUI_CurveDlg.h
View File

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

8
src/BasicGUI/BasicGUI_EllipseDlg.cxx
View File

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

2
src/BasicGUI/BasicGUI_EllipseDlg.h
View File

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

8
src/BasicGUI/BasicGUI_LineDlg.cxx
View File

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

2
src/BasicGUI/BasicGUI_LineDlg.h
View File

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

8
src/BasicGUI/BasicGUI_MarkerDlg.cxx
View File

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

2
src/BasicGUI/BasicGUI_MarkerDlg.h
View File

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

8
src/BasicGUI/BasicGUI_PlaneDlg.cxx
View File

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

2
src/BasicGUI/BasicGUI_PlaneDlg.h
View File

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

8
src/BasicGUI/BasicGUI_PointDlg.cxx
View File

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

2
src/BasicGUI/BasicGUI_PointDlg.h
View File

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

8
src/BasicGUI/BasicGUI_VectorDlg.cxx
View File

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

2
src/BasicGUI/BasicGUI_VectorDlg.h
View File

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

8
src/BasicGUI/BasicGUI_WorkingPlaneDlg.cxx
View File

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

2
src/BasicGUI/BasicGUI_WorkingPlaneDlg.h
View File

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

8
src/BlocksGUI/BlocksGUI.cxx
View File

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

2
src/BlocksGUI/BlocksGUI.h
View File

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

8
src/BlocksGUI/BlocksGUI_BlockDlg.cxx
View File

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

2
src/BlocksGUI/BlocksGUI_BlockDlg.h
View File

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

20
src/BlocksGUI/BlocksGUI_ExplodeDlg.cxx
View File

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

2
src/BlocksGUI/BlocksGUI_ExplodeDlg.h
View File

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

8
src/BlocksGUI/BlocksGUI_PropagateDlg.cxx
View File

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

2
src/BlocksGUI/BlocksGUI_PropagateDlg.h
View File

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

8
src/BlocksGUI/BlocksGUI_QuadFaceDlg.cxx
View File

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

2
src/BlocksGUI/BlocksGUI_QuadFaceDlg.h
View File

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

16
src/BlocksGUI/BlocksGUI_TrsfDlg.cxx
View File

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

2
src/BlocksGUI/BlocksGUI_TrsfDlg.h
View File

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

2
src/BooleanGUI/BooleanGUI.cxx
View File

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

2
src/BooleanGUI/BooleanGUI.h
View File

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

8
src/BooleanGUI/BooleanGUI_Dialog.cxx
View File

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

2
src/BooleanGUI/BooleanGUI_Dialog.h
View File

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

4
src/BuildGUI/BuildGUI.cxx
View File

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

2
src/BuildGUI/BuildGUI.h
View File

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

8
src/BuildGUI/BuildGUI_CompoundDlg.cxx
View File

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

2
src/BuildGUI/BuildGUI_CompoundDlg.h
View File

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

8
src/BuildGUI/BuildGUI_EdgeDlg.cxx
View File

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

2
src/BuildGUI/BuildGUI_EdgeDlg.h
View File

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

8
src/BuildGUI/BuildGUI_FaceDlg.cxx
View File

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

2
src/BuildGUI/BuildGUI_FaceDlg.h
View File

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

8
src/BuildGUI/BuildGUI_ShellDlg.cxx
View File

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

2
src/BuildGUI/BuildGUI_ShellDlg.h
View File

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

10
src/BuildGUI/BuildGUI_SolidDlg.cxx
View File

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

2
src/BuildGUI/BuildGUI_SolidDlg.h
View File

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

8
src/BuildGUI/BuildGUI_WireDlg.cxx
View File

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

2
src/BuildGUI/BuildGUI_WireDlg.h
View File

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

34
src/DisplayGUI/DisplayGUI.cxx
View File

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

2
src/DlgRef/DlgRef_1Sel1Spin1Check_QTD.ui
View File

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

2
src/DlgRef/DlgRef_1Sel1Spin_QTD.ui
View File

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

2
src/DlgRef/DlgRef_1Sel2Spin1View1Check_QTD.ui
View File

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

2
src/DlgRef/DlgRef_1Sel2Spin_QTD.ui
View File

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

2
src/DlgRef/DlgRef_1Sel3Spin1Check_QTD.ui
View File

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

2
src/DlgRef/DlgRef_1Sel3Spin_QTD.ui
View File

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

2
src/DlgRef/DlgRef_1Sel4Spin_QTD.ui
View File

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

2
src/DlgRef/DlgRef_1Sel5Spin1Check_QTD.ui
View File

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

2
src/DlgRef/DlgRef_1Sel5Spin_QTD.ui
View File

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

2
src/DlgRef/DlgRef_1Spin_QTD.ui
View File

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

2
src/DlgRef/DlgRef_2Sel1Spin2Check_QTD.ui
View File

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

2
src/DlgRef/DlgRef_2Sel1SpinInt_QTD.ui
View File

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

2
src/DlgRef/DlgRef_2Sel1Spin_QTD.ui
View File

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

4
src/DlgRef/DlgRef_2Sel2Spin1Check_QTD.ui
View File

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

2
src/DlgRef/DlgRef_2Sel2Spin_QTD.ui
View File

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

2
src/DlgRef/DlgRef_2Sel3Spin2Rb_QTD.ui
View File

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

2
src/DlgRef/DlgRef_2Sel3Spin_QTD.ui
View File

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

4
src/DlgRef/DlgRef_2Sel4Spin1Check_QTD.ui
View File

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

2
src/DlgRef/DlgRef_2Spin_QTD.ui
View File

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

2
src/DlgRef/DlgRef_3Radio1Sel1Spin_QTD.ui
View File

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

2
src/DlgRef/DlgRef_3Sel1Spin_QTD.ui
View File

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

2
src/DlgRef/DlgRef_3Sel2Spin_QTD.ui
View File

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

2
src/DlgRef/DlgRef_3Sel3Spin1Check_QTD.ui
View File

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

2
src/DlgRef/DlgRef_3Sel3Spin2Check_QTD.ui
View File

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

4
src/DlgRef/DlgRef_3Sel4Spin2Check_QTD.ui
View File

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

2
src/DlgRef/DlgRef_3Spin1Check_QTD.ui
View File

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

2
src/DlgRef/DlgRef_3Spin_QTD.ui
View File

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

2
src/DlgRef/DlgRef_4Sel1Spin2Check_QTD.ui
View File

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

2
src/DlgRef/DlgRef_4Sel1Spin3Check_QTD.ui
View File

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

12
src/EntityGUI/EntityGUI.cxx
View File

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

4
src/EntityGUI/EntityGUI.h
View File

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

2
src/EntityGUI/EntityGUI_1Spin_QTD.ui
View File

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

2
src/EntityGUI/EntityGUI_2Spin_QTD.ui
View File

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

16
src/EntityGUI/EntityGUI_3DSketcherDlg.cxx
View File

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

2
src/EntityGUI/EntityGUI_3DSketcherDlg.h
View File

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

2
src/EntityGUI/EntityGUI_3Spin_QTD.ui
View File

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

2
src/EntityGUI/EntityGUI_4Spin_QTD.ui
View File

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

18
src/EntityGUI/EntityGUI_SketcherDlg.cxx
View File

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

2
src/EntityGUI/EntityGUI_SketcherDlg.h
View File

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

16
src/EntityGUI/EntityGUI_SubShapeDlg.cxx
View File

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

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