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

include/CDynamicMeshBuffer.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 __C_DYNAMIC_MESHBUFFER_H_INCLUDED__
+#ifndef IRR_C_DYNAMIC_MESHBUFFER_H_INCLUDED
-#define __C_DYNAMIC_MESHBUFFER_H_INCLUDED__
+#define IRR_C_DYNAMIC_MESHBUFFER_H_INCLUDED
 
 #include "IDynamicMeshBuffer.h"
 
@@ -130,4 +130,3 @@ namespace scene
 } // end namespace irr
 
 #endif
-

include/CIndexBuffer.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 __C_INDEX_BUFFER_H_INCLUDED__
+#ifndef IRR_C_INDEX_BUFFER_H_INCLUDED
-#define __C_INDEX_BUFFER_H_INCLUDED__
+#define IRR_C_INDEX_BUFFER_H_INCLUDED
 
 #include "IIndexBuffer.h"
 
@@ -223,4 +223,3 @@ namespace scene
 } // end namespace irr
 
 #endif
-

include/CMeshBuffer.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 __T_MESH_BUFFER_H_INCLUDED__
+#ifndef IRR_T_MESH_BUFFER_H_INCLUDED
-#define __T_MESH_BUFFER_H_INCLUDED__
+#define IRR_T_MESH_BUFFER_H_INCLUDED
 
 #include "irrArray.h"
 #include "IMeshBuffer.h"
@@ -315,5 +315,3 @@ namespace scene
 } // end namespace irr
 
 #endif
-
-

include/CVertexBuffer.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 __C_VERTEX_BUFFER_H_INCLUDED__
+#ifndef IRR_C_VERTEX_BUFFER_H_INCLUDED
-#define __C_VERTEX_BUFFER_H_INCLUDED__
+#define IRR_C_VERTEX_BUFFER_H_INCLUDED
 
 #include "IVertexBuffer.h"
 
@@ -207,4 +207,3 @@ namespace scene
 } // end namespace irr
 
 #endif
-

include/EAttributes.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 __E_ATTRIBUTES_H_INCLUDED__
+#ifndef IRR_E_ATTRIBUTES_H_INCLUDED
-#define __E_ATTRIBUTES_H_INCLUDED__
+#define IRR_E_ATTRIBUTES_H_INCLUDED
 
 namespace irr
 {

include/ECullingTypes.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 __E_CULLING_TYPES_H_INCLUDED__
+#ifndef IRR_E_CULLING_TYPES_H_INCLUDED
-#define __E_CULLING_TYPES_H_INCLUDED__
+#define IRR_E_CULLING_TYPES_H_INCLUDED
 
 #include "irrTypes.h"
 
@@ -36,6 +36,4 @@ namespace scene
 } // end namespace scene
 } // end namespace irr
 
-
+#endif // IRR_E_CULLING_TYPES_H_INCLUDED
-#endif // __E_CULLING_TYPES_H_INCLUDED__
-

include/EDebugSceneTypes.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 __E_DEBUG_SCENE_TYPES_H_INCLUDED__
+#ifndef IRR_E_DEBUG_SCENE_TYPES_H_INCLUDED
-#define __E_DEBUG_SCENE_TYPES_H_INCLUDED__
+#define IRR_E_DEBUG_SCENE_TYPES_H_INCLUDED
 
 namespace irr
 {
@@ -45,6 +45,4 @@ namespace scene
 } // end namespace scene
 } // end namespace irr
 
-
+#endif // IRR_E_DEBUG_SCENE_TYPES_H_INCLUDED
-#endif // __E_DEBUG_SCENE_TYPES_H_INCLUDED__
-

include/EDeviceTypes.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 __E_DEVICE_TYPES_H_INCLUDED__
+#ifndef IRR_E_DEVICE_TYPES_H_INCLUDED
-#define __E_DEVICE_TYPES_H_INCLUDED__
+#define IRR_E_DEVICE_TYPES_H_INCLUDED
 
 namespace irr
 {
@@ -56,5 +56,4 @@ namespace irr
 
 } // end namespace irr
 
-#endif // __E_DEVICE_TYPES_H_INCLUDED__
+#endif // IRR_E_DEVICE_TYPES_H_INCLUDED
-

include/EDriverFeatures.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 __E_DRIVER_FEATURES_H_INCLUDED__
+#ifndef IRR_E_DRIVER_FEATURES_H_INCLUDED
-#define __E_DRIVER_FEATURES_H_INCLUDED__
+#define IRR_E_DRIVER_FEATURES_H_INCLUDED
 
 namespace irr
 {
@@ -152,6 +152,4 @@ namespace video
 } // end namespace video
 } // end namespace irr
 
-
 #endif
-

include/EDriverTypes.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 __E_DRIVER_TYPES_H_INCLUDED__
+#ifndef IRR_E_DRIVER_TYPES_H_INCLUDED
-#define __E_DRIVER_TYPES_H_INCLUDED__
+#define IRR_E_DRIVER_TYPES_H_INCLUDED
 
 #include "irrTypes.h"
 
@@ -81,5 +81,4 @@ namespace video
 } // end namespace video
 } // end namespace irr
 
-
 #endif

include/EFocusFlags.h

@@ -1,8 +1,8 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
-#ifndef E_FOCUS_FLAGS_H_INCLUDED__
+#ifndef IRR_E_FOCUS_FLAGS_H_INCLUDED
-#define E_FOCUS_FLAGS_H_INCLUDED__
+#define IRR_E_FOCUS_FLAGS_H_INCLUDED
 
 namespace irr
 {
@@ -35,4 +35,3 @@ enum EFOCUS_FLAG
 } // namespace irr
 
 #endif
-

include/EGUIAlignment.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 __E_GUI_ALIGNMENT_H_INCLUDED__
+#ifndef IRR_E_GUI_ALIGNMENT_H_INCLUDED
-#define __E_GUI_ALIGNMENT_H_INCLUDED__
+#define IRR_E_GUI_ALIGNMENT_H_INCLUDED
 
 #include "irrTypes.h"
 
@@ -36,4 +36,4 @@ const c8* const GUIAlignmentNames[] =
 } // namespace gui
 } // namespace irr
 
-#endif // __E_GUI_ALIGNMENT_H_INCLUDED__
+#endif // IRR_E_GUI_ALIGNMENT_H_INCLUDED

include/EGUIElementTypes.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 __E_GUI_ELEMENT_TYPES_H_INCLUDED__
+#ifndef IRR_E_GUI_ELEMENT_TYPES_H_INCLUDED
-#define __E_GUI_ELEMENT_TYPES_H_INCLUDED__
+#define IRR_E_GUI_ELEMENT_TYPES_H_INCLUDED
 
 #include "irrTypes.h"
 
@@ -138,7 +138,3 @@ const c8* const GUIElementTypeNames[] =
 } // end namespace irr
 
 #endif
