Replace public header guards to avoid using indentifiers reserved by c++

Usually something like __IRR_SOME_GUARD_INCLUDED__ replaced by IRR_SOME_GUARD_INCLUDED. Removing underscores at the end wasn't necessary, but more symmetric (probably the reason they got added there as well). While this touches every header it shouldn't affect users (I hope). Also a few whitespace changes to unify whitespace usage a bit. And a bunch of spelling fixes in comments. git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@6252 dfc29bdd-3216-0410-991c-e03cc46cb475
2025-06-28 06:20:21 +02:00 · 2021-08-27 15:03:34 +00:00
parent ffd7b63af0
commit 0c6385cb92
211 changed files with 502 additions and 659 deletions
--- a/source/Irrlicht/CB3DMeshWriter.h
+++ b/source/Irrlicht/CB3DMeshWriter.h
@ -4,8 +4,8 @@

 // Modified version with rigging/skinning support

-#ifndef __IRR_B3D_MESH_WRITER_H_INCLUDED__
-#define __IRR_B3D_MESH_WRITER_H_INCLUDED__
+#ifndef IRR_B3D_MESH_WRITER_H_INCLUDED
+#define IRR_B3D_MESH_WRITER_H_INCLUDED

 #include "IMeshWriter.h"
 #include "IWriteFile.h"
--- a/source/Irrlicht/CColladaMeshWriter.h
+++ b/source/Irrlicht/CColladaMeshWriter.h
@ -2,8 +2,8 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h

-#ifndef __IRR_C_COLLADA_MESH_WRITER_H_INCLUDED__
-#define __IRR_C_COLLADA_MESH_WRITER_H_INCLUDED__
+#ifndef IRR_C_COLLADA_MESH_WRITER_H_INCLUDED
+#define IRR_C_COLLADA_MESH_WRITER_H_INCLUDED

 #include "IColladaMeshWriter.h"
 #include "S3DVertex.h"
--- a/source/Irrlicht/CIrrMeshWriter.h
+++ b/source/Irrlicht/CIrrMeshWriter.h
@ -2,8 +2,8 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h

-#ifndef __IRR_IRR_MESH_WRITER_H_INCLUDED__
-#define __IRR_IRR_MESH_WRITER_H_INCLUDED__
+#ifndef IRR_IRR_MESH_WRITER_H_INCLUDED
+#define IRR_IRR_MESH_WRITER_H_INCLUDED

 #include "IMeshWriter.h"
 #include "S3DVertex.h"
@ -58,4 +58,3 @@ namespace scene
 } // end namespace

 #endif
-
--- a/source/Irrlicht/COBJMeshWriter.h
+++ b/source/Irrlicht/COBJMeshWriter.h
@ -2,8 +2,8 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h

-#ifndef __IRR_OBJ_MESH_WRITER_H_INCLUDED__
-#define __IRR_OBJ_MESH_WRITER_H_INCLUDED__
+#ifndef IRR_OBJ_MESH_WRITER_H_INCLUDED
+#define IRR_OBJ_MESH_WRITER_H_INCLUDED

 #include "IMeshWriter.h"
 #include "S3DVertex.h"
@ -55,4 +55,3 @@ namespace scene
 } // end namespace

 #endif
-
--- a/source/Irrlicht/CPLYMeshWriter.h
+++ b/source/Irrlicht/CPLYMeshWriter.h
@ -2,8 +2,8 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h

-#ifndef __IRR_PLY_MESH_WRITER_H_INCLUDED__
-#define __IRR_PLY_MESH_WRITER_H_INCLUDED__
+#ifndef IRR_PLY_MESH_WRITER_H_INCLUDED
+#define IRR_PLY_MESH_WRITER_H_INCLUDED

 #include "IMeshWriter.h"

--- a/source/Irrlicht/CSTLMeshWriter.h
+++ b/source/Irrlicht/CSTLMeshWriter.h
@ -2,8 +2,8 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h

-#ifndef __IRR_STL_MESH_WRITER_H_INCLUDED__
-#define __IRR_STL_MESH_WRITER_H_INCLUDED__
+#ifndef IRR_STL_MESH_WRITER_H_INCLUDED
+#define IRR_STL_MESH_WRITER_H_INCLUDED

 #include "IMeshWriter.h"
 #include "S3DVertex.h"
@ -52,4 +52,3 @@ namespace scene
 } // end namespace

 #endif
-
--- a/source/Irrlicht/CVideoModeList.h
+++ b/source/Irrlicht/CVideoModeList.h
@ -2,8 +2,8 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h

