Cleanup: conform header guards to Blender's style

source/blender/collada/ExtraTags.h

@@ -18,6 +18,9 @@
  * \ingroup collada
  */
 
+#ifndef __EXTRATAGS_H__
+#define __EXTRATAGS_H__
+
 #include <string>
 #include <map>
 #include <vector>
@@ -70,3 +73,5 @@ class ExtraTags {
   /** Get text data for tag as a string. */
   std::string asString(std::string tag, bool *ok);
 };
+
+#endif /* __EXTRATAGS_H__ */

source/blender/modifiers/intern/MOD_solidify_util.h

@@ -18,8 +18,8 @@
  * \ingroup modifiers
  */
 
-#ifndef __MOD_MESHCACHE_UTIL_H__
-#define __MOD_MESHCACHE_UTIL_H__
+#ifndef __MOD_SOLIDIFY_UTIL_H__
+#define __MOD_SOLIDIFY_UTIL_H__
 
 /* MOD_solidify_extrude.c */
 Mesh *MOD_solidify_extrude_applyModifier(ModifierData *md,
@@ -31,4 +31,4 @@ Mesh *MOD_solidify_nonmanifold_applyModifier(ModifierData *md,
                                              const ModifierEvalContext *ctx,
                                              Mesh *mesh);
 
-#endif /* __MOD_MESHCACHE_UTIL_H__ */
+#endif /* __MOD_SOLIDIFY_UTIL_H__ */

source/blender/usd/intern/abstract_hierarchy_iterator.h

@@ -33,8 +33,8 @@
  * Selections like "selected only" or "no hair systems" are left to concrete subclasses.
  */
 
-#ifndef __USD__ABSTRACT_HIERARCHY_ITERATOR_H__
-#define __USD__ABSTRACT_HIERARCHY_ITERATOR_H__
+#ifndef __ABSTRACT_HIERARCHY_ITERATOR_H__
+#define __ABSTRACT_HIERARCHY_ITERATOR_H__
 
 #include <map>
 #include <string>
@@ -245,4 +245,4 @@ class AbstractHierarchyIterator {
 
 }  // namespace USD
 
-#endif /* __USD__ABSTRACT_HIERARCHY_ITERATOR_H__ */
+#endif /* __ABSTRACT_HIERARCHY_ITERATOR_H__ */

source/blender/usd/intern/usd_exporter_context.h

@@ -16,8 +16,8 @@
  * The Original Code is Copyright (C) 2019 Blender Foundation.
  * All rights reserved.
  */
-#ifndef __USD__USD_EXPORTER_CONTEXT_H__
-#define __USD__USD_EXPORTER_CONTEXT_H__
+#ifndef __USD_EXPORTER_CONTEXT_H__
+#define __USD_EXPORTER_CONTEXT_H__
 
 #include "usd.h"
 
@@ -41,4 +41,4 @@ struct USDExporterContext {
 
 }  // namespace USD
 
-#endif /* __USD__USD_EXPORTER_CONTEXT_H__ */
+#endif /* __USD_EXPORTER_CONTEXT_H__ */

source/blender/usd/intern/usd_hierarchy_iterator.h

@@ -16,8 +16,8 @@
  * The Original Code is Copyright (C) 2019 Blender Foundation.
  * All rights reserved.
  */
-#ifndef __USD__USD_HIERARCHY_ITERATOR_H__
-#define __USD__USD_HIERARCHY_ITERATOR_H__
+#ifndef __USD_HIERARCHY_ITERATOR_H__
+#define __USD_HIERARCHY_ITERATOR_H__
 
 #include "abstract_hierarchy_iterator.h"
 #include "usd_exporter_context.h"
@@ -68,4 +68,4 @@ class USDHierarchyIterator : public AbstractHierarchyIterator {
 
 }  // namespace USD
 
-#endif /* __USD__USD_HIERARCHY_ITERATOR_H__ */
+#endif /* __USD_HIERARCHY_ITERATOR_H__ */

source/blender/usd/intern/usd_writer_abstract.h

@@ -16,8 +16,8 @@
  * The Original Code is Copyright (C) 2019 Blender Foundation.
  * All rights reserved.
  */
-#ifndef __USD__USD_WRITER_ABSTRACT_H__
-#define __USD__USD_WRITER_ABSTRACT_H__
+#ifndef __USD_WRITER_ABSTRACT_H__
+#define __USD_WRITER_ABSTRACT_H__
 
 #include "usd_exporter_context.h"
 #include "abstract_hierarchy_iterator.h"
@@ -75,4 +75,4 @@ class USDAbstractWriter : public AbstractHierarchyWriter {
 
 }  // namespace USD
 
-#endif /* __USD__USD_WRITER_ABSTRACT_H__ */
+#endif /* __USD_WRITER_ABSTRACT_H__ */

source/blender/usd/intern/usd_writer_camera.h

@@ -16,8 +16,8 @@
  * The Original Code is Copyright (C) 2019 Blender Foundation.
  * All rights reserved.
  */
-#ifndef __USD__USD_WRITER_CAMERA_H__
-#define __USD__USD_WRITER_CAMERA_H__
+#ifndef __USD_WRITER_CAMERA_H__
+#define __USD_WRITER_CAMERA_H__
 
 #include "usd_writer_abstract.h"
 
@@ -35,4 +35,4 @@ class USDCameraWriter : public USDAbstractWriter {
 
 }  // namespace USD
 
-#endif /* __USD__USD_WRITER_CAMERA_H__ */
+#endif /* __USD_WRITER_CAMERA_H__ */

source/blender/usd/intern/usd_writer_hair.h

@@ -16,8 +16,8 @@
  * The Original Code is Copyright (C) 2019 Blender Foundation.
  * All rights reserved.
  */
-#ifndef __USD__USD_WRITER_HAIR_H__
-#define __USD__USD_WRITER_HAIR_H__
+#ifndef __USD_WRITER_HAIR_H__
+#define __USD_WRITER_HAIR_H__
 
 #include "usd_writer_abstract.h"
 
@@ -35,4 +35,4 @@ class USDHairWriter : public USDAbstractWriter {
 
 }  // namespace USD
 
-#endif /* __USD__USD_WRITER_HAIR_H__ */
+#endif /* __USD_WRITER_HAIR_H__ */

source/blender/usd/intern/usd_writer_light.h

@@ -16,8 +16,8 @@
  * The Original Code is Copyright (C) 2019 Blender Foundation.
  * All rights reserved.
  */
-#ifndef __USD__USD_WRITER_LIGHT_H__
-#define __USD__USD_WRITER_LIGHT_H__
+#ifndef __USD_WRITER_LIGHT_H__
+#define __USD_WRITER_LIGHT_H__
 
 #include "usd_writer_abstract.h"
 
@@ -34,4 +34,4 @@ class USDLightWriter : public USDAbstractWriter {
 
 }  // namespace USD
 
-#endif /* __USD__USD_WRITER_LIGHT_H__ */
+#endif /* __USD_WRITER_LIGHT_H__ */

source/blender/usd/intern/usd_writer_mesh.h

@@ -16,8 +16,8 @@
  * The Original Code is Copyright (C) 2019 Blender Foundation.
  * All rights reserved.
  */
-#ifndef __USD__USD_WRITER_MESH_H__
-#define __USD__USD_WRITER_MESH_H__
+#ifndef __USD_WRITER_MESH_H__
+#define __USD_WRITER_MESH_H__
 
 #include "usd_writer_abstract.h"
 
@@ -63,4 +63,4 @@ class USDMeshWriter : public USDGenericMeshWriter {
 
 }  // namespace USD
 
-#endif /* __USD__USD_WRITER_MESH_H__ */
+#endif /* __USD_WRITER_MESH_H__ */

source/blender/usd/intern/usd_writer_transform.h

@@ -16,8 +16,8 @@
  * The Original Code is Copyright (C) 2019 Blender Foundation.
  * All rights reserved.
  */
-#ifndef __USD__USD_WRITER_TRANSFORM_H__
-#define __USD__USD_WRITER_TRANSFORM_H__
+#ifndef __USD_WRITER_TRANSFORM_H__
+#define __USD_WRITER_TRANSFORM_H__
 
 #include "usd_writer_abstract.h"
 
@@ -39,4 +39,4 @@ class USDTransformWriter : public USDAbstractWriter {
 
 }  // namespace USD
 
-#endif /* __USD__USD_WRITER_TRANSFORM_H__ */
+#endif /* __USD_WRITER_TRANSFORM_H__ */

source/blender/usd/usd.h

@@ -17,8 +17,8 @@
  * All rights reserved.
  */
 
-#ifndef __BLENDER_USD_H__
-#define __BLENDER_USD_H__
+#ifndef __USD_H__
+#define __USD_H__
 
 #ifdef __cplusplus
 extern "C" {
@@ -59,4 +59,4 @@ bool USD_export(struct bContext *C,
 }
 #endif
 
-#endif /* __BLENDER_USD_H__ */
+#endif /* __USD_H__ */