-
-
-
-

include/EHardwareBufferFlags.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 __E_HARDWARE_BUFFER_FLAGS_INCLUDED__
+#ifndef IRR_E_HARDWARE_BUFFER_FLAGS_INCLUDED
-#define __E_HARDWARE_BUFFER_FLAGS_INCLUDED__
+#define IRR_E_HARDWARE_BUFFER_FLAGS_INCLUDED
 
 namespace irr
 {
@@ -41,4 +41,3 @@ namespace scene
 } // end namespace irr
 
 #endif
-

include/EMaterialFlags.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 __E_MATERIAL_FLAGS_H_INCLUDED__
+#ifndef IRR_E_MATERIAL_FLAGS_H_INCLUDED
-#define __E_MATERIAL_FLAGS_H_INCLUDED__
+#define IRR_E_MATERIAL_FLAGS_H_INCLUDED
 
 namespace irr
 {
@@ -96,6 +96,4 @@ namespace video
 } // end namespace video
 } // end namespace irr
 
-
+#endif // IRR_E_MATERIAL_FLAGS_H_INCLUDED
-#endif // __E_MATERIAL_FLAGS_H_INCLUDED__
-

include/EMaterialTypes.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 __E_MATERIAL_TYPES_H_INCLUDED__
+#ifndef IRR_E_MATERIAL_TYPES_H_INCLUDED
-#define __E_MATERIAL_TYPES_H_INCLUDED__
+#define IRR_E_MATERIAL_TYPES_H_INCLUDED
 
 namespace irr
 {
@@ -229,6 +229,4 @@ namespace video
 } // end namespace video
 } // end namespace irr
 
-
+#endif // IRR_E_MATERIAL_TYPES_H_INCLUDED
-#endif // __E_MATERIAL_TYPES_H_INCLUDED__
-

include/EMeshWriterEnums.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 __E_MESH_WRITER_ENUMS_H_INCLUDED__
+#ifndef IRR_E_MESH_WRITER_ENUMS_H_INCLUDED
-#define __E_MESH_WRITER_ENUMS_H_INCLUDED__
+#define IRR_E_MESH_WRITER_ENUMS_H_INCLUDED
 
 #include "irrTypes.h"
 
@@ -60,6 +60,4 @@ namespace scene
 } // end namespace scene
 } // end namespace irr
 
-
+#endif // IRR_E_MESH_WRITER_ENUMS_H_INCLUDED
-#endif // __E_MESH_WRITER_ENUMS_H_INCLUDED__
-

include/EMessageBoxFlags.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 __E_MESSAGE_BOX_FLAGS_H_INCLUDED__
+#ifndef IRR_E_MESSAGE_BOX_FLAGS_H_INCLUDED
-#define __E_MESSAGE_BOX_FLAGS_H_INCLUDED__
+#define IRR_E_MESSAGE_BOX_FLAGS_H_INCLUDED
 
 namespace irr
 {
@@ -33,4 +33,3 @@ enum EMESSAGE_BOX_FLAG
 } // namespace irr
 
 #endif
-

include/EPrimitiveTypes.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 __E_PRIMITIVE_TYPES_H_INCLUDED__
+#ifndef IRR_E_PRIMITIVE_TYPES_H_INCLUDED
-#define __E_PRIMITIVE_TYPES_H_INCLUDED__
+#define IRR_E_PRIMITIVE_TYPES_H_INCLUDED
 
 namespace irr
 {
@@ -58,4 +58,3 @@ namespace scene
 } // end namespace irr
 
 #endif
-

include/EReadFileType.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 __E_READ_FILE_TYPES_H_INCLUDED__
+#ifndef IRR_E_READ_FILE_TYPES_H_INCLUDED
-#define __E_READ_FILE_TYPES_H_INCLUDED__
+#define IRR_E_READ_FILE_TYPES_H_INCLUDED
 
 #include "irrTypes.h"
 
@@ -30,5 +30,4 @@ namespace io
 } // end namespace io
 } // end namespace irr
 
-
 #endif

include/ESceneNodeAnimatorTypes.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 __E_SCENE_NODE_ANIMATOR_TYPES_H_INCLUDED__
+#ifndef IRR_E_SCENE_NODE_ANIMATOR_TYPES_H_INCLUDED
-#define __E_SCENE_NODE_ANIMATOR_TYPES_H_INCLUDED__
+#define IRR_E_SCENE_NODE_ANIMATOR_TYPES_H_INCLUDED
 
 namespace irr
 {
@@ -53,6 +53,4 @@ namespace scene
 } // end namespace scene
 } // end namespace irr
 
-
 #endif
-

include/ESceneNodeTypes.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 __E_SCENE_NODE_TYPES_H_INCLUDED__
+#ifndef IRR_E_SCENE_NODE_TYPES_H_INCLUDED
-#define __E_SCENE_NODE_TYPES_H_INCLUDED__
+#define IRR_E_SCENE_NODE_TYPES_H_INCLUDED
 
 #include "irrTypes.h"
 
@@ -99,11 +99,7 @@ namespace scene
 		ESNT_ANY            = MAKE_IRR_ID('a','n','y','_')
 	};
 
-
-
 } // end namespace scene
 } // end namespace irr
 
-
 #endif
-

include/EShaderTypes.h

@@ -1,5 +1,5 @@
-#ifndef __E_SHADER_TYPES_H_INCLUDED__
+#ifndef IRR_E_SHADER_TYPES_H_INCLUDED
-#define __E_SHADER_TYPES_H_INCLUDED__
+#define IRR_E_SHADER_TYPES_H_INCLUDED
 
 #include "irrTypes.h"
 
@@ -86,5 +86,4 @@ const c8* const GEOMETRY_SHADER_TYPE_NAMES[] = {
 } // end namespace video
 } // end namespace irr
 
-#endif // __E_SHADER_TYPES_H_INCLUDED__
+#endif // IRR_E_SHADER_TYPES_H_INCLUDED
-

include/ETerrainElements.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 __E_TERRAIN_ELEMENTS_H__
+#ifndef IRR_E_TERRAIN_ELEMENTS_H
-#define __E_TERRAIN_ELEMENTS_H__
+#define IRR_E_TERRAIN_ELEMENTS_H
 
 namespace irr
 {
@@ -33,4 +33,3 @@ namespace scene
 } // end namespace irr
 
 #endif
-

include/IAnimatedMesh.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_ANIMATED_MESH_H_INCLUDED__
+#ifndef IRR_I_ANIMATED_MESH_H_INCLUDED
-#define __I_ANIMATED_MESH_H_INCLUDED__
+#define IRR_I_ANIMATED_MESH_H_INCLUDED
 
 #include "aabbox3d.h"
 #include "IMesh.h"