-#ifndef __IRR_C_VIDEO_MODE_LIST_H_INCLUDED__
-#define __IRR_C_VIDEO_MODE_LIST_H_INCLUDED__
+#ifndef IRR_C_VIDEO_MODE_LIST_H_INCLUDED
+#define IRR_C_VIDEO_MODE_LIST_H_INCLUDED

 #include "IVideoModeList.h"
 #include "dimension2d.h"
@ -74,6 +74,4 @@ namespace video
 } // end namespace video
 } // end namespace irr

-
 #endif
-
--- a/source/Irrlicht/CXMLReaderImpl.h
+++ b/source/Irrlicht/CXMLReaderImpl.h
@ -2,8 +2,8 @@
 // This file is part of the "Irrlicht Engine" and the "irrXML" project.
 // For conditions of distribution and use, see copyright notice in irrlicht.h and/or irrXML.h

-#ifndef __ICXML_READER_IMPL_H_INCLUDED__
-#define __ICXML_READER_IMPL_H_INCLUDED__
+#ifndef IRR_ICXML_READER_IMPL_H_INCLUDED
+#define IRR_ICXML_READER_IMPL_H_INCLUDED

 #include "irrXML.h"
 #include "irrString.h"
--- a/source/Irrlicht/IAttribute.h
+++ b/source/Irrlicht/IAttribute.h
@ -2,8 +2,8 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h

-#ifndef __I_ATTRIBUTE_H_INCLUDED__
-#define __I_ATTRIBUTE_H_INCLUDED__
+#ifndef IRR_I_ATTRIBUTE_H_INCLUDED
+#define IRR_I_ATTRIBUTE_H_INCLUDED

 #include "IReferenceCounted.h"
 #include "SColor.h"
--- a/source/Irrlicht/IBurningShader.h
+++ b/source/Irrlicht/IBurningShader.h
@ -2,8 +2,8 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h

-#ifndef __I_BURNING_SHADER_H_INCLUDED__
-#define __I_BURNING_SHADER_H_INCLUDED__
+#ifndef IRR_I_BURNING_SHADER_H_INCLUDED
+#define IRR_I_BURNING_SHADER_H_INCLUDED

 #include "SoftwareDriver2_compile_config.h"
 #include "IReferenceCounted.h"
@ -440,4 +440,3 @@ namespace video
 } // end namespace irr

 #endif
-
--- a/source/Irrlicht/IDepthBuffer.h
+++ b/source/Irrlicht/IDepthBuffer.h
@ -2,8 +2,8 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h

-#ifndef __I_Z2_BUFFER_H_INCLUDED__
-#define __I_Z2_BUFFER_H_INCLUDED__
+#ifndef IRR_I_Z2_BUFFER_H_INCLUDED
+#define IRR_I_Z2_BUFFER_H_INCLUDED

 #include "IReferenceCounted.h"
 #include "dimension2d.h"
@ -79,4 +79,3 @@ namespace video
 } // end namespace irr

 #endif
-
--- a/source/Irrlicht/IImagePresenter.h
+++ b/source/Irrlicht/IImagePresenter.h
@ -2,8 +2,8 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h

-#ifndef __I_IMAGE_PRESENTER_H_INCLUDED__
-#define __I_IMAGE_PRESENTER_H_INCLUDED__
+#ifndef IRR_I_IMAGE_PRESENTER_H_INCLUDED
+#define IRR_I_IMAGE_PRESENTER_H_INCLUDED

 #include "IImage.h"

@ -33,4 +33,3 @@ namespace video
 } // end namespace irr

 #endif
-
--- a/source/Irrlicht/ISceneNodeAnimatorFinishing.h
+++ b/source/Irrlicht/ISceneNodeAnimatorFinishing.h
@ -2,8 +2,8 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h

-#ifndef __I_SCENE_NODE_ANIMATOR_FINISHING_H_INCLUDED__
-#define __I_SCENE_NODE_ANIMATOR_FINISHING_H_INCLUDED__
+#ifndef IRR_I_SCENE_NODE_ANIMATOR_FINISHING_H_INCLUDED
+#define IRR_I_SCENE_NODE_ANIMATOR_FINISHING_H_INCLUDED

 #include "ISceneNode.h"

--- a/source/Irrlicht/ITriangleRenderer.h
+++ b/source/Irrlicht/ITriangleRenderer.h
@ -2,8 +2,8 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h

-#ifndef __I_TRIANGLE_RENDERER_H_INCLUDED__
-#define __I_TRIANGLE_RENDERER_H_INCLUDED__
+#ifndef IRR_I_TRIANGLE_RENDERER_H_INCLUDED
+#define IRR_I_TRIANGLE_RENDERER_H_INCLUDED

 #include "IReferenceCounted.h"
 #include "S2DVertex.h"
