Skip to content

Commit e959abb

Browse files
damienmarchaldamienmarchal
authored
Merge pull request sofa-framework#638 from epernod/header_include_cleanup
[SofaKernel] Header include cleanup
2 parents 8667226 + bb4e3d2 commit e959abb

File tree

133 files changed

+52
-359
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

133 files changed

+52
-359
lines changed

‎SofaGui/CMakeLists.txt‎

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -78,16 +78,7 @@ list(APPEND SOFAGUI_TARGETS SofaGuiCommon)
7878

7979
## OpenGL-based GUIs
8080
if(NOT SOFA_NO_OPENGL)
81-
## Glut GUI
82-
if(SOFA_HAVE_GLUT)
83-
option(SOFAGUI_GLUT "Compile the Glut GUI" OFF)
84-
if(SOFAGUI_GLUT)
85-
set(SOFA_GUI_GLUT 1) # cmakedefine
86-
list(APPEND SOFAGUI_TARGETS SofaGuiGlut)
87-
add_subdirectory(../applications/sofa/gui/glut ${CMAKE_CURRENT_BINARY_DIR}/SofaGuiGlut)
88-
endif()
89-
endif()
90-
81+
9182
option(SOFAGUI_HEADLESS_RECORDER "Compile the headless recorder (Linux only)" OFF)
9283
if(SOFAGUI_HEADLESS_RECORDER)
9384
set(SOFA_GUI_HEADLESS_RECORDER 1) # cmakedefine

‎SofaKernel/framework/sofa/core/BaseMapping.h‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -22,17 +22,10 @@
2222
#ifndef SOFA_CORE_BASEMAPPING_H
2323
#define SOFA_CORE_BASEMAPPING_H
2424

25-
#include <cstdlib>
26-
#include <string>
27-
#include <iostream>
2825

29-
#include <sofa/core/objectmodel/BaseObject.h>
30-
#include <sofa/core/BehaviorModel.h>
3126
#include <sofa/core/behavior/MechanicalState.h>
3227
#include <sofa/core/ConstraintParams.h>
3328
#include <sofa/core/MechanicalParams.h>
34-
#include <sofa/core/VecId.h>
35-
#include <sofa/helper/vector.h>
3629

3730
namespace sofa
3831
{

‎SofaKernel/framework/sofa/core/CollisionModel.h‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
#ifndef SOFA_CORE_COLLISIONMODEL_H
2323
#define SOFA_CORE_COLLISIONMODEL_H
2424

25-
#include <vector>
2625
#include <sofa/core/objectmodel/BaseObject.h>
2726
#include <sofa/core/CollisionElement.h>
2827

‎SofaKernel/framework/sofa/core/DataEngine.h‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,8 @@
2727
#endif
2828

2929
#include <sofa/core/core.h>
30-
#include <sofa/core/objectmodel/DDGNode.h>
3130
#include <sofa/core/objectmodel/BaseObject.h>
32-
#include <list>
33-
#include "DataTracker.h"
31+
#include <sofa/core/DataTracker.h>
3432

3533
namespace sofa
3634
{

‎SofaKernel/framework/sofa/core/Mapping.h‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,7 @@
2323
#define SOFA_CORE_MAPPING_H
2424

2525
#include <sofa/core/BaseMapping.h>
26-
#include <sofa/core/State.h>
27-
#include <sofa/core/behavior/BaseMechanicalState.h>
2826

29-
#include <sofa/defaulttype/Vec3Types.h>
30-
#include <sofa/defaulttype/RigidTypes.h>
3127

3228
namespace sofa
3329
{

‎SofaKernel/framework/sofa/core/Multi2Mapping.h‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@
2424

2525
#include <sofa/core/BaseMapping.h>
2626
#include <sofa/core/core.h>
27-
#include <sofa/core/VecId.h>
2827

2928

3029
namespace sofa

‎SofaKernel/framework/sofa/core/MultiMapping.h‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,7 @@
2323
#define SOFA_CORE_MULTIMAPPING_H
2424

2525
#include <sofa/core/BaseMapping.h>
26-
#include <sofa/core/State.h>
2726
#include <sofa/core/core.h>
28-
#include <sofa/core/VecId.h>
2927

3028
namespace sofa
3129
{

‎SofaKernel/framework/sofa/core/MultiVecId.h‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@
2424

2525
#include <sofa/core/VecId.h>
2626

27-
#include <map>
2827

2928
namespace sofa
3029
{

‎SofaKernel/framework/sofa/core/ObjectFactory.h‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,14 +23,8 @@
2323
#define SOFA_CORE_OBJECTFACTORY_H
2424

2525
#include <sofa/helper/system/config.h>
26-
#include <sofa/core/objectmodel/BaseObjectDescription.h>
27-
#include <sofa/core/objectmodel/BaseContext.h>
2826
#include <sofa/core/objectmodel/BaseObject.h>
2927

30-
#include <map>
31-
#include <memory>
32-
#include <iostream>
33-
#include <typeinfo>
3428

3529
namespace sofa
3630
{

‎SofaKernel/framework/sofa/core/Plugin.h‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -50,12 +50,7 @@ public: \
5050

5151

5252
#include <sofa/core/core.h>
53-
#include <sofa/core/ObjectFactory.h>
5453

55-
#include <map>
56-
#include <set>
57-
#include <string>
58-
#include <vector>
5954

6055
namespace sofa
6156
{

0 commit comments

Comments
 (0)