@@ -71,4 +71,3 @@ namespace scene
 } // end namespace irr
 
 #endif
-

include/IAnimatedMeshMD2.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_ANIMATED_MESH_MD2_H_INCLUDED__
+#ifndef IRR_I_ANIMATED_MESH_MD2_H_INCLUDED
-#define __I_ANIMATED_MESH_MD2_H_INCLUDED__
+#define IRR_I_ANIMATED_MESH_MD2_H_INCLUDED
 
 #include "IAnimatedMesh.h"
 
@@ -76,4 +76,3 @@ namespace scene
 } // end namespace irr
 
 #endif
-

include/IAnimatedMeshMD3.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_ANIMATED_MESH_MD3_H_INCLUDED__
+#ifndef IRR_I_ANIMATED_MESH_MD3_H_INCLUDED
-#define __I_ANIMATED_MESH_MD3_H_INCLUDED__
+#define IRR_I_ANIMATED_MESH_MD3_H_INCLUDED
 
 #include "IAnimatedMesh.h"
 #include "IQ3Shader.h"
@@ -301,4 +301,3 @@ namespace scene
 } // end namespace irr
 
 #endif
-

include/IAnimatedMeshSceneNode.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_ANIMATED_MESH_SCENE_NODE_H_INCLUDED__
+#ifndef IRR_I_ANIMATED_MESH_SCENE_NODE_H_INCLUDED
-#define __I_ANIMATED_MESH_SCENE_NODE_H_INCLUDED__
+#define IRR_I_ANIMATED_MESH_SCENE_NODE_H_INCLUDED
 
 #include "ISceneNode.h"
 #include "IBoneSceneNode.h"
@@ -230,4 +230,3 @@ namespace scene
 } // end namespace irr
 
 #endif
-

include/IAttributeExchangingObject.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_EXCHANGING_OBJECT_H_INCLUDED__
+#ifndef IRR_I_ATTRIBUTE_EXCHANGING_OBJECT_H_INCLUDED
-#define __I_ATTRIBUTE_EXCHANGING_OBJECT_H_INCLUDED__
+#define IRR_I_ATTRIBUTE_EXCHANGING_OBJECT_H_INCLUDED
 
 #include "IReferenceCounted.h"
 
@@ -19,10 +19,10 @@ class IAttributes;
 //! Enumeration flags passed through SAttributeReadWriteOptions to the IAttributeExchangingObject object
 enum E_ATTRIBUTE_READ_WRITE_FLAGS
 {
-	//! Serialization/Deserializion is done for an xml file
+	//! Serialization/deserialization is done for an xml file
 	EARWF_FOR_FILE = 0x00000001,
 
-	//! Serialization/Deserializion is done for an editor property box
+	//! Serialization/deserialization is done for an editor property box
 	EARWF_FOR_EDITOR = 0x00000002,
 
 	//! When writing filenames, relative paths should be used
@@ -68,4 +68,3 @@ public:
 } // end namespace irr
 
 #endif
-

include/IAttributes.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_ATTRIBUTES_H_INCLUDED__
+#ifndef IRR_I_ATTRIBUTES_H_INCLUDED
-#define __I_ATTRIBUTES_H_INCLUDED__
+#define IRR_I_ATTRIBUTES_H_INCLUDED
 
 #include "IReferenceCounted.h"
 #include "SColor.h"
@@ -759,6 +759,3 @@ public:
 } // end namespace irr
 
 #endif
-
-
-

include/IBillboardSceneNode.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_BILLBOARD_SCENE_NODE_H_INCLUDED__
+#ifndef IRR_I_BILLBOARD_SCENE_NODE_H_INCLUDED
-#define __I_BILLBOARD_SCENE_NODE_H_INCLUDED__
+#define IRR_I_BILLBOARD_SCENE_NODE_H_INCLUDED
 
 #include "ISceneNode.h"
 
@@ -79,6 +79,4 @@ public:
 } // end namespace scene
 } // end namespace irr
 
-
 #endif
-

include/IBillboardTextSceneNode.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_BILLBOARD_TEXT_SCENE_NODE_H_INCLUDED__
+#ifndef IRR_I_BILLBOARD_TEXT_SCENE_NODE_H_INCLUDED
-#define __I_BILLBOARD_TEXT_SCENE_NODE_H_INCLUDED__
+#define IRR_I_BILLBOARD_TEXT_SCENE_NODE_H_INCLUDED
 
 #include "IBillboardSceneNode.h"
 
@@ -73,6 +73,4 @@ public:
 } // end namespace scene
 } // end namespace irr
 
-
 #endif
-

include/IBoneSceneNode.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_BONE_SCENE_NODE_H_INCLUDED__
+#ifndef IRR_I_BONE_SCENE_NODE_H_INCLUDED
-#define __I_BONE_SCENE_NODE_H_INCLUDED__
+#define IRR_I_BONE_SCENE_NODE_H_INCLUDED
 
 #include "ISceneNode.h"
 
@@ -105,4 +105,3 @@ namespace scene
 } // end namespace irr
 
 #endif
-

include/ICameraSceneNode.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_CAMERA_SCENE_NODE_H_INCLUDED__
+#ifndef IRR_I_CAMERA_SCENE_NODE_H_INCLUDED
-#define __I_CAMERA_SCENE_NODE_H_INCLUDED__
+#define IRR_I_CAMERA_SCENE_NODE_H_INCLUDED
 
 #include "ISceneNode.h"
 #include "IEventReceiver.h"
@@ -207,4 +207,3 @@ namespace scene
 } // end namespace irr
 
 #endif
-

include/IColladaMeshWriter.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_I_COLLADA_MESH_WRITER_H_INCLUDED__
+#ifndef IRR_I_COLLADA_MESH_WRITER_H_INCLUDED
-#define __IRR_I_COLLADA_MESH_WRITER_H_INCLUDED__
+#define IRR_I_COLLADA_MESH_WRITER_H_INCLUDED
 
 #include "IMeshWriter.h"
 #include "ISceneNode.h"

include/IContextManager.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_I_CONTEXT_MANAGER_H_INCLUDED__
+#ifndef IRR_I_CONTEXT_MANAGER_H_INCLUDED
-#define __IRR_I_CONTEXT_MANAGER_H_INCLUDED__
+#define IRR_I_CONTEXT_MANAGER_H_INCLUDED
 
 #include "SExposedVideoData.h"
 #include "SIrrCreationParameters.h"

include/ICursorControl.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_CURSOR_CONTROL_H_INCLUDED__
+#ifndef IRR_I_CURSOR_CONTROL_H_INCLUDED
-#define __I_CURSOR_CONTROL_H_INCLUDED__
+#define IRR_I_CURSOR_CONTROL_H_INCLUDED
 
 #include "IReferenceCounted.h"
 #include "position2d.h"
