From 368dfaae0dd3d873c6c289a399ebdd27b3a314fd Mon Sep 17 00:00:00 2001 From: adv Date: Fri, 19 Feb 2010 15:48:19 +0000 Subject: [PATCH] Improve build system: install each module's header files to the sub-directory of ${prefix}/include/salome/${module_name} --- .../unix/config_files/check_NETGENPLUGIN.m4 | 2 +- adm_local/unix/make_common_starter.am | 3 ++- idl/Makefile.am | 2 +- src/GUI/NETGENPluginGUI.cxx | 2 +- src/GUI/NETGENPluginGUI_HypothesisCreator.cxx | 14 +++++------ src/GUI/NETGENPluginGUI_HypothesisCreator.h | 2 +- src/GUI/NETGENPluginGUI_SimpleCreator.cxx | 16 ++++++------- src/GUI/NETGENPluginGUI_SimpleCreator.h | 2 +- src/NETGENPlugin/NETGENPlugin_Hypothesis.cxx | 2 +- src/NETGENPlugin/NETGENPlugin_Hypothesis.hxx | 4 ++-- .../NETGENPlugin_Hypothesis_2D.cxx | 2 +- .../NETGENPlugin_Hypothesis_2D.hxx | 2 +- .../NETGENPlugin_Hypothesis_2D_i.cxx | 8 +++---- .../NETGENPlugin_Hypothesis_i.cxx | 8 +++---- .../NETGENPlugin_Hypothesis_i.hxx | 2 +- src/NETGENPlugin/NETGENPlugin_Mesher.cxx | 18 +++++++------- src/NETGENPlugin/NETGENPlugin_Mesher.hxx | 2 +- src/NETGENPlugin/NETGENPlugin_NETGEN_2D.cxx | 10 ++++---- src/NETGENPlugin/NETGENPlugin_NETGEN_2D.hxx | 8 +++---- src/NETGENPlugin/NETGENPlugin_NETGEN_2D3D.cxx | 10 ++++---- src/NETGENPlugin/NETGENPlugin_NETGEN_2D3D.hxx | 8 +++---- .../NETGENPlugin_NETGEN_2D3D_i.cxx | 6 ++--- .../NETGENPlugin_NETGEN_2D3D_i.hxx | 2 +- .../NETGENPlugin_NETGEN_2D_ONLY.cxx | 24 +++++++++---------- .../NETGENPlugin_NETGEN_2D_ONLY.hxx | 4 ++-- .../NETGENPlugin_NETGEN_2D_ONLY_i.cxx | 4 ++-- .../NETGENPlugin_NETGEN_2D_ONLY_i.hxx | 2 +- src/NETGENPlugin/NETGENPlugin_NETGEN_2D_i.cxx | 6 ++--- src/NETGENPlugin/NETGENPlugin_NETGEN_2D_i.hxx | 2 +- src/NETGENPlugin/NETGENPlugin_NETGEN_3D.cxx | 22 ++++++++--------- src/NETGENPlugin/NETGENPlugin_NETGEN_3D.hxx | 8 +++---- src/NETGENPlugin/NETGENPlugin_NETGEN_3D_i.cxx | 6 ++--- src/NETGENPlugin/NETGENPlugin_NETGEN_3D_i.hxx | 2 +- .../NETGENPlugin_SimpleHypothesis_2D.cxx | 8 +++---- .../NETGENPlugin_SimpleHypothesis_2D.hxx | 4 ++-- .../NETGENPlugin_SimpleHypothesis_2D_i.cxx | 8 +++---- .../NETGENPlugin_SimpleHypothesis_2D_i.hxx | 2 +- .../NETGENPlugin_SimpleHypothesis_3D.cxx | 8 +++---- .../NETGENPlugin_SimpleHypothesis_3D.hxx | 2 +- .../NETGENPlugin_SimpleHypothesis_3D_i.cxx | 8 +++---- src/NETGENPlugin/NETGENPlugin_i.cxx | 2 +- 41 files changed, 129 insertions(+), 128 deletions(-) diff --git a/adm_local/unix/config_files/check_NETGENPLUGIN.m4 b/adm_local/unix/config_files/check_NETGENPLUGIN.m4 index 9ceac78..329fa60 100644 --- a/adm_local/unix/config_files/check_NETGENPLUGIN.m4 +++ b/adm_local/unix/config_files/check_NETGENPLUGIN.m4 @@ -60,7 +60,7 @@ if test -f ${NETGENPLUGIN_DIR}/lib${LIB_LOCATION_SUFFIX}/salome/libNETGENEngine. AC_SUBST(NETGENPLUGIN_ROOT_DIR) NETGENPLUGIN_LDFLAGS=-L${NETGENPLUGIN_DIR}/lib${LIB_LOCATION_SUFFIX}/salome - NETGENPLUGIN_CXXFLAGS=-I${NETGENPLUGIN_DIR}/include/salome + NETGENPLUGIN_CXXFLAGS="-I${NETGENPLUGIN_DIR}/include/salome -I${NETGENPLUGIN_DIR}/include/salome/skel" AC_SUBST(NETGENPLUGIN_LDFLAGS) AC_SUBST(NETGENPLUGIN_CXXFLAGS) diff --git a/adm_local/unix/make_common_starter.am b/adm_local/unix/make_common_starter.am index cd85151..42063b9 100644 --- a/adm_local/unix/make_common_starter.am +++ b/adm_local/unix/make_common_starter.am @@ -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) diff --git a/idl/Makefile.am b/idl/Makefile.am index de2be43..2624ff0 100644 --- a/idl/Makefile.am +++ b/idl/Makefile.am @@ -38,7 +38,7 @@ lib_LTLIBRARIES = libSalomeIDLNETGENPLUGIN.la nodist_libSalomeIDLNETGENPLUGIN_la_SOURCES = NETGENPlugin_AlgorithmSK.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) libSalomeIDLNETGENPLUGIN_la_CPPFLAGS = \ $(KERNEL_CXXFLAGS) \ diff --git a/src/GUI/NETGENPluginGUI.cxx b/src/GUI/NETGENPluginGUI.cxx index d455547..6d10611 100755 --- a/src/GUI/NETGENPluginGUI.cxx +++ b/src/GUI/NETGENPluginGUI.cxx @@ -24,7 +24,7 @@ // Author : Michael Zorin // Module : NETGENPlugin // $Header: -//#include "SMESHGUI_Hypotheses.h" +//#include // #include "NETGENPluginGUI_HypothesisCreator.h" #include "NETGENPluginGUI_SimpleCreator.h" diff --git a/src/GUI/NETGENPluginGUI_HypothesisCreator.cxx b/src/GUI/NETGENPluginGUI_HypothesisCreator.cxx index f3a1b7f..c640f9f 100644 --- a/src/GUI/NETGENPluginGUI_HypothesisCreator.cxx +++ b/src/GUI/NETGENPluginGUI_HypothesisCreator.cxx @@ -27,18 +27,18 @@ // #include "NETGENPluginGUI_HypothesisCreator.h" -#include -#include -#include +#include +#include +#include #include CORBA_SERVER_HEADER(NETGENPlugin_Algorithm) -#include -#include +#include +#include -#include +#include -#include +#include #include #include diff --git a/src/GUI/NETGENPluginGUI_HypothesisCreator.h b/src/GUI/NETGENPluginGUI_HypothesisCreator.h index a23739e..bb773cb 100644 --- a/src/GUI/NETGENPluginGUI_HypothesisCreator.h +++ b/src/GUI/NETGENPluginGUI_HypothesisCreator.h @@ -30,7 +30,7 @@ #include "NETGENPluginGUI.h" -#include +#include class SalomeApp_DoubleSpinBox; class QComboBox; diff --git a/src/GUI/NETGENPluginGUI_SimpleCreator.cxx b/src/GUI/NETGENPluginGUI_SimpleCreator.cxx index 3a9c871..a88bdd1 100644 --- a/src/GUI/NETGENPluginGUI_SimpleCreator.cxx +++ b/src/GUI/NETGENPluginGUI_SimpleCreator.cxx @@ -25,20 +25,20 @@ // #include "NETGENPluginGUI_SimpleCreator.h" -#include -#include -#include -#include +#include +#include +#include +#include // IDL includes #include CORBA_SERVER_HEADER(NETGENPlugin_Algorithm) -#include -#include +#include +#include // SALOME GUI includes -#include -#include +#include +#include // Qt includes #include diff --git a/src/GUI/NETGENPluginGUI_SimpleCreator.h b/src/GUI/NETGENPluginGUI_SimpleCreator.h index 4b7bb88..f897c4d 100644 --- a/src/GUI/NETGENPluginGUI_SimpleCreator.h +++ b/src/GUI/NETGENPluginGUI_SimpleCreator.h @@ -28,7 +28,7 @@ #include "NETGENPluginGUI.h" // SMESH includes -#include +#include class QCheckBox; class QLineEdit; diff --git a/src/NETGENPlugin/NETGENPlugin_Hypothesis.cxx b/src/NETGENPlugin/NETGENPlugin_Hypothesis.cxx index f743919..84bfd51 100644 --- a/src/NETGENPlugin/NETGENPlugin_Hypothesis.cxx +++ b/src/NETGENPlugin/NETGENPlugin_Hypothesis.cxx @@ -26,7 +26,7 @@ // Project : SALOME // #include "NETGENPlugin_Hypothesis.hxx" -#include +#include using namespace std; diff --git a/src/NETGENPlugin/NETGENPlugin_Hypothesis.hxx b/src/NETGENPlugin/NETGENPlugin_Hypothesis.hxx index 3654f86..f48e216 100644 --- a/src/NETGENPlugin/NETGENPlugin_Hypothesis.hxx +++ b/src/NETGENPlugin/NETGENPlugin_Hypothesis.hxx @@ -30,8 +30,8 @@ #include "NETGENPlugin_Defs.hxx" -#include "SMESH_Hypothesis.hxx" -#include "Utils_SALOME_Exception.hxx" +#include +#include // Parameters for work of NETGEN // diff --git a/src/NETGENPlugin/NETGENPlugin_Hypothesis_2D.cxx b/src/NETGENPlugin/NETGENPlugin_Hypothesis_2D.cxx index 93dd116..616ac91 100644 --- a/src/NETGENPlugin/NETGENPlugin_Hypothesis_2D.cxx +++ b/src/NETGENPlugin/NETGENPlugin_Hypothesis_2D.cxx @@ -28,7 +28,7 @@ //============================================================================= // #include "NETGENPlugin_Hypothesis_2D.hxx" -#include +#include using namespace std; diff --git a/src/NETGENPlugin/NETGENPlugin_Hypothesis_2D.hxx b/src/NETGENPlugin/NETGENPlugin_Hypothesis_2D.hxx index 07f1195..aa54d22 100644 --- a/src/NETGENPlugin/NETGENPlugin_Hypothesis_2D.hxx +++ b/src/NETGENPlugin/NETGENPlugin_Hypothesis_2D.hxx @@ -33,7 +33,7 @@ #include "NETGENPlugin_Defs.hxx" #include "NETGENPlugin_Hypothesis.hxx" -#include "Utils_SALOME_Exception.hxx" +#include // Parameters for work of NETGEN. // This class is just to give 2D dimension, actually diff --git a/src/NETGENPlugin/NETGENPlugin_Hypothesis_2D_i.cxx b/src/NETGENPlugin/NETGENPlugin_Hypothesis_2D_i.cxx index cdb595c..6d16cce 100644 --- a/src/NETGENPlugin/NETGENPlugin_Hypothesis_2D_i.cxx +++ b/src/NETGENPlugin/NETGENPlugin_Hypothesis_2D_i.cxx @@ -28,11 +28,11 @@ //============================================================================= // #include "NETGENPlugin_Hypothesis_2D_i.hxx" -#include "SMESH_Gen.hxx" -#include "SMESH_PythonDump.hxx" +#include +#include -#include "Utils_CorbaException.hxx" -#include "utilities.h" +#include +#include using namespace std; diff --git a/src/NETGENPlugin/NETGENPlugin_Hypothesis_i.cxx b/src/NETGENPlugin/NETGENPlugin_Hypothesis_i.cxx index f13e9db..881d494 100644 --- a/src/NETGENPlugin/NETGENPlugin_Hypothesis_i.cxx +++ b/src/NETGENPlugin/NETGENPlugin_Hypothesis_i.cxx @@ -28,11 +28,11 @@ //============================================================================= // #include "NETGENPlugin_Hypothesis_i.hxx" -#include "SMESH_Gen.hxx" -#include "SMESH_PythonDump.hxx" +#include +#include -#include "Utils_CorbaException.hxx" -#include "utilities.h" +#include +#include using namespace std; diff --git a/src/NETGENPlugin/NETGENPlugin_Hypothesis_i.hxx b/src/NETGENPlugin/NETGENPlugin_Hypothesis_i.hxx index 94ad126..cae1652 100644 --- a/src/NETGENPlugin/NETGENPlugin_Hypothesis_i.hxx +++ b/src/NETGENPlugin/NETGENPlugin_Hypothesis_i.hxx @@ -35,7 +35,7 @@ #include #include CORBA_SERVER_HEADER(NETGENPlugin_Algorithm) -#include "SMESH_Hypothesis_i.hxx" +#include #include "NETGENPlugin_Hypothesis.hxx" class SMESH_Gen; diff --git a/src/NETGENPlugin/NETGENPlugin_Mesher.cxx b/src/NETGENPlugin/NETGENPlugin_Mesher.cxx index 7a20b1a..28b3805 100644 --- a/src/NETGENPlugin/NETGENPlugin_Mesher.cxx +++ b/src/NETGENPlugin/NETGENPlugin_Mesher.cxx @@ -30,15 +30,15 @@ #include "NETGENPlugin_Hypothesis_2D.hxx" #include "NETGENPlugin_SimpleHypothesis_3D.hxx" -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include diff --git a/src/NETGENPlugin/NETGENPlugin_Mesher.hxx b/src/NETGENPlugin/NETGENPlugin_Mesher.hxx index d10d771..f24c8c5 100644 --- a/src/NETGENPlugin/NETGENPlugin_Mesher.hxx +++ b/src/NETGENPlugin/NETGENPlugin_Mesher.hxx @@ -29,7 +29,7 @@ #define _NETGENPlugin_Mesher_HXX_ #include "NETGENPlugin_Defs.hxx" -#include "StdMeshers_FaceSide.hxx" +#include #include class SMESH_Mesh; diff --git a/src/NETGENPlugin/NETGENPlugin_NETGEN_2D.cxx b/src/NETGENPlugin/NETGENPlugin_NETGEN_2D.cxx index 331de00..26a73f3 100644 --- a/src/NETGENPlugin/NETGENPlugin_NETGEN_2D.cxx +++ b/src/NETGENPlugin/NETGENPlugin_NETGEN_2D.cxx @@ -32,11 +32,11 @@ #include "NETGENPlugin_SimpleHypothesis_2D.hxx" #include "NETGENPlugin_Mesher.hxx" -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include diff --git a/src/NETGENPlugin/NETGENPlugin_NETGEN_2D.hxx b/src/NETGENPlugin/NETGENPlugin_NETGEN_2D.hxx index 7f66988..3682efb 100644 --- a/src/NETGENPlugin/NETGENPlugin_NETGEN_2D.hxx +++ b/src/NETGENPlugin/NETGENPlugin_NETGEN_2D.hxx @@ -32,10 +32,10 @@ #include "NETGENPlugin_Defs.hxx" -#include "SMESH_2D_Algo.hxx" -#include "SMESH_Mesh.hxx" -#include "StdMeshers_MaxElementVolume.hxx" -#include "Utils_SALOME_Exception.hxx" +#include +#include +#include +#include //class NETGENPlugin_Hypothesis_2D; diff --git a/src/NETGENPlugin/NETGENPlugin_NETGEN_2D3D.cxx b/src/NETGENPlugin/NETGENPlugin_NETGEN_2D3D.cxx index f167436..07b8944 100644 --- a/src/NETGENPlugin/NETGENPlugin_NETGEN_2D3D.cxx +++ b/src/NETGENPlugin/NETGENPlugin_NETGEN_2D3D.cxx @@ -32,11 +32,11 @@ #include "NETGENPlugin_SimpleHypothesis_2D.hxx" #include "NETGENPlugin_Mesher.hxx" -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include diff --git a/src/NETGENPlugin/NETGENPlugin_NETGEN_2D3D.hxx b/src/NETGENPlugin/NETGENPlugin_NETGEN_2D3D.hxx index 3740bb0..4387395 100644 --- a/src/NETGENPlugin/NETGENPlugin_NETGEN_2D3D.hxx +++ b/src/NETGENPlugin/NETGENPlugin_NETGEN_2D3D.hxx @@ -32,10 +32,10 @@ #include "NETGENPlugin_Defs.hxx" -#include "SMESH_3D_Algo.hxx" -#include "SMESH_Mesh.hxx" -#include "StdMeshers_MaxElementVolume.hxx" -#include "Utils_SALOME_Exception.hxx" +#include +#include +#include +#include //class NETGENPlugin_Hypothesis; diff --git a/src/NETGENPlugin/NETGENPlugin_NETGEN_2D3D_i.cxx b/src/NETGENPlugin/NETGENPlugin_NETGEN_2D3D_i.cxx index c15f825..363c336 100644 --- a/src/NETGENPlugin/NETGENPlugin_NETGEN_2D3D_i.cxx +++ b/src/NETGENPlugin/NETGENPlugin_NETGEN_2D3D_i.cxx @@ -26,10 +26,10 @@ // $Header$ // #include "NETGENPlugin_NETGEN_2D3D_i.hxx" -#include "SMESH_Gen.hxx" +#include -#include "Utils_CorbaException.hxx" -#include "utilities.h" +#include +#include using namespace std; diff --git a/src/NETGENPlugin/NETGENPlugin_NETGEN_2D3D_i.hxx b/src/NETGENPlugin/NETGENPlugin_NETGEN_2D3D_i.hxx index 083deeb..28d7fae 100644 --- a/src/NETGENPlugin/NETGENPlugin_NETGEN_2D3D_i.hxx +++ b/src/NETGENPlugin/NETGENPlugin_NETGEN_2D3D_i.hxx @@ -33,7 +33,7 @@ #include #include CORBA_SERVER_HEADER(NETGENPlugin_Algorithm) -#include "SMESH_3D_Algo_i.hxx" +#include #include "NETGENPlugin_NETGEN_2D3D.hxx" // ====================================================== diff --git a/src/NETGENPlugin/NETGENPlugin_NETGEN_2D_ONLY.cxx b/src/NETGENPlugin/NETGENPlugin_NETGEN_2D_ONLY.cxx index 5b2b2b8..6b80284 100644 --- a/src/NETGENPlugin/NETGENPlugin_NETGEN_2D_ONLY.cxx +++ b/src/NETGENPlugin/NETGENPlugin_NETGEN_2D_ONLY.cxx @@ -27,23 +27,23 @@ #include "NETGENPlugin_Mesher.hxx" -#include "SMDS_MeshElement.hxx" -#include "SMDS_MeshNode.hxx" -#include "SMESHDS_Mesh.hxx" -#include "SMESH_Comment.hxx" -#include "SMESH_Gen.hxx" -#include "SMESH_Mesh.hxx" -#include "SMESH_MesherHelper.hxx" -#include "StdMeshers_FaceSide.hxx" -#include "StdMeshers_MaxElementArea.hxx" -#include "StdMeshers_LengthFromEdges.hxx" -#include "StdMeshers_QuadranglePreference.hxx" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include #include -#include "utilities.h" +#include #include #include diff --git a/src/NETGENPlugin/NETGENPlugin_NETGEN_2D_ONLY.hxx b/src/NETGENPlugin/NETGENPlugin_NETGEN_2D_ONLY.hxx index 14b3b2c..4f8b5ed 100644 --- a/src/NETGENPlugin/NETGENPlugin_NETGEN_2D_ONLY.hxx +++ b/src/NETGENPlugin/NETGENPlugin_NETGEN_2D_ONLY.hxx @@ -26,8 +26,8 @@ #ifndef _NETGENPlugin_NETGEN_2D_ONLY_HXX_ #define _NETGENPlugin_NETGEN_2D_ONLY_HXX_ -#include "SMESH_2D_Algo.hxx" -#include "SMESH_Mesh.hxx" +#include +#include /*#define OCCGEOMETRY #include diff --git a/src/NETGENPlugin/NETGENPlugin_NETGEN_2D_ONLY_i.cxx b/src/NETGENPlugin/NETGENPlugin_NETGEN_2D_ONLY_i.cxx index dfe93eb..2f1b4f0 100644 --- a/src/NETGENPlugin/NETGENPlugin_NETGEN_2D_ONLY_i.cxx +++ b/src/NETGENPlugin/NETGENPlugin_NETGEN_2D_ONLY_i.cxx @@ -25,9 +25,9 @@ // Module : SMESH // #include "NETGENPlugin_NETGEN_2D_ONLY_i.hxx" -#include "SMESH_Gen.hxx" +#include -#include "utilities.h" +#include //============================================================================= /*! diff --git a/src/NETGENPlugin/NETGENPlugin_NETGEN_2D_ONLY_i.hxx b/src/NETGENPlugin/NETGENPlugin_NETGEN_2D_ONLY_i.hxx index 125a5dc..596b732 100644 --- a/src/NETGENPlugin/NETGENPlugin_NETGEN_2D_ONLY_i.hxx +++ b/src/NETGENPlugin/NETGENPlugin_NETGEN_2D_ONLY_i.hxx @@ -30,7 +30,7 @@ #include #include CORBA_SERVER_HEADER(NETGENPlugin_Algorithm) -#include "SMESH_2D_Algo_i.hxx" +#include #include "NETGENPlugin_NETGEN_2D_ONLY.hxx" // ====================================================== diff --git a/src/NETGENPlugin/NETGENPlugin_NETGEN_2D_i.cxx b/src/NETGENPlugin/NETGENPlugin_NETGEN_2D_i.cxx index 3a113f6..a097b80 100644 --- a/src/NETGENPlugin/NETGENPlugin_NETGEN_2D_i.cxx +++ b/src/NETGENPlugin/NETGENPlugin_NETGEN_2D_i.cxx @@ -26,10 +26,10 @@ // $Header$ // #include "NETGENPlugin_NETGEN_2D_i.hxx" -#include "SMESH_Gen.hxx" +#include -#include "Utils_CorbaException.hxx" -#include "utilities.h" +#include +#include using namespace std; diff --git a/src/NETGENPlugin/NETGENPlugin_NETGEN_2D_i.hxx b/src/NETGENPlugin/NETGENPlugin_NETGEN_2D_i.hxx index 984f953..921df08 100644 --- a/src/NETGENPlugin/NETGENPlugin_NETGEN_2D_i.hxx +++ b/src/NETGENPlugin/NETGENPlugin_NETGEN_2D_i.hxx @@ -33,7 +33,7 @@ #include #include CORBA_SERVER_HEADER(NETGENPlugin_Algorithm) -#include "SMESH_2D_Algo_i.hxx" +#include #include "NETGENPlugin_NETGEN_2D.hxx" // ====================================================== diff --git a/src/NETGENPlugin/NETGENPlugin_NETGEN_3D.cxx b/src/NETGENPlugin/NETGENPlugin_NETGEN_3D.cxx index 08fc384..29d1fb1 100644 --- a/src/NETGENPlugin/NETGENPlugin_NETGEN_3D.cxx +++ b/src/NETGENPlugin/NETGENPlugin_NETGEN_3D.cxx @@ -31,16 +31,16 @@ #include "NETGENPlugin_Mesher.hxx" -#include "SMDS_MeshElement.hxx" -#include "SMDS_MeshNode.hxx" -#include "SMESHDS_Mesh.hxx" -#include "SMESH_Comment.hxx" -#include "SMESH_ControlsDef.hxx" -#include "SMESH_Gen.hxx" -#include "SMESH_Mesh.hxx" -#include "SMESH_MesherHelper.hxx" -#include "SMESH_MeshEditor.hxx" -#include "StdMeshers_QuadToTriaAdaptor.hxx" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include @@ -52,7 +52,7 @@ #include #include -#include "utilities.h" +#include #include #include diff --git a/src/NETGENPlugin/NETGENPlugin_NETGEN_3D.hxx b/src/NETGENPlugin/NETGENPlugin_NETGEN_3D.hxx index c3f6be0..852ddd6 100644 --- a/src/NETGENPlugin/NETGENPlugin_NETGEN_3D.hxx +++ b/src/NETGENPlugin/NETGENPlugin_NETGEN_3D.hxx @@ -33,10 +33,10 @@ #include "NETGENPlugin_Defs.hxx" -#include "SMESH_3D_Algo.hxx" -#include "SMESH_Mesh.hxx" -#include "StdMeshers_MaxElementVolume.hxx" -#include "Utils_SALOME_Exception.hxx" +#include +#include +#include +#include class NETGENPLUGIN_EXPORT NETGENPlugin_NETGEN_3D: public SMESH_3D_Algo { diff --git a/src/NETGENPlugin/NETGENPlugin_NETGEN_3D_i.cxx b/src/NETGENPlugin/NETGENPlugin_NETGEN_3D_i.cxx index e541cb6..a4622fb 100644 --- a/src/NETGENPlugin/NETGENPlugin_NETGEN_3D_i.cxx +++ b/src/NETGENPlugin/NETGENPlugin_NETGEN_3D_i.cxx @@ -27,10 +27,10 @@ // $Header$ // #include "NETGENPlugin_NETGEN_3D_i.hxx" -#include "SMESH_Gen.hxx" +#include -#include "Utils_CorbaException.hxx" -#include "utilities.h" +#include +#include using namespace std; diff --git a/src/NETGENPlugin/NETGENPlugin_NETGEN_3D_i.hxx b/src/NETGENPlugin/NETGENPlugin_NETGEN_3D_i.hxx index cbc660b..4763a83 100644 --- a/src/NETGENPlugin/NETGENPlugin_NETGEN_3D_i.hxx +++ b/src/NETGENPlugin/NETGENPlugin_NETGEN_3D_i.hxx @@ -34,7 +34,7 @@ #include #include CORBA_SERVER_HEADER(NETGENPlugin_Algorithm) -#include "SMESH_3D_Algo_i.hxx" +#include #include "NETGENPlugin_NETGEN_3D.hxx" // ====================================================== diff --git a/src/NETGENPlugin/NETGENPlugin_SimpleHypothesis_2D.cxx b/src/NETGENPlugin/NETGENPlugin_SimpleHypothesis_2D.cxx index a54d2fb..12e52d4 100644 --- a/src/NETGENPlugin/NETGENPlugin_SimpleHypothesis_2D.cxx +++ b/src/NETGENPlugin/NETGENPlugin_SimpleHypothesis_2D.cxx @@ -28,13 +28,13 @@ #include "NETGENPlugin_SimpleHypothesis_2D.hxx" #include "NETGENPlugin_Hypothesis.hxx" -#include -#include -#include +#include +#include +#include #include -#include +#include using namespace std; diff --git a/src/NETGENPlugin/NETGENPlugin_SimpleHypothesis_2D.hxx b/src/NETGENPlugin/NETGENPlugin_SimpleHypothesis_2D.hxx index 4ed9218..aa39413 100644 --- a/src/NETGENPlugin/NETGENPlugin_SimpleHypothesis_2D.hxx +++ b/src/NETGENPlugin/NETGENPlugin_SimpleHypothesis_2D.hxx @@ -30,8 +30,8 @@ #include "NETGENPlugin_Defs.hxx" -#include "SMESH_Hypothesis.hxx" -#include "Utils_SALOME_Exception.hxx" +#include +#include // Simplified parameters of NETGEN // diff --git a/src/NETGENPlugin/NETGENPlugin_SimpleHypothesis_2D_i.cxx b/src/NETGENPlugin/NETGENPlugin_SimpleHypothesis_2D_i.cxx index fac763e..260ea7d 100644 --- a/src/NETGENPlugin/NETGENPlugin_SimpleHypothesis_2D_i.cxx +++ b/src/NETGENPlugin/NETGENPlugin_SimpleHypothesis_2D_i.cxx @@ -28,11 +28,11 @@ #include "NETGENPlugin_SimpleHypothesis_2D_i.hxx" #include "NETGENPlugin_SimpleHypothesis_2D.hxx" -#include -#include +#include +#include -#include -#include +#include +#include using namespace std; diff --git a/src/NETGENPlugin/NETGENPlugin_SimpleHypothesis_2D_i.hxx b/src/NETGENPlugin/NETGENPlugin_SimpleHypothesis_2D_i.hxx index 5426293..ad8fec7 100644 --- a/src/NETGENPlugin/NETGENPlugin_SimpleHypothesis_2D_i.hxx +++ b/src/NETGENPlugin/NETGENPlugin_SimpleHypothesis_2D_i.hxx @@ -33,7 +33,7 @@ #include #include CORBA_SERVER_HEADER(NETGENPlugin_Algorithm) -#include "SMESH_Hypothesis_i.hxx" +#include class SMESH_Gen; class NETGENPlugin_SimpleHypothesis_2D; diff --git a/src/NETGENPlugin/NETGENPlugin_SimpleHypothesis_3D.cxx b/src/NETGENPlugin/NETGENPlugin_SimpleHypothesis_3D.cxx index fd799b9..ed86abf 100644 --- a/src/NETGENPlugin/NETGENPlugin_SimpleHypothesis_3D.cxx +++ b/src/NETGENPlugin/NETGENPlugin_SimpleHypothesis_3D.cxx @@ -28,13 +28,13 @@ #include "NETGENPlugin_SimpleHypothesis_3D.hxx" #include "NETGENPlugin_Hypothesis.hxx" -#include -#include -#include +#include +#include +#include #include -#include +#include using namespace std; diff --git a/src/NETGENPlugin/NETGENPlugin_SimpleHypothesis_3D.hxx b/src/NETGENPlugin/NETGENPlugin_SimpleHypothesis_3D.hxx index 7b7de4f..00d7975 100644 --- a/src/NETGENPlugin/NETGENPlugin_SimpleHypothesis_3D.hxx +++ b/src/NETGENPlugin/NETGENPlugin_SimpleHypothesis_3D.hxx @@ -31,7 +31,7 @@ #include "NETGENPlugin_Defs.hxx" #include "NETGENPlugin_SimpleHypothesis_2D.hxx" -#include +#include // Simplified parameters of NETGEN // diff --git a/src/NETGENPlugin/NETGENPlugin_SimpleHypothesis_3D_i.cxx b/src/NETGENPlugin/NETGENPlugin_SimpleHypothesis_3D_i.cxx index 96b9aa8..a739048 100644 --- a/src/NETGENPlugin/NETGENPlugin_SimpleHypothesis_3D_i.cxx +++ b/src/NETGENPlugin/NETGENPlugin_SimpleHypothesis_3D_i.cxx @@ -28,11 +28,11 @@ #include "NETGENPlugin_SimpleHypothesis_3D_i.hxx" #include "NETGENPlugin_SimpleHypothesis_3D.hxx" -#include -#include +#include +#include -#include -#include +#include +#include using namespace std; diff --git a/src/NETGENPlugin/NETGENPlugin_i.cxx b/src/NETGENPlugin/NETGENPlugin_i.cxx index 78e77c1..6f2532d 100644 --- a/src/NETGENPlugin/NETGENPlugin_i.cxx +++ b/src/NETGENPlugin/NETGENPlugin_i.cxx @@ -25,7 +25,7 @@ // Module : SMESH // $Header$ // -#include "utilities.h" +#include #include "NETGENPlugin_NETGEN_3D_i.hxx" #include "NETGENPlugin_NETGEN_2D_i.hxx" -- 2.39.2