@ -65,4 +65,3 @@ namespace video
 } // end namespace irr

 #endif
-
--- a/source/Irrlicht/IZBuffer.h
+++ b/source/Irrlicht/IZBuffer.h
@ -2,8 +2,8 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h

-#ifndef __I_Z_BUFFER_H_INCLUDED__
-#define __I_Z_BUFFER_H_INCLUDED__
+#ifndef IRR_I_Z_BUFFER_H_INCLUDED
+#define IRR_I_Z_BUFFER_H_INCLUDED

 #include "IReferenceCounted.h"
 #include "dimension2d.h"
@ -44,4 +44,3 @@ namespace video
 } // end namespace irr

 #endif
-
--- a/source/Irrlicht/Irrlicht10.0.vcxproj
+++ b/source/Irrlicht/Irrlicht10.0.vcxproj
@ -841,14 +841,23 @@
  <ItemGroup>
    <ClInclude Include="..\..\include\EDriverFeatures.h" />
    <ClInclude Include="..\..\include\EMaterialFlags.h" />
+    <ClInclude Include="..\..\include\EReadFileType.h" />
+    <ClInclude Include="..\..\include\EShaderTypes.h" />
    <ClInclude Include="..\..\include\fast_atof.h" />
    <ClInclude Include="..\..\include\IAnimatedMeshMD3.h" />
+    <ClInclude Include="..\..\include\IBillboardTextSceneNode.h" />
    <ClInclude Include="..\..\include\IBoneSceneNode.h" />
+    <ClInclude Include="..\..\include\IColladaMeshWriter.h" />
    <ClInclude Include="..\..\include\IDynamicMeshBuffer.h" />
    <ClInclude Include="..\..\include\IEventReceiver.h" />
+    <ClInclude Include="..\..\include\IFileArchive.h" />
    <ClInclude Include="..\..\include\IGUIFontBitmap.h" />
+    <ClInclude Include="..\..\include\IGUITable.h" />
+    <ClInclude Include="..\..\include\IImageWriter.h" />
+    <ClInclude Include="..\..\include\IIndexBuffer.h" />
    <ClInclude Include="..\..\include\ILightManager.h" />
    <ClInclude Include="..\..\include\ILogger.h" />
+    <ClInclude Include="..\..\include\IMemoryReadFile.h" />
    <ClInclude Include="..\..\include\IOctreeSceneNode.h" />
    <ClInclude Include="..\..\include\IOSOperator.h" />
    <ClInclude Include="..\..\include\IProfiler.h" />
@ -859,7 +868,9 @@
    <ClInclude Include="..\..\include\irrlicht.h" />
    <ClInclude Include="..\..\include\IrrlichtDevice.h" />
    <ClInclude Include="..\..\include\irrTypes.h" />
+    <ClInclude Include="..\..\include\ISceneUserDataSerializer.h" />
    <ClInclude Include="..\..\include\ITimer.h" />
+    <ClInclude Include="..\..\include\IVertexBuffer.h" />
    <ClInclude Include="..\..\include\Keycodes.h" />
    <ClInclude Include="..\..\include\SIrrCreationParameters.h" />
    <ClInclude Include="..\..\include\SKeyMap.h" />
@ -900,6 +911,7 @@
    <ClInclude Include="..\..\include\rect.h" />
    <ClInclude Include="..\..\include\SOverrideMaterial.h" />
    <ClInclude Include="..\..\include\SSharedMeshBuffer.h" />
+    <ClInclude Include="..\..\include\SVertexIndex.h" />
    <ClInclude Include="..\..\include\SVertexManipulator.h" />
    <ClInclude Include="..\..\include\triangle3d.h" />
    <ClInclude Include="..\..\include\vector2d.h" />
--- a/source/Irrlicht/Irrlicht10.0.vcxproj.filters
+++ b/source/Irrlicht/Irrlicht10.0.vcxproj.filters
@ -1387,6 +1387,42 @@
    <ClInclude Include="..\..\include\irrTypes.h">
      <Filter>include\core</Filter>
    </ClInclude>
+    <ClInclude Include="..\..\include\SVertexIndex.h">
+      <Filter>include\video</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\include\IVertexBuffer.h">
+      <Filter>include\scene</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\include\ISceneUserDataSerializer.h">
+      <Filter>include\scene</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\include\IMemoryReadFile.h">
+      <Filter>include\io</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\include\IIndexBuffer.h">
+      <Filter>include\scene</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\include\IImageWriter.h">
+      <Filter>include\video</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\include\IGUITable.h">
+      <Filter>include\gui</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\include\IFileArchive.h">
+      <Filter>include\io</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\include\IColladaMeshWriter.h">
+      <Filter>include\scene</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\include\IBillboardTextSceneNode.h">
+      <Filter>include\scene</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\include\EShaderTypes.h">
+      <Filter>include\video</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\include\EReadFileType.h">
+      <Filter>include\io</Filter>
+    </ClInclude>
  </ItemGroup>
  <ItemGroup>
    <None Include="..\..\changes.txt">