@@ -196,4 +196,3 @@ namespace gui
 } // end namespace irr
 
 #endif
-

include/IDummyTransformationSceneNode.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_DUMMY_TRANSFORMATION_SCENE_NODE_H_INCLUDED__
+#ifndef IRR_I_DUMMY_TRANSFORMATION_SCENE_NODE_H_INCLUDED
-#define __I_DUMMY_TRANSFORMATION_SCENE_NODE_H_INCLUDED__
+#define IRR_I_DUMMY_TRANSFORMATION_SCENE_NODE_H_INCLUDED
 
 #include "ISceneNode.h"
 
@@ -39,4 +39,3 @@ public:
 
 
 #endif
-

include/IDynamicMeshBuffer.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_DYNAMIC_MESH_BUFFER_H_INCLUDED__
+#ifndef IRR_I_DYNAMIC_MESH_BUFFER_H_INCLUDED
-#define __I_DYNAMIC_MESH_BUFFER_H_INCLUDED__
+#define IRR_I_DYNAMIC_MESH_BUFFER_H_INCLUDED
 
 #include "IMeshBuffer.h"
 #include "IVertexBuffer.h"
@@ -207,5 +207,3 @@ namespace scene
 } // end namespace irr
 
 #endif
-
-

include/IEventReceiver.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_EVENT_RECEIVER_H_INCLUDED__
+#ifndef IRR_I_EVENT_RECEIVER_H_INCLUDED
-#define __I_EVENT_RECEIVER_H_INCLUDED__
+#define IRR_I_EVENT_RECEIVER_H_INCLUDED
 
 #include "ILogger.h"
 #include "Keycodes.h"
@@ -524,4 +524,3 @@ struct SJoystickInfo
 } // end namespace irr
 
 #endif
-

include/IFileArchive.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_FILE_ARCHIVE_H_INCLUDED__
+#ifndef IRR_I_FILE_ARCHIVE_H_INCLUDED
-#define __I_FILE_ARCHIVE_H_INCLUDED__
+#define IRR_I_FILE_ARCHIVE_H_INCLUDED
 
 #include "IReadFile.h"
 #include "IFileList.h"
@@ -132,4 +132,3 @@ public:
 } // end namespace irr
 
 #endif
-

include/IFileList.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_FILE_LIST_H_INCLUDED__
+#ifndef IRR_I_FILE_LIST_H_INCLUDED
-#define __I_FILE_LIST_H_INCLUDED__
+#define IRR_I_FILE_LIST_H_INCLUDED
 
 #include "IReferenceCounted.h"
 #include "path.h"
@@ -89,6 +89,4 @@ public:
 } // end namespace irr
 } // end namespace io
 
-
 #endif
-

include/IFileSystem.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_FILE_SYSTEM_H_INCLUDED__
+#ifndef IRR_I_FILE_SYSTEM_H_INCLUDED
-#define __I_FILE_SYSTEM_H_INCLUDED__
+#define IRR_I_FILE_SYSTEM_H_INCLUDED
 
 #include "IReferenceCounted.h"
 #include "IXMLReader.h"
@@ -396,4 +396,3 @@ public:
 } // end namespace irr
 
 #endif
-

include/IGPUProgrammingServices.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_GPU_PROGRAMMING_SERVICES_H_INCLUDED__
+#ifndef IRR_I_GPU_PROGRAMMING_SERVICES_H_INCLUDED
-#define __I_GPU_PROGRAMMING_SERVICES_H_INCLUDED__
+#define IRR_I_GPU_PROGRAMMING_SERVICES_H_INCLUDED
 
 #include "EShaderTypes.h"
 #include "EMaterialTypes.h"
@@ -452,4 +452,3 @@ public:
 } // end namespace irr
 
 #endif
-

include/IGUIButton.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_GUI_BUTTON_H_INCLUDED__
+#ifndef IRR_I_GUI_BUTTON_H_INCLUDED
-#define __I_GUI_BUTTON_H_INCLUDED__
+#define IRR_I_GUI_BUTTON_H_INCLUDED
 
 #include "IGUIElement.h"
 
@@ -265,4 +265,3 @@ namespace gui
 } // end namespace irr
 
 #endif
-

include/IGUICheckBox.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_GUI_CHECKBOX_H_INCLUDED__
+#ifndef IRR_I_GUI_CHECKBOX_H_INCLUDED
-#define __I_GUI_CHECKBOX_H_INCLUDED__
+#define IRR_I_GUI_CHECKBOX_H_INCLUDED
 
 #include "IGUIElement.h"
 
@@ -50,4 +50,3 @@ namespace gui
 } // end namespace irr
 
 #endif
-

include/IGUIColorSelectDialog.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_GUI_COLOR_SELECT_DIALOG_H_INCLUDED__
+#ifndef IRR_I_GUI_COLOR_SELECT_DIALOG_H_INCLUDED
-#define __I_GUI_COLOR_SELECT_DIALOG_H_INCLUDED__
+#define IRR_I_GUI_COLOR_SELECT_DIALOG_H_INCLUDED
 
 #include "IGUIElement.h"
 
@@ -34,4 +34,3 @@ namespace gui
 } // end namespace irr
 
 #endif
-

include/IGUIComboBox.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_GUI_COMBO_BOX_H_INCLUDED__
+#ifndef IRR_I_GUI_COMBO_BOX_H_INCLUDED
-#define __I_GUI_COMBO_BOX_H_INCLUDED__
+#define IRR_I_GUI_COMBO_BOX_H_INCLUDED
 
 #include "IGUIElement.h"
 
@@ -71,4 +71,3 @@ namespace gui
 } // end namespace irr
 
 #endif
-

include/IGUIContextMenu.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_GUI_CONTEXT_MENU_H_INCLUDED__
+#ifndef IRR_I_GUI_CONTEXT_MENU_H_INCLUDED
-#define __I_GUI_CONTEXT_MENU_H_INCLUDED__
+#define IRR_I_GUI_CONTEXT_MENU_H_INCLUDED
 
 #include "IGUIElement.h"
 
@@ -159,4 +159,3 @@ namespace gui
 } // end namespace irr
 
 #endif
-

include/IGUIEditBox.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_GUI_EDIT_BOX_H_INCLUDED__
+#ifndef IRR_I_GUI_EDIT_BOX_H_INCLUDED
-#define __I_GUI_EDIT_BOX_H_INCLUDED__
+#define IRR_I_GUI_EDIT_BOX_H_INCLUDED
 
 #include "IGUIElement.h"
 #include "SColor.h"
@@ -154,4 +154,3 @@ namespace gui
 } // end namespace irr
 
 #endif
-

include/IGUIElement.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_GUI_ELEMENT_H_INCLUDED__
+#ifndef IRR_I_GUI_ELEMENT_H_INCLUDED
-#define __I_GUI_ELEMENT_H_INCLUDED__
+#define IRR_I_GUI_ELEMENT_H_INCLUDED
 
 #include "IAttributeExchangingObject.h"
 #include "irrList.h"
