diff options
author | Campbell Barton <ideasman42@gmail.com> | 2019-12-10 03:06:38 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2019-12-10 03:06:38 +0300 |
commit | 00e9241d49d122052038295db9005542d25e4454 (patch) | |
tree | add386511228648b8fb308363a62c60d3229ff6f | |
parent | cc70f7d048be1970b80e9493b269b331e8adee54 (diff) |
Cleanup: header guards
-rw-r--r-- | source/blender/collada/AnimationClipExporter.h | 5 | ||||
-rw-r--r-- | source/blender/collada/AnimationExporter.h | 6 | ||||
-rw-r--r-- | source/blender/collada/BCAnimationCurve.h | 6 | ||||
-rw-r--r-- | source/blender/collada/BCAnimationSampler.h | 6 | ||||
-rw-r--r-- | source/blender/collada/BCMath.h | 6 | ||||
-rw-r--r-- | source/blender/collada/BCSampleData.h | 6 | ||||
-rw-r--r-- | source/blender/collada/ErrorHandler.h | 5 | ||||
-rw-r--r-- | source/blender/collada/ExtraHandler.h | 5 | ||||
-rw-r--r-- | source/blender/collada/Materials.h | 6 | ||||
-rw-r--r-- | source/blender/editors/physics/particle_edit_utildefines.h | 6 | ||||
-rw-r--r-- | source/blender/makesdna/DNA_curveprofile_types.h | 6 |
11 files changed, 39 insertions, 24 deletions
diff --git a/source/blender/collada/AnimationClipExporter.h b/source/blender/collada/AnimationClipExporter.h index ead894dc941..25c69fe6b93 100644 --- a/source/blender/collada/AnimationClipExporter.h +++ b/source/blender/collada/AnimationClipExporter.h @@ -14,6 +14,9 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ +#ifndef __ANIMATIONCLIPEXPORTER_H__ +#define __ANIMATIONCLIPEXPORTER_H__ + #include <stdlib.h> #include <stdio.h> #include <math.h> @@ -44,3 +47,5 @@ class AnimationClipExporter : COLLADASW::LibraryAnimationClips { void exportAnimationClips(Scene *sce); }; + +#endif /* __ANIMATIONCLIPEXPORTER_H__ */ diff --git a/source/blender/collada/AnimationExporter.h b/source/blender/collada/AnimationExporter.h index 2be2dadeeeb..64751ec5327 100644 --- a/source/blender/collada/AnimationExporter.h +++ b/source/blender/collada/AnimationExporter.h @@ -14,8 +14,8 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef __BC_ANIMATION_EXPORTER_H__ -#define __BC_ANIMATION_EXPORTER_H__ +#ifndef __ANIMATIONEXPORTER_H__ +#define __ANIMATIONEXPORTER_H__ #include <stdlib.h> #include <stdio.h> @@ -263,4 +263,4 @@ class AnimationExporter : COLLADASW::LibraryAnimations { #endif }; -#endif +#endif /* __ANIMATIONEXPORTER_H__ */ diff --git a/source/blender/collada/BCAnimationCurve.h b/source/blender/collada/BCAnimationCurve.h index 33533258dc2..4651290ea0f 100644 --- a/source/blender/collada/BCAnimationCurve.h +++ b/source/blender/collada/BCAnimationCurve.h @@ -17,8 +17,8 @@ * All rights reserved. */ -#ifndef __BC_ANIMATION_CURVE_H__ -#define __BC_ANIMATION_CURVE_H__ +#ifndef __BCANIMATIONCURVE_H__ +#define __BCANIMATIONCURVE_H__ #include "collada_utils.h" #include "BCSampleData.h" @@ -148,4 +148,4 @@ class BCAnimationCurve { typedef std::map<BCCurveKey, BCAnimationCurve *> BCAnimationCurveMap; -#endif +#endif /* __BCANIMATIONCURVE_H__ */ diff --git a/source/blender/collada/BCAnimationSampler.h b/source/blender/collada/BCAnimationSampler.h index e8d2ab56ae7..0f192a7a68b 100644 --- a/source/blender/collada/BCAnimationSampler.h +++ b/source/blender/collada/BCAnimationSampler.h @@ -14,8 +14,8 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef __BC_ANIMATION_CURVE_CONTAINER_H__ -#define __BC_ANIMATION_CURVE_CONTAINER_H__ +#ifndef __BCANIMATIONSAMPLER_H__ +#define __BCANIMATIONSAMPLER_H__ #include "BCAnimationCurve.h" #include "BCSampleData.h" @@ -191,4 +191,4 @@ class BCAnimationSampler { std::set<Object *> &animated_objects); }; -#endif +#endif /* __BCANIMATIONSAMPLER_H__ */ diff --git a/source/blender/collada/BCMath.h b/source/blender/collada/BCMath.h index bb62f6c179a..9ecea85b08c 100644 --- a/source/blender/collada/BCMath.h +++ b/source/blender/collada/BCMath.h @@ -18,8 +18,8 @@ * \ingroup collada */ -#ifndef __BCMATRIX_H__ -#define __BCMATRIX_H__ +#ifndef __BCMATH_H__ +#define __BCMATH_H__ #include "BlenderTypes.h" @@ -107,4 +107,4 @@ class BCMatrix { static void transpose(Matrix &matrix); }; -#endif +#endif /* __BCMATH_H__ */ diff --git a/source/blender/collada/BCSampleData.h b/source/blender/collada/BCSampleData.h index c4e840ac3b3..07ecb544c71 100644 --- a/source/blender/collada/BCSampleData.h +++ b/source/blender/collada/BCSampleData.h @@ -17,8 +17,8 @@ * All rights reserved. */ -#ifndef __BC_SAMPLE_H__ -#define __BC_SAMPLE_H__ +#ifndef __BCSAMPLEDATA_H__ +#define __BCSAMPLEDATA_H__ #include <string> #include <map> @@ -63,4 +63,4 @@ typedef std::map<Object *, BCSample *> BCSampleMap; typedef std::map<int, const BCSample *> BCFrameSampleMap; typedef std::map<int, const BCMatrix *> BCMatrixSampleMap; -#endif +#endif /* __BCSAMPLEDATA_H__ */ diff --git a/source/blender/collada/ErrorHandler.h b/source/blender/collada/ErrorHandler.h index 5851e5da67b..f040855244d 100644 --- a/source/blender/collada/ErrorHandler.h +++ b/source/blender/collada/ErrorHandler.h @@ -18,6 +18,9 @@ * \ingroup collada */ +#ifndef __ERRORHANDLER_H__ +#define __ERRORHANDLER_H__ + #include <string> #include <map> #include <vector> @@ -50,3 +53,5 @@ class ErrorHandler : public COLLADASaxFWL::IErrorHandler { /** Hold error status. */ bool mError; }; + +#endif /* __ERRORHANDLER_H__ */ diff --git a/source/blender/collada/ExtraHandler.h b/source/blender/collada/ExtraHandler.h index b695f5221f6..021eb8e9663 100644 --- a/source/blender/collada/ExtraHandler.h +++ b/source/blender/collada/ExtraHandler.h @@ -18,6 +18,9 @@ * \ingroup collada */ +#ifndef __EXTRAHANDLER_H__ +#define __EXTRAHANDLER_H__ + #include <string> #include <map> #include <vector> @@ -76,3 +79,5 @@ class ExtraHandler : public COLLADASaxFWL::IExtraDataCallbackHandler { ExtraTags *currentExtraTags; std::string currentElement; }; + +#endif /* __EXTRAHANDLER_H__ */ diff --git a/source/blender/collada/Materials.h b/source/blender/collada/Materials.h index 8f3c3dbcd93..0a4f2ee61a5 100644 --- a/source/blender/collada/Materials.h +++ b/source/blender/collada/Materials.h @@ -14,8 +14,8 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef __MATERIAL_H__ -#define __MATERIAL_H__ +#ifndef __MATERIALS_H__ +#define __MATERIALS_H__ #include <map> #include <string> @@ -73,4 +73,4 @@ class MaterialNode { COLLADAFW::FloatOrParam &val); }; -#endif +#endif /* __MATERIALS_H__ */ diff --git a/source/blender/editors/physics/particle_edit_utildefines.h b/source/blender/editors/physics/particle_edit_utildefines.h index da27420505f..dc858687341 100644 --- a/source/blender/editors/physics/particle_edit_utildefines.h +++ b/source/blender/editors/physics/particle_edit_utildefines.h @@ -21,8 +21,8 @@ * \ingroup edphys */ -#ifndef __PARTICLE_EDIT_UTILDEFNIES_H__ -#define __PARTICLE_EDIT_UTILDEFNIES_H__ +#ifndef __PARTICLE_EDIT_UTILDEFINES_H__ +#define __PARTICLE_EDIT_UTILDEFINES_H__ #define KEY_K \ PTCacheEditKey *key; \ @@ -59,4 +59,4 @@ #define KEY_WCO ((key->flag & PEK_USE_WCO) ? key->world_co : key->co) -#endif /* __PARTICLE_EDIT_UTILDEFNIES_H__ */ +#endif /* __PARTICLE_EDIT_UTILDEFINES_H__ */ diff --git a/source/blender/makesdna/DNA_curveprofile_types.h b/source/blender/makesdna/DNA_curveprofile_types.h index 13e638437c4..18d170e7bd5 100644 --- a/source/blender/makesdna/DNA_curveprofile_types.h +++ b/source/blender/makesdna/DNA_curveprofile_types.h @@ -21,8 +21,8 @@ * \ingroup DNA */ -#ifndef DNA_PROFILEPATH_TYPES_H -#define DNA_PROFILEPATH_TYPES_H +#ifndef __DNA_CURVEPROFILE_TYPES_H__ +#define __DNA_CURVEPROFILE_TYPES_H__ #include "DNA_vec_types.h" @@ -90,4 +90,4 @@ typedef enum eCurveProfilePresets { PROF_PRESET_STEPS = 4, /* Dynamic number of steps defined by segments_len. */ } eCurveProfilePresets; -#endif +#endif /* __DNA_CURVEPROFILE_TYPES_H__ */ |