From 0c6385cb92c8544e1c81ee1dcd830d0e8857ad5b Mon Sep 17 00:00:00 2001 From: cutealien Date: Fri, 27 Aug 2021 15:03:34 +0000 Subject: [PATCH] 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 | 5 ++- include/CIndexBuffer.h | 5 ++- include/CMeshBuffer.h | 6 ++-- include/CVertexBuffer.h | 5 ++- include/EAttributes.h | 4 +-- include/ECullingTypes.h | 8 ++--- include/EDebugSceneTypes.h | 8 ++--- include/EDeviceTypes.h | 7 ++-- include/EDriverFeatures.h | 6 ++-- include/EDriverTypes.h | 5 ++- include/EFocusFlags.h | 5 ++- include/EGUIAlignment.h | 6 ++-- include/EGUIElementTypes.h | 8 ++--- include/EHardwareBufferFlags.h | 5 ++- include/EMaterialFlags.h | 8 ++--- include/EMaterialTypes.h | 8 ++--- include/EMeshWriterEnums.h | 8 ++--- include/EMessageBoxFlags.h | 5 ++- include/EPrimitiveTypes.h | 5 ++- include/EReadFileType.h | 5 ++- include/ESceneNodeAnimatorTypes.h | 6 ++-- include/ESceneNodeTypes.h | 8 ++--- include/EShaderTypes.h | 7 ++-- include/ETerrainElements.h | 5 ++- include/IAnimatedMesh.h | 5 ++- include/IAnimatedMeshMD2.h | 5 ++- include/IAnimatedMeshMD3.h | 5 ++- include/IAnimatedMeshSceneNode.h | 5 ++- include/IAttributeExchangingObject.h | 9 +++-- include/IAttributes.h | 7 ++-- include/IBillboardSceneNode.h | 6 ++-- include/IBillboardTextSceneNode.h | 6 ++-- include/IBoneSceneNode.h | 5 ++- include/ICameraSceneNode.h | 5 ++- include/IColladaMeshWriter.h | 4 +-- include/IContextManager.h | 4 +-- include/ICursorControl.h | 5 ++- include/IDummyTransformationSceneNode.h | 5 ++- include/IDynamicMeshBuffer.h | 6 ++-- include/IEventReceiver.h | 5 ++- include/IFileArchive.h | 5 ++- include/IFileList.h | 6 ++-- include/IFileSystem.h | 5 ++- include/IGPUProgrammingServices.h | 5 ++- include/IGUIButton.h | 5 ++- include/IGUICheckBox.h | 5 ++- include/IGUIColorSelectDialog.h | 5 ++- include/IGUIComboBox.h | 5 ++- include/IGUIContextMenu.h | 5 ++- include/IGUIEditBox.h | 5 ++- include/IGUIElement.h | 5 ++- include/IGUIElementFactory.h | 7 ++-- include/IGUIEnvironment.h | 5 ++- include/IGUIFileOpenDialog.h | 5 ++- include/IGUIFont.h | 5 ++- include/IGUIFontBitmap.h | 5 ++- include/IGUIImage.h | 4 +-- include/IGUIImageList.h | 5 ++- include/IGUIInOutFader.h | 7 ++-- include/IGUIListBox.h | 5 ++- include/IGUIMeshViewer.h | 5 ++- include/IGUIProfiler.h | 4 +-- include/IGUIScrollBar.h | 5 ++- include/IGUISkin.h | 5 ++- include/IGUISpinBox.h | 7 ++-- include/IGUISpriteBank.h | 7 ++-- include/IGUIStaticText.h | 5 ++- include/IGUITabControl.h | 5 ++- include/IGUITable.h | 5 ++- include/IGUIToolbar.h | 5 ++- include/IGUITreeView.h | 5 ++- include/IGUIWindow.h | 5 ++- include/IGeometryCreator.h | 7 ++-- include/IImage.h | 5 ++- include/IImageLoader.h | 5 ++- include/IImageWriter.h | 7 ++-- include/IIndexBuffer.h | 10 ++---- include/ILightManager.h | 4 +-- include/ILightSceneNode.h | 5 ++- include/ILogger.h | 5 ++- include/IMaterialRenderer.h | 5 ++- include/IMaterialRendererServices.h | 7 ++-- include/IMemoryReadFile.h | 5 ++- include/IMesh.h | 7 ++-- include/IMeshBuffer.h | 4 +-- include/IMeshCache.h | 5 ++- include/IMeshLoader.h | 4 +-- include/IMeshManipulator.h | 5 ++- include/IMeshSceneNode.h | 6 ++-- include/IMeshTextureLoader.h | 4 +-- include/IMeshWriter.h | 5 ++- include/IMetaTriangleSelector.h | 6 ++-- include/IOSOperator.h | 4 +-- include/IOctreeSceneNode.h | 6 ++-- include/IParticleAffector.h | 6 ++-- .../IParticleAnimatedMeshSceneNodeEmitter.h | 8 ++--- include/IParticleAttractionAffector.h | 8 ++--- include/IParticleBoxEmitter.h | 6 ++-- include/IParticleCylinderEmitter.h | 6 ++-- include/IParticleEmitter.h | 6 ++-- include/IParticleFadeOutAffector.h | 6 ++-- include/IParticleGravityAffector.h | 8 ++--- include/IParticleMeshEmitter.h | 6 ++-- include/IParticleRingEmitter.h | 6 ++-- include/IParticleRotationAffector.h | 8 ++--- include/IParticleSphereEmitter.h | 6 ++-- include/IParticleSystemSceneNode.h | 4 +-- include/IProfiler.h | 6 ++-- include/IQ3LevelMesh.h | 5 ++- include/IQ3Shader.h | 5 ++- include/IRandomizer.h | 6 ++-- include/IReadFile.h | 5 ++- include/IReferenceCounted.h | 5 ++- include/IRenderTarget.h | 4 +-- include/ISceneCollisionManager.h | 4 +-- include/ISceneLoader.h | 5 ++- include/ISceneManager.h | 5 ++- include/ISceneNode.h | 5 ++- include/ISceneNodeAnimator.h | 7 ++-- include/ISceneNodeAnimatorCameraFPS.h | 5 ++- include/ISceneNodeAnimatorCameraMaya.h | 5 ++- include/ISceneNodeAnimatorCollisionResponse.h | 5 ++- include/ISceneNodeAnimatorFactory.h | 5 ++- include/ISceneNodeFactory.h | 5 ++- include/ISceneUserDataSerializer.h | 5 ++- include/IShaderConstantSetCallBack.h | 5 ++- include/IShadowVolumeSceneNode.h | 5 ++- include/ISkinnedMesh.h | 5 ++- include/ITerrainSceneNode.h | 7 ++-- include/ITextSceneNode.h | 6 ++-- include/ITexture.h | 5 ++- include/ITimer.h | 4 +-- include/ITriangleSelector.h | 4 +-- include/IVertexBuffer.h | 5 ++- include/IVideoDriver.h | 4 +-- include/IVideoModeList.h | 6 ++-- include/IVolumeLightSceneNode.h | 4 +-- include/IWriteFile.h | 5 ++- include/IXMLReader.h | 5 ++- include/IXMLWriter.h | 4 +-- include/IrrCompileConfig.h | 7 ++-- include/IrrlichtDevice.h | 5 ++- include/Keycodes.h | 5 ++- include/S3DVertex.h | 5 ++- include/SAnimatedMesh.h | 5 ++- include/SColor.h | 4 +-- include/SExposedVideoData.h | 6 ++-- include/SIrrCreationParameters.h | 5 ++- include/SKeyMap.h | 5 ++- include/SLight.h | 4 +-- include/SMaterial.h | 4 +-- include/SMaterialLayer.h | 6 ++-- include/SMesh.h | 5 ++- include/SOverrideMaterial.h | 7 ++-- include/SParticle.h | 5 ++- include/SSharedMeshBuffer.h | 5 ++- include/SSkinMeshBuffer.h | 5 ++- include/SVertexIndex.h | 5 ++- include/SVertexManipulator.h | 5 ++- include/SViewFrustum.h | 5 ++- include/SceneParameters.h | 5 ++- include/aabbox3d.h | 4 +-- include/coreutil.h | 4 +-- include/dimension2d.h | 4 +-- include/driverChoice.h | 4 +-- include/exampleHelper.h | 4 +-- include/fast_atof.h | 5 ++- include/heapsort.h | 4 +-- include/irrAllocator.h | 4 +-- include/irrArray.h | 4 +-- include/irrList.h | 4 +-- include/irrMap.h | 7 ++-- include/irrMath.h | 4 +-- include/irrString.h | 4 +-- include/irrXML.h | 7 ++-- include/irrlicht.h | 5 ++- include/leakHunter.h | 4 +-- include/line2d.h | 4 +-- include/line3d.h | 4 +-- include/matrix4.h | 4 +-- include/path.h | 6 ++-- include/plane3d.h | 4 +-- include/position2d.h | 7 ++-- include/quaternion.h | 5 ++- include/rect.h | 5 ++- include/triangle3d.h | 5 ++- include/vector2d.h | 5 ++- include/vector3d.h | 5 ++- source/Irrlicht/CB3DMeshWriter.h | 4 +-- source/Irrlicht/CColladaMeshWriter.h | 4 +-- source/Irrlicht/CIrrMeshWriter.h | 5 ++- source/Irrlicht/COBJMeshWriter.h | 5 ++- source/Irrlicht/CPLYMeshWriter.h | 4 +-- source/Irrlicht/CSTLMeshWriter.h | 5 ++- source/Irrlicht/CVideoModeList.h | 6 ++-- source/Irrlicht/CXMLReaderImpl.h | 4 +-- source/Irrlicht/IAttribute.h | 4 +-- source/Irrlicht/IBurningShader.h | 5 ++- source/Irrlicht/IDepthBuffer.h | 5 ++- source/Irrlicht/IImagePresenter.h | 5 ++- source/Irrlicht/ISceneNodeAnimatorFinishing.h | 4 +-- source/Irrlicht/ITriangleRenderer.h | 5 ++- source/Irrlicht/IZBuffer.h | 5 ++- source/Irrlicht/Irrlicht10.0.vcxproj | 12 +++++++ source/Irrlicht/Irrlicht10.0.vcxproj.filters | 36 +++++++++++++++++++ source/Irrlicht/S2DVertex.h | 5 ++- source/Irrlicht/S4DVertex.h | 8 ++--- .../Irrlicht/SoftwareDriver2_compile_config.h | 6 ++-- source/Irrlicht/SoftwareDriver2_helper.h | 5 ++- source/Irrlicht/os.h | 6 ++-- tools/IrrFontTool/newFontTool/CFontTool.h | 6 ++-- 211 files changed, 502 insertions(+), 659 deletions(-) diff --git a/include/CDynamicMeshBuffer.h b/include/CDynamicMeshBuffer.h index 550c5f2f..cb776d2f 100644 --- a/include/CDynamicMeshBuffer.h +++ b/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__ -#define __C_DYNAMIC_MESHBUFFER_H_INCLUDED__ +#ifndef IRR_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 - diff --git a/include/CIndexBuffer.h b/include/CIndexBuffer.h index 2b75b501..152fb040 100644 --- a/include/CIndexBuffer.h +++ b/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__ -#define __C_INDEX_BUFFER_H_INCLUDED__ +#ifndef IRR_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 - diff --git a/include/CMeshBuffer.h b/include/CMeshBuffer.h index f6591e5d..b5cbcb25 100644 --- a/include/CMeshBuffer.h +++ b/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__ -#define __T_MESH_BUFFER_H_INCLUDED__ +#ifndef IRR_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 - - diff --git a/include/CVertexBuffer.h b/include/CVertexBuffer.h index 8eae7991..2a984268 100644 --- a/include/CVertexBuffer.h +++ b/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__ -#define __C_VERTEX_BUFFER_H_INCLUDED__ +#ifndef IRR_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 - diff --git a/include/EAttributes.h b/include/EAttributes.h index 51f102b2..22bc8914 100644 --- a/include/EAttributes.h +++ b/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__ -#define __E_ATTRIBUTES_H_INCLUDED__ +#ifndef IRR_E_ATTRIBUTES_H_INCLUDED +#define IRR_E_ATTRIBUTES_H_INCLUDED namespace irr { diff --git a/include/ECullingTypes.h b/include/ECullingTypes.h index eeb3d912..86b7d120 100644 --- a/include/ECullingTypes.h +++ b/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__ -#define __E_CULLING_TYPES_H_INCLUDED__ +#ifndef IRR_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 // __E_CULLING_TYPES_H_INCLUDED__ - +#endif // IRR_E_CULLING_TYPES_H_INCLUDED diff --git a/include/EDebugSceneTypes.h b/include/EDebugSceneTypes.h index 987b7902..ce542b18 100644 --- a/include/EDebugSceneTypes.h +++ b/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__ -#define __E_DEBUG_SCENE_TYPES_H_INCLUDED__ +#ifndef IRR_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 // __E_DEBUG_SCENE_TYPES_H_INCLUDED__ - +#endif // IRR_E_DEBUG_SCENE_TYPES_H_INCLUDED diff --git a/include/EDeviceTypes.h b/include/EDeviceTypes.h index 32f9211a..a230a42e 100644 --- a/include/EDeviceTypes.h +++ b/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__ -#define __E_DEVICE_TYPES_H_INCLUDED__ +#ifndef IRR_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 diff --git a/include/EDriverFeatures.h b/include/EDriverFeatures.h index 6d7fee40..651333ce 100644 --- a/include/EDriverFeatures.h +++ b/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__ -#define __E_DRIVER_FEATURES_H_INCLUDED__ +#ifndef IRR_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 - diff --git a/include/EDriverTypes.h b/include/EDriverTypes.h index 16fefb47..e5fe312b 100644 --- a/include/EDriverTypes.h +++ b/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__ -#define __E_DRIVER_TYPES_H_INCLUDED__ +#ifndef IRR_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 diff --git a/include/EFocusFlags.h b/include/EFocusFlags.h index c5180024..e511dc6a 100644 --- a/include/EFocusFlags.h +++ b/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__ -#define E_FOCUS_FLAGS_H_INCLUDED__ +#ifndef IRR_E_FOCUS_FLAGS_H_INCLUDED +#define IRR_E_FOCUS_FLAGS_H_INCLUDED namespace irr { @@ -35,4 +35,3 @@ enum EFOCUS_FLAG } // namespace irr #endif - diff --git a/include/EGUIAlignment.h b/include/EGUIAlignment.h index 4876503b..436298f3 100644 --- a/include/EGUIAlignment.h +++ b/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__ -#define __E_GUI_ALIGNMENT_H_INCLUDED__ +#ifndef IRR_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 diff --git a/include/EGUIElementTypes.h b/include/EGUIElementTypes.h index a26a02cf..1051723d 100644 --- a/include/EGUIElementTypes.h +++ b/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__ -#define __E_GUI_ELEMENT_TYPES_H_INCLUDED__ +#ifndef IRR_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 - - - - diff --git a/include/EHardwareBufferFlags.h b/include/EHardwareBufferFlags.h index d7594555..d29b0e18 100644 --- a/include/EHardwareBufferFlags.h +++ b/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__ -#define __E_HARDWARE_BUFFER_FLAGS_INCLUDED__ +#ifndef IRR_E_HARDWARE_BUFFER_FLAGS_INCLUDED +#define IRR_E_HARDWARE_BUFFER_FLAGS_INCLUDED namespace irr { @@ -41,4 +41,3 @@ namespace scene } // end namespace irr #endif - diff --git a/include/EMaterialFlags.h b/include/EMaterialFlags.h index 04ef13ea..d3ee86d8 100644 --- a/include/EMaterialFlags.h +++ b/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__ -#define __E_MATERIAL_FLAGS_H_INCLUDED__ +#ifndef IRR_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 // __E_MATERIAL_FLAGS_H_INCLUDED__ - +#endif // IRR_E_MATERIAL_FLAGS_H_INCLUDED diff --git a/include/EMaterialTypes.h b/include/EMaterialTypes.h index cdbd4997..26b5f9e2 100644 --- a/include/EMaterialTypes.h +++ b/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__ -#define __E_MATERIAL_TYPES_H_INCLUDED__ +#ifndef IRR_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 // __E_MATERIAL_TYPES_H_INCLUDED__ - +#endif // IRR_E_MATERIAL_TYPES_H_INCLUDED diff --git a/include/EMeshWriterEnums.h b/include/EMeshWriterEnums.h index 16e1e376..22a2a127 100644 --- a/include/EMeshWriterEnums.h +++ b/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__ -#define __E_MESH_WRITER_ENUMS_H_INCLUDED__ +#ifndef IRR_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 // __E_MESH_WRITER_ENUMS_H_INCLUDED__ - +#endif // IRR_E_MESH_WRITER_ENUMS_H_INCLUDED diff --git a/include/EMessageBoxFlags.h b/include/EMessageBoxFlags.h index 06468043..e51cf47e 100644 --- a/include/EMessageBoxFlags.h +++ b/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__ -#define __E_MESSAGE_BOX_FLAGS_H_INCLUDED__ +#ifndef IRR_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 - diff --git a/include/EPrimitiveTypes.h b/include/EPrimitiveTypes.h index ae8f5f50..3134821e 100644 --- a/include/EPrimitiveTypes.h +++ b/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__ -#define __E_PRIMITIVE_TYPES_H_INCLUDED__ +#ifndef IRR_E_PRIMITIVE_TYPES_H_INCLUDED +#define IRR_E_PRIMITIVE_TYPES_H_INCLUDED namespace irr { @@ -58,4 +58,3 @@ namespace scene } // end namespace irr #endif - diff --git a/include/EReadFileType.h b/include/EReadFileType.h index b4124ccf..e9989603 100644 --- a/include/EReadFileType.h +++ b/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__ -#define __E_READ_FILE_TYPES_H_INCLUDED__ +#ifndef IRR_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 diff --git a/include/ESceneNodeAnimatorTypes.h b/include/ESceneNodeAnimatorTypes.h index f771d128..8094457a 100644 --- a/include/ESceneNodeAnimatorTypes.h +++ b/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__ -#define __E_SCENE_NODE_ANIMATOR_TYPES_H_INCLUDED__ +#ifndef IRR_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 - diff --git a/include/ESceneNodeTypes.h b/include/ESceneNodeTypes.h index 0eeab92a..b7e8f249 100644 --- a/include/ESceneNodeTypes.h +++ b/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__ -#define __E_SCENE_NODE_TYPES_H_INCLUDED__ +#ifndef IRR_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 - diff --git a/include/EShaderTypes.h b/include/EShaderTypes.h index 29eef56a..0b3afa9e 100644 --- a/include/EShaderTypes.h +++ b/include/EShaderTypes.h @@ -1,5 +1,5 @@ -#ifndef __E_SHADER_TYPES_H_INCLUDED__ -#define __E_SHADER_TYPES_H_INCLUDED__ +#ifndef IRR_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 diff --git a/include/ETerrainElements.h b/include/ETerrainElements.h index 5bb48c0a..24ec4b14 100644 --- a/include/ETerrainElements.h +++ b/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__ -#define __E_TERRAIN_ELEMENTS_H__ +#ifndef IRR_E_TERRAIN_ELEMENTS_H +#define IRR_E_TERRAIN_ELEMENTS_H namespace irr { @@ -33,4 +33,3 @@ namespace scene } // end namespace irr #endif - diff --git a/include/IAnimatedMesh.h b/include/IAnimatedMesh.h index 4f9f0867..ab9be06d 100644 --- a/include/IAnimatedMesh.h +++ b/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__ -#define __I_ANIMATED_MESH_H_INCLUDED__ +#ifndef IRR_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 - diff --git a/include/IAnimatedMeshMD2.h b/include/IAnimatedMeshMD2.h index 6830f37e..071025e9 100644 --- a/include/IAnimatedMeshMD2.h +++ b/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__ -#define __I_ANIMATED_MESH_MD2_H_INCLUDED__ +#ifndef IRR_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 - diff --git a/include/IAnimatedMeshMD3.h b/include/IAnimatedMeshMD3.h index 08c897d0..6612516b 100644 --- a/include/IAnimatedMeshMD3.h +++ b/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__ -#define __I_ANIMATED_MESH_MD3_H_INCLUDED__ +#ifndef IRR_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 - diff --git a/include/IAnimatedMeshSceneNode.h b/include/IAnimatedMeshSceneNode.h index 5a399039..a69b7b5f 100644 --- a/include/IAnimatedMeshSceneNode.h +++ b/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__ -#define __I_ANIMATED_MESH_SCENE_NODE_H_INCLUDED__ +#ifndef IRR_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 - diff --git a/include/IAttributeExchangingObject.h b/include/IAttributeExchangingObject.h index 5b13cdba..25cdbbec 100644 --- a/include/IAttributeExchangingObject.h +++ b/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__ -#define __I_ATTRIBUTE_EXCHANGING_OBJECT_H_INCLUDED__ +#ifndef IRR_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 - diff --git a/include/IAttributes.h b/include/IAttributes.h index 507561d8..cd3086cf 100644 --- a/include/IAttributes.h +++ b/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__ -#define __I_ATTRIBUTES_H_INCLUDED__ +#ifndef IRR_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 - - - diff --git a/include/IBillboardSceneNode.h b/include/IBillboardSceneNode.h index 63846561..ee7a3327 100644 --- a/include/IBillboardSceneNode.h +++ b/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__ -#define __I_BILLBOARD_SCENE_NODE_H_INCLUDED__ +#ifndef IRR_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 - diff --git a/include/IBillboardTextSceneNode.h b/include/IBillboardTextSceneNode.h index 0526b63f..6f104985 100644 --- a/include/IBillboardTextSceneNode.h +++ b/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__ -#define __I_BILLBOARD_TEXT_SCENE_NODE_H_INCLUDED__ +#ifndef IRR_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 - diff --git a/include/IBoneSceneNode.h b/include/IBoneSceneNode.h index f68fd1da..0a4a9b16 100644 --- a/include/IBoneSceneNode.h +++ b/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__ -#define __I_BONE_SCENE_NODE_H_INCLUDED__ +#ifndef IRR_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 - diff --git a/include/ICameraSceneNode.h b/include/ICameraSceneNode.h index fd7bf773..feb3cefc 100644 --- a/include/ICameraSceneNode.h +++ b/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__ -#define __I_CAMERA_SCENE_NODE_H_INCLUDED__ +#ifndef IRR_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 - diff --git a/include/IColladaMeshWriter.h b/include/IColladaMeshWriter.h index a8c6dd24..0c700810 100644 --- a/include/IColladaMeshWriter.h +++ b/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__ -#define __IRR_I_COLLADA_MESH_WRITER_H_INCLUDED__ +#ifndef IRR_I_COLLADA_MESH_WRITER_H_INCLUDED +#define IRR_I_COLLADA_MESH_WRITER_H_INCLUDED #include "IMeshWriter.h" #include "ISceneNode.h" diff --git a/include/IContextManager.h b/include/IContextManager.h index 1937190e..cd59168b 100644 --- a/include/IContextManager.h +++ b/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__ -#define __IRR_I_CONTEXT_MANAGER_H_INCLUDED__ +#ifndef IRR_I_CONTEXT_MANAGER_H_INCLUDED +#define IRR_I_CONTEXT_MANAGER_H_INCLUDED #include "SExposedVideoData.h" #include "SIrrCreationParameters.h" diff --git a/include/ICursorControl.h b/include/ICursorControl.h index 13c99c45..4a9c6171 100644 --- a/include/ICursorControl.h +++ b/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__ -#define __I_CURSOR_CONTROL_H_INCLUDED__ +#ifndef IRR_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 - diff --git a/include/IDummyTransformationSceneNode.h b/include/IDummyTransformationSceneNode.h index 60dfe208..7e70e265 100644 --- a/include/IDummyTransformationSceneNode.h +++ b/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__ -#define __I_DUMMY_TRANSFORMATION_SCENE_NODE_H_INCLUDED__ +#ifndef IRR_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 - diff --git a/include/IDynamicMeshBuffer.h b/include/IDynamicMeshBuffer.h index fabd2207..00ebbaaf 100644 --- a/include/IDynamicMeshBuffer.h +++ b/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__ -#define __I_DYNAMIC_MESH_BUFFER_H_INCLUDED__ +#ifndef IRR_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 - - diff --git a/include/IEventReceiver.h b/include/IEventReceiver.h index 6dd7f9b0..516984b2 100644 --- a/include/IEventReceiver.h +++ b/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__ -#define __I_EVENT_RECEIVER_H_INCLUDED__ +#ifndef IRR_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 - diff --git a/include/IFileArchive.h b/include/IFileArchive.h index 613e7013..27341c43 100644 --- a/include/IFileArchive.h +++ b/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__ -#define __I_FILE_ARCHIVE_H_INCLUDED__ +#ifndef IRR_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 - diff --git a/include/IFileList.h b/include/IFileList.h index 2d0af466..140e69d9 100644 --- a/include/IFileList.h +++ b/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__ -#define __I_FILE_LIST_H_INCLUDED__ +#ifndef IRR_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 - diff --git a/include/IFileSystem.h b/include/IFileSystem.h index 64c0d87a..b3e8e4f6 100644 --- a/include/IFileSystem.h +++ b/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__ -#define __I_FILE_SYSTEM_H_INCLUDED__ +#ifndef IRR_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 - diff --git a/include/IGPUProgrammingServices.h b/include/IGPUProgrammingServices.h index abe910fc..70ebe539 100644 --- a/include/IGPUProgrammingServices.h +++ b/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__ -#define __I_GPU_PROGRAMMING_SERVICES_H_INCLUDED__ +#ifndef IRR_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 - diff --git a/include/IGUIButton.h b/include/IGUIButton.h index 88eb97bb..1a461c6c 100644 --- a/include/IGUIButton.h +++ b/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__ -#define __I_GUI_BUTTON_H_INCLUDED__ +#ifndef IRR_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 - diff --git a/include/IGUICheckBox.h b/include/IGUICheckBox.h index 3c0c8e3d..7a9958ff 100644 --- a/include/IGUICheckBox.h +++ b/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__ -#define __I_GUI_CHECKBOX_H_INCLUDED__ +#ifndef IRR_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 - diff --git a/include/IGUIColorSelectDialog.h b/include/IGUIColorSelectDialog.h index a27991c9..c41ad11f 100644 --- a/include/IGUIColorSelectDialog.h +++ b/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__ -#define __I_GUI_COLOR_SELECT_DIALOG_H_INCLUDED__ +#ifndef IRR_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 - diff --git a/include/IGUIComboBox.h b/include/IGUIComboBox.h index 8d238341..7027d4fb 100644 --- a/include/IGUIComboBox.h +++ b/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__ -#define __I_GUI_COMBO_BOX_H_INCLUDED__ +#ifndef IRR_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 - diff --git a/include/IGUIContextMenu.h b/include/IGUIContextMenu.h index 66237632..e686b8c2 100644 --- a/include/IGUIContextMenu.h +++ b/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__ -#define __I_GUI_CONTEXT_MENU_H_INCLUDED__ +#ifndef IRR_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 - diff --git a/include/IGUIEditBox.h b/include/IGUIEditBox.h index 0c126a3f..3d444854 100644 --- a/include/IGUIEditBox.h +++ b/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__ -#define __I_GUI_EDIT_BOX_H_INCLUDED__ +#ifndef IRR_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 - diff --git a/include/IGUIElement.h b/include/IGUIElement.h index 99d5ad75..aa1e8922 100644 --- a/include/IGUIElement.h +++ b/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__ -#define __I_GUI_ELEMENT_H_INCLUDED__ +#ifndef IRR_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 - diff --git a/include/IGUIElementFactory.h b/include/IGUIElementFactory.h index a447c048..d82c15e9 100644 --- a/include/IGUIElementFactory.h +++ b/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__ -#define __I_GUI_ELEMENT_FACTORY_H_INCLUDED__ +#ifndef IRR_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 diff --git a/include/IGUIEnvironment.h b/include/IGUIEnvironment.h index e631b1dc..fd573342 100644 --- a/include/IGUIEnvironment.h +++ b/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__ -#define __I_GUI_ENVIRONMENT_H_INCLUDED__ +#ifndef IRR_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 - diff --git a/include/IGUIFileOpenDialog.h b/include/IGUIFileOpenDialog.h index 96744cc8..1c1229d9 100644 --- a/include/IGUIFileOpenDialog.h +++ b/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__ -#define __I_GUI_FILE_OPEN_DIALOG_H_INCLUDED__ +#ifndef IRR_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 - diff --git a/include/IGUIFont.h b/include/IGUIFont.h index 4746c81a..40020a70 100644 --- a/include/IGUIFont.h +++ b/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__ -#define __I_GUI_FONT_H_INCLUDED__ +#ifndef IRR_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 - diff --git a/include/IGUIFontBitmap.h b/include/IGUIFontBitmap.h index 71df1fbe..ab715ffe 100644 --- a/include/IGUIFontBitmap.h +++ b/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__ -#define __I_GUI_FONT_BITMAP_H_INCLUDED__ +#ifndef IRR_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 - diff --git a/include/IGUIImage.h b/include/IGUIImage.h index c99de0dd..d2acacf2 100644 --- a/include/IGUIImage.h +++ b/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__ -#define __I_GUI_IMAGE_H_INCLUDED__ +#ifndef IRR_I_GUI_IMAGE_H_INCLUDED +#define IRR_I_GUI_IMAGE_H_INCLUDED #include "IGUIElement.h" diff --git a/include/IGUIImageList.h b/include/IGUIImageList.h index 7f27a99e..2280f05c 100644 --- a/include/IGUIImageList.h +++ b/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__ -#define __I_GUI_IMAGE_LIST_H_INCLUDED__ +#ifndef IRR_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 - diff --git a/include/IGUIInOutFader.h b/include/IGUIInOutFader.h index a89f615f..7afd552f 100644 --- a/include/IGUIInOutFader.h +++ b/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__ -#define __I_GUI_IN_OUT_FADER_H_INCLUDED__ +#ifndef IRR_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 - diff --git a/include/IGUIListBox.h b/include/IGUIListBox.h index b76888c8..a74b4499 100644 --- a/include/IGUIListBox.h +++ b/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__ -#define __I_GUI_LIST_BOX_H_INCLUDED__ +#ifndef IRR_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 - diff --git a/include/IGUIMeshViewer.h b/include/IGUIMeshViewer.h index 3255f4ed..25e079d1 100644 --- a/include/IGUIMeshViewer.h +++ b/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__ -#define __I_GUI_MESH_VIEWER_H_INCLUDED__ +#ifndef IRR_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 - diff --git a/include/IGUIProfiler.h b/include/IGUIProfiler.h index 995899c1..36cb16e4 100644 --- a/include/IGUIProfiler.h +++ b/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__ -#define I_GUI_PROFILER_H_INCLUDED__ +#ifndef IRR_I_GUI_PROFILER_H_INCLUDED +#define IRR_I_GUI_PROFILER_H_INCLUDED #include "IGUIElement.h" diff --git a/include/IGUIScrollBar.h b/include/IGUIScrollBar.h index c75900e9..e943cd30 100644 --- a/include/IGUIScrollBar.h +++ b/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__ -#define __I_GUI_SCROLL_BAR_H_INCLUDED__ +#ifndef IRR_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 - diff --git a/include/IGUISkin.h b/include/IGUISkin.h index e685a1ed..814f5af3 100644 --- a/include/IGUISkin.h +++ b/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__ -#define __I_GUI_SKIN_H_INCLUDED__ +#ifndef IRR_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 - diff --git a/include/IGUISpinBox.h b/include/IGUISpinBox.h index 1c647627..6251d673 100644 --- a/include/IGUISpinBox.h +++ b/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__ -#define __I_GUI_SPIN_BOX_H_INCLUDED__ +#ifndef IRR_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 diff --git a/include/IGUISpriteBank.h b/include/IGUISpriteBank.h index 84816164..19a9a417 100644 --- a/include/IGUISpriteBank.h +++ b/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__ -#define __I_GUI_SPRITE_BANK_H_INCLUDED__ +#ifndef IRR_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 diff --git a/include/IGUIStaticText.h b/include/IGUIStaticText.h index 33db281e..b7abb412 100644 --- a/include/IGUIStaticText.h +++ b/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__ -#define __I_GUI_STATIC_TEXT_H_INCLUDED__ +#ifndef IRR_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 - diff --git a/include/IGUITabControl.h b/include/IGUITabControl.h index 403dfccd..dc4b145e 100644 --- a/include/IGUITabControl.h +++ b/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__ -#define __I_GUI_TAB_CONTROL_H_INCLUDED__ +#ifndef IRR_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 - diff --git a/include/IGUITable.h b/include/IGUITable.h index ea3afccc..b6377633 100644 --- a/include/IGUITable.h +++ b/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__ -#define __I_GUI_TABLE_H_INCLUDED__ +#ifndef IRR_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 - diff --git a/include/IGUIToolbar.h b/include/IGUIToolbar.h index 58796bf4..05dd6530 100644 --- a/include/IGUIToolbar.h +++ b/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__ -#define __I_GUI_TOOL_BAR_H_INCLUDED__ +#ifndef IRR_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 - diff --git a/include/IGUITreeView.h b/include/IGUITreeView.h index 33bdb117..d08b041d 100644 --- a/include/IGUITreeView.h +++ b/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__ -#define __I_GUI_TREE_VIEW_H_INCLUDED__ +#ifndef IRR_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 - diff --git a/include/IGUIWindow.h b/include/IGUIWindow.h index 60349d67..88723b00 100644 --- a/include/IGUIWindow.h +++ b/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__ -#define __I_GUI_WINDOW_H_INCLUDED__ +#ifndef IRR_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 - diff --git a/include/IGeometryCreator.h b/include/IGeometryCreator.h index 6b711fea..7a4bdf87 100644 --- a/include/IGeometryCreator.h +++ b/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__ -#define __I_GEOMETRY_CREATOR_H_INCLUDED__ +#ifndef IRR_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 diff --git a/include/IImage.h b/include/IImage.h index 9be3ebe0..92029b2f 100644 --- a/include/IImage.h +++ b/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__ -#define __I_IMAGE_H_INCLUDED__ +#ifndef IRR_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 - diff --git a/include/IImageLoader.h b/include/IImageLoader.h index 13eef977..ad936c0e 100644 --- a/include/IImageLoader.h +++ b/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__ -#define __I_SURFACE_LOADER_H_INCLUDED__ +#ifndef IRR_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 - diff --git a/include/IImageWriter.h b/include/IImageWriter.h index 884a488e..7ac8ada1 100644 --- a/include/IImageWriter.h +++ b/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__ -#define _I_IMAGE_WRITER_H_INCLUDED__ +#ifndef IRR_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 diff --git a/include/IIndexBuffer.h b/include/IIndexBuffer.h index 6aee1a1d..d1bb961a 100644 --- a/include/IIndexBuffer.h +++ b/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__ -#define __I_INDEX_BUFFER_H_INCLUDED__ +#ifndef IRR_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 - diff --git a/include/ILightManager.h b/include/ILightManager.h index 297e981b..ad8988c8 100644 --- a/include/ILightManager.h +++ b/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__ -#define __I_LIGHT_MANAGER_H_INCLUDED__ +#ifndef IRR_I_LIGHT_MANAGER_H_INCLUDED +#define IRR_I_LIGHT_MANAGER_H_INCLUDED #include "IReferenceCounted.h" #include "irrArray.h" diff --git a/include/ILightSceneNode.h b/include/ILightSceneNode.h index 62533a0d..ccf7cdb9 100644 --- a/include/ILightSceneNode.h +++ b/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__ -#define __I_LIGHT_SCENE_NODE_H_INCLUDED__ +#ifndef IRR_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 - diff --git a/include/ILogger.h b/include/ILogger.h index b6c9f6f0..4f4210c9 100644 --- a/include/ILogger.h +++ b/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__ -#define __I_LOGGER_H_INCLUDED__ +#ifndef IRR_I_LOGGER_H_INCLUDED +#define IRR_I_LOGGER_H_INCLUDED #include "IReferenceCounted.h" @@ -99,4 +99,3 @@ public: } // end namespace #endif - diff --git a/include/IMaterialRenderer.h b/include/IMaterialRenderer.h index f23d0284..8ada1530 100644 --- a/include/IMaterialRenderer.h +++ b/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__ -#define __I_MATERIAL_RENDERER_H_INCLUDED__ +#ifndef IRR_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 - diff --git a/include/IMaterialRendererServices.h b/include/IMaterialRendererServices.h index 555f2169..7dcf342f 100644 --- a/include/IMaterialRendererServices.h +++ b/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__ -#define __I_MATERIAL_RENDERER_SERVICES_H_INCLUDED__ +#ifndef IRR_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 - diff --git a/include/IMemoryReadFile.h b/include/IMemoryReadFile.h index 435cfa53..1f471a31 100644 --- a/include/IMemoryReadFile.h +++ b/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__ -#define __I_MEMORY_READ_FILE_H_INCLUDED__ +#ifndef IRR_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 - diff --git a/include/IMesh.h b/include/IMesh.h index 227ef509..cb6dba59 100644 --- a/include/IMesh.h +++ b/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__ -#define __I_MESH_H_INCLUDED__ +#ifndef IRR_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 - diff --git a/include/IMeshBuffer.h b/include/IMeshBuffer.h index 488eb029..8b14177a 100644 --- a/include/IMeshBuffer.h +++ b/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__ -#define __I_MESH_BUFFER_H_INCLUDED__ +#ifndef IRR_I_MESH_BUFFER_H_INCLUDED +#define IRR_I_MESH_BUFFER_H_INCLUDED #include "IReferenceCounted.h" #include "SMaterial.h" diff --git a/include/IMeshCache.h b/include/IMeshCache.h index b6979897..828ba156 100644 --- a/include/IMeshCache.h +++ b/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__ -#define __I_MESH_CACHE_H_INCLUDED__ +#ifndef IRR_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 - diff --git a/include/IMeshLoader.h b/include/IMeshLoader.h index f81f3307..25df3efe 100644 --- a/include/IMeshLoader.h +++ b/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__ -#define __I_MESH_LOADER_H_INCLUDED__ +#ifndef IRR_I_MESH_LOADER_H_INCLUDED +#define IRR_I_MESH_LOADER_H_INCLUDED #include "IReferenceCounted.h" #include "path.h" diff --git a/include/IMeshManipulator.h b/include/IMeshManipulator.h index 388710db..f53a651d 100644 --- a/include/IMeshManipulator.h +++ b/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__ -#define __I_MESH_MANIPULATOR_H_INCLUDED__ +#ifndef IRR_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 diff --git a/include/IMeshSceneNode.h b/include/IMeshSceneNode.h index 03c5c522..990e1da4 100644 --- a/include/IMeshSceneNode.h +++ b/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__ -#define __I_MESH_SCENE_NODE_H_INCLUDED__ +#ifndef IRR_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 - diff --git a/include/IMeshTextureLoader.h b/include/IMeshTextureLoader.h index 92df7b0d..9f6a079d 100644 --- a/include/IMeshTextureLoader.h +++ b/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__ -#define IRR_I_MESH_TEXTURE_LOADER_H_INCLUDED__ +#ifndef IRR_I_MESH_TEXTURE_LOADER_H_INCLUDED +#define IRR_I_MESH_TEXTURE_LOADER_H_INCLUDED #include "path.h" #include "IReferenceCounted.h" diff --git a/include/IMeshWriter.h b/include/IMeshWriter.h index 8394c922..597453be 100644 --- a/include/IMeshWriter.h +++ b/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__ -#define __IRR_I_MESH_WRITER_H_INCLUDED__ +#ifndef 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 - diff --git a/include/IMetaTriangleSelector.h b/include/IMetaTriangleSelector.h index 2cbb385c..ffdceeb9 100644 --- a/include/IMetaTriangleSelector.h +++ b/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__ -#define __I_META_TRIANGLE_SELECTOR_H_INCLUDED__ +#ifndef IRR_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 - diff --git a/include/IOSOperator.h b/include/IOSOperator.h index c90da25c..c62cc18c 100644 --- a/include/IOSOperator.h +++ b/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__ -#define __I_OS_OPERATOR_H_INCLUDED__ +#ifndef IRR_I_OS_OPERATOR_H_INCLUDED +#define IRR_I_OS_OPERATOR_H_INCLUDED #include "IReferenceCounted.h" #include "irrString.h" diff --git a/include/IOctreeSceneNode.h b/include/IOctreeSceneNode.h index 352a274a..d4bc7a35 100644 --- a/include/IOctreeSceneNode.h +++ b/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__ -#define __I_OCTREE_SCENE_NODE_H_INCLUDED__ +#ifndef IRR_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 - diff --git a/include/IParticleAffector.h b/include/IParticleAffector.h index e2b83e8f..f35c8555 100644 --- a/include/IParticleAffector.h +++ b/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__ -#define __I_PARTICLE_AFFECTOR_H_INCLUDED__ +#ifndef IRR_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 - diff --git a/include/IParticleAnimatedMeshSceneNodeEmitter.h b/include/IParticleAnimatedMeshSceneNodeEmitter.h index f61bfab9..3ac92d39 100644 --- a/include/IParticleAnimatedMeshSceneNodeEmitter.h +++ b/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__ -#define __I_PARTICLE_ANIMATED_MESH_SCENE_NODE_EMITTER_H_INCLUDED__ +#ifndef IRR_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 // __I_PARTICLE_ANIMATED_MESH_SCENE_NODE_EMITTER_H_INCLUDED__ - +#endif // IRR_I_PARTICLE_ANIMATED_MESH_SCENE_NODE_EMITTER_H_INCLUDED diff --git a/include/IParticleAttractionAffector.h b/include/IParticleAttractionAffector.h index b12a386f..9db26459 100644 --- a/include/IParticleAttractionAffector.h +++ b/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__ -#define __I_PARTICLE_ATTRACTION_AFFECTOR_H_INCLUDED__ +#ifndef IRR_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 // __I_PARTICLE_ATTRACTION_AFFECTOR_H_INCLUDED__ - +#endif // IRR_I_PARTICLE_ATTRACTION_AFFECTOR_H_INCLUDED diff --git a/include/IParticleBoxEmitter.h b/include/IParticleBoxEmitter.h index 3510b94c..470e8a7f 100644 --- a/include/IParticleBoxEmitter.h +++ b/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__ -#define __I_PARTICLE_BOX_EMITTER_H_INCLUDED__ +#ifndef IRR_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 - diff --git a/include/IParticleCylinderEmitter.h b/include/IParticleCylinderEmitter.h index cef88240..8f71b477 100644 --- a/include/IParticleCylinderEmitter.h +++ b/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__ -#define __I_PARTICLE_CYLINDER_EMITTER_H_INCLUDED__ +#ifndef IRR_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 - diff --git a/include/IParticleEmitter.h b/include/IParticleEmitter.h index 4e54e85d..0c6b5b6a 100644 --- a/include/IParticleEmitter.h +++ b/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__ -#define __I_PARTICLE_EMITTER_H_INCLUDED__ +#ifndef IRR_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 - diff --git a/include/IParticleFadeOutAffector.h b/include/IParticleFadeOutAffector.h index a2b6b397..b2d4c839 100644 --- a/include/IParticleFadeOutAffector.h +++ b/include/IParticleFadeOutAffector.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_FADE_OUT_AFFECTOR_H_INCLUDED__ -#define __I_PARTICLE_FADE_OUT_AFFECTOR_H_INCLUDED__ +#ifndef IRR_I_PARTICLE_FADE_OUT_AFFECTOR_H_INCLUDED +#define IRR_I_PARTICLE_FADE_OUT_AFFECTOR_H_INCLUDED #include "IParticleAffector.h" @@ -36,6 +36,4 @@ public: } // end namespace scene } // end namespace irr - #endif // __I_PARTICLE_FADE_OUT_AFFECTOR_H_INCLUDED__ - diff --git a/include/IParticleGravityAffector.h b/include/IParticleGravityAffector.h index 5607c668..40055c2c 100644 --- a/include/IParticleGravityAffector.h +++ b/include/IParticleGravityAffector.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_GRAVITY_AFFECTOR_H_INCLUDED__ -#define __I_PARTICLE_GRAVITY_AFFECTOR_H_INCLUDED__ +#ifndef IRR_I_PARTICLE_GRAVITY_AFFECTOR_H_INCLUDED +#define IRR_I_PARTICLE_GRAVITY_AFFECTOR_H_INCLUDED #include "IParticleAffector.h" @@ -37,6 +37,4 @@ public: } // end namespace scene } // end namespace irr - -#endif // __I_PARTICLE_GRAVITY_AFFECTOR_H_INCLUDED__ - +#endif // IRR_I_PARTICLE_GRAVITY_AFFECTOR_H_INCLUDED diff --git a/include/IParticleMeshEmitter.h b/include/IParticleMeshEmitter.h index e480091b..148fa930 100644 --- a/include/IParticleMeshEmitter.h +++ b/include/IParticleMeshEmitter.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_MESH_EMITTER_H_INCLUDED__ -#define __I_PARTICLE_MESH_EMITTER_H_INCLUDED__ +#ifndef IRR_I_PARTICLE_MESH_EMITTER_H_INCLUDED +#define IRR_I_PARTICLE_MESH_EMITTER_H_INCLUDED #include "IParticleEmitter.h" #include "IMesh.h" @@ -49,6 +49,4 @@ public: } // end namespace scene } // end namespace irr - #endif - diff --git a/include/IParticleRingEmitter.h b/include/IParticleRingEmitter.h index 58ed49eb..bc1ed528 100644 --- a/include/IParticleRingEmitter.h +++ b/include/IParticleRingEmitter.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_RING_EMITTER_H_INCLUDED__ -#define __I_PARTICLE_RING_EMITTER_H_INCLUDED__ +#ifndef IRR_I_PARTICLE_RING_EMITTER_H_INCLUDED +#define IRR_I_PARTICLE_RING_EMITTER_H_INCLUDED #include "IParticleEmitter.h" @@ -42,6 +42,4 @@ public: } // end namespace scene } // end namespace irr - #endif - diff --git a/include/IParticleRotationAffector.h b/include/IParticleRotationAffector.h index 7b98aaf6..77780807 100644 --- a/include/IParticleRotationAffector.h +++ b/include/IParticleRotationAffector.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_ROTATION_AFFECTOR_H_INCLUDED__ -#define __I_PARTICLE_ROTATION_AFFECTOR_H_INCLUDED__ +#ifndef IRR_I_PARTICLE_ROTATION_AFFECTOR_H_INCLUDED +#define IRR_I_PARTICLE_ROTATION_AFFECTOR_H_INCLUDED #include "IParticleAffector.h" @@ -36,6 +36,4 @@ public: } // end namespace scene } // end namespace irr - -#endif // __I_PARTICLE_ROTATION_AFFECTOR_H_INCLUDED__ - +#endif // IRR_I_PARTICLE_ROTATION_AFFECTOR_H_INCLUDED diff --git a/include/IParticleSphereEmitter.h b/include/IParticleSphereEmitter.h index b8d95fa4..1c39db73 100644 --- a/include/IParticleSphereEmitter.h +++ b/include/IParticleSphereEmitter.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_SPHERE_EMITTER_H_INCLUDED__ -#define __I_PARTICLE_SPHERE_EMITTER_H_INCLUDED__ +#ifndef IRR_I_PARTICLE_SPHERE_EMITTER_H_INCLUDED +#define IRR_I_PARTICLE_SPHERE_EMITTER_H_INCLUDED #include "IParticleEmitter.h" @@ -36,6 +36,4 @@ public: } // end namespace scene } // end namespace irr - #endif - diff --git a/include/IParticleSystemSceneNode.h b/include/IParticleSystemSceneNode.h index 27fe6121..56826bd3 100644 --- a/include/IParticleSystemSceneNode.h +++ b/include/IParticleSystemSceneNode.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_SYSTEM_SCENE_NODE_H_INCLUDED__ -#define __I_PARTICLE_SYSTEM_SCENE_NODE_H_INCLUDED__ +#ifndef IRR_I_PARTICLE_SYSTEM_SCENE_NODE_H_INCLUDED +#define IRR_I_PARTICLE_SYSTEM_SCENE_NODE_H_INCLUDED #include "ISceneNode.h" #include "IParticleAnimatedMeshSceneNodeEmitter.h" diff --git a/include/IProfiler.h b/include/IProfiler.h index c2e837db..bfc24301 100644 --- a/include/IProfiler.h +++ b/include/IProfiler.h @@ -2,8 +2,8 @@ // For conditions of distribution and use, see copyright notice in irrlicht.h // Written by Michael Zeilfelder -#ifndef __I_PROFILER_H_INCLUDED__ -#define __I_PROFILER_H_INCLUDED__ +#ifndef IRR_I_PROFILER_H_INCLUDED +#define IRR_I_PROFILER_H_INCLUDED #include "IrrCompileConfig.h" #include "irrString.h" @@ -477,4 +477,4 @@ void IProfiler::resetAll() } // namespace irr -#endif // __I_PROFILER_H_INCLUDED__ +#endif // IRR_I_PROFILER_H_INCLUDED diff --git a/include/IQ3LevelMesh.h b/include/IQ3LevelMesh.h index 62feffc6..65cda3ee 100644 --- a/include/IQ3LevelMesh.h +++ b/include/IQ3LevelMesh.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_Q3_LEVEL_MESH_H_INCLUDED__ -#define __I_Q3_LEVEL_MESH_H_INCLUDED__ +#ifndef IRR_I_Q3_LEVEL_MESH_H_INCLUDED +#define IRR_I_Q3_LEVEL_MESH_H_INCLUDED #include "IAnimatedMesh.h" #include "IQ3Shader.h" @@ -43,4 +43,3 @@ namespace scene } // end namespace irr #endif - diff --git a/include/IQ3Shader.h b/include/IQ3Shader.h index d4108f63..31b3c2df 100644 --- a/include/IQ3Shader.h +++ b/include/IQ3Shader.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_Q3_LEVEL_SHADER_H_INCLUDED__ -#define __I_Q3_LEVEL_SHADER_H_INCLUDED__ +#ifndef IRR_I_Q3_LEVEL_SHADER_H_INCLUDED +#define IRR_I_Q3_LEVEL_SHADER_H_INCLUDED #include "irrArray.h" #include "fast_atof.h" @@ -879,4 +879,3 @@ namespace quake3 } // end namespace irr #endif - diff --git a/include/IRandomizer.h b/include/IRandomizer.h index a0c07301..9b5fb120 100644 --- a/include/IRandomizer.h +++ b/include/IRandomizer.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_RANDOMIZER_H_INCLUDED__ -#define __I_RANDOMIZER_H_INCLUDED__ +#ifndef IRR_I_RANDOMIZER_H_INCLUDED +#define IRR_I_RANDOMIZER_H_INCLUDED #include "IReferenceCounted.h" @@ -24,7 +24,7 @@ public: //! generates a pseudo random number in the range 0..1 virtual f32 frand() const =0; - //! get maxmimum number generated by rand() + //! get maximum number generated by rand() virtual s32 randMax() const =0; }; diff --git a/include/IReadFile.h b/include/IReadFile.h index f3de9ebb..f90a4544 100644 --- a/include/IReadFile.h +++ b/include/IReadFile.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_READ_FILE_H_INCLUDED__ -#define __I_READ_FILE_H_INCLUDED__ +#ifndef IRR_I_READ_FILE_H_INCLUDED +#define IRR_I_READ_FILE_H_INCLUDED #include "IReferenceCounted.h" #include "coreutil.h" @@ -58,4 +58,3 @@ namespace io } // end namespace irr #endif - diff --git a/include/IReferenceCounted.h b/include/IReferenceCounted.h index fe589016..fe4659d2 100644 --- a/include/IReferenceCounted.h +++ b/include/IReferenceCounted.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_IREFERENCE_COUNTED_H_INCLUDED__ -#define __I_IREFERENCE_COUNTED_H_INCLUDED__ +#ifndef IRR_I_IREFERENCE_COUNTED_H_INCLUDED +#define IRR_I_IREFERENCE_COUNTED_H_INCLUDED #include "irrTypes.h" @@ -177,4 +177,3 @@ namespace irr } // end namespace irr #endif - diff --git a/include/IRenderTarget.h b/include/IRenderTarget.h index 0247f798..1a1ccd3e 100644 --- a/include/IRenderTarget.h +++ b/include/IRenderTarget.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_RENDER_TARGET_H_INCLUDED__ -#define __I_RENDER_TARGET_H_INCLUDED__ +#ifndef IRR_I_RENDER_TARGET_H_INCLUDED +#define IRR_I_RENDER_TARGET_H_INCLUDED #include "IReferenceCounted.h" #include "EDriverTypes.h" diff --git a/include/ISceneCollisionManager.h b/include/ISceneCollisionManager.h index ccfe8639..067581f2 100644 --- a/include/ISceneCollisionManager.h +++ b/include/ISceneCollisionManager.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_COLLISION_MANAGER_H_INCLUDED__ -#define __I_SCENE_COLLISION_MANAGER_H_INCLUDED__ +#ifndef IRR_I_SCENE_COLLISION_MANAGER_H_INCLUDED +#define IRR_I_SCENE_COLLISION_MANAGER_H_INCLUDED #include "IReferenceCounted.h" #include "vector3d.h" diff --git a/include/ISceneLoader.h b/include/ISceneLoader.h index c71c15dd..fcadaa31 100644 --- a/include/ISceneLoader.h +++ b/include/ISceneLoader.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_LOADER_H_INCLUDED__ -#define __I_SCENE_LOADER_H_INCLUDED__ +#ifndef IRR_I_SCENE_LOADER_H_INCLUDED +#define IRR_I_SCENE_LOADER_H_INCLUDED #include "IReferenceCounted.h" #include "path.h" @@ -59,4 +59,3 @@ public: } // end namespace irr #endif - diff --git a/include/ISceneManager.h b/include/ISceneManager.h index a9d597cc..3df4678c 100644 --- a/include/ISceneManager.h +++ b/include/ISceneManager.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_MANAGER_H_INCLUDED__ -#define __I_SCENE_MANAGER_H_INCLUDED__ +#ifndef IRR_I_SCENE_MANAGER_H_INCLUDED +#define IRR_I_SCENE_MANAGER_H_INCLUDED #include "IReferenceCounted.h" #include "irrArray.h" @@ -1693,4 +1693,3 @@ namespace scene } // end namespace irr #endif - diff --git a/include/ISceneNode.h b/include/ISceneNode.h index 837fd655..f26cc8a2 100644 --- a/include/ISceneNode.h +++ b/include/ISceneNode.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_H_INCLUDED__ -#define __I_SCENE_NODE_H_INCLUDED__ +#ifndef IRR_I_SCENE_NODE_H_INCLUDED +#define IRR_I_SCENE_NODE_H_INCLUDED #include "IAttributeExchangingObject.h" #include "ESceneNodeTypes.h" @@ -871,4 +871,3 @@ namespace scene } // end namespace irr #endif - diff --git a/include/ISceneNodeAnimator.h b/include/ISceneNodeAnimator.h index 9436acd8..b2848652 100644 --- a/include/ISceneNodeAnimator.h +++ b/include/ISceneNodeAnimator.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_H_INCLUDED__ -#define __I_SCENE_NODE_ANIMATOR_H_INCLUDED__ +#ifndef IRR_I_SCENE_NODE_ANIMATOR_H_INCLUDED +#define IRR_I_SCENE_NODE_ANIMATOR_H_INCLUDED #include "IReferenceCounted.h" #include "vector3d.h" @@ -79,7 +79,7 @@ namespace scene This value is ignored by animators which don't work with a starttime. Known problems: CSceneNodeAnimatorRotation currently overwrites this value constantly (might be changed in the future). \param time Commonly you will use irr::ITimer::getTime(). - \param resetPauseTime Reset internal pause time for enabling/diabling animators as well + \param resetPauseTime Reset internal pause time for enabling/disabling animators as well */ virtual void setStartTime(u32 time, bool resetPauseTime=true) { @@ -167,4 +167,3 @@ namespace scene } // end namespace irr #endif - diff --git a/include/ISceneNodeAnimatorCameraFPS.h b/include/ISceneNodeAnimatorCameraFPS.h index 91a00680..8caaef9d 100644 --- a/include/ISceneNodeAnimatorCameraFPS.h +++ b/include/ISceneNodeAnimatorCameraFPS.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_CAMERA_FPS_H_INCLUDED__ -#define __I_SCENE_NODE_ANIMATOR_CAMERA_FPS_H_INCLUDED__ +#ifndef IRR_I_SCENE_NODE_ANIMATOR_CAMERA_FPS_H_INCLUDED +#define IRR_I_SCENE_NODE_ANIMATOR_CAMERA_FPS_H_INCLUDED #include "ISceneNodeAnimator.h" #include "IEventReceiver.h" @@ -72,4 +72,3 @@ namespace scene } // end namespace irr #endif - diff --git a/include/ISceneNodeAnimatorCameraMaya.h b/include/ISceneNodeAnimatorCameraMaya.h index a1dba263..52c02ecd 100644 --- a/include/ISceneNodeAnimatorCameraMaya.h +++ b/include/ISceneNodeAnimatorCameraMaya.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_CAMERA_MAYA_H_INCLUDED__ -#define __I_SCENE_NODE_ANIMATOR_CAMERA_MAYA_H_INCLUDED__ +#ifndef IRR_I_SCENE_NODE_ANIMATOR_CAMERA_MAYA_H_INCLUDED +#define IRR_I_SCENE_NODE_ANIMATOR_CAMERA_MAYA_H_INCLUDED #include "ISceneNodeAnimator.h" @@ -62,4 +62,3 @@ namespace scene } // end namespace irr #endif - diff --git a/include/ISceneNodeAnimatorCollisionResponse.h b/include/ISceneNodeAnimatorCollisionResponse.h index 66334127..86afe05c 100644 --- a/include/ISceneNodeAnimatorCollisionResponse.h +++ b/include/ISceneNodeAnimatorCollisionResponse.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_COLLISION_RESPONSE_H_INCLUDED__ -#define __I_SCENE_NODE_ANIMATOR_COLLISION_RESPONSE_H_INCLUDED__ +#ifndef IRR_I_SCENE_NODE_ANIMATOR_COLLISION_RESPONSE_H_INCLUDED +#define IRR_I_SCENE_NODE_ANIMATOR_COLLISION_RESPONSE_H_INCLUDED #include "ISceneNode.h" @@ -168,4 +168,3 @@ namespace scene } // end namespace irr #endif - diff --git a/include/ISceneNodeAnimatorFactory.h b/include/ISceneNodeAnimatorFactory.h index a50703f2..de6e5c5c 100644 --- a/include/ISceneNodeAnimatorFactory.h +++ b/include/ISceneNodeAnimatorFactory.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_FACTORY_H_INCLUDED__ -#define __I_SCENE_NODE_ANIMATOR_FACTORY_H_INCLUDED__ +#ifndef IRR_I_SCENE_NODE_ANIMATOR_FACTORY_H_INCLUDED +#define IRR_I_SCENE_NODE_ANIMATOR_FACTORY_H_INCLUDED #include "IReferenceCounted.h" #include "ESceneNodeAnimatorTypes.h" @@ -66,4 +66,3 @@ namespace scene } // end namespace irr #endif - diff --git a/include/ISceneNodeFactory.h b/include/ISceneNodeFactory.h index 43043bd2..6e9f9338 100644 --- a/include/ISceneNodeFactory.h +++ b/include/ISceneNodeFactory.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_FACTORY_H_INCLUDED__ -#define __I_SCENE_NODE_FACTORY_H_INCLUDED__ +#ifndef IRR_I_SCENE_NODE_FACTORY_H_INCLUDED +#define IRR_I_SCENE_NODE_FACTORY_H_INCLUDED #include "IReferenceCounted.h" #include "ESceneNodeTypes.h" @@ -65,4 +65,3 @@ namespace scene } // end namespace irr #endif - diff --git a/include/ISceneUserDataSerializer.h b/include/ISceneUserDataSerializer.h index 46b15b53..8978ce91 100644 --- a/include/ISceneUserDataSerializer.h +++ b/include/ISceneUserDataSerializer.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_USER_DATA_SERIALIZER_H_INCLUDED__ -#define __I_SCENE_USER_DATA_SERIALIZER_H_INCLUDED__ +#ifndef IRR_I_SCENE_USER_DATA_SERIALIZER_H_INCLUDED +#define IRR_I_SCENE_USER_DATA_SERIALIZER_H_INCLUDED #include "IReferenceCounted.h" @@ -48,4 +48,3 @@ public: } // end namespace irr #endif - diff --git a/include/IShaderConstantSetCallBack.h b/include/IShaderConstantSetCallBack.h index fdf9e9af..eef3be3b 100644 --- a/include/IShaderConstantSetCallBack.h +++ b/include/IShaderConstantSetCallBack.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_SHADER_CONSTANT_SET_CALLBACT_H_INCLUDED__ -#define __I_SHADER_CONSTANT_SET_CALLBACT_H_INCLUDED__ +#ifndef IRR_I_SHADER_CONSTANT_SET_CALLBACT_H_INCLUDED +#define IRR_I_SHADER_CONSTANT_SET_CALLBACT_H_INCLUDED #include "IReferenceCounted.h" @@ -82,4 +82,3 @@ public: } // end namespace irr #endif - diff --git a/include/IShadowVolumeSceneNode.h b/include/IShadowVolumeSceneNode.h index f19e6aab..7f661cd9 100644 --- a/include/IShadowVolumeSceneNode.h +++ b/include/IShadowVolumeSceneNode.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_SHADOW_VOLUME_SCENE_NODE_H_INCLUDED__ -#define __I_SHADOW_VOLUME_SCENE_NODE_H_INCLUDED__ +#ifndef IRR_I_SHADOW_VOLUME_SCENE_NODE_H_INCLUDED +#define IRR_I_SHADOW_VOLUME_SCENE_NODE_H_INCLUDED #include "ISceneNode.h" @@ -62,4 +62,3 @@ namespace scene } // end namespace irr #endif - diff --git a/include/ISkinnedMesh.h b/include/ISkinnedMesh.h index 783b26eb..baa487a7 100644 --- a/include/ISkinnedMesh.h +++ b/include/ISkinnedMesh.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_SKINNED_MESH_H_INCLUDED__ -#define __I_SKINNED_MESH_H_INCLUDED__ +#ifndef IRR_I_SKINNED_MESH_H_INCLUDED +#define IRR_I_SKINNED_MESH_H_INCLUDED #include "irrArray.h" #include "IBoneSceneNode.h" @@ -216,4 +216,3 @@ namespace scene } // end namespace irr #endif - diff --git a/include/ITerrainSceneNode.h b/include/ITerrainSceneNode.h index b0c822ce..9c14f15a 100644 --- a/include/ITerrainSceneNode.h +++ b/include/ITerrainSceneNode.h @@ -7,8 +7,8 @@ // code available for Irrlicht and allowed it to be distributed under this // licence. I only modified some parts. A lot of thanks go to them. -#ifndef __I_TERRAIN_SCENE_NODE_H__ -#define __I_TERRAIN_SCENE_NODE_H__ +#ifndef IRR_I_TERRAIN_SCENE_NODE_H +#define IRR_I_TERRAIN_SCENE_NODE_H #include "ETerrainElements.h" #include "ISceneNode.h" @@ -186,5 +186,4 @@ namespace scene } // end namespace irr -#endif // __I_TERRAIN_SCENE_NODE_H__ - +#endif // IRR_I_TERRAIN_SCENE_NODE_H diff --git a/include/ITextSceneNode.h b/include/ITextSceneNode.h index 2e12379f..113e20d5 100644 --- a/include/ITextSceneNode.h +++ b/include/ITextSceneNode.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_TEXT_SCENE_NODE_H_INCLUDED__ -#define __I_TEXT_SCENE_NODE_H_INCLUDED__ +#ifndef IRR_I_TEXT_SCENE_NODE_H_INCLUDED +#define IRR_I_TEXT_SCENE_NODE_H_INCLUDED #include "ISceneNode.h" @@ -50,6 +50,4 @@ public: } // end namespace scene } // end namespace irr - #endif - diff --git a/include/ITexture.h b/include/ITexture.h index 3976ba37..9be26775 100644 --- a/include/ITexture.h +++ b/include/ITexture.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_TEXTURE_H_INCLUDED__ -#define __I_TEXTURE_H_INCLUDED__ +#ifndef IRR_I_TEXTURE_H_INCLUDED +#define IRR_I_TEXTURE_H_INCLUDED #include "IReferenceCounted.h" #include "IImage.h" @@ -355,4 +355,3 @@ protected: } // end namespace irr #endif - diff --git a/include/ITimer.h b/include/ITimer.h index 709db975..c60c57f5 100644 --- a/include/ITimer.h +++ b/include/ITimer.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_TIMER_H_INCLUDED__ -#define __I_TIMER_H_INCLUDED__ +#ifndef IRR_I_TIMER_H_INCLUDED +#define IRR_I_TIMER_H_INCLUDED #include "IReferenceCounted.h" diff --git a/include/ITriangleSelector.h b/include/ITriangleSelector.h index 04aa0467..dcc73333 100644 --- a/include/ITriangleSelector.h +++ b/include/ITriangleSelector.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_SELECTOR_H_INCLUDED__ -#define __I_TRIANGLE_SELECTOR_H_INCLUDED__ +#ifndef IRR_I_TRIANGLE_SELECTOR_H_INCLUDED +#define IRR_I_TRIANGLE_SELECTOR_H_INCLUDED #include "IReferenceCounted.h" #include "triangle3d.h" diff --git a/include/IVertexBuffer.h b/include/IVertexBuffer.h index 8467d7c7..5c513546 100644 --- a/include/IVertexBuffer.h +++ b/include/IVertexBuffer.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_VERTEX_BUFFER_H_INCLUDED__ -#define __I_VERTEX_BUFFER_H_INCLUDED__ +#ifndef IRR_I_VERTEX_BUFFER_H_INCLUDED +#define IRR_I_VERTEX_BUFFER_H_INCLUDED #include "IReferenceCounted.h" #include "irrArray.h" @@ -50,4 +50,3 @@ namespace scene } // end namespace irr #endif - diff --git a/include/IVideoDriver.h b/include/IVideoDriver.h index d96f153e..f490dfe8 100644 --- a/include/IVideoDriver.h +++ b/include/IVideoDriver.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_VIDEO_DRIVER_H_INCLUDED__ -#define __IRR_I_VIDEO_DRIVER_H_INCLUDED__ +#ifndef IRR_I_VIDEO_DRIVER_H_INCLUDED +#define IRR_I_VIDEO_DRIVER_H_INCLUDED #include "rect.h" #include "SColor.h" diff --git a/include/IVideoModeList.h b/include/IVideoModeList.h index cc87b2e2..49e41990 100644 --- a/include/IVideoModeList.h +++ b/include/IVideoModeList.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_VIDEO_MODE_LIST_H_INCLUDED__ -#define __IRR_I_VIDEO_MODE_LIST_H_INCLUDED__ +#ifndef IRR_I_VIDEO_MODE_LIST_H_INCLUDED +#define IRR_I_VIDEO_MODE_LIST_H_INCLUDED #include "IReferenceCounted.h" #include "dimension2d.h" @@ -53,6 +53,4 @@ namespace video } // end namespace video } // end namespace irr - #endif - diff --git a/include/IVolumeLightSceneNode.h b/include/IVolumeLightSceneNode.h index 0c869ab4..695e07bb 100644 --- a/include/IVolumeLightSceneNode.h +++ b/include/IVolumeLightSceneNode.h @@ -4,8 +4,8 @@ // // created by Dean Wadsworth aka Varmint Dec 31 2007 -#ifndef __I_VOLUME_LIGHT_SCENE_NODE_H_INCLUDED__ -#define __I_VOLUME_LIGHT_SCENE_NODE_H_INCLUDED__ +#ifndef IRR_I_VOLUME_LIGHT_SCENE_NODE_H_INCLUDED +#define IRR_I_VOLUME_LIGHT_SCENE_NODE_H_INCLUDED #include "ISceneNode.h" diff --git a/include/IWriteFile.h b/include/IWriteFile.h index 5cc48352..9fdad1f1 100644 --- a/include/IWriteFile.h +++ b/include/IWriteFile.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_WRITE_FILE_H_INCLUDED__ -#define __I_WRITE_FILE_H_INCLUDED__ +#ifndef IRR_I_WRITE_FILE_H_INCLUDED +#define IRR_I_WRITE_FILE_H_INCLUDED #include "IReferenceCounted.h" #include "path.h" @@ -48,4 +48,3 @@ namespace io } // end namespace irr #endif - diff --git a/include/IXMLReader.h b/include/IXMLReader.h index 7babb454..9d343dd5 100644 --- a/include/IXMLReader.h +++ b/include/IXMLReader.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_XML_READER_H_INCLUDED__ -#define __I_XML_READER_H_INCLUDED__ +#ifndef IRR_I_XML_READER_H_INCLUDED +#define IRR_I_XML_READER_H_INCLUDED #include "IReferenceCounted.h" #include "irrXML.h" @@ -28,4 +28,3 @@ namespace io } // end namespace irr #endif - diff --git a/include/IXMLWriter.h b/include/IXMLWriter.h index 18c40e28..22986d7a 100644 --- a/include/IXMLWriter.h +++ b/include/IXMLWriter.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_XML_WRITER_H_INCLUDED__ -#define __I_XML_WRITER_H_INCLUDED__ +#ifndef IRR_I_XML_WRITER_H_INCLUDED +#define IRR_I_XML_WRITER_H_INCLUDED #include "IReferenceCounted.h" #include "irrXML.h" diff --git a/include/IrrCompileConfig.h b/include/IrrCompileConfig.h index a5cf87e9..45b5892d 100644 --- a/include/IrrCompileConfig.h +++ b/include/IrrCompileConfig.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_COMPILE_CONFIG_H_INCLUDED__ -#define __IRR_COMPILE_CONFIG_H_INCLUDED__ +#ifndef IRR_COMPILE_CONFIG_H_INCLUDED +#define IRR_COMPILE_CONFIG_H_INCLUDED //! Irrlicht SDK Version #define IRRLICHT_VERSION_MAJOR 1 @@ -862,5 +862,4 @@ precision will be lower but speed higher. currently X86 only #endif #endif -#endif // __IRR_COMPILE_CONFIG_H_INCLUDED__ - +#endif // IRR_COMPILE_CONFIG_H_INCLUDED diff --git a/include/IrrlichtDevice.h b/include/IrrlichtDevice.h index f6b53d2a..69038d1e 100644 --- a/include/IrrlichtDevice.h +++ b/include/IrrlichtDevice.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_IRRLICHT_DEVICE_H_INCLUDED__ -#define __I_IRRLICHT_DEVICE_H_INCLUDED__ +#ifndef IRR_I_IRRLICHT_DEVICE_H_INCLUDED +#define IRR_I_IRRLICHT_DEVICE_H_INCLUDED #include "IReferenceCounted.h" #include "dimension2d.h" @@ -339,4 +339,3 @@ namespace irr } // end namespace irr #endif - diff --git a/include/Keycodes.h b/include/Keycodes.h index 3d032a39..d1026c49 100644 --- a/include/Keycodes.h +++ b/include/Keycodes.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_KEY_CODES_H_INCLUDED__ -#define __IRR_KEY_CODES_H_INCLUDED__ +#ifndef IRR_KEY_CODES_H_INCLUDED +#define IRR_KEY_CODES_H_INCLUDED namespace irr { @@ -171,4 +171,3 @@ namespace irr } // end namespace irr #endif - diff --git a/include/S3DVertex.h b/include/S3DVertex.h index 2040f9d1..0b48ee96 100644 --- a/include/S3DVertex.h +++ b/include/S3DVertex.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_3D_VERTEX_H_INCLUDED__ -#define __S_3D_VERTEX_H_INCLUDED__ +#ifndef S_3D_VERTEX_H_INCLUDED +#define S_3D_VERTEX_H_INCLUDED #include "vector3d.h" #include "vector2d.h" @@ -278,4 +278,3 @@ inline u32 getVertexPitchFromType(E_VERTEX_TYPE vertexType) } // end namespace irr #endif - diff --git a/include/SAnimatedMesh.h b/include/SAnimatedMesh.h index c7e64db9..a422a5f5 100644 --- a/include/SAnimatedMesh.h +++ b/include/SAnimatedMesh.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_ANIMATED_MESH_H_INCLUDED__ -#define __S_ANIMATED_MESH_H_INCLUDED__ +#ifndef S_ANIMATED_MESH_H_INCLUDED +#define S_ANIMATED_MESH_H_INCLUDED #include "IAnimatedMesh.h" #include "IMesh.h" @@ -186,4 +186,3 @@ namespace scene } // end namespace irr #endif - diff --git a/include/SColor.h b/include/SColor.h index 7384da9b..66f03cc2 100644 --- a/include/SColor.h +++ b/include/SColor.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 __COLOR_H_INCLUDED__ -#define __COLOR_H_INCLUDED__ +#ifndef IRR_S_COLOR_H_INCLUDED +#define IRR_S_COLOR_H_INCLUDED #include "irrTypes.h" #include "irrMath.h" diff --git a/include/SExposedVideoData.h b/include/SExposedVideoData.h index a3cbd080..d4b2cfd2 100644 --- a/include/SExposedVideoData.h +++ b/include/SExposedVideoData.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_EXPOSED_VIDEO_DATA_H_INCLUDED__ -#define __S_EXPOSED_VIDEO_DATA_H_INCLUDED__ +#ifndef S_EXPOSED_VIDEO_DATA_H_INCLUDED +#define S_EXPOSED_VIDEO_DATA_H_INCLUDED // forward declarations for internal pointers struct IDirect3D9; @@ -84,6 +84,4 @@ struct SExposedVideoData } // end namespace video } // end namespace irr - #endif - diff --git a/include/SIrrCreationParameters.h b/include/SIrrCreationParameters.h index 046a5e44..78f224e2 100644 --- a/include/SIrrCreationParameters.h +++ b/include/SIrrCreationParameters.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_IRRLICHT_CREATION_PARAMETERS_H_INCLUDED__ -#define __I_IRRLICHT_CREATION_PARAMETERS_H_INCLUDED__ +#ifndef IRR_IRRLICHT_CREATION_PARAMETERS_H_INCLUDED +#define IRR_IRRLICHT_CREATION_PARAMETERS_H_INCLUDED #include "EDriverTypes.h" #include "EDeviceTypes.h" @@ -306,4 +306,3 @@ namespace irr } // end namespace irr #endif - diff --git a/include/SKeyMap.h b/include/SKeyMap.h index 3f1b68c5..a4388835 100644 --- a/include/SKeyMap.h +++ b/include/SKeyMap.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_KEY_MAP_H_INCLUDED__ -#define __S_KEY_MAP_H_INCLUDED__ +#ifndef S_KEY_MAP_H_INCLUDED +#define S_KEY_MAP_H_INCLUDED #include "Keycodes.h" @@ -40,4 +40,3 @@ namespace irr } // end namespace irr #endif - diff --git a/include/SLight.h b/include/SLight.h index 8f725945..f23b375a 100644 --- a/include/SLight.h +++ b/include/SLight.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_LIGHT_H_INCLUDED__ -#define __S_LIGHT_H_INCLUDED__ +#ifndef S_LIGHT_H_INCLUDED +#define S_LIGHT_H_INCLUDED #include "SColor.h" #include "vector3d.h" diff --git a/include/SMaterial.h b/include/SMaterial.h index 29bc3327..9d775c86 100644 --- a/include/SMaterial.h +++ b/include/SMaterial.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_MATERIAL_H_INCLUDED__ -#define __S_MATERIAL_H_INCLUDED__ +#ifndef S_MATERIAL_H_INCLUDED +#define S_MATERIAL_H_INCLUDED #include "SColor.h" #include "matrix4.h" diff --git a/include/SMaterialLayer.h b/include/SMaterialLayer.h index 2ef72c82..51ddf668 100644 --- a/include/SMaterialLayer.h +++ b/include/SMaterialLayer.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_MATERIAL_LAYER_H_INCLUDED__ -#define __S_MATERIAL_LAYER_H_INCLUDED__ +#ifndef S_MATERIAL_LAYER_H_INCLUDED +#define S_MATERIAL_LAYER_H_INCLUDED #include "matrix4.h" #include "irrAllocator.h" @@ -227,4 +227,4 @@ namespace video } // end namespace video } // end namespace irr -#endif // __S_MATERIAL_LAYER_H_INCLUDED__ +#endif // S_MATERIAL_LAYER_H_INCLUDED diff --git a/include/SMesh.h b/include/SMesh.h index 78535666..c87cee81 100644 --- a/include/SMesh.h +++ b/include/SMesh.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_MESH_H_INCLUDED__ -#define __S_MESH_H_INCLUDED__ +#ifndef S_MESH_H_INCLUDED +#define S_MESH_H_INCLUDED #include "IMesh.h" #include "IMeshBuffer.h" @@ -150,4 +150,3 @@ namespace scene } // end namespace irr #endif - diff --git a/include/SOverrideMaterial.h b/include/SOverrideMaterial.h index 8ecbae25..84f3f7b3 100644 --- a/include/SOverrideMaterial.h +++ b/include/SOverrideMaterial.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_OVERRIDE_MATERIAL_H_INCLUDED__ -#define __S_OVERRIDE_MATERIAL_H_INCLUDED__ +#ifndef S_OVERRIDE_MATERIAL_H_INCLUDED +#define S_OVERRIDE_MATERIAL_H_INCLUDED #include "SMaterial.h" @@ -178,5 +178,4 @@ namespace video } // end namespace video } // end namespace irr -#endif // __S_OVERRIDE_MATERIAL_H_INCLUDED__ - +#endif // S_OVERRIDE_MATERIAL_H_INCLUDED diff --git a/include/SParticle.h b/include/SParticle.h index d1507a12..73787547 100644 --- a/include/SParticle.h +++ b/include/SParticle.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_PARTICLE_H_INCLUDED__ -#define __S_PARTICLE_H_INCLUDED__ +#ifndef S_PARTICLE_H_INCLUDED +#define S_PARTICLE_H_INCLUDED #include "vector3d.h" #include "dimension2d.h" @@ -53,4 +53,3 @@ namespace scene } // end namespace irr #endif - diff --git a/include/SSharedMeshBuffer.h b/include/SSharedMeshBuffer.h index 71f334a5..0a171be6 100644 --- a/include/SSharedMeshBuffer.h +++ b/include/SSharedMeshBuffer.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_SHARED_MESH_BUFFER_H_INCLUDED__ -#define __S_SHARED_MESH_BUFFER_H_INCLUDED__ +#ifndef S_SHARED_MESH_BUFFER_H_INCLUDED +#define S_SHARED_MESH_BUFFER_H_INCLUDED #include "irrArray.h" #include "IMeshBuffer.h" @@ -257,4 +257,3 @@ namespace scene } // end namespace irr #endif - diff --git a/include/SSkinMeshBuffer.h b/include/SSkinMeshBuffer.h index b4c82326..726deffe 100644 --- a/include/SSkinMeshBuffer.h +++ b/include/SSkinMeshBuffer.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_SKIN_MESH_BUFFER_H_INCLUDED__ -#define __I_SKIN_MESH_BUFFER_H_INCLUDED__ +#ifndef S_SKIN_MESH_BUFFER_H_INCLUDED +#define S_SKIN_MESH_BUFFER_H_INCLUDED #include "IMeshBuffer.h" #include "S3DVertex.h" @@ -417,4 +417,3 @@ struct SSkinMeshBuffer : public IMeshBuffer } // end namespace irr #endif - diff --git a/include/SVertexIndex.h b/include/SVertexIndex.h index d6837dc2..3bad8395 100644 --- a/include/SVertexIndex.h +++ b/include/SVertexIndex.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_VERTEX_INDEX_H_INCLUDED__ -#define __S_VERTEX_INDEX_H_INCLUDED__ +#ifndef S_VERTEX_INDEX_H_INCLUDED +#define S_VERTEX_INDEX_H_INCLUDED #include "irrTypes.h" @@ -76,4 +76,3 @@ typedef u32 SVertexIndex; } // end namespace irr #endif - diff --git a/include/SVertexManipulator.h b/include/SVertexManipulator.h index 3cb1477c..1c32d4c9 100644 --- a/include/SVertexManipulator.h +++ b/include/SVertexManipulator.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_VERTEX_MANIPULATOR_H_INCLUDED__ -#define __S_VERTEX_MANIPULATOR_H_INCLUDED__ +#ifndef S_VERTEX_MANIPULATOR_H_INCLUDED +#define S_VERTEX_MANIPULATOR_H_INCLUDED #include "matrix4.h" #include "S3DVertex.h" @@ -303,5 +303,4 @@ namespace scene } // end namespace scene } // end namespace irr - #endif diff --git a/include/SViewFrustum.h b/include/SViewFrustum.h index 1b522976..0a973490 100644 --- a/include/SViewFrustum.h +++ b/include/SViewFrustum.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_VIEW_FRUSTUM_H_INCLUDED__ -#define __S_VIEW_FRUSTUM_H_INCLUDED__ +#ifndef S_VIEW_FRUSTUM_H_INCLUDED +#define S_VIEW_FRUSTUM_H_INCLUDED #include "plane3d.h" #include "vector3d.h" @@ -459,4 +459,3 @@ namespace scene } // end namespace irr #endif - diff --git a/include/SceneParameters.h b/include/SceneParameters.h index 6e2aaced..2fb73995 100644 --- a/include/SceneParameters.h +++ b/include/SceneParameters.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_PARAMETERS_H_INCLUDED__ -#define __I_SCENE_PARAMETERS_H_INCLUDED__ +#ifndef IRR_I_SCENE_PARAMETERS_H_INCLUDED +#define IRR_I_SCENE_PARAMETERS_H_INCLUDED #include "irrTypes.h" @@ -181,4 +181,3 @@ namespace scene } // end namespace irr #endif - diff --git a/include/aabbox3d.h b/include/aabbox3d.h index 27dfc384..c3ec0186 100644 --- a/include/aabbox3d.h +++ b/include/aabbox3d.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_AABBOX_3D_H_INCLUDED__ -#define __IRR_AABBOX_3D_H_INCLUDED__ +#ifndef IRR_AABBOX_3D_H_INCLUDED +#define IRR_AABBOX_3D_H_INCLUDED #include "irrMath.h" #include "plane3d.h" diff --git a/include/coreutil.h b/include/coreutil.h index aae7f1b9..74e27f15 100644 --- a/include/coreutil.h +++ b/include/coreutil.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_CORE_UTIL_H_INCLUDED__ -#define __IRR_CORE_UTIL_H_INCLUDED__ +#ifndef IRR_CORE_UTIL_H_INCLUDED +#define IRR_CORE_UTIL_H_INCLUDED #include "irrString.h" #include "path.h" diff --git a/include/dimension2d.h b/include/dimension2d.h index 4f0a87a1..7bd96ae3 100644 --- a/include/dimension2d.h +++ b/include/dimension2d.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_DIMENSION2D_H_INCLUDED__ -#define __IRR_DIMENSION2D_H_INCLUDED__ +#ifndef IRR_DIMENSION2D_H_INCLUDED +#define IRR_DIMENSION2D_H_INCLUDED #include "irrTypes.h" #include "irrMath.h" // for irr::core::equals() diff --git a/include/driverChoice.h b/include/driverChoice.h index accd4034..402e71c1 100644 --- a/include/driverChoice.h +++ b/include/driverChoice.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_CHOICE_H_INCLUDED__ -#define __E_DRIVER_CHOICE_H_INCLUDED__ +#ifndef IRR_E_DRIVER_CHOICE_H_INCLUDED +#define IRR_E_DRIVER_CHOICE_H_INCLUDED #include #include diff --git a/include/exampleHelper.h b/include/exampleHelper.h index 867073a9..b2dd8aa9 100755 --- a/include/exampleHelper.h +++ b/include/exampleHelper.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 __EXAMPLE_HELPER_H_INCLUDED__ -#define __EXAMPLE_HELPER_H_INCLUDED__ +#ifndef IRR_EXAMPLE_HELPER_H_INCLUDED +#define IRR_EXAMPLE_HELPER_H_INCLUDED #include "IrrCompileConfig.h" #include "path.h" diff --git a/include/fast_atof.h b/include/fast_atof.h index bb1077fe..7b7ca7d2 100644 --- a/include/fast_atof.h +++ b/include/fast_atof.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 irrXML.h -#ifndef __FAST_ATOF_H_INCLUDED__ -#define __FAST_ATOF_H_INCLUDED__ +#ifndef IRR_FAST_ATOF_H_INCLUDED +#define IRR_FAST_ATOF_H_INCLUDED #include "irrMath.h" #include "irrString.h" @@ -378,4 +378,3 @@ inline float fast_atof(const char* floatAsString, const char** out=0) } // end namespace irr #endif - diff --git a/include/heapsort.h b/include/heapsort.h index 36211c4d..cbee7c73 100644 --- a/include/heapsort.h +++ b/include/heapsort.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_HEAPSORT_H_INCLUDED__ -#define __IRR_HEAPSORT_H_INCLUDED__ +#ifndef IRR_HEAPSORT_H_INCLUDED +#define IRR_HEAPSORT_H_INCLUDED #include "irrTypes.h" diff --git a/include/irrAllocator.h b/include/irrAllocator.h index c7450ed7..39f9293b 100644 --- a/include/irrAllocator.h +++ b/include/irrAllocator.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 irrXML.h -#ifndef __IRR_ALLOCATOR_H_INCLUDED__ -#define __IRR_ALLOCATOR_H_INCLUDED__ +#ifndef IRR_ALLOCATOR_H_INCLUDED +#define IRR_ALLOCATOR_H_INCLUDED #include "irrTypes.h" #include diff --git a/include/irrArray.h b/include/irrArray.h index e86d4b0e..3572e626 100644 --- a/include/irrArray.h +++ b/include/irrArray.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 irrXML.h -#ifndef __IRR_ARRAY_H_INCLUDED__ -#define __IRR_ARRAY_H_INCLUDED__ +#ifndef IRR_ARRAY_H_INCLUDED +#define IRR_ARRAY_H_INCLUDED #include "irrTypes.h" #include "heapsort.h" diff --git a/include/irrList.h b/include/irrList.h index 27044a45..04a00194 100644 --- a/include/irrList.h +++ b/include/irrList.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_LIST_H_INCLUDED__ -#define __IRR_LIST_H_INCLUDED__ +#ifndef IRR_LIST_H_INCLUDED +#define IRR_LIST_H_INCLUDED #include "irrTypes.h" #include "irrAllocator.h" diff --git a/include/irrMap.h b/include/irrMap.h index 7ee31695..20674646 100644 --- a/include/irrMap.h +++ b/include/irrMap.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_MAP_H_INCLUDED__ -#define __IRR_MAP_H_INCLUDED__ +#ifndef IRR_MAP_H_INCLUDED +#define IRR_MAP_H_INCLUDED #include "irrTypes.h" #include "irrMath.h" @@ -1110,5 +1110,4 @@ class map } // end namespace core } // end namespace irr -#endif // __IRR_MAP_H_INCLUDED__ - +#endif // IRR_MAP_H_INCLUDED diff --git a/include/irrMath.h b/include/irrMath.h index 94eda174..1bae6667 100644 --- a/include/irrMath.h +++ b/include/irrMath.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_MATH_H_INCLUDED__ -#define __IRR_MATH_H_INCLUDED__ +#ifndef IRR_MATH_H_INCLUDED +#define IRR_MATH_H_INCLUDED #include "IrrCompileConfig.h" #include "irrTypes.h" diff --git a/include/irrString.h b/include/irrString.h index 63329c9e..021086f6 100644 --- a/include/irrString.h +++ b/include/irrString.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 irrXML.h -#ifndef __IRR_STRING_H_INCLUDED__ -#define __IRR_STRING_H_INCLUDED__ +#ifndef IRR_STRING_H_INCLUDED +#define IRR_STRING_H_INCLUDED #include "irrTypes.h" #include "irrAllocator.h" diff --git a/include/irrXML.h b/include/irrXML.h index 57c3b549..6d6ae01b 100644 --- a/include/irrXML.h +++ b/include/irrXML.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 __IRR_XML_H_INCLUDED__ -#define __IRR_XML_H_INCLUDED__ +#ifndef IRR_XML_H_INCLUDED +#define IRR_XML_H_INCLUDED #include #include "IrrCompileConfig.h" @@ -641,5 +641,4 @@ namespace io } // end namespace io } // end namespace irr -#endif // __IRR_XML_H_INCLUDED__ - +#endif // IRR_XML_H_INCLUDED diff --git a/include/irrlicht.h b/include/irrlicht.h index ec623487..3c00a4b0 100644 --- a/include/irrlicht.h +++ b/include/irrlicht.h @@ -26,8 +26,8 @@ in the jpeglib, the zlib and libPng for further information. */ -#ifndef __IRRLICHT_H_INCLUDED__ -#define __IRRLICHT_H_INCLUDED__ +#ifndef IRRLICHT_H_INCLUDED +#define IRRLICHT_H_INCLUDED #include "IrrCompileConfig.h" #include "aabbox3d.h" @@ -396,4 +396,3 @@ namespace irr */ #endif - diff --git a/include/leakHunter.h b/include/leakHunter.h index 4e1ada45..e3e9361e 100644 --- a/include/leakHunter.h +++ b/include/leakHunter.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 __LEAK_HUNTER_INCLUDED__ -#define __LEAK_HUNTER_INCLUDED__ +#ifndef IRR_LEAK_HUNTER_INCLUDED +#define IRR_LEAK_HUNTER_INCLUDED #include "IrrCompileConfig.h" diff --git a/include/line2d.h b/include/line2d.h index dca02a45..2f2cace8 100644 --- a/include/line2d.h +++ b/include/line2d.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_LINE_2D_H_INCLUDED__ -#define __IRR_LINE_2D_H_INCLUDED__ +#ifndef IRR_LINE_2D_H_INCLUDED +#define IRR_LINE_2D_H_INCLUDED #include "irrTypes.h" #include "vector2d.h" diff --git a/include/line3d.h b/include/line3d.h index 355c52f5..e61f9b0a 100644 --- a/include/line3d.h +++ b/include/line3d.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_LINE_3D_H_INCLUDED__ -#define __IRR_LINE_3D_H_INCLUDED__ +#ifndef IRR_LINE_3D_H_INCLUDED +#define IRR_LINE_3D_H_INCLUDED #include "irrTypes.h" #include "vector3d.h" diff --git a/include/matrix4.h b/include/matrix4.h index 0f6d8d2b..90d13ada 100644 --- a/include/matrix4.h +++ b/include/matrix4.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_MATRIX_H_INCLUDED__ -#define __IRR_MATRIX_H_INCLUDED__ +#ifndef IRR_MATRIX_H_INCLUDED +#define IRR_MATRIX_H_INCLUDED #include "irrMath.h" #include "vector3d.h" diff --git a/include/path.h b/include/path.h index 6bfa2a0b..9e55f574 100644 --- a/include/path.h +++ b/include/path.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 -#ifndef __IRR_PATH_H_INCLUDED__ -#define __IRR_PATH_H_INCLUDED__ +#ifndef IRR_PATH_H_INCLUDED +#define IRR_PATH_H_INCLUDED #include "irrString.h" @@ -87,4 +87,4 @@ private: } // io } // irr -#endif // __IRR_PATH_H_INCLUDED__ +#endif // IRR_PATH_H_INCLUDED diff --git a/include/plane3d.h b/include/plane3d.h index 21701f04..6f7c4d7c 100644 --- a/include/plane3d.h +++ b/include/plane3d.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_PLANE_3D_H_INCLUDED__ -#define __IRR_PLANE_3D_H_INCLUDED__ +#ifndef IRR_PLANE_3D_H_INCLUDED +#define IRR_PLANE_3D_H_INCLUDED #include "irrMath.h" #include "vector3d.h" diff --git a/include/position2d.h b/include/position2d.h index 63275d2c..3eb3b2cd 100644 --- a/include/position2d.h +++ b/include/position2d.h @@ -5,8 +5,8 @@ //! As of Irrlicht 1.6, position2d is a synonym for vector2d. /** You should consider position2d to be deprecated, and use vector2d by preference. */ -#ifndef __IRR_POSITION_H_INCLUDED__ -#define __IRR_POSITION_H_INCLUDED__ +#ifndef IRR_POSITION_H_INCLUDED +#define IRR_POSITION_H_INCLUDED #include "vector2d.h" @@ -28,5 +28,4 @@ typedef vector2d position2di; // ...and use a #define to catch the rest, for (e.g.) position2d #define position2d vector2d -#endif // __IRR_POSITION_H_INCLUDED__ - +#endif // IRR_POSITION_H_INCLUDED diff --git a/include/quaternion.h b/include/quaternion.h index 5fdff798..f816ada3 100644 --- a/include/quaternion.h +++ b/include/quaternion.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_QUATERNION_H_INCLUDED__ -#define __IRR_QUATERNION_H_INCLUDED__ +#ifndef IRR_QUATERNION_H_INCLUDED +#define IRR_QUATERNION_H_INCLUDED #include "irrTypes.h" #include "irrMath.h" @@ -768,4 +768,3 @@ inline core::quaternion& quaternion::rotationFromTo(const vector3df& from, const } // end namespace irr #endif - diff --git a/include/rect.h b/include/rect.h index 85becf0e..be5012bc 100644 --- a/include/rect.h +++ b/include/rect.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_RECT_H_INCLUDED__ -#define __IRR_RECT_H_INCLUDED__ +#ifndef IRR_RECT_H_INCLUDED +#define IRR_RECT_H_INCLUDED #include "irrTypes.h" #include "dimension2d.h" @@ -285,4 +285,3 @@ namespace core } // end namespace irr #endif - diff --git a/include/triangle3d.h b/include/triangle3d.h index 61d23a4b..7e0ff81e 100644 --- a/include/triangle3d.h +++ b/include/triangle3d.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_TRIANGLE_3D_H_INCLUDED__ -#define __IRR_TRIANGLE_3D_H_INCLUDED__ +#ifndef IRR_TRIANGLE_3D_H_INCLUDED +#define IRR_TRIANGLE_3D_H_INCLUDED #include "vector3d.h" #include "line3d.h" @@ -276,4 +276,3 @@ namespace core } // end namespace irr #endif - diff --git a/include/vector2d.h b/include/vector2d.h index 6fde85e2..93ab5049 100644 --- a/include/vector2d.h +++ b/include/vector2d.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_POINT_2D_H_INCLUDED__ -#define __IRR_POINT_2D_H_INCLUDED__ +#ifndef IRR_POINT_2D_H_INCLUDED +#define IRR_POINT_2D_H_INCLUDED #include "irrMath.h" #include "dimension2d.h" @@ -419,4 +419,3 @@ public: } // end namespace irr #endif - diff --git a/include/vector3d.h b/include/vector3d.h index 5fc18866..c348cd74 100644 --- a/include/vector3d.h +++ b/include/vector3d.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_POINT_3D_H_INCLUDED__ -#define __IRR_POINT_3D_H_INCLUDED__ +#ifndef IRR_POINT_3D_H_INCLUDED +#define IRR_POINT_3D_H_INCLUDED #include "irrMath.h" @@ -471,4 +471,3 @@ namespace core } // end namespace irr #endif - diff --git a/source/Irrlicht/CB3DMeshWriter.h b/source/Irrlicht/CB3DMeshWriter.h index ac626c70..12c7324f 100644 --- 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" diff --git a/source/Irrlicht/CColladaMeshWriter.h b/source/Irrlicht/CColladaMeshWriter.h index 07314bfc..0fa5630c 100644 --- 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" diff --git a/source/Irrlicht/CIrrMeshWriter.h b/source/Irrlicht/CIrrMeshWriter.h index 856e64b8..4b21bb64 100644 --- 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 - diff --git a/source/Irrlicht/COBJMeshWriter.h b/source/Irrlicht/COBJMeshWriter.h index 52732aa0..9c9ff37c 100644 --- 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 - diff --git a/source/Irrlicht/CPLYMeshWriter.h b/source/Irrlicht/CPLYMeshWriter.h index 002c68a5..7b44264f 100644 --- 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" diff --git a/source/Irrlicht/CSTLMeshWriter.h b/source/Irrlicht/CSTLMeshWriter.h index 537902c0..58974f30 100644 --- 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 - diff --git a/source/Irrlicht/CVideoModeList.h b/source/Irrlicht/CVideoModeList.h index b4ab26e2..b22da64d 100644 --- 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 - diff --git a/source/Irrlicht/CXMLReaderImpl.h b/source/Irrlicht/CXMLReaderImpl.h index 14c1c747..8fb87e17 100644 --- 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" diff --git a/source/Irrlicht/IAttribute.h b/source/Irrlicht/IAttribute.h index 554ca951..dc054bbc 100644 --- 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" diff --git a/source/Irrlicht/IBurningShader.h b/source/Irrlicht/IBurningShader.h index 970b0569..155b94da 100644 --- 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 - diff --git a/source/Irrlicht/IDepthBuffer.h b/source/Irrlicht/IDepthBuffer.h index 996926c8..de2d2a6e 100644 --- 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 - diff --git a/source/Irrlicht/IImagePresenter.h b/source/Irrlicht/IImagePresenter.h index c93fc855..35ff6345 100644 --- 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 - diff --git a/source/Irrlicht/ISceneNodeAnimatorFinishing.h b/source/Irrlicht/ISceneNodeAnimatorFinishing.h index 71462c84..50933a17 100644 --- 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" diff --git a/source/Irrlicht/ITriangleRenderer.h b/source/Irrlicht/ITriangleRenderer.h index 954ce6de..a55ad237 100644 --- 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 - diff --git a/source/Irrlicht/IZBuffer.h b/source/Irrlicht/IZBuffer.h index 2c235a89..b16d03be 100644 --- 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 - diff --git a/source/Irrlicht/Irrlicht10.0.vcxproj b/source/Irrlicht/Irrlicht10.0.vcxproj index 7efcde43..5ee55af6 100644 --- a/source/Irrlicht/Irrlicht10.0.vcxproj +++ b/source/Irrlicht/Irrlicht10.0.vcxproj @@ -841,14 +841,23 @@ + + + + + + + + + @@ -859,7 +868,9 @@ + + @@ -900,6 +911,7 @@ + diff --git a/source/Irrlicht/Irrlicht10.0.vcxproj.filters b/source/Irrlicht/Irrlicht10.0.vcxproj.filters index 9e44e7e6..d0744c8c 100644 --- a/source/Irrlicht/Irrlicht10.0.vcxproj.filters +++ b/source/Irrlicht/Irrlicht10.0.vcxproj.filters @@ -1387,6 +1387,42 @@ include\core + + include\video + + + include\scene + + + include\scene + + + include\io + + + include\scene + + + include\video + + + include\gui + + + include\io + + + include\scene + + + include\scene + + + include\video + + + include\io + diff --git a/source/Irrlicht/S2DVertex.h b/source/Irrlicht/S2DVertex.h index f6f6a885..62876727 100644 --- 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 - diff --git a/source/Irrlicht/S4DVertex.h b/source/Irrlicht/S4DVertex.h index 667fd6d4..2057a893 100644 --- 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 - diff --git a/source/Irrlicht/SoftwareDriver2_compile_config.h b/source/Irrlicht/SoftwareDriver2_compile_config.h index f76bfe7e..968a2d50 100644 --- 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 diff --git a/source/Irrlicht/SoftwareDriver2_helper.h b/source/Irrlicht/SoftwareDriver2_helper.h index 47377aed..54cd8d3a 100644 --- 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 - diff --git a/source/Irrlicht/os.h b/source/Irrlicht/os.h index e81aec44..8d1c9ecc 100644 --- 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 - diff --git a/tools/IrrFontTool/newFontTool/CFontTool.h b/tools/IrrFontTool/newFontTool/CFontTool.h index 5a35938b..e1b43ead 100644 --- a/tools/IrrFontTool/newFontTool/CFontTool.h +++ b/tools/IrrFontTool/newFontTool/CFontTool.h @@ -1,5 +1,5 @@ -#ifndef __IRR_FONT_TOOL_INCLUDED__ -#define __IRR_FONT_TOOL_INCLUDED__ +#ifndef IRR_FONT_TOOL_INCLUDED +#define IRR_FONT_TOOL_INCLUDED #include "irrlicht.h" @@ -75,4 +75,4 @@ namespace irr { }; } -#endif // __IRR_FONT_TOOL_INCLUDED__ +#endif // IRR_FONT_TOOL_INCLUDED