@@ -1066,4 +1066,3 @@ protected:
 } // end namespace irr
 
 #endif
-

include/IGUIElementFactory.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_GUI_ELEMENT_FACTORY_H_INCLUDED__
+#ifndef IRR_I_GUI_ELEMENT_FACTORY_H_INCLUDED
-#define __I_GUI_ELEMENT_FACTORY_H_INCLUDED__
+#define IRR_I_GUI_ELEMENT_FACTORY_H_INCLUDED
 
 #include "IReferenceCounted.h"
 #include "EGUIElementTypes.h"
@@ -62,5 +62,4 @@ namespace gui
 } // end namespace gui
 } // end namespace irr
 
-#endif // __I_GUI_ELEMENT_FACTORY_H_INCLUDED__
+#endif // IRR_I_GUI_ELEMENT_FACTORY_H_INCLUDED
-

include/IGUIEnvironment.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_GUI_ENVIRONMENT_H_INCLUDED__
+#ifndef IRR_I_GUI_ENVIRONMENT_H_INCLUDED
-#define __I_GUI_ENVIRONMENT_H_INCLUDED__
+#define IRR_I_GUI_ENVIRONMENT_H_INCLUDED
 
 #include "IReferenceCounted.h"
 #include "IGUISkin.h"
@@ -668,4 +668,3 @@ public:
 } // end namespace irr
 
 #endif
-

include/IGUIFileOpenDialog.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_GUI_FILE_OPEN_DIALOG_H_INCLUDED__
+#ifndef IRR_I_GUI_FILE_OPEN_DIALOG_H_INCLUDED
-#define __I_GUI_FILE_OPEN_DIALOG_H_INCLUDED__
+#define IRR_I_GUI_FILE_OPEN_DIALOG_H_INCLUDED
 
 #include "IGUIElement.h"
 #include "path.h"
@@ -47,4 +47,3 @@ namespace gui
 } // end namespace irr
 
 #endif
-

include/IGUIFont.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_GUI_FONT_H_INCLUDED__
+#ifndef IRR_I_GUI_FONT_H_INCLUDED
-#define __I_GUI_FONT_H_INCLUDED__
+#define IRR_I_GUI_FONT_H_INCLUDED
 
 #include "IReferenceCounted.h"
 #include "SColor.h"
@@ -101,4 +101,3 @@ public:
 } // end namespace irr
 
 #endif
-

include/IGUIFontBitmap.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_GUI_FONT_BITMAP_H_INCLUDED__
+#ifndef IRR_I_GUI_FONT_BITMAP_H_INCLUDED
-#define __I_GUI_FONT_BITMAP_H_INCLUDED__
+#define IRR_I_GUI_FONT_BITMAP_H_INCLUDED
 
 #include "IGUIFont.h"
 
@@ -43,4 +43,3 @@ public:
 } // end namespace irr
 
 #endif
-

include/IGUIImage.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_GUI_IMAGE_H_INCLUDED__
+#ifndef IRR_I_GUI_IMAGE_H_INCLUDED
-#define __I_GUI_IMAGE_H_INCLUDED__
+#define IRR_I_GUI_IMAGE_H_INCLUDED
 
 #include "IGUIElement.h"
 

include/IGUIImageList.h

@@ -1,8 +1,8 @@
 // This file is part of the "Irrlicht Engine".
 // written by Reinhard Ostermeier, reinhard@nospam.r-ostermeier.de
 
-#ifndef __I_GUI_IMAGE_LIST_H_INCLUDED__
+#ifndef IRR_I_GUI_IMAGE_LIST_H_INCLUDED
-#define __I_GUI_IMAGE_LIST_H_INCLUDED__
+#define IRR_I_GUI_IMAGE_LIST_H_INCLUDED
 
 #include "IGUIElement.h"
 #include "rect.h"
@@ -42,4 +42,3 @@ public:
 } // end namespace irr
 
 #endif
-

include/IGUIInOutFader.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_GUI_IN_OUT_FADER_H_INCLUDED__
+#ifndef IRR_I_GUI_IN_OUT_FADER_H_INCLUDED
-#define __I_GUI_IN_OUT_FADER_H_INCLUDED__
+#define IRR_I_GUI_IN_OUT_FADER_H_INCLUDED
 
 #include "IGUIElement.h"
 #include "SColor.h"
@@ -42,7 +42,7 @@ namespace gui
 
 		//! Starts the fade in process.
 		/** In the beginning the whole rect is drawn by the set color
-		(black by default) and at the end of the overgiven time the
+		(black by default) and at the end of the given time the
 		color has faded out.
 		\param time: Time specifying how long it should need to fade in,
 		in milliseconds. */
@@ -64,4 +64,3 @@ namespace gui
 } // end namespace irr
 
 #endif
-

include/IGUIListBox.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_GUI_LIST_BOX_H_INCLUDED__
+#ifndef IRR_I_GUI_LIST_BOX_H_INCLUDED
-#define __I_GUI_LIST_BOX_H_INCLUDED__
+#define IRR_I_GUI_LIST_BOX_H_INCLUDED
 
 #include "IGUIElement.h"
 #include "SColor.h"
@@ -139,4 +139,3 @@ namespace gui
 } // end namespace irr
 
 #endif
-

include/IGUIMeshViewer.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_GUI_MESH_VIEWER_H_INCLUDED__
+#ifndef IRR_I_GUI_MESH_VIEWER_H_INCLUDED
-#define __I_GUI_MESH_VIEWER_H_INCLUDED__
+#define IRR_I_GUI_MESH_VIEWER_H_INCLUDED
 
 #include "IGUIElement.h"
 
@@ -50,4 +50,3 @@ namespace gui
 } // end namespace irr
 
 #endif
-

include/IGUIProfiler.h

@@ -2,8 +2,8 @@
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 // Written by Michael Zeilfelder
 
-#ifndef I_GUI_PROFILER_H_INCLUDED__
+#ifndef IRR_I_GUI_PROFILER_H_INCLUDED
-#define I_GUI_PROFILER_H_INCLUDED__
+#define IRR_I_GUI_PROFILER_H_INCLUDED
 
 #include "IGUIElement.h"
 

include/IGUIScrollBar.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_GUI_SCROLL_BAR_H_INCLUDED__
+#ifndef IRR_I_GUI_SCROLL_BAR_H_INCLUDED
-#define __I_GUI_SCROLL_BAR_H_INCLUDED__
+#define IRR_I_GUI_SCROLL_BAR_H_INCLUDED
 
 #include "IGUIElement.h"
 
@@ -62,4 +62,3 @@ namespace gui
 } // end namespace irr
 
 #endif