--- a/source/Irrlicht/S2DVertex.h
+++ b/source/Irrlicht/S2DVertex.h
@ -2,8 +2,8 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h

-#ifndef __S_K_2D_VERTEX_H_INCLUDED__
-#define __S_K_2D_VERTEX_H_INCLUDED__
+#ifndef S_K_2D_VERTEX_H_INCLUDED
+#define S_K_2D_VERTEX_H_INCLUDED

 #include "vector2d.h"

@ -27,4 +27,3 @@ namespace video
 } // end namespace irr

 #endif
-
--- a/source/Irrlicht/S4DVertex.h
+++ b/source/Irrlicht/S4DVertex.h
@ -2,9 +2,8 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h

-
-#ifndef __S_4D_VERTEX_H_INCLUDED__
-#define __S_4D_VERTEX_H_INCLUDED__
+#ifndef S_4D_VERTEX_H_INCLUDED
+#define S_4D_VERTEX_H_INCLUDED

 #include "SoftwareDriver2_compile_config.h"
 #include "SoftwareDriver2_helper.h"
@ -769,7 +768,7 @@ struct sScanConvertData

 #if BURNING_MATERIAL_MAX_LIGHT_TANGENT > 0
 	sVec3Pack_unpack l[BURNING_MATERIAL_MAX_LIGHT_TANGENT][2];		// Light Tangent
-	sVec3Pack_unpack slopeL[BURNING_MATERIAL_MAX_LIGHT_TANGENT][2];	// tanget slope along edges
+	sVec3Pack_unpack slopeL[BURNING_MATERIAL_MAX_LIGHT_TANGENT][2];	// tangent slope along edges
 #endif
 };

@ -872,4 +871,3 @@ REALINLINE void vec4_to_fix(tFixPoint &a,tFixPoint &r, tFixPoint &g, tFixPoint &
 }

 #endif
-
--- a/source/Irrlicht/SoftwareDriver2_compile_config.h
+++ b/source/Irrlicht/SoftwareDriver2_compile_config.h
@ -2,8 +2,8 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h

-#ifndef __S_VIDEO_2_SOFTWARE_COMPILE_CONFIG_H_INCLUDED__
-#define __S_VIDEO_2_SOFTWARE_COMPILE_CONFIG_H_INCLUDED__
+#ifndef S_VIDEO_2_SOFTWARE_COMPILE_CONFIG_H_INCLUDED
+#define S_VIDEO_2_SOFTWARE_COMPILE_CONFIG_H_INCLUDED

 #include "IrrCompileConfig.h"

@ -320,4 +320,4 @@ namespace irr {
 #define ALIGN(x)
 #endif

-#endif // __S_VIDEO_2_SOFTWARE_COMPILE_CONFIG_H_INCLUDED__
+#endif // S_VIDEO_2_SOFTWARE_COMPILE_CONFIG_H_INCLUDED
--- a/source/Irrlicht/SoftwareDriver2_helper.h
+++ b/source/Irrlicht/SoftwareDriver2_helper.h
@ -7,8 +7,8 @@
 	- changed behavior for log2 textures ( replaced multiplies by shift )
 */

-#ifndef __S_VIDEO_2_SOFTWARE_HELPER_H_INCLUDED__
-#define __S_VIDEO_2_SOFTWARE_HELPER_H_INCLUDED__
+#ifndef S_VIDEO_2_SOFTWARE_HELPER_H_INCLUDED
+#define S_VIDEO_2_SOFTWARE_HELPER_H_INCLUDED

 #include "SoftwareDriver2_compile_config.h"
 #include "irrMath.h"
@ -1241,4 +1241,3 @@ static inline int tiny_isequal(const char *s1, const char *s2, size_t n)
 } // end namespace irr

 #endif
-
--- a/source/Irrlicht/os.h
+++ b/source/Irrlicht/os.h
@ -2,8 +2,8 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h

-#ifndef __IRR_OS_H_INCLUDED__
-#define __IRR_OS_H_INCLUDED__
+#ifndef IRR_OS_H_INCLUDED
+#define IRR_OS_H_INCLUDED

 #include "IrrCompileConfig.h" // for endian check
 #include "irrTypes.h"
@ -127,6 +127,4 @@ namespace os
 } // end namespace os
 } // end namespace irr

-
 #endif
-