-

include/IGUISkin.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_GUI_SKIN_H_INCLUDED__
+#ifndef IRR_I_GUI_SKIN_H_INCLUDED
-#define __I_GUI_SKIN_H_INCLUDED__
+#define IRR_I_GUI_SKIN_H_INCLUDED
 
 #include "IAttributeExchangingObject.h"
 #include "EGUIAlignment.h"
@@ -577,4 +577,3 @@ namespace gui
 } // end namespace irr
 
 #endif
-

include/IGUISpinBox.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_GUI_SPIN_BOX_H_INCLUDED__
+#ifndef IRR_I_GUI_SPIN_BOX_H_INCLUDED
-#define __I_GUI_SPIN_BOX_H_INCLUDED__
+#define IRR_I_GUI_SPIN_BOX_H_INCLUDED
 
 #include "IGUIElement.h"
 
@@ -88,5 +88,4 @@ namespace gui
 } // end namespace gui
 } // end namespace irr
 
-#endif // __I_GUI_SPIN_BOX_H_INCLUDED__
+#endif // IRR_I_GUI_SPIN_BOX_H_INCLUDED
-

include/IGUISpriteBank.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_GUI_SPRITE_BANK_H_INCLUDED__
+#ifndef IRR_I_GUI_SPRITE_BANK_H_INCLUDED
-#define __I_GUI_SPRITE_BANK_H_INCLUDED__
+#define IRR_I_GUI_SPRITE_BANK_H_INCLUDED
 
 #include "IReferenceCounted.h"
 #include "irrArray.h"
@@ -138,5 +138,4 @@ public:
 } // end namespace gui
 } // end namespace irr
 
-#endif // __I_GUI_SPRITE_BANK_H_INCLUDED__
+#endif // IRR_I_GUI_SPRITE_BANK_H_INCLUDED
-

include/IGUIStaticText.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_GUI_STATIC_TEXT_H_INCLUDED__
+#ifndef IRR_I_GUI_STATIC_TEXT_H_INCLUDED
-#define __I_GUI_STATIC_TEXT_H_INCLUDED__
+#define IRR_I_GUI_STATIC_TEXT_H_INCLUDED
 
 #include "IGUIElement.h"
 #include "SColor.h"
@@ -136,4 +136,3 @@ namespace gui
 } // end namespace irr
 
 #endif
-

include/IGUITabControl.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_GUI_TAB_CONTROL_H_INCLUDED__
+#ifndef IRR_I_GUI_TAB_CONTROL_H_INCLUDED
-#define __I_GUI_TAB_CONTROL_H_INCLUDED__
+#define IRR_I_GUI_TAB_CONTROL_H_INCLUDED
 
 #include "IGUIElement.h"
 #include "SColor.h"
@@ -161,4 +161,3 @@ namespace gui
 } // end namespace irr
 
 #endif
-

include/IGUITable.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_GUI_TABLE_H_INCLUDED__
+#ifndef IRR_I_GUI_TABLE_H_INCLUDED
-#define __I_GUI_TABLE_H_INCLUDED__
+#define IRR_I_GUI_TABLE_H_INCLUDED
 
 #include "IGUIElement.h"
 #include "SColor.h"
@@ -232,4 +232,3 @@ namespace gui
 } // end namespace irr
 
 #endif
-

include/IGUIToolbar.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_GUI_TOOL_BAR_H_INCLUDED__
+#ifndef IRR_I_GUI_TOOL_BAR_H_INCLUDED
-#define __I_GUI_TOOL_BAR_H_INCLUDED__
+#define IRR_I_GUI_TOOL_BAR_H_INCLUDED
 
 #include "IGUIElement.h"
 
@@ -37,4 +37,3 @@ namespace gui
 } // end namespace irr
 
 #endif
-

include/IGUITreeView.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_GUI_TREE_VIEW_H_INCLUDED__
+#ifndef IRR_I_GUI_TREE_VIEW_H_INCLUDED
-#define __I_GUI_TREE_VIEW_H_INCLUDED__
+#define IRR_I_GUI_TREE_VIEW_H_INCLUDED
 
 #include "IGUIElement.h"
 #include "IGUIImageList.h"
@@ -295,4 +295,3 @@ namespace gui
 } // end namespace irr
 
 #endif
-

include/IGUIWindow.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_GUI_WINDOW_H_INCLUDED__
+#ifndef IRR_I_GUI_WINDOW_H_INCLUDED
-#define __I_GUI_WINDOW_H_INCLUDED__
+#define IRR_I_GUI_WINDOW_H_INCLUDED
 
 #include "IGUIElement.h"
 #include "EMessageBoxFlags.h"
@@ -71,4 +71,3 @@ namespace gui
 } // end namespace irr
 
 #endif
-

include/IGeometryCreator.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_GEOMETRY_CREATOR_H_INCLUDED__
+#ifndef IRR_I_GEOMETRY_CREATOR_H_INCLUDED
-#define __I_GEOMETRY_CREATOR_H_INCLUDED__
+#define IRR_I_GEOMETRY_CREATOR_H_INCLUDED
 
 #include "IReferenceCounted.h"
 #include "IMesh.h"
@@ -225,5 +225,4 @@ public:
 } // end namespace scene
 } // end namespace irr
 
-#endif // __I_GEOMETRY_CREATOR_H_INCLUDED__
+#endif // IRR_I_GEOMETRY_CREATOR_H_INCLUDED
-

include/IImage.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_H_INCLUDED__
+#ifndef IRR_I_IMAGE_H_INCLUDED
-#define __I_IMAGE_H_INCLUDED__
+#define IRR_I_IMAGE_H_INCLUDED
 
 #include "IReferenceCounted.h"
 #include "position2d.h"
@@ -586,4 +586,3 @@ protected:
 } // end namespace irr
 
 #endif
-

include/IImageLoader.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_SURFACE_LOADER_H_INCLUDED__
+#ifndef IRR_I_SURFACE_LOADER_H_INCLUDED
-#define __I_SURFACE_LOADER_H_INCLUDED__
+#define IRR_I_SURFACE_LOADER_H_INCLUDED
 
 #include "IReferenceCounted.h"
 #include "IImage.h"
@@ -63,4 +63,3 @@ public:
 } // end namespace irr
 
 #endif
-

include/IImageWriter.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_WRITER_H_INCLUDED__
+#ifndef IRR_I_IMAGE_WRITER_H_INCLUDED
-#define _I_IMAGE_WRITER_H_INCLUDED__
+#define IRR_I_IMAGE_WRITER_H_INCLUDED
 
 #include "IReferenceCounted.h"
 #include "irrString.h"
@@ -41,5 +41,4 @@ public:
 } // namespace video
 } // namespace irr
 
-#endif // _I_IMAGE_WRITER_H_INCLUDED__
+#endif // IRR_I_IMAGE_WRITER_H_INCLUDED
-

include/IIndexBuffer.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_INDEX_BUFFER_H_INCLUDED__
+#ifndef IRR_I_INDEX_BUFFER_H_INCLUDED
-#define __I_INDEX_BUFFER_H_INCLUDED__
+#define IRR_I_INDEX_BUFFER_H_INCLUDED
 
 #include "IReferenceCounted.h"
 #include "irrArray.h"
@@ -13,11 +13,6 @@
 namespace irr
 {
 
-namespace video
-{
-
-}
-
 namespace scene
 {
 
@@ -62,4 +57,3 @@ namespace scene
 } // end namespace irr
 
 #endif
-

include/ILightManager.h

@@ -3,8 +3,8 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
-#ifndef __I_LIGHT_MANAGER_H_INCLUDED__
+#ifndef IRR_I_LIGHT_MANAGER_H_INCLUDED
-#define __I_LIGHT_MANAGER_H_INCLUDED__
+#define IRR_I_LIGHT_MANAGER_H_INCLUDED
 
 #include "IReferenceCounted.h"
 #include "irrArray.h"

include/ILightSceneNode.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_LIGHT_SCENE_NODE_H_INCLUDED__
+#ifndef IRR_I_LIGHT_SCENE_NODE_H_INCLUDED
-#define __I_LIGHT_SCENE_NODE_H_INCLUDED__
+#define IRR_I_LIGHT_SCENE_NODE_H_INCLUDED
 
 #include "ISceneNode.h"
 #include "SLight.h"
@@ -84,4 +84,3 @@ public:
 
 
 #endif
-

include/ILogger.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_LOGGER_H_INCLUDED__
+#ifndef IRR_I_LOGGER_H_INCLUDED
-#define __I_LOGGER_H_INCLUDED__
+#define IRR_I_LOGGER_H_INCLUDED
 
 #include "IReferenceCounted.h"
 
@@ -99,4 +99,3 @@ public:
 } // end namespace
 
 #endif
-

include/IMaterialRenderer.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_MATERIAL_RENDERER_H_INCLUDED__
+#ifndef IRR_I_MATERIAL_RENDERER_H_INCLUDED
-#define __I_MATERIAL_RENDERER_H_INCLUDED__
+#define IRR_I_MATERIAL_RENDERER_H_INCLUDED
 
 #include "IReferenceCounted.h"
 #include "SMaterial.h"
@@ -104,4 +104,3 @@ public:
 } // end namespace irr
 
 #endif
-

include/IMaterialRendererServices.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_MATERIAL_RENDERER_SERVICES_H_INCLUDED__
+#ifndef IRR_I_MATERIAL_RENDERER_SERVICES_H_INCLUDED
-#define __I_MATERIAL_RENDERER_SERVICES_H_INCLUDED__
+#define IRR_I_MATERIAL_RENDERER_SERVICES_H_INCLUDED
 
 #include "SMaterial.h"
 #include "S3DVertex.h"
@@ -28,7 +28,7 @@ public:
 	/** Sets all basic renderstates if needed.
 	Basic render states are diffuse, ambient, specular, and emissive color,
 	specular power, bilinear and trilinear filtering, wireframe mode,
-	grouraudshading, lighting, zbuffer, zwriteenable, backfaceculling and
+	gouraudshading, lighting, zbuffer, zwriteenable, backfaceculling and
 	fog enabling.
 	\param material The new material to be used.
 	\param lastMaterial The material used until now.
@@ -144,4 +144,3 @@ public:
 } // end namespace irr
 
 #endif
-

include/IMemoryReadFile.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_MEMORY_READ_FILE_H_INCLUDED__
+#ifndef IRR_I_MEMORY_READ_FILE_H_INCLUDED
-#define __I_MEMORY_READ_FILE_H_INCLUDED__
+#define IRR_I_MEMORY_READ_FILE_H_INCLUDED
 
 #include "IReadFile.h"
 
@@ -28,4 +28,3 @@ namespace io
 } // end namespace irr
 
 #endif
-

include/IMesh.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_MESH_H_INCLUDED__
+#ifndef IRR_I_MESH_H_INCLUDED
-#define __I_MESH_H_INCLUDED__
+#define IRR_I_MESH_H_INCLUDED
 
 #include "IReferenceCounted.h"
 #include "SMaterial.h"
@@ -120,7 +120,7 @@ namespace scene
 		if getMeshType() returns EAMT_MD2 it's safe to cast the
 		IMesh to IAnimatedMeshMD2.
 		Note: It's no longer just about animated meshes, that name has just historical reasons.
-		\returns Type of the mesh  */
+		\return Type of the mesh  */
 		virtual E_ANIMATED_MESH_TYPE getMeshType() const
 		{
 			return EAMT_STATIC;
@@ -131,4 +131,3 @@ namespace scene
 } // end namespace irr
 
 #endif
-

include/IMeshBuffer.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_MESH_BUFFER_H_INCLUDED__
+#ifndef IRR_I_MESH_BUFFER_H_INCLUDED
-#define __I_MESH_BUFFER_H_INCLUDED__
+#define IRR_I_MESH_BUFFER_H_INCLUDED
 
 #include "IReferenceCounted.h"
 #include "SMaterial.h"

include/IMeshCache.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_MESH_CACHE_H_INCLUDED__
+#ifndef IRR_I_MESH_CACHE_H_INCLUDED
-#define __I_MESH_CACHE_H_INCLUDED__
+#define IRR_I_MESH_CACHE_H_INCLUDED
 
 #include "IReferenceCounted.h"
 #include "path.h"
@@ -174,4 +174,3 @@ namespace scene
 } // end namespace irr
 
 #endif
-

include/IMeshLoader.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_MESH_LOADER_H_INCLUDED__
+#ifndef IRR_I_MESH_LOADER_H_INCLUDED
-#define __I_MESH_LOADER_H_INCLUDED__
+#define IRR_I_MESH_LOADER_H_INCLUDED
 
 #include "IReferenceCounted.h"
 #include "path.h"

include/IMeshManipulator.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_MESH_MANIPULATOR_H_INCLUDED__
+#ifndef IRR_I_MESH_MANIPULATOR_H_INCLUDED
-#define __I_MESH_MANIPULATOR_H_INCLUDED__
+#define IRR_I_MESH_MANIPULATOR_H_INCLUDED
 
 #include "IReferenceCounted.h"
 #include "vector3d.h"
@@ -441,5 +441,4 @@ protected:
 } // end namespace scene
 } // end namespace irr
 
-
 #endif

include/IMeshSceneNode.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_MESH_SCENE_NODE_H_INCLUDED__
+#ifndef IRR_I_MESH_SCENE_NODE_H_INCLUDED
-#define __I_MESH_SCENE_NODE_H_INCLUDED__
+#define IRR_I_MESH_SCENE_NODE_H_INCLUDED
 
 #include "ISceneNode.h"
 
@@ -78,6 +78,4 @@ public:
 } // end namespace scene
 } // end namespace irr
 
-
 #endif
-

include/IMeshTextureLoader.h

@@ -1,8 +1,8 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
-#ifndef IRR_I_MESH_TEXTURE_LOADER_H_INCLUDED__
+#ifndef IRR_I_MESH_TEXTURE_LOADER_H_INCLUDED
-#define IRR_I_MESH_TEXTURE_LOADER_H_INCLUDED__
+#define IRR_I_MESH_TEXTURE_LOADER_H_INCLUDED
 
 #include "path.h"
 #include "IReferenceCounted.h"

include/IMeshWriter.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_I_MESH_WRITER_H_INCLUDED__
+#ifndef IRR_I_MESH_WRITER_H_INCLUDED
-#define __IRR_I_MESH_WRITER_H_INCLUDED__
+#define IRR_I_MESH_WRITER_H_INCLUDED
 
 #include "IReferenceCounted.h"
 #include "EMeshWriterEnums.h"
@@ -55,4 +55,3 @@ namespace scene
 } // end namespace
 
 #endif
-

include/IMetaTriangleSelector.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_META_TRIANGLE_SELECTOR_H_INCLUDED__
+#ifndef IRR_I_META_TRIANGLE_SELECTOR_H_INCLUDED
-#define __I_META_TRIANGLE_SELECTOR_H_INCLUDED__
+#define IRR_I_META_TRIANGLE_SELECTOR_H_INCLUDED
 
 #include "ITriangleSelector.h"
 
@@ -38,6 +38,4 @@ public:
 } // end namespace scene
 } // end namespace irr
 
-
 #endif
-

include/IOSOperator.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_OS_OPERATOR_H_INCLUDED__
+#ifndef IRR_I_OS_OPERATOR_H_INCLUDED
-#define __I_OS_OPERATOR_H_INCLUDED__
+#define IRR_I_OS_OPERATOR_H_INCLUDED
 
 #include "IReferenceCounted.h"
 #include "irrString.h"

include/IOctreeSceneNode.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_OCTREE_SCENE_NODE_H_INCLUDED__
+#ifndef IRR_I_OCTREE_SCENE_NODE_H_INCLUDED
-#define __I_OCTREE_SCENE_NODE_H_INCLUDED__
+#define IRR_I_OCTREE_SCENE_NODE_H_INCLUDED
 
 #include "IMeshSceneNode.h"
 
@@ -78,6 +78,4 @@ public:
 } // end namespace scene
 } // end namespace irr
 
-
 #endif
-

include/IParticleAffector.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_PARTICLE_AFFECTOR_H_INCLUDED__
+#ifndef IRR_I_PARTICLE_AFFECTOR_H_INCLUDED
-#define __I_PARTICLE_AFFECTOR_H_INCLUDED__
+#define IRR_I_PARTICLE_AFFECTOR_H_INCLUDED
 
 #include "IAttributeExchangingObject.h"
 #include "SParticle.h"
@@ -67,6 +67,4 @@ protected:
 } // end namespace scene
 } // end namespace irr
 
-
 #endif
-

include/IParticleAnimatedMeshSceneNodeEmitter.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_PARTICLE_ANIMATED_MESH_SCENE_NODE_EMITTER_H_INCLUDED__
+#ifndef IRR_I_PARTICLE_ANIMATED_MESH_SCENE_NODE_EMITTER_H_INCLUDED
-#define __I_PARTICLE_ANIMATED_MESH_SCENE_NODE_EMITTER_H_INCLUDED__
+#define IRR_I_PARTICLE_ANIMATED_MESH_SCENE_NODE_EMITTER_H_INCLUDED
 
 #include "IParticleEmitter.h"
 #include "IAnimatedMeshSceneNode.h"
@@ -49,6 +49,4 @@ public:
 } // end namespace scene
 } // end namespace irr
 
-
+#endif // IRR_I_PARTICLE_ANIMATED_MESH_SCENE_NODE_EMITTER_H_INCLUDED
-#endif // __I_PARTICLE_ANIMATED_MESH_SCENE_NODE_EMITTER_H_INCLUDED__
-

include/IParticleAttractionAffector.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_PARTICLE_ATTRACTION_AFFECTOR_H_INCLUDED__
+#ifndef IRR_I_PARTICLE_ATTRACTION_AFFECTOR_H_INCLUDED
-#define __I_PARTICLE_ATTRACTION_AFFECTOR_H_INCLUDED__
+#define IRR_I_PARTICLE_ATTRACTION_AFFECTOR_H_INCLUDED
 
 #include "IParticleAffector.h"
 
@@ -60,6 +60,4 @@ public:
 } // end namespace scene
 } // end namespace irr
 
-
+#endif // IRR_I_PARTICLE_ATTRACTION_AFFECTOR_H_INCLUDED
-#endif // __I_PARTICLE_ATTRACTION_AFFECTOR_H_INCLUDED__
-

include/IParticleBoxEmitter.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_PARTICLE_BOX_EMITTER_H_INCLUDED__
+#ifndef IRR_I_PARTICLE_BOX_EMITTER_H_INCLUDED
-#define __I_PARTICLE_BOX_EMITTER_H_INCLUDED__
+#define IRR_I_PARTICLE_BOX_EMITTER_H_INCLUDED
 
 #include "IParticleEmitter.h"
 #include "aabbox3d.h"
@@ -31,6 +31,4 @@ public:
 } // end namespace scene
 } // end namespace irr
 
-
 #endif
-

include/IParticleCylinderEmitter.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_PARTICLE_CYLINDER_EMITTER_H_INCLUDED__
+#ifndef IRR_I_PARTICLE_CYLINDER_EMITTER_H_INCLUDED
-#define __I_PARTICLE_CYLINDER_EMITTER_H_INCLUDED__
+#define IRR_I_PARTICLE_CYLINDER_EMITTER_H_INCLUDED
 
 #include "IParticleEmitter.h"
 
@@ -54,6 +54,4 @@ public:
 } // end namespace scene
 } // end namespace irr
 
-
 #endif
-

include/IParticleEmitter.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_PARTICLE_EMITTER_H_INCLUDED__
+#ifndef IRR_I_PARTICLE_EMITTER_H_INCLUDED
-#define __I_PARTICLE_EMITTER_H_INCLUDED__
+#define IRR_I_PARTICLE_EMITTER_H_INCLUDED
 
 #include "IAttributeExchangingObject.h"
 #include "SParticle.h"
@@ -123,6 +123,4 @@ typedef IParticleEmitter IParticlePointEmitter;
 } // end namespace scene
 } // end namespace irr
 
-
 #endif
-