From 3d2a55e78802185f1ebd83822acee1c093431d25 Mon Sep 17 00:00:00 2001 From: cutealien Date: Fri, 27 Aug 2021 15:55:04 +0000 Subject: [PATCH] Replace header guards in source folder to avoid using identifiers reserved by c++ Basically fixing original Bug#427 reported by MArkus Elfring. Unfortunately there are still more defines (in IrrCompileConfig.h) which also are not nice c++ Lots of files touched for very minor cleanup *sigh* git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@6253 dfc29bdd-3216-0410-991c-e03cc46cb475 --- changes.txt | 1 + source/Irrlicht/C3DSMeshFileLoader.h | 5 ++--- source/Irrlicht/CAnimatedMeshHalfLife.h | 5 ++--- source/Irrlicht/CAnimatedMeshMD2.h | 5 ++--- source/Irrlicht/CAnimatedMeshMD3.h | 5 ++--- source/Irrlicht/CAnimatedMeshSceneNode.h | 5 ++--- source/Irrlicht/CAttributes.h | 5 ++--- source/Irrlicht/CB3DMeshFileLoader.h | 7 +++---- source/Irrlicht/CBSPMeshFileLoader.h | 5 ++--- source/Irrlicht/CBillboardSceneNode.h | 5 ++--- source/Irrlicht/CBoneSceneNode.h | 5 ++--- source/Irrlicht/CCameraSceneNode.h | 5 ++--- source/Irrlicht/CColladaFileLoader.h | 5 ++--- source/Irrlicht/CColorConverter.h | 5 ++--- source/Irrlicht/CCubeSceneNode.h | 5 ++--- source/Irrlicht/CD3D9Driver.h | 8 +++----- source/Irrlicht/CD3D9HLSLMaterialRenderer.h | 5 ++--- source/Irrlicht/CD3D9MaterialRenderer.h | 5 ++--- source/Irrlicht/CD3D9NormalMapRenderer.h | 5 ++--- source/Irrlicht/CD3D9ParallaxMapRenderer.h | 5 ++--- source/Irrlicht/CD3D9RenderTarget.h | 4 ++-- source/Irrlicht/CD3D9ShaderMaterialRenderer.h | 5 ++--- source/Irrlicht/CD3D9Texture.h | 4 ++-- source/Irrlicht/CDMFLoader.h | 5 ++--- source/Irrlicht/CDefaultGUIElementFactory.h | 6 +++--- source/Irrlicht/CDefaultSceneNodeAnimatorFactory.h | 5 ++--- source/Irrlicht/CDefaultSceneNodeFactory.h | 7 +++---- source/Irrlicht/CDepthBuffer.h | 5 ++--- source/Irrlicht/CDummyTransformationSceneNode.h | 5 ++--- source/Irrlicht/CEmptySceneNode.h | 5 ++--- source/Irrlicht/CFPSCounter.h | 6 ++---- source/Irrlicht/CFileList.h | 5 ++--- source/Irrlicht/CFileSystem.h | 5 ++--- source/Irrlicht/CGLXManager.h | 5 ++--- source/Irrlicht/CGUIButton.h | 7 +++---- source/Irrlicht/CGUICheckBox.h | 8 ++++---- source/Irrlicht/CGUIColorSelectDialog.h | 6 +++--- source/Irrlicht/CGUIComboBox.h | 7 +++---- source/Irrlicht/CGUIContextMenu.h | 7 +++---- source/Irrlicht/CGUIEditBox.h | 7 +++---- source/Irrlicht/CGUIEnvironment.h | 8 +++----- source/Irrlicht/CGUIFileOpenDialog.h | 7 +++---- source/Irrlicht/CGUIFont.h | 7 +++---- source/Irrlicht/CGUIImage.h | 6 +++--- source/Irrlicht/CGUIImageList.h | 4 ++-- source/Irrlicht/CGUIInOutFader.h | 7 +++---- source/Irrlicht/CGUIListBox.h | 4 ++-- source/Irrlicht/CGUIMenu.h | 8 +++----- source/Irrlicht/CGUIMeshViewer.h | 7 +++---- source/Irrlicht/CGUIMessageBox.h | 4 ++-- source/Irrlicht/CGUIModalScreen.h | 5 ++--- source/Irrlicht/CGUIProfiler.h | 6 +++--- source/Irrlicht/CGUIScrollBar.h | 5 ++--- source/Irrlicht/CGUISkin.h | 6 ++---- source/Irrlicht/CGUISpinBox.h | 7 +++---- source/Irrlicht/CGUISpriteBank.h | 7 +++---- source/Irrlicht/CGUIStaticText.h | 5 ++--- source/Irrlicht/CGUITabControl.h | 5 ++--- source/Irrlicht/CGUITable.h | 5 ++--- source/Irrlicht/CGUIToolBar.h | 5 ++--- source/Irrlicht/CGUITreeView.h | 5 ++--- source/Irrlicht/CGUIWindow.h | 5 ++--- source/Irrlicht/CGeometryCreator.h | 5 ++--- source/Irrlicht/CImage.h | 6 ++---- source/Irrlicht/CImageLoaderBMP.h | 5 ++--- source/Irrlicht/CImageLoaderDDS.h | 5 ++--- source/Irrlicht/CImageLoaderJPG.h | 5 ++--- source/Irrlicht/CImageLoaderPCX.h | 5 ++--- source/Irrlicht/CImageLoaderPNG.h | 5 ++--- source/Irrlicht/CImageLoaderPPM.h | 6 ++---- source/Irrlicht/CImageLoaderPSD.h | 5 ++--- source/Irrlicht/CImageLoaderPVR.h | 4 ++-- source/Irrlicht/CImageLoaderRGB.h | 7 +++---- source/Irrlicht/CImageLoaderTGA.h | 5 ++--- source/Irrlicht/CImageLoaderWAL.h | 5 ++--- source/Irrlicht/CIrrDeviceConsole.h | 7 +++---- source/Irrlicht/CIrrDeviceFB.h | 7 +++---- source/Irrlicht/CIrrDeviceLinux.h | 7 +++---- source/Irrlicht/CIrrDeviceSDL.h | 7 +++---- source/Irrlicht/CIrrDeviceStub.h | 5 ++--- source/Irrlicht/CIrrDeviceWin32.h | 6 +++--- source/Irrlicht/CIrrMeshFileLoader.h | 5 ++--- source/Irrlicht/CLMTSMeshFileLoader.h | 6 +++--- source/Irrlicht/CLWOMeshFileLoader.h | 4 ++-- source/Irrlicht/CLightSceneNode.h | 5 ++--- source/Irrlicht/CLimitReadFile.h | 5 ++--- source/Irrlicht/CLogger.h | 5 ++--- source/Irrlicht/CMD2MeshFileLoader.h | 7 +++---- source/Irrlicht/CMD3MeshFileLoader.h | 5 ++--- source/Irrlicht/CMS3DMeshFileLoader.h | 6 ++---- source/Irrlicht/CMY3DHelper.h | 7 +++---- source/Irrlicht/CMemoryFile.h | 5 ++--- source/Irrlicht/CMeshCache.h | 5 ++--- source/Irrlicht/CMeshManipulator.h | 5 ++--- source/Irrlicht/CMeshSceneNode.h | 5 ++--- source/Irrlicht/CMetaTriangleSelector.h | 5 ++--- source/Irrlicht/CMountPointReader.h | 6 +++--- source/Irrlicht/CNPKReader.h | 7 +++---- source/Irrlicht/CNullDriver.h | 5 ++--- source/Irrlicht/COBJMeshFileLoader.h | 5 ++--- source/Irrlicht/COCTLoader.h | 5 ++--- source/Irrlicht/COSOperator.h | 5 ++--- source/Irrlicht/COctreeSceneNode.h | 5 ++--- source/Irrlicht/COctreeTriangleSelector.h | 6 ++---- source/Irrlicht/COgreMeshFileLoader.h | 5 ++--- source/Irrlicht/COpenGLCacheHandler.h | 4 ++-- source/Irrlicht/COpenGLCommon.h | 4 ++-- source/Irrlicht/COpenGLCoreCacheHandler.h | 4 ++-- source/Irrlicht/COpenGLCoreFeature.h | 4 ++-- source/Irrlicht/COpenGLCoreRenderTarget.h | 4 ++-- source/Irrlicht/COpenGLCoreTexture.h | 4 ++-- source/Irrlicht/COpenGLDriver.h | 5 ++--- source/Irrlicht/COpenGLExtensionHandler.h | 5 ++--- source/Irrlicht/COpenGLMaterialRenderer.h | 5 ++--- source/Irrlicht/COpenGLNormalMapRenderer.h | 5 ++--- source/Irrlicht/COpenGLParallaxMapRenderer.h | 5 ++--- source/Irrlicht/COpenGLSLMaterialRenderer.h | 5 ++--- source/Irrlicht/COpenGLShaderMaterialRenderer.h | 5 ++--- source/Irrlicht/CPLYMeshFileLoader.h | 5 ++--- source/Irrlicht/CPakReader.h | 7 +++---- .../Irrlicht/CParticleAnimatedMeshSceneNodeEmitter.h | 8 +++----- source/Irrlicht/CParticleAttractionAffector.h | 7 +++---- source/Irrlicht/CParticleBoxEmitter.h | 5 ++--- source/Irrlicht/CParticleCylinderEmitter.h | 5 ++--- source/Irrlicht/CParticleFadeOutAffector.h | 5 ++--- source/Irrlicht/CParticleGravityAffector.h | 5 ++--- source/Irrlicht/CParticleMeshEmitter.h | 7 +++---- source/Irrlicht/CParticlePointEmitter.h | 4 ++-- source/Irrlicht/CParticleRingEmitter.h | 5 ++--- source/Irrlicht/CParticleRotationAffector.h | 6 +++--- source/Irrlicht/CParticleSphereEmitter.h | 5 ++--- source/Irrlicht/CParticleSystemSceneNode.h | 5 ++--- source/Irrlicht/CProfiler.h | 6 +++--- source/Irrlicht/CQ3LevelMesh.h | 5 ++--- source/Irrlicht/CQuake3ShaderSceneNode.h | 6 ++---- source/Irrlicht/CReadFile.h | 5 ++--- source/Irrlicht/CSMFMeshFileLoader.h | 7 +++---- source/Irrlicht/CSTLMeshFileLoader.h | 5 ++--- source/Irrlicht/CSceneCollisionManager.h | 5 ++--- source/Irrlicht/CSceneLoaderIrr.h | 5 ++--- source/Irrlicht/CSceneManager.h | 5 ++--- source/Irrlicht/CSceneNodeAnimatorCameraFPS.h | 7 +++---- source/Irrlicht/CSceneNodeAnimatorCameraMaya.h | 5 ++--- source/Irrlicht/CSceneNodeAnimatorCollisionResponse.h | 5 ++--- source/Irrlicht/CSceneNodeAnimatorDelete.h | 5 ++--- source/Irrlicht/CSceneNodeAnimatorFlyCircle.h | 5 ++--- source/Irrlicht/CSceneNodeAnimatorFlyStraight.h | 4 ++-- source/Irrlicht/CSceneNodeAnimatorFollowSpline.h | 5 ++--- source/Irrlicht/CSceneNodeAnimatorRotation.h | 5 ++--- source/Irrlicht/CSceneNodeAnimatorTexture.h | 5 ++--- source/Irrlicht/CShadowVolumeSceneNode.h | 4 ++-- source/Irrlicht/CSkinnedMesh.h | 5 ++--- source/Irrlicht/CSkyBoxSceneNode.h | 5 ++--- source/Irrlicht/CSkyDomeSceneNode.h | 5 ++--- source/Irrlicht/CSoftware2MaterialRenderer.h | 5 ++--- source/Irrlicht/CSoftwareDriver.h | 6 ++---- source/Irrlicht/CSoftwareDriver2.h | 5 ++--- source/Irrlicht/CSoftwareTexture.h | 5 ++--- source/Irrlicht/CSoftwareTexture2.h | 8 +++----- source/Irrlicht/CSphereSceneNode.h | 5 ++--- source/Irrlicht/CTRTextureGouraud.h | 5 ++--- source/Irrlicht/CTarReader.h | 6 +++--- source/Irrlicht/CTerrainSceneNode.h | 10 ++++------ source/Irrlicht/CTerrainTriangleSelector.h | 9 ++++----- source/Irrlicht/CTextSceneNode.h | 5 ++--- source/Irrlicht/CTimer.h | 5 ++--- source/Irrlicht/CTriangleBBSelector.h | 6 ++---- source/Irrlicht/CTriangleSelector.h | 4 ++-- source/Irrlicht/CWADReader.h | 10 ++++------ source/Irrlicht/CWGLManager.h | 4 ++-- source/Irrlicht/CWaterSurfaceSceneNode.h | 5 ++--- source/Irrlicht/CWriteFile.h | 5 ++--- source/Irrlicht/CXMLReader.h | 5 ++--- source/Irrlicht/CXMLWriter.h | 5 ++--- source/Irrlicht/CXMeshFileLoader.h | 4 ++-- source/Irrlicht/CZBuffer.h | 5 ++--- source/Irrlicht/CZipReader.h | 7 +++---- source/Irrlicht/Irrlicht10.0.vcxproj | 3 +++ source/Irrlicht/Irrlicht10.0.vcxproj.filters | 9 +++++++++ source/Irrlicht/Octree.h | 5 ++--- 180 files changed, 416 insertions(+), 566 deletions(-) diff --git a/changes.txt b/changes.txt index 42648019..891a2d80 100644 --- a/changes.txt +++ b/changes.txt @@ -4,6 +4,7 @@ Changes in 1.9 (not yet released) Mostly it's about replacing __IRRxxx or _IRRxxx identifiers by versions without underscores Sometimes underscores at end also got removed. There is a header file irrLegacyDefines.h which can be included to allow having the old defines back. + Thanks @Markus Elfring for reporting this (bug #427) - Add equals and set_data functions to core::array for easier working with blocks of data. - SIrrlichtCreationParameters::IgnoreInput set to false works again on X11. Thanks @ Victor Gaydov for report + patch + very good test cases! (bug #401) diff --git a/source/Irrlicht/C3DSMeshFileLoader.h b/source/Irrlicht/C3DSMeshFileLoader.h index 718327d8..a6ab1c8c 100644 --- a/source/Irrlicht/C3DSMeshFileLoader.h +++ b/source/Irrlicht/C3DSMeshFileLoader.h @@ -2,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_3DS_MESH_FILE_LOADER_H_INCLUDED__ -#define __C_3DS_MESH_FILE_LOADER_H_INCLUDED__ +#ifndef IRR_C_3DS_MESH_FILE_LOADER_H_INCLUDED +#define IRR_C_3DS_MESH_FILE_LOADER_H_INCLUDED #include "IMeshLoader.h" #include "IFileSystem.h" @@ -163,4 +163,3 @@ private: } // end namespace irr #endif - diff --git a/source/Irrlicht/CAnimatedMeshHalfLife.h b/source/Irrlicht/CAnimatedMeshHalfLife.h index 0a983706..99e88ce0 100644 --- a/source/Irrlicht/CAnimatedMeshHalfLife.h +++ b/source/Irrlicht/CAnimatedMeshHalfLife.h @@ -2,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_ANIMATED_MESH_HALFLIFE_H_INCLUDED__ -#define __C_ANIMATED_MESH_HALFLIFE_H_INCLUDED__ +#ifndef IRR_C_ANIMATED_MESH_HALFLIFE_H_INCLUDED +#define IRR_C_ANIMATED_MESH_HALFLIFE_H_INCLUDED #include "IAnimatedMesh.h" #include "ISceneManager.h" @@ -627,4 +627,3 @@ namespace scene } // end namespace irr #endif - diff --git a/source/Irrlicht/CAnimatedMeshMD2.h b/source/Irrlicht/CAnimatedMeshMD2.h index 575b90c7..04e0fa5d 100644 --- a/source/Irrlicht/CAnimatedMeshMD2.h +++ b/source/Irrlicht/CAnimatedMeshMD2.h @@ -2,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_ANIMATED_MESH_MD2_H_INCLUDED__ -#define __C_ANIMATED_MESH_MD2_H_INCLUDED__ +#ifndef IRR_C_ANIMATED_MESH_MD2_H_INCLUDED +#define IRR_C_ANIMATED_MESH_MD2_H_INCLUDED #include "IAnimatedMeshMD2.h" #include "IMesh.h" @@ -155,4 +155,3 @@ namespace scene } // end namespace irr #endif - diff --git a/source/Irrlicht/CAnimatedMeshMD3.h b/source/Irrlicht/CAnimatedMeshMD3.h index 78474e95..c3f2f925 100644 --- a/source/Irrlicht/CAnimatedMeshMD3.h +++ b/source/Irrlicht/CAnimatedMeshMD3.h @@ -2,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_ANIMATED_MESH_MD3_H_INCLUDED__ -#define __C_ANIMATED_MESH_MD3_H_INCLUDED__ +#ifndef IRR_C_ANIMATED_MESH_MD3_H_INCLUDED +#define IRR_C_ANIMATED_MESH_MD3_H_INCLUDED #include "IAnimatedMeshMD3.h" #include "IReadFile.h" @@ -132,4 +132,3 @@ namespace scene } // end namespace irr #endif - diff --git a/source/Irrlicht/CAnimatedMeshSceneNode.h b/source/Irrlicht/CAnimatedMeshSceneNode.h index a331a190..92121985 100644 --- a/source/Irrlicht/CAnimatedMeshSceneNode.h +++ b/source/Irrlicht/CAnimatedMeshSceneNode.h @@ -2,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_ANIMATED_MESH_SCENE_NODE_H_INCLUDED__ -#define __C_ANIMATED_MESH_SCENE_NODE_H_INCLUDED__ +#ifndef IRR_C_ANIMATED_MESH_SCENE_NODE_H_INCLUDED +#define IRR_C_ANIMATED_MESH_SCENE_NODE_H_INCLUDED #include "IAnimatedMeshSceneNode.h" #include "IAnimatedMesh.h" @@ -220,4 +220,3 @@ namespace scene } // end namespace irr #endif - diff --git a/source/Irrlicht/CAttributes.h b/source/Irrlicht/CAttributes.h index 50d5ddfb..652a91d3 100644 --- a/source/Irrlicht/CAttributes.h +++ b/source/Irrlicht/CAttributes.h @@ -2,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_ATTRIBUTES_H_INCLUDED__ -#define __C_ATTRIBUTES_H_INCLUDED__ +#ifndef IRR_C_ATTRIBUTES_H_INCLUDED +#define IRR_C_ATTRIBUTES_H_INCLUDED #include "IrrCompileConfig.h" @@ -735,4 +735,3 @@ protected: } // end namespace irr #endif - diff --git a/source/Irrlicht/CB3DMeshFileLoader.h b/source/Irrlicht/CB3DMeshFileLoader.h index 7e13219d..afced1c6 100644 --- a/source/Irrlicht/CB3DMeshFileLoader.h +++ b/source/Irrlicht/CB3DMeshFileLoader.h @@ -8,8 +8,8 @@ #include "IrrCompileConfig.h" -#ifndef __C_B3D_MESH_LOADER_H_INCLUDED__ -#define __C_B3D_MESH_LOADER_H_INCLUDED__ +#ifndef IRR_C_B3D_MESH_LOADER_H_INCLUDED +#define IRR_C_B3D_MESH_LOADER_H_INCLUDED #include "IMeshLoader.h" #include "ISceneManager.h" @@ -87,5 +87,4 @@ private: } // end namespace scene } // end namespace irr -#endif // __C_B3D_MESH_LOADER_H_INCLUDED__ - +#endif // IRR_C_B3D_MESH_LOADER_H_INCLUDED diff --git a/source/Irrlicht/CBSPMeshFileLoader.h b/source/Irrlicht/CBSPMeshFileLoader.h index 7001ce57..f9adab72 100644 --- a/source/Irrlicht/CBSPMeshFileLoader.h +++ b/source/Irrlicht/CBSPMeshFileLoader.h @@ -2,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_BSP_MESH_FILE_LOADER_H_INCLUDED__ -#define __C_BSP_MESH_FILE_LOADER_H_INCLUDED__ +#ifndef IRR_C_BSP_MESH_FILE_LOADER_H_INCLUDED +#define IRR_C_BSP_MESH_FILE_LOADER_H_INCLUDED #include "IMeshLoader.h" #include "IFileSystem.h" @@ -49,4 +49,3 @@ private: } // end namespace irr #endif - diff --git a/source/Irrlicht/CBillboardSceneNode.h b/source/Irrlicht/CBillboardSceneNode.h index 6d130fa1..2bb6cbec 100644 --- a/source/Irrlicht/CBillboardSceneNode.h +++ b/source/Irrlicht/CBillboardSceneNode.h @@ -2,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_BILLBOARD_SCENE_NODE_H_INCLUDED__ -#define __C_BILLBOARD_SCENE_NODE_H_INCLUDED__ +#ifndef IRR_C_BILLBOARD_SCENE_NODE_H_INCLUDED +#define IRR_C_BILLBOARD_SCENE_NODE_H_INCLUDED #include "IBillboardSceneNode.h" #include "SMeshBuffer.h" @@ -109,4 +109,3 @@ private: } // end namespace irr #endif - diff --git a/source/Irrlicht/CBoneSceneNode.h b/source/Irrlicht/CBoneSceneNode.h index 413708f0..adf47ba2 100644 --- a/source/Irrlicht/CBoneSceneNode.h +++ b/source/Irrlicht/CBoneSceneNode.h @@ -2,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_BONE_SCENE_NODE_H_INCLUDED__ -#define __C_BONE_SCENE_NODE_H_INCLUDED__ +#ifndef IRR_C_BONE_SCENE_NODE_H_INCLUDED +#define IRR_C_BONE_SCENE_NODE_H_INCLUDED // Used with SkinnedMesh and IAnimatedMeshSceneNode, for boned meshes @@ -76,4 +76,3 @@ namespace scene } // end namespace irr #endif - diff --git a/source/Irrlicht/CCameraSceneNode.h b/source/Irrlicht/CCameraSceneNode.h index 2b4f2f42..2f6d4e49 100644 --- a/source/Irrlicht/CCameraSceneNode.h +++ b/source/Irrlicht/CCameraSceneNode.h @@ -2,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_CAMERA_SCENE_NODE_H_INCLUDED__ -#define __C_CAMERA_SCENE_NODE_H_INCLUDED__ +#ifndef IRR_C_CAMERA_SCENE_NODE_H_INCLUDED +#define IRR_C_CAMERA_SCENE_NODE_H_INCLUDED #include "ICameraSceneNode.h" #include "SViewFrustum.h" @@ -176,4 +176,3 @@ namespace scene } // end namespace #endif - diff --git a/source/Irrlicht/CColladaFileLoader.h b/source/Irrlicht/CColladaFileLoader.h index 5e344eb3..b8b661ce 100644 --- a/source/Irrlicht/CColladaFileLoader.h +++ b/source/Irrlicht/CColladaFileLoader.h @@ -2,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_COLLADA_MESH_FILE_LOADER_H_INCLUDED__ -#define __C_COLLADA_MESH_FILE_LOADER_H_INCLUDED__ +#ifndef IRR_C_COLLADA_MESH_FILE_LOADER_H_INCLUDED +#define IRR_C_COLLADA_MESH_FILE_LOADER_H_INCLUDED #include "IMeshLoader.h" #include "IFileSystem.h" @@ -407,4 +407,3 @@ public: } // end namespace irr #endif - diff --git a/source/Irrlicht/CColorConverter.h b/source/Irrlicht/CColorConverter.h index b4486b78..888b18fb 100644 --- a/source/Irrlicht/CColorConverter.h +++ b/source/Irrlicht/CColorConverter.h @@ -2,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_COLOR_CONVERTER_H_INCLUDED__ -#define __C_COLOR_CONVERTER_H_INCLUDED__ +#ifndef IRR_C_COLOR_CONVERTER_H_INCLUDED +#define IRR_C_COLOR_CONVERTER_H_INCLUDED #include "irrTypes.h" #include "IImage.h" @@ -95,4 +95,3 @@ public: } // end namespace irr #endif - diff --git a/source/Irrlicht/CCubeSceneNode.h b/source/Irrlicht/CCubeSceneNode.h index 519d2139..d1719e23 100644 --- a/source/Irrlicht/CCubeSceneNode.h +++ b/source/Irrlicht/CCubeSceneNode.h @@ -2,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_CUBE_SCENE_NODE_H_INCLUDED__ -#define __C_CUBE_SCENE_NODE_H_INCLUDED__ +#ifndef IRR_C_CUBE_SCENE_NODE_H_INCLUDED +#define IRR_C_CUBE_SCENE_NODE_H_INCLUDED #include "IMeshSceneNode.h" #include "SMesh.h" @@ -90,4 +90,3 @@ namespace scene } // end namespace irr #endif - diff --git a/source/Irrlicht/CD3D9Driver.h b/source/Irrlicht/CD3D9Driver.h index b285d5f9..596cd1c2 100644 --- a/source/Irrlicht/CD3D9Driver.h +++ b/source/Irrlicht/CD3D9Driver.h @@ -2,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_VIDEO_DIRECTX_9_H_INCLUDED__ -#define __C_VIDEO_DIRECTX_9_H_INCLUDED__ +#ifndef IRR_C_VIDEO_DIRECTX_9_H_INCLUDED +#define IRR_C_VIDEO_DIRECTX_9_H_INCLUDED #include "IrrCompileConfig.h" @@ -506,7 +506,5 @@ namespace video } // end namespace video } // end namespace irr - #endif // _IRR_COMPILE_WITH_DIRECT3D_9_ -#endif // __C_VIDEO_DIRECTX_9_H_INCLUDED__ - +#endif // IRR_C_VIDEO_DIRECTX_9_H_INCLUDED diff --git a/source/Irrlicht/CD3D9HLSLMaterialRenderer.h b/source/Irrlicht/CD3D9HLSLMaterialRenderer.h index 0067df2e..a9156b67 100644 --- a/source/Irrlicht/CD3D9HLSLMaterialRenderer.h +++ b/source/Irrlicht/CD3D9HLSLMaterialRenderer.h @@ -2,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_D3D9_HLSL_MATERIAL_RENDERER_H_INCLUDED__ -#define __C_D3D9_HLSL_MATERIAL_RENDERER_H_INCLUDED__ +#ifndef IRR_C_D3D9_HLSL_MATERIAL_RENDERER_H_INCLUDED +#define IRR_C_D3D9_HLSL_MATERIAL_RENDERER_H_INCLUDED #include "IrrCompileConfig.h" #ifdef _IRR_WINDOWS_ @@ -84,4 +84,3 @@ protected: #endif #endif #endif - diff --git a/source/Irrlicht/CD3D9MaterialRenderer.h b/source/Irrlicht/CD3D9MaterialRenderer.h index e4f23d0b..d67e81c0 100644 --- a/source/Irrlicht/CD3D9MaterialRenderer.h +++ b/source/Irrlicht/CD3D9MaterialRenderer.h @@ -2,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_D3D9_MATERIAL_RENDERER_H_INCLUDED__ -#define __C_D3D9_MATERIAL_RENDERER_H_INCLUDED__ +#ifndef IRR_C_D3D9_MATERIAL_RENDERER_H_INCLUDED +#define IRR_C_D3D9_MATERIAL_RENDERER_H_INCLUDED #include "IrrCompileConfig.h" #ifdef _IRR_WINDOWS_ @@ -581,4 +581,3 @@ public: #endif #endif #endif - diff --git a/source/Irrlicht/CD3D9NormalMapRenderer.h b/source/Irrlicht/CD3D9NormalMapRenderer.h index a83ffa5d..ff0f333b 100644 --- a/source/Irrlicht/CD3D9NormalMapRenderer.h +++ b/source/Irrlicht/CD3D9NormalMapRenderer.h @@ -2,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_D3D9_NORMAL_MAPMATERIAL_RENDERER_H_INCLUDED__ -#define __C_D3D9_NORMAL_MAPMATERIAL_RENDERER_H_INCLUDED__ +#ifndef IRR_C_D3D9_NORMAL_MAPMATERIAL_RENDERER_H_INCLUDED +#define IRR_C_D3D9_NORMAL_MAPMATERIAL_RENDERER_H_INCLUDED #include "IrrCompileConfig.h" #ifdef _IRR_WINDOWS_ @@ -53,4 +53,3 @@ private: #endif #endif #endif - diff --git a/source/Irrlicht/CD3D9ParallaxMapRenderer.h b/source/Irrlicht/CD3D9ParallaxMapRenderer.h index cf51a71c..17dbdac3 100644 --- a/source/Irrlicht/CD3D9ParallaxMapRenderer.h +++ b/source/Irrlicht/CD3D9ParallaxMapRenderer.h @@ -2,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_D3D9_PARALLAX_MAPMATERIAL_RENDERER_H_INCLUDED__ -#define __C_D3D9_PARALLAX_MAPMATERIAL_RENDERER_H_INCLUDED__ +#ifndef IRR_C_D3D9_PARALLAX_MAPMATERIAL_RENDERER_H_INCLUDED +#define IRR_C_D3D9_PARALLAX_MAPMATERIAL_RENDERER_H_INCLUDED #include "IrrCompileConfig.h" #ifdef _IRR_WINDOWS_ @@ -60,4 +60,3 @@ private: #endif #endif #endif - diff --git a/source/Irrlicht/CD3D9RenderTarget.h b/source/Irrlicht/CD3D9RenderTarget.h index d0c59e6f..040db001 100644 --- a/source/Irrlicht/CD3D9RenderTarget.h +++ b/source/Irrlicht/CD3D9RenderTarget.h @@ -2,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_OPEN_GL_RENDER_TARGET_H_INCLUDED__ -#define __C_OPEN_GL_RENDER_TARGET_H_INCLUDED__ +#ifndef IRR_C_OPEN_GL_RENDER_TARGET_H_INCLUDED +#define IRR_C_OPEN_GL_RENDER_TARGET_H_INCLUDED #include "IrrCompileConfig.h" diff --git a/source/Irrlicht/CD3D9ShaderMaterialRenderer.h b/source/Irrlicht/CD3D9ShaderMaterialRenderer.h index 04b53daa..88d61e43 100644 --- a/source/Irrlicht/CD3D9ShaderMaterialRenderer.h +++ b/source/Irrlicht/CD3D9ShaderMaterialRenderer.h @@ -2,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_D3D9_SHADER_MATERIAL_RENDERER_H_INCLUDED__ -#define __C_D3D9_SHADER_MATERIAL_RENDERER_H_INCLUDED__ +#ifndef IRR_C_D3D9_SHADER_MATERIAL_RENDERER_H_INCLUDED +#define IRR_C_D3D9_SHADER_MATERIAL_RENDERER_H_INCLUDED #include "IrrCompileConfig.h" #ifdef _IRR_WINDOWS_ @@ -105,4 +105,3 @@ protected: #endif #endif #endif - diff --git a/source/Irrlicht/CD3D9Texture.h b/source/Irrlicht/CD3D9Texture.h index 689180ae..3dd1bd10 100644 --- a/source/Irrlicht/CD3D9Texture.h +++ b/source/Irrlicht/CD3D9Texture.h @@ -2,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_DIRECTX9_TEXTURE_H_INCLUDED__ -#define __C_DIRECTX9_TEXTURE_H_INCLUDED__ +#ifndef IRR_C_DIRECTX9_TEXTURE_H_INCLUDED +#define IRR_C_DIRECTX9_TEXTURE_H_INCLUDED #include "IrrCompileConfig.h" #ifdef _IRR_COMPILE_WITH_DIRECT3D_9_ diff --git a/source/Irrlicht/CDMFLoader.h b/source/Irrlicht/CDMFLoader.h index cb5d2ec4..bf82b392 100644 --- a/source/Irrlicht/CDMFLoader.h +++ b/source/Irrlicht/CDMFLoader.h @@ -27,8 +27,8 @@ credits to others for parts of this code. */ -#ifndef __C_DMF_LOADER_H_INCLUDED__ -#define __C_DMF_LOADER_H_INCLUDED__ +#ifndef IRR_C_DMF_LOADER_H_INCLUDED +#define IRR_C_DMF_LOADER_H_INCLUDED #include "IMeshLoader.h" #include "IReadFile.h" @@ -88,4 +88,3 @@ namespace scene } // end namespace irr #endif - diff --git a/source/Irrlicht/CDefaultGUIElementFactory.h b/source/Irrlicht/CDefaultGUIElementFactory.h index c2cb163d..cea60bca 100644 --- a/source/Irrlicht/CDefaultGUIElementFactory.h +++ b/source/Irrlicht/CDefaultGUIElementFactory.h @@ -2,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_DEFAULT_GUI_ELEMENT_FACTORY_H_INCLUDED__ -#define __C_DEFAULT_GUI_ELEMENT_FACTORY_H_INCLUDED__ +#ifndef IRR_C_DEFAULT_GUI_ELEMENT_FACTORY_H_INCLUDED +#define IRR_C_DEFAULT_GUI_ELEMENT_FACTORY_H_INCLUDED #include "IrrCompileConfig.h" #ifdef _IRR_COMPILE_WITH_GUI_ @@ -67,4 +67,4 @@ namespace gui #endif // _IRR_COMPILE_WITH_GUI_ -#endif // __C_DEFAULT_GUI_ELEMENT_FACTORY_H_INCLUDED__ +#endif // IRR_C_DEFAULT_GUI_ELEMENT_FACTORY_H_INCLUDED diff --git a/source/Irrlicht/CDefaultSceneNodeAnimatorFactory.h b/source/Irrlicht/CDefaultSceneNodeAnimatorFactory.h index 9e54996a..deb16bf8 100644 --- a/source/Irrlicht/CDefaultSceneNodeAnimatorFactory.h +++ b/source/Irrlicht/CDefaultSceneNodeAnimatorFactory.h @@ -2,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_DEFAULT_SCENE_NODE_ANIMATOR_FACTORY_H_INCLUDED__ -#define __C_DEFAULT_SCENE_NODE_ANIMATOR_FACTORY_H_INCLUDED__ +#ifndef IRR_C_DEFAULT_SCENE_NODE_ANIMATOR_FACTORY_H_INCLUDED +#define IRR_C_DEFAULT_SCENE_NODE_ANIMATOR_FACTORY_H_INCLUDED #include "ISceneNodeAnimatorFactory.h" @@ -72,4 +72,3 @@ namespace scene } // end namespace irr #endif - diff --git a/source/Irrlicht/CDefaultSceneNodeFactory.h b/source/Irrlicht/CDefaultSceneNodeFactory.h index bec6c3b5..922c972f 100644 --- a/source/Irrlicht/CDefaultSceneNodeFactory.h +++ b/source/Irrlicht/CDefaultSceneNodeFactory.h @@ -2,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_DEFAULT_SCENE_NODE_FACTORY_H_INCLUDED__ -#define __C_DEFAULT_SCENE_NODE_FACTORY_H_INCLUDED__ +#ifndef IRR_C_DEFAULT_SCENE_NODE_FACTORY_H_INCLUDED +#define IRR_C_DEFAULT_SCENE_NODE_FACTORY_H_INCLUDED #include "ISceneNodeFactory.h" #include "irrArray.h" @@ -16,7 +16,7 @@ namespace scene class ISceneNode; class ISceneManager; - //! Interface making it possible to dynamicly create scene nodes and animators + //! Interface making it possible to dynamically create scene nodes and animators class CDefaultSceneNodeFactory : public ISceneNodeFactory { public: @@ -77,4 +77,3 @@ namespace scene } // end namespace irr #endif - diff --git a/source/Irrlicht/CDepthBuffer.h b/source/Irrlicht/CDepthBuffer.h index 8ddea073..f8873da2 100644 --- a/source/Irrlicht/CDepthBuffer.h +++ b/source/Irrlicht/CDepthBuffer.h @@ -2,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_Z_BUFFER_H_INCLUDED__ -#define __C_Z_BUFFER_H_INCLUDED__ +#ifndef IRR_C_Z_BUFFER_H_INCLUDED +#define IRR_C_Z_BUFFER_H_INCLUDED #include "IDepthBuffer.h" @@ -89,4 +89,3 @@ namespace video } // end namespace irr #endif - diff --git a/source/Irrlicht/CDummyTransformationSceneNode.h b/source/Irrlicht/CDummyTransformationSceneNode.h index 9f44bae3..095131f2 100644 --- a/source/Irrlicht/CDummyTransformationSceneNode.h +++ b/source/Irrlicht/CDummyTransformationSceneNode.h @@ -2,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_DUMMY_TRANSFORMATION_SCENE_NODE_H_INCLUDED__ -#define __C_DUMMY_TRANSFORMATION_SCENE_NODE_H_INCLUDED__ +#ifndef IRR_C_DUMMY_TRANSFORMATION_SCENE_NODE_H_INCLUDED +#define IRR_C_DUMMY_TRANSFORMATION_SCENE_NODE_H_INCLUDED #include "IDummyTransformationSceneNode.h" @@ -59,4 +59,3 @@ namespace scene } // end namespace irr #endif - diff --git a/source/Irrlicht/CEmptySceneNode.h b/source/Irrlicht/CEmptySceneNode.h index d9d67317..fc0b2491 100644 --- a/source/Irrlicht/CEmptySceneNode.h +++ b/source/Irrlicht/CEmptySceneNode.h @@ -2,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_EMPTY_SCENE_NODE_H_INCLUDED__ -#define __C_EMPTY_SCENE_NODE_H_INCLUDED__ +#ifndef IRR_C_EMPTY_SCENE_NODE_H_INCLUDED +#define IRR_C_EMPTY_SCENE_NODE_H_INCLUDED #include "ISceneNode.h" @@ -43,4 +43,3 @@ namespace scene } // end namespace irr #endif - diff --git a/source/Irrlicht/CFPSCounter.h b/source/Irrlicht/CFPSCounter.h index 12e0d4e8..f0d853b0 100644 --- a/source/Irrlicht/CFPSCounter.h +++ b/source/Irrlicht/CFPSCounter.h @@ -2,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_FPSCOUNTER_H_INCLUDED__ -#define __C_FPSCOUNTER_H_INCLUDED__ +#ifndef IRR_C_FPSCOUNTER_H_INCLUDED +#define IRR_C_FPSCOUNTER_H_INCLUDED #include "irrTypes.h" @@ -49,6 +49,4 @@ private: } // end namespace video } // end namespace irr - #endif - diff --git a/source/Irrlicht/CFileList.h b/source/Irrlicht/CFileList.h index 79f50639..2056a794 100644 --- a/source/Irrlicht/CFileList.h +++ b/source/Irrlicht/CFileList.h @@ -2,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_FILE_LIST_H_INCLUDED__ -#define __C_FILE_LIST_H_INCLUDED__ +#ifndef IRR_C_FILE_LIST_H_INCLUDED +#define IRR_C_FILE_LIST_H_INCLUDED #include "IFileList.h" #include "irrString.h" @@ -135,4 +135,3 @@ protected: #endif - diff --git a/source/Irrlicht/CFileSystem.h b/source/Irrlicht/CFileSystem.h index 0382ef54..ba11cd11 100644 --- a/source/Irrlicht/CFileSystem.h +++ b/source/Irrlicht/CFileSystem.h @@ -2,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_FILE_SYSTEM_H_INCLUDED__ -#define __C_FILE_SYSTEM_H_INCLUDED__ +#ifndef IRR_C_FILE_SYSTEM_H_INCLUDED +#define IRR_C_FILE_SYSTEM_H_INCLUDED #include "IFileSystem.h" #include "irrArray.h" @@ -176,4 +176,3 @@ private: } // end namespace io #endif - diff --git a/source/Irrlicht/CGLXManager.h b/source/Irrlicht/CGLXManager.h index 98795be5..085d4184 100644 --- a/source/Irrlicht/CGLXManager.h +++ b/source/Irrlicht/CGLXManager.h @@ -2,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_GLX_MANAGER_H_INCLUDED__ -#define __C_GLX_MANAGER_H_INCLUDED__ +#ifndef IRR_C_GLX_MANAGER_H_INCLUDED +#define IRR_C_GLX_MANAGER_H_INCLUDED #include "IrrCompileConfig.h" @@ -76,4 +76,3 @@ namespace video #endif #endif - diff --git a/source/Irrlicht/CGUIButton.h b/source/Irrlicht/CGUIButton.h index bda96c74..1fc82dff 100644 --- a/source/Irrlicht/CGUIButton.h +++ b/source/Irrlicht/CGUIButton.h @@ -2,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_GUI_BUTTON_H_INCLUDED__ -#define __C_GUI_BUTTON_H_INCLUDED__ +#ifndef IRR_C_GUI_BUTTON_H_INCLUDED +#define IRR_C_GUI_BUTTON_H_INCLUDED #include "IrrCompileConfig.h" #ifdef _IRR_COMPILE_WITH_GUI_ @@ -252,5 +252,4 @@ namespace gui #endif // _IRR_COMPILE_WITH_GUI_ -#endif // __C_GUI_BUTTON_H_INCLUDED__ - +#endif // IRR_C_GUI_BUTTON_H_INCLUDED diff --git a/source/Irrlicht/CGUICheckBox.h b/source/Irrlicht/CGUICheckBox.h index 61841ede..5e154e6a 100644 --- a/source/Irrlicht/CGUICheckBox.h +++ b/source/Irrlicht/CGUICheckBox.h @@ -2,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_GUI_CHECKBOX_H_INCLUDED__ -#define __C_GUI_CHECKBOX_H_INCLUDED__ +#ifndef IRR_C_GUI_CHECKBOX_H_INCLUDED +#define IRR_C_GUI_CHECKBOX_H_INCLUDED #include "IrrCompileConfig.h" #ifdef _IRR_COMPILE_WITH_GUI_ @@ -66,6 +66,6 @@ namespace gui } // end namespace gui } // end namespace irr -#endif // __C_GUI_CHECKBOX_H_INCLUDED__ - #endif // _IRR_COMPILE_WITH_GUI_ + +#endif // IRR_C_GUI_CHECKBOX_H_INCLUDED diff --git a/source/Irrlicht/CGUIColorSelectDialog.h b/source/Irrlicht/CGUIColorSelectDialog.h index 8e15d34f..111219a3 100644 --- a/source/Irrlicht/CGUIColorSelectDialog.h +++ b/source/Irrlicht/CGUIColorSelectDialog.h @@ -2,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_GUI_COLOR_SELECT_DIALOG_H_INCLUDED__ -#define __C_GUI_COLOR_SELECT_DIALOG_H_INCLUDED__ +#ifndef IRR_C_GUI_COLOR_SELECT_DIALOG_H_INCLUDED +#define IRR_C_GUI_COLOR_SELECT_DIALOG_H_INCLUDED #include "IrrCompileConfig.h" #ifdef _IRR_COMPILE_WITH_GUI_ @@ -71,4 +71,4 @@ namespace gui #endif // _IRR_COMPILE_WITH_GUI_ -#endif // __C_GUI_COLOR_SELECT_DIALOG_H_INCLUDED__ +#endif // IRR_C_GUI_COLOR_SELECT_DIALOG_H_INCLUDED diff --git a/source/Irrlicht/CGUIComboBox.h b/source/Irrlicht/CGUIComboBox.h index ec246bfd..ae4ad604 100644 --- a/source/Irrlicht/CGUIComboBox.h +++ b/source/Irrlicht/CGUIComboBox.h @@ -2,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_GUI_COMBO_BOX_H_INCLUDED__ -#define __C_GUI_COMBO_BOX_H_INCLUDED__ +#ifndef IRR_C_GUI_COMBO_BOX_H_INCLUDED +#define IRR_C_GUI_COMBO_BOX_H_INCLUDED #include "IrrCompileConfig.h" #ifdef _IRR_COMPILE_WITH_GUI_ @@ -115,5 +115,4 @@ namespace gui #endif // _IRR_COMPILE_WITH_GUI_ -#endif // __C_GUI_COMBO_BOX_H_INCLUDED__ - +#endif // IRR_C_GUI_COMBO_BOX_H_INCLUDED diff --git a/source/Irrlicht/CGUIContextMenu.h b/source/Irrlicht/CGUIContextMenu.h index 2a7cbf4b..f877d59d 100644 --- a/source/Irrlicht/CGUIContextMenu.h +++ b/source/Irrlicht/CGUIContextMenu.h @@ -2,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_GUI_CONTEXT_MENU_H_INCLUDED__ -#define __C_GUI_CONTEXT_MENU_H_INCLUDED__ +#ifndef IRR_C_GUI_CONTEXT_MENU_H_INCLUDED +#define IRR_C_GUI_CONTEXT_MENU_H_INCLUDED #include "IrrCompileConfig.h" #ifdef _IRR_COMPILE_WITH_GUI_ @@ -170,5 +170,4 @@ namespace gui #endif // _IRR_COMPILE_WITH_GUI_ -#endif // __C_GUI_CONTEXT_MENU_H_INCLUDED__ - +#endif // IRR_C_GUI_CONTEXT_MENU_H_INCLUDED diff --git a/source/Irrlicht/CGUIEditBox.h b/source/Irrlicht/CGUIEditBox.h index 1bcaf89a..18d866cc 100644 --- a/source/Irrlicht/CGUIEditBox.h +++ b/source/Irrlicht/CGUIEditBox.h @@ -2,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_GUI_EDIT_BOX_H_INCLUDED__ -#define __C_GUI_EDIT_BOX_H_INCLUDED__ +#ifndef IRR_C_GUI_EDIT_BOX_H_INCLUDED +#define IRR_C_GUI_EDIT_BOX_H_INCLUDED #include "IrrCompileConfig.h" #ifdef _IRR_COMPILE_WITH_GUI_ @@ -203,5 +203,4 @@ namespace gui } // end namespace irr #endif // _IRR_COMPILE_WITH_GUI_ -#endif // __C_GUI_EDIT_BOX_H_INCLUDED__ - +#endif // IRR_C_GUI_EDIT_BOX_H_INCLUDED diff --git a/source/Irrlicht/CGUIEnvironment.h b/source/Irrlicht/CGUIEnvironment.h index 012f2543..e03852b1 100644 --- a/source/Irrlicht/CGUIEnvironment.h +++ b/source/Irrlicht/CGUIEnvironment.h @@ -2,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_GUI_ENVIRONMENT_H_INCLUDED__ -#define __C_GUI_ENVIRONMENT_H_INCLUDED__ +#ifndef IRR_C_GUI_ENVIRONMENT_H_INCLUDED +#define IRR_C_GUI_ENVIRONMENT_H_INCLUDED #include "IrrCompileConfig.h" #ifdef _IRR_COMPILE_WITH_GUI_ @@ -338,6 +338,4 @@ private: #endif // _IRR_COMPILE_WITH_GUI_ -#endif // __C_GUI_ENVIRONMENT_H_INCLUDED__ - - +#endif // IRR_C_GUI_ENVIRONMENT_H_INCLUDED diff --git a/source/Irrlicht/CGUIFileOpenDialog.h b/source/Irrlicht/CGUIFileOpenDialog.h index 37822070..0b4ab076 100644 --- a/source/Irrlicht/CGUIFileOpenDialog.h +++ b/source/Irrlicht/CGUIFileOpenDialog.h @@ -2,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_GUI_FILE_OPEN_DIALOG_H_INCLUDED__ -#define __C_GUI_FILE_OPEN_DIALOG_H_INCLUDED__ +#ifndef IRR_C_GUI_FILE_OPEN_DIALOG_H_INCLUDED +#define IRR_C_GUI_FILE_OPEN_DIALOG_H_INCLUDED #include "IrrCompileConfig.h" #ifdef _IRR_COMPILE_WITH_GUI_ @@ -95,5 +95,4 @@ namespace gui #endif // _IRR_COMPILE_WITH_GUI_ -#endif // __C_GUI_FILE_OPEN_DIALOG_H_INCLUDED__ - +#endif // IRR_C_GUI_FILE_OPEN_DIALOG_H_INCLUDED diff --git a/source/Irrlicht/CGUIFont.h b/source/Irrlicht/CGUIFont.h index 29353a39..c4fece7d 100644 --- a/source/Irrlicht/CGUIFont.h +++ b/source/Irrlicht/CGUIFont.h @@ -2,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_GUI_FONT_H_INCLUDED__ -#define __C_GUI_FONT_H_INCLUDED__ +#ifndef IRR_C_GUI_FONT_H_INCLUDED +#define IRR_C_GUI_FONT_H_INCLUDED #include "IrrCompileConfig.h" #ifdef _IRR_COMPILE_WITH_GUI_ @@ -118,5 +118,4 @@ private: #endif // _IRR_COMPILE_WITH_GUI_ -#endif // __C_GUI_FONT_H_INCLUDED__ - +#endif // IRR_C_GUI_FONT_H_INCLUDED diff --git a/source/Irrlicht/CGUIImage.h b/source/Irrlicht/CGUIImage.h index 19c4e658..fde4f9a6 100644 --- a/source/Irrlicht/CGUIImage.h +++ b/source/Irrlicht/CGUIImage.h @@ -2,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_GUI_IMAGE_H_INCLUDED__ -#define __C_GUI_IMAGE_H_INCLUDED__ +#ifndef IRR_C_GUI_IMAGE_H_INCLUDED +#define IRR_C_GUI_IMAGE_H_INCLUDED #include "IrrCompileConfig.h" #ifdef _IRR_COMPILE_WITH_GUI_ @@ -110,4 +110,4 @@ namespace gui #endif // _IRR_COMPILE_WITH_GUI_ -#endif // __C_GUI_IMAGE_H_INCLUDED__ +#endif // IRR_C_GUI_IMAGE_H_INCLUDED diff --git a/source/Irrlicht/CGUIImageList.h b/source/Irrlicht/CGUIImageList.h index 35b5f499..11d13078 100644 --- a/source/Irrlicht/CGUIImageList.h +++ b/source/Irrlicht/CGUIImageList.h @@ -1,8 +1,8 @@ // This file is part of the "Irrlicht Engine". // written by Reinhard Ostermeier, reinhard@nospam.r-ostermeier.de -#ifndef __C_GUI_IMAGE_LIST_H_INCLUDED__ -#define __C_GUI_IMAGE_LIST_H_INCLUDED__ +#ifndef IRR_C_GUI_IMAGE_LIST_H_INCLUDED +#define IRR_C_GUI_IMAGE_LIST_H_INCLUDED #include "IGUIImageList.h" #include "IVideoDriver.h" diff --git a/source/Irrlicht/CGUIInOutFader.h b/source/Irrlicht/CGUIInOutFader.h index 147de8df..3488f4da 100644 --- a/source/Irrlicht/CGUIInOutFader.h +++ b/source/Irrlicht/CGUIInOutFader.h @@ -2,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_GUI_IN_OUT_FADER_H_INCLUDED__ -#define __C_GUI_IN_OUT_FADER_H_INCLUDED__ +#ifndef IRR_C_GUI_IN_OUT_FADER_H_INCLUDED +#define IRR_C_GUI_IN_OUT_FADER_H_INCLUDED #include "IrrCompileConfig.h" #ifdef _IRR_COMPILE_WITH_GUI_ @@ -71,5 +71,4 @@ namespace gui #endif // _IRR_COMPILE_WITH_GUI_ -#endif // __C_GUI_IN_OUT_FADER_H_INCLUDED__ - +#endif // IRR_C_GUI_IN_OUT_FADER_H_INCLUDED diff --git a/source/Irrlicht/CGUIListBox.h b/source/Irrlicht/CGUIListBox.h index 155fd486..0afe81d4 100644 --- a/source/Irrlicht/CGUIListBox.h +++ b/source/Irrlicht/CGUIListBox.h @@ -2,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_GUI_LIST_BOX_H_INCLUDED__ -#define __C_GUI_LIST_BOX_H_INCLUDED__ +#ifndef IRR_C_GUI_LIST_BOX_H_INCLUDED +#define IRR_C_GUI_LIST_BOX_H_INCLUDED #include "IrrCompileConfig.h" #ifdef _IRR_COMPILE_WITH_GUI_ diff --git a/source/Irrlicht/CGUIMenu.h b/source/Irrlicht/CGUIMenu.h index 5595dbe0..954dac64 100644 --- a/source/Irrlicht/CGUIMenu.h +++ b/source/Irrlicht/CGUIMenu.h @@ -2,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_GUI_MENU_H_INCLUDED__ -#define __C_GUI_MENU_H_INCLUDED__ +#ifndef IRR_C_GUI_MENU_H_INCLUDED +#define IRR_C_GUI_MENU_H_INCLUDED #include "IrrCompileConfig.h" #ifdef _IRR_COMPILE_WITH_GUI_ @@ -46,7 +46,5 @@ namespace gui } // end namespace gui } // end namespace irr - -#endif // __C_GUI_MENU_H_INCLUDED__ #endif // _IRR_COMPILE_WITH_GUI_ - +#endif // IRR_C_GUI_MENU_H_INCLUDED diff --git a/source/Irrlicht/CGUIMeshViewer.h b/source/Irrlicht/CGUIMeshViewer.h index 7f79d706..be2343ab 100644 --- a/source/Irrlicht/CGUIMeshViewer.h +++ b/source/Irrlicht/CGUIMeshViewer.h @@ -2,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_GUI_MESH_VIEWER_H_INCLUDED__ -#define __C_GUI_MESH_VIEWER_H_INCLUDED__ +#ifndef IRR_C_GUI_MESH_VIEWER_H_INCLUDED +#define IRR_C_GUI_MESH_VIEWER_H_INCLUDED #include "IrrCompileConfig.h" #ifdef _IRR_COMPILE_WITH_GUI_ @@ -57,5 +57,4 @@ namespace gui #endif // _IRR_COMPILE_WITH_GUI_ -#endif // __C_GUI_MESH_VIEWER_H_INCLUDED__ - +#endif // IRR_C_GUI_MESH_VIEWER_H_INCLUDED diff --git a/source/Irrlicht/CGUIMessageBox.h b/source/Irrlicht/CGUIMessageBox.h index 62714c76..0d17d50a 100644 --- a/source/Irrlicht/CGUIMessageBox.h +++ b/source/Irrlicht/CGUIMessageBox.h @@ -2,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_GUI_MESSAGE_BOX_H_INCLUDED__ -#define __C_GUI_MESSAGE_BOX_H_INCLUDED__ +#ifndef IRR_C_GUI_MESSAGE_BOX_H_INCLUDED +#define IRR_C_GUI_MESSAGE_BOX_H_INCLUDED #include "IrrCompileConfig.h" #ifdef _IRR_COMPILE_WITH_GUI_ diff --git a/source/Irrlicht/CGUIModalScreen.h b/source/Irrlicht/CGUIModalScreen.h index c39fab1b..b57e4fc9 100644 --- a/source/Irrlicht/CGUIModalScreen.h +++ b/source/Irrlicht/CGUIModalScreen.h @@ -2,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_GUI_MODAL_SCREEN_H_INCLUDED__ -#define __C_GUI_MODAL_SCREEN_H_INCLUDED__ +#ifndef IRR_C_GUI_MODAL_SCREEN_H_INCLUDED +#define IRR_C_GUI_MODAL_SCREEN_H_INCLUDED #include "IrrCompileConfig.h" #ifdef _IRR_COMPILE_WITH_GUI_ @@ -83,4 +83,3 @@ namespace gui #endif // _IRR_COMPILE_WITH_GUI_ #endif - diff --git a/source/Irrlicht/CGUIProfiler.h b/source/Irrlicht/CGUIProfiler.h index 25646c30..81a10414 100644 --- a/source/Irrlicht/CGUIProfiler.h +++ b/source/Irrlicht/CGUIProfiler.h @@ -2,8 +2,8 @@ // For conditions of distribution and use, see copyright notice in irrlicht.h // Written by Michael Zeilfelder -#ifndef C_GUI_PROFILER_H_INCLUDED__ -#define C_GUI_PROFILER_H_INCLUDED__ +#ifndef IRR_C_GUI_PROFILER_H_INCLUDED +#define IRR_C_GUI_PROFILER_H_INCLUDED #include "IrrCompileConfig.h" #ifdef _IRR_COMPILE_WITH_GUI_ @@ -103,4 +103,4 @@ namespace gui #endif // _IRR_COMPILE_WITH_GUI_ -#endif // __C_GUI_IMAGE_H_INCLUDED__ +#endif diff --git a/source/Irrlicht/CGUIScrollBar.h b/source/Irrlicht/CGUIScrollBar.h index 07f613f5..53abbc0f 100644 --- a/source/Irrlicht/CGUIScrollBar.h +++ b/source/Irrlicht/CGUIScrollBar.h @@ -2,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_GUI_SCROLL_BAR_H_INCLUDED__ -#define __C_GUI_SCROLL_BAR_H_INCLUDED__ +#ifndef IRR_C_GUI_SCROLL_BAR_H_INCLUDED +#define IRR_C_GUI_SCROLL_BAR_H_INCLUDED #include "IrrCompileConfig.h" #ifdef _IRR_COMPILE_WITH_GUI_ @@ -110,4 +110,3 @@ namespace gui #endif // _IRR_COMPILE_WITH_GUI_ #endif - diff --git a/source/Irrlicht/CGUISkin.h b/source/Irrlicht/CGUISkin.h index c99182df..0cf682ef 100644 --- a/source/Irrlicht/CGUISkin.h +++ b/source/Irrlicht/CGUISkin.h @@ -2,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_GUI_SKIN_H_INCLUDED__ -#define __C_GUI_SKIN_H_INCLUDED__ +#ifndef IRR_C_GUI_SKIN_H_INCLUDED +#define IRR_C_GUI_SKIN_H_INCLUDED #include "IrrCompileConfig.h" #ifdef _IRR_COMPILE_WITH_GUI_ @@ -243,5 +243,3 @@ namespace gui #endif // _IRR_COMPILE_WITH_GUI_ #endif - - diff --git a/source/Irrlicht/CGUISpinBox.h b/source/Irrlicht/CGUISpinBox.h index 0b7dfdbe..b412577e 100644 --- a/source/Irrlicht/CGUISpinBox.h +++ b/source/Irrlicht/CGUISpinBox.h @@ -2,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_GUI_SPIN_BOX_H_INCLUDED__ -#define __C_GUI_SPIN_BOX_H_INCLUDED__ +#ifndef IRR_C_GUI_SPIN_BOX_H_INCLUDED +#define IRR_C_GUI_SPIN_BOX_H_INCLUDED #include "IrrCompileConfig.h" #ifdef _IRR_COMPILE_WITH_GUI_ @@ -112,5 +112,4 @@ namespace gui #endif // _IRR_COMPILE_WITH_GUI_ -#endif // __C_GUI_SPIN_BOX_H_INCLUDED__ - +#endif // IRR_C_GUI_SPIN_BOX_H_INCLUDED diff --git a/source/Irrlicht/CGUISpriteBank.h b/source/Irrlicht/CGUISpriteBank.h index c3f63ef0..1d63c531 100644 --- a/source/Irrlicht/CGUISpriteBank.h +++ b/source/Irrlicht/CGUISpriteBank.h @@ -2,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_GUI_SPRITE_BANK_H_INCLUDED__ -#define __C_GUI_SPRITE_BANK_H_INCLUDED__ +#ifndef IRR_C_GUI_SPRITE_BANK_H_INCLUDED +#define IRR_C_GUI_SPRITE_BANK_H_INCLUDED #include "IrrCompileConfig.h" #ifdef _IRR_COMPILE_WITH_GUI_ @@ -101,5 +101,4 @@ protected: #endif // _IRR_COMPILE_WITH_GUI_ -#endif // __C_GUI_SPRITE_BANK_H_INCLUDED__ - +#endif // IRR_C_GUI_SPRITE_BANK_H_INCLUDED diff --git a/source/Irrlicht/CGUIStaticText.h b/source/Irrlicht/CGUIStaticText.h index 349f4ca2..d80d0fe1 100644 --- a/source/Irrlicht/CGUIStaticText.h +++ b/source/Irrlicht/CGUIStaticText.h @@ -2,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_GUI_STATIC_TEXT_H_INCLUDED__ -#define __C_GUI_STATIC_TEXT_H_INCLUDED__ +#ifndef IRR_C_GUI_STATIC_TEXT_H_INCLUDED +#define IRR_C_GUI_STATIC_TEXT_H_INCLUDED #include "IrrCompileConfig.h" #ifdef _IRR_COMPILE_WITH_GUI_ @@ -145,4 +145,3 @@ namespace gui #endif // _IRR_COMPILE_WITH_GUI_ #endif - diff --git a/source/Irrlicht/CGUITabControl.h b/source/Irrlicht/CGUITabControl.h index dbadb27b..3c34a156 100644 --- a/source/Irrlicht/CGUITabControl.h +++ b/source/Irrlicht/CGUITabControl.h @@ -2,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_GUI_TAB_CONTROL_H_INCLUDED__ -#define __C_GUI_TAB_CONTROL_H_INCLUDED__ +#ifndef IRR_C_GUI_TAB_CONTROL_H_INCLUDED +#define IRR_C_GUI_TAB_CONTROL_H_INCLUDED #include "IrrCompileConfig.h" #ifdef _IRR_COMPILE_WITH_GUI_ @@ -195,4 +195,3 @@ namespace gui #endif // _IRR_COMPILE_WITH_GUI_ #endif - diff --git a/source/Irrlicht/CGUITable.h b/source/Irrlicht/CGUITable.h index b15edf15..fcc499e4 100644 --- a/source/Irrlicht/CGUITable.h +++ b/source/Irrlicht/CGUITable.h @@ -5,8 +5,8 @@ // 07.10.2005 - Multicolor-Listbox addet by A. Buschhueter (Acki) // A_Buschhueter@gmx.de -#ifndef __C_GUI_TABLE_BAR_H_INCLUDED__ -#define __C_GUI_TABLE_BAR_H_INCLUDED__ +#ifndef IRR_C_GUI_TABLE_BAR_H_INCLUDED +#define IRR_C_GUI_TABLE_BAR_H_INCLUDED #include "IrrCompileConfig.h" #ifdef _IRR_COMPILE_WITH_GUI_ @@ -251,4 +251,3 @@ namespace gui #endif // _IRR_COMPILE_WITH_GUI_ #endif - diff --git a/source/Irrlicht/CGUIToolBar.h b/source/Irrlicht/CGUIToolBar.h index 5701dc2c..c9847dad 100644 --- a/source/Irrlicht/CGUIToolBar.h +++ b/source/Irrlicht/CGUIToolBar.h @@ -2,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_GUI_TOOL_BAR_H_INCLUDED__ -#define __C_GUI_TOOL_BAR_H_INCLUDED__ +#ifndef IRR_C_GUI_TOOL_BAR_H_INCLUDED +#define IRR_C_GUI_TOOL_BAR_H_INCLUDED #include "IrrCompileConfig.h" #ifdef _IRR_COMPILE_WITH_GUI_ @@ -49,4 +49,3 @@ namespace gui #endif // _IRR_COMPILE_WITH_GUI_ #endif - diff --git a/source/Irrlicht/CGUITreeView.h b/source/Irrlicht/CGUITreeView.h index be8b96d2..42e9b7dd 100644 --- a/source/Irrlicht/CGUITreeView.h +++ b/source/Irrlicht/CGUITreeView.h @@ -1,8 +1,8 @@ // This file is part of the "Irrlicht Engine". // written by Reinhard Ostermeier, reinhard@nospam.r-ostermeier.de -#ifndef __C_GUI_TREE_VIEW_H_INCLUDED__ -#define __C_GUI_TREE_VIEW_H_INCLUDED__ +#ifndef IRR_C_GUI_TREE_VIEW_H_INCLUDED +#define IRR_C_GUI_TREE_VIEW_H_INCLUDED #include "IGUITreeView.h" #include "irrList.h" @@ -352,4 +352,3 @@ namespace gui } // end namespace irr #endif - diff --git a/source/Irrlicht/CGUIWindow.h b/source/Irrlicht/CGUIWindow.h index 9668388a..7497064c 100644 --- a/source/Irrlicht/CGUIWindow.h +++ b/source/Irrlicht/CGUIWindow.h @@ -2,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_GUI_WINDOW_H_INCLUDED__ -#define __C_GUI_WINDOW_H_INCLUDED__ +#ifndef IRR_C_GUI_WINDOW_H_INCLUDED +#define IRR_C_GUI_WINDOW_H_INCLUDED #include "IrrCompileConfig.h" #ifdef _IRR_COMPILE_WITH_GUI_ @@ -96,4 +96,3 @@ namespace gui #endif // _IRR_COMPILE_WITH_GUI_ #endif - diff --git a/source/Irrlicht/CGeometryCreator.h b/source/Irrlicht/CGeometryCreator.h index f7962e06..d7646c15 100644 --- a/source/Irrlicht/CGeometryCreator.h +++ b/source/Irrlicht/CGeometryCreator.h @@ -2,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_GEOMETRY_CREATOR_H_INCLUDED__ -#define __C_GEOMETRY_CREATOR_H_INCLUDED__ +#ifndef IRR_C_GEOMETRY_CREATOR_H_INCLUDED +#define IRR_C_GEOMETRY_CREATOR_H_INCLUDED #include "IGeometryCreator.h" #include "SMeshBuffer.h" @@ -68,4 +68,3 @@ public: } // end namespace irr #endif - diff --git a/source/Irrlicht/CImage.h b/source/Irrlicht/CImage.h index d793bd7a..523935bb 100644 --- a/source/Irrlicht/CImage.h +++ b/source/Irrlicht/CImage.h @@ -2,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_IMAGE_H_INCLUDED__ -#define __C_IMAGE_H_INCLUDED__ +#ifndef IRR_C_IMAGE_H_INCLUDED +#define IRR_C_IMAGE_H_INCLUDED #include "IImage.h" #include "rect.h" @@ -65,6 +65,4 @@ private: } // end namespace video } // end namespace irr - #endif - diff --git a/source/Irrlicht/CImageLoaderBMP.h b/source/Irrlicht/CImageLoaderBMP.h index a1262e48..46980c25 100644 --- a/source/Irrlicht/CImageLoaderBMP.h +++ b/source/Irrlicht/CImageLoaderBMP.h @@ -2,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_IMAGE_LOADER_BMP_H_INCLUDED__ -#define __C_IMAGE_LOADER_BMP_H_INCLUDED__ +#ifndef IRR_C_IMAGE_LOADER_BMP_H_INCLUDED +#define IRR_C_IMAGE_LOADER_BMP_H_INCLUDED #include "IrrCompileConfig.h" @@ -97,4 +97,3 @@ private: } // end namespace irr #endif - diff --git a/source/Irrlicht/CImageLoaderDDS.h b/source/Irrlicht/CImageLoaderDDS.h index d249921d..13b1500b 100644 --- a/source/Irrlicht/CImageLoaderDDS.h +++ b/source/Irrlicht/CImageLoaderDDS.h @@ -2,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_IMAGE_LOADER_DDS_H_INCLUDED__ -#define __C_IMAGE_LOADER_DDS_H_INCLUDED__ +#ifndef IRR_C_IMAGE_LOADER_DDS_H_INCLUDED +#define IRR_C_IMAGE_LOADER_DDS_H_INCLUDED #include "IrrCompileConfig.h" @@ -212,4 +212,3 @@ public: #endif // compiled with DDS loader #endif - diff --git a/source/Irrlicht/CImageLoaderJPG.h b/source/Irrlicht/CImageLoaderJPG.h index b98fcb7a..f3ffa95e 100644 --- a/source/Irrlicht/CImageLoaderJPG.h +++ b/source/Irrlicht/CImageLoaderJPG.h @@ -2,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_IMAGE_LOADER_JPG_H_INCLUDED__ -#define __C_IMAGE_LOADER_JPG_H_INCLUDED__ +#ifndef IRR_C_IMAGE_LOADER_JPG_H_INCLUDED +#define IRR_C_IMAGE_LOADER_JPG_H_INCLUDED #include "IrrCompileConfig.h" @@ -110,4 +110,3 @@ private: #endif #endif - diff --git a/source/Irrlicht/CImageLoaderPCX.h b/source/Irrlicht/CImageLoaderPCX.h index bb2e1a8c..6fd8a782 100644 --- a/source/Irrlicht/CImageLoaderPCX.h +++ b/source/Irrlicht/CImageLoaderPCX.h @@ -2,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_IMAGE_LOADER_PCX_H_INCLUDED__ -#define __C_IMAGE_LOADER_PCX_H_INCLUDED__ +#ifndef IRR_C_IMAGE_LOADER_PCX_H_INCLUDED +#define IRR_C_IMAGE_LOADER_PCX_H_INCLUDED #include "IrrCompileConfig.h" @@ -79,4 +79,3 @@ public: } // end namespace irr #endif - diff --git a/source/Irrlicht/CImageLoaderPNG.h b/source/Irrlicht/CImageLoaderPNG.h index d33cb521..a727d8bf 100644 --- a/source/Irrlicht/CImageLoaderPNG.h +++ b/source/Irrlicht/CImageLoaderPNG.h @@ -6,8 +6,8 @@ // i wanted to be able to read in PNG images with irrlicht :) // why? lossless compression with 8-bit alpha channel! -#ifndef __C_IMAGE_LOADER_PNG_H_INCLUDED__ -#define __C_IMAGE_LOADER_PNG_H_INCLUDED__ +#ifndef IRR_C_IMAGE_LOADER_PNG_H_INCLUDED +#define IRR_C_IMAGE_LOADER_PNG_H_INCLUDED #include "IrrCompileConfig.h" @@ -42,4 +42,3 @@ public: #endif #endif - diff --git a/source/Irrlicht/CImageLoaderPPM.h b/source/Irrlicht/CImageLoaderPPM.h index 50622c22..a7a58e8e 100644 --- a/source/Irrlicht/CImageLoaderPPM.h +++ b/source/Irrlicht/CImageLoaderPPM.h @@ -2,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_IMAGE_LOADER_PPM_H_INCLUDED__ -#define __C_IMAGE_LOADER_PPM_H_INCLUDED__ +#ifndef IRR_C_IMAGE_LOADER_PPM_H_INCLUDED +#define IRR_C_IMAGE_LOADER_PPM_H_INCLUDED #include "IrrCompileConfig.h" @@ -49,7 +49,5 @@ private: } // end namespace video } // end namespace irr - #endif #endif - diff --git a/source/Irrlicht/CImageLoaderPSD.h b/source/Irrlicht/CImageLoaderPSD.h index 6024e170..56a44152 100644 --- a/source/Irrlicht/CImageLoaderPSD.h +++ b/source/Irrlicht/CImageLoaderPSD.h @@ -2,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_IMAGE_LOADER_PSD_H_INCLUDED__ -#define __C_IMAGE_LOADER_PSD_H_INCLUDED__ +#ifndef IRR_C_IMAGE_LOADER_PSD_H_INCLUDED +#define IRR_C_IMAGE_LOADER_PSD_H_INCLUDED #include "IrrCompileConfig.h" @@ -69,4 +69,3 @@ private: #endif #endif - diff --git a/source/Irrlicht/CImageLoaderPVR.h b/source/Irrlicht/CImageLoaderPVR.h index d899e828..906c9cef 100644 --- a/source/Irrlicht/CImageLoaderPVR.h +++ b/source/Irrlicht/CImageLoaderPVR.h @@ -2,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_IMAGE_LOADER_PVR_H_INCLUDED__ -#define __C_IMAGE_LOADER_PVR_H_INCLUDED__ +#ifndef IRR_C_IMAGE_LOADER_PVR_H_INCLUDED +#define IRR_C_IMAGE_LOADER_PVR_H_INCLUDED #include "IrrCompileConfig.h" diff --git a/source/Irrlicht/CImageLoaderRGB.h b/source/Irrlicht/CImageLoaderRGB.h index af22d668..3a959ab0 100644 --- a/source/Irrlicht/CImageLoaderRGB.h +++ b/source/Irrlicht/CImageLoaderRGB.h @@ -13,8 +13,8 @@ Updated: */ -#ifndef __C_IMAGE_LOADER_RGB_H_INCLUDED__ -#define __C_IMAGE_LOADER_RGB_H_INCLUDED__ +#ifndef IRR_C_IMAGE_LOADER_RGB_H_INCLUDED +#define IRR_C_IMAGE_LOADER_RGB_H_INCLUDED // define _IRR_RGB_FILE_INVERTED_IMAGE_ to preserve the inverted format of the RGB file // commenting this out will invert the inverted image,resulting in the image being upright @@ -160,5 +160,4 @@ private: } // end namespace irr #endif // _IRR_COMPILE_WITH_RGB_LOADER_ -#endif // __C_IMAGE_LOADER_RGB_H_INCLUDED__ - +#endif // IRR_C_IMAGE_LOADER_RGB_H_INCLUDED diff --git a/source/Irrlicht/CImageLoaderTGA.h b/source/Irrlicht/CImageLoaderTGA.h index 5eb1b352..9a83e615 100644 --- a/source/Irrlicht/CImageLoaderTGA.h +++ b/source/Irrlicht/CImageLoaderTGA.h @@ -2,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_IMAGE_LOADER_TGA_H_INCLUDED__ -#define __C_IMAGE_LOADER_TGA_H_INCLUDED__ +#ifndef IRR_C_IMAGE_LOADER_TGA_H_INCLUDED +#define IRR_C_IMAGE_LOADER_TGA_H_INCLUDED #include "IrrCompileConfig.h" @@ -79,4 +79,3 @@ private: } // end namespace irr #endif - diff --git a/source/Irrlicht/CImageLoaderWAL.h b/source/Irrlicht/CImageLoaderWAL.h index fa3c8dc1..ea04735f 100644 --- a/source/Irrlicht/CImageLoaderWAL.h +++ b/source/Irrlicht/CImageLoaderWAL.h @@ -8,8 +8,8 @@ Nikolaus Gebhardt for the Irrlicht 3D engine */ -#ifndef __C_IMAGE_LOADER_WAL_H_INCLUDED__ -#define __C_IMAGE_LOADER_WAL_H_INCLUDED__ +#ifndef IRR_C_IMAGE_LOADER_WAL_H_INCLUDED +#define IRR_C_IMAGE_LOADER_WAL_H_INCLUDED #include "IrrCompileConfig.h" #include "IImageLoader.h" @@ -97,4 +97,3 @@ public: } #endif - diff --git a/source/Irrlicht/CIrrDeviceConsole.h b/source/Irrlicht/CIrrDeviceConsole.h index eb9bca2b..fb4a1e69 100644 --- a/source/Irrlicht/CIrrDeviceConsole.h +++ b/source/Irrlicht/CIrrDeviceConsole.h @@ -2,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_IRR_DEVICE_CONSOLE_H_INCLUDED__ -#define __C_IRR_DEVICE_CONSOLE_H_INCLUDED__ +#ifndef IRR_C_IRR_DEVICE_CONSOLE_H_INCLUDED +#define IRR_C_IRR_DEVICE_CONSOLE_H_INCLUDED #include "IrrCompileConfig.h" #ifdef _IRR_COMPILE_WITH_CONSOLE_DEVICE_ @@ -332,5 +332,4 @@ namespace gui } // end namespace irr #endif // _IRR_COMPILE_WITH_CONSOLE_DEVICE_ -#endif // __C_IRR_DEVICE_CONSOLE_H_INCLUDED__ - +#endif // IRR_C_IRR_DEVICE_CONSOLE_H_INCLUDED diff --git a/source/Irrlicht/CIrrDeviceFB.h b/source/Irrlicht/CIrrDeviceFB.h index ee6c7431..e782c580 100644 --- a/source/Irrlicht/CIrrDeviceFB.h +++ b/source/Irrlicht/CIrrDeviceFB.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 __C_IRR_DEVICE_FB_H_INCLUDED__ -#define __C_IRR_DEVICE_FB_H_INCLUDED__ +#ifndef IRR_C_IRR_DEVICE_FB_H_INCLUDED +#define IRR_C_IRR_DEVICE_FB_H_INCLUDED #include "IrrCompileConfig.h" @@ -211,5 +211,4 @@ namespace irr } // end namespace irr #endif // _IRR_USE_FB_DEVICE_ -#endif // __C_IRR_DEVICE_FB_H_INCLUDED__ - +#endif // IRR_C_IRR_DEVICE_FB_H_INCLUDED diff --git a/source/Irrlicht/CIrrDeviceLinux.h b/source/Irrlicht/CIrrDeviceLinux.h index 1d102719..9ecf758e 100644 --- a/source/Irrlicht/CIrrDeviceLinux.h +++ b/source/Irrlicht/CIrrDeviceLinux.h @@ -2,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_IRR_DEVICE_LINUX_H_INCLUDED__ -#define __C_IRR_DEVICE_LINUX_H_INCLUDED__ +#ifndef IRR_C_IRR_DEVICE_LINUX_H_INCLUDED +#define IRR_C_IRR_DEVICE_LINUX_H_INCLUDED #include "IrrCompileConfig.h" @@ -498,5 +498,4 @@ namespace irr } // end namespace irr #endif // _IRR_COMPILE_WITH_X11_DEVICE_ -#endif // __C_IRR_DEVICE_LINUX_H_INCLUDED__ - +#endif // IRR_C_IRR_DEVICE_LINUX_H_INCLUDED diff --git a/source/Irrlicht/CIrrDeviceSDL.h b/source/Irrlicht/CIrrDeviceSDL.h index 653c67ec..61a3fd88 100644 --- a/source/Irrlicht/CIrrDeviceSDL.h +++ b/source/Irrlicht/CIrrDeviceSDL.h @@ -4,8 +4,8 @@ // This device code is based on the original SDL device implementation // contributed by Shane Parker (sirshane). -#ifndef __C_IRR_DEVICE_SDL_H_INCLUDED__ -#define __C_IRR_DEVICE_SDL_H_INCLUDED__ +#ifndef IRR_C_IRR_DEVICE_SDL_H_INCLUDED +#define IRR_C_IRR_DEVICE_SDL_H_INCLUDED #include "IrrCompileConfig.h" @@ -235,5 +235,4 @@ namespace irr } // end namespace irr #endif // _IRR_COMPILE_WITH_SDL_DEVICE_ -#endif // __C_IRR_DEVICE_SDL_H_INCLUDED__ - +#endif // IRR_C_IRR_DEVICE_SDL_H_INCLUDED diff --git a/source/Irrlicht/CIrrDeviceStub.h b/source/Irrlicht/CIrrDeviceStub.h index 1c388cba..58be1e91 100644 --- a/source/Irrlicht/CIrrDeviceStub.h +++ b/source/Irrlicht/CIrrDeviceStub.h @@ -2,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_IRR_DEVICE_STUB_H_INCLUDED__ -#define __C_IRR_DEVICE_STUB_H_INCLUDED__ +#ifndef IRR_C_IRR_DEVICE_STUB_H_INCLUDED +#define IRR_C_IRR_DEVICE_STUB_H_INCLUDED #include "IrrlichtDevice.h" #include "IImagePresenter.h" @@ -192,4 +192,3 @@ namespace irr } // end namespace irr #endif - diff --git a/source/Irrlicht/CIrrDeviceWin32.h b/source/Irrlicht/CIrrDeviceWin32.h index ee3d19a8..0acea073 100644 --- a/source/Irrlicht/CIrrDeviceWin32.h +++ b/source/Irrlicht/CIrrDeviceWin32.h @@ -2,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_IRR_DEVICE_WIN32_H_INCLUDED__ -#define __C_IRR_DEVICE_WIN32_H_INCLUDED__ +#ifndef IRR_C_IRR_DEVICE_WIN32_H_INCLUDED +#define IRR_C_IRR_DEVICE_WIN32_H_INCLUDED #include "IrrCompileConfig.h" #ifdef _IRR_COMPILE_WITH_WINDOWS_DEVICE_ @@ -444,4 +444,4 @@ namespace irr } // end namespace irr #endif // _IRR_COMPILE_WITH_WINDOWS_DEVICE_ -#endif // __C_IRR_DEVICE_WIN32_H_INCLUDED__ +#endif // IRR_C_IRR_DEVICE_WIN32_H_INCLUDED diff --git a/source/Irrlicht/CIrrMeshFileLoader.h b/source/Irrlicht/CIrrMeshFileLoader.h index fb4c620a..90ace996 100644 --- a/source/Irrlicht/CIrrMeshFileLoader.h +++ b/source/Irrlicht/CIrrMeshFileLoader.h @@ -2,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_IRR_MESH_FILE_LOADER_H_INCLUDED__ -#define __C_IRR_MESH_FILE_LOADER_H_INCLUDED__ +#ifndef IRR_C_IRR_MESH_FILE_LOADER_H_INCLUDED +#define IRR_C_IRR_MESH_FILE_LOADER_H_INCLUDED #include "IMeshLoader.h" #include "IFileSystem.h" @@ -87,4 +87,3 @@ private: } // end namespace irr #endif - diff --git a/source/Irrlicht/CLMTSMeshFileLoader.h b/source/Irrlicht/CLMTSMeshFileLoader.h index 6e75fa93..7ba4a20d 100644 --- a/source/Irrlicht/CLMTSMeshFileLoader.h +++ b/source/Irrlicht/CLMTSMeshFileLoader.h @@ -18,8 +18,8 @@ Version 1.5 - 15 March 2005 */ -#if !defined(__C_LMTS_MESH_FILE_LOADER_H_INCLUDED__) -#define __C_LMTS_MESH_FILE_LOADER_H_INCLUDED__ +#ifndef IRR_C_LMTS_MESH_FILE_LOADER_H_INCLUDED +#define IRR_C_LMTS_MESH_FILE_LOADER_H_INCLUDED #include "IMeshLoader.h" #include "SMesh.h" @@ -106,4 +106,4 @@ private: } // end namespace scene } // end namespace irr -#endif // !defined(__C_LMTS_MESH_FILE_LOADER_H_INCLUDED__) +#endif // IRR_C_LMTS_MESH_FILE_LOADER_H_INCLUDED diff --git a/source/Irrlicht/CLWOMeshFileLoader.h b/source/Irrlicht/CLWOMeshFileLoader.h index 9df3e97f..edcd7e88 100644 --- a/source/Irrlicht/CLWOMeshFileLoader.h +++ b/source/Irrlicht/CLWOMeshFileLoader.h @@ -2,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_LWO_MESH_FILE_LOADER_H_INCLUDED__ -#define __C_LWO_MESH_FILE_LOADER_H_INCLUDED__ +#ifndef IRR_C_LWO_MESH_FILE_LOADER_H_INCLUDED +#define IRR_C_LWO_MESH_FILE_LOADER_H_INCLUDED #include "IMeshLoader.h" #include "SMeshBuffer.h" diff --git a/source/Irrlicht/CLightSceneNode.h b/source/Irrlicht/CLightSceneNode.h index 3317e547..be6e47e2 100644 --- a/source/Irrlicht/CLightSceneNode.h +++ b/source/Irrlicht/CLightSceneNode.h @@ -2,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_LIGHT_SCENE_NODE_H_INCLUDED__ -#define __C_LIGHT_SCENE_NODE_H_INCLUDED__ +#ifndef IRR_C_LIGHT_SCENE_NODE_H_INCLUDED +#define IRR_C_LIGHT_SCENE_NODE_H_INCLUDED #include "ILightSceneNode.h" @@ -106,4 +106,3 @@ private: } // end namespace irr #endif - diff --git a/source/Irrlicht/CLimitReadFile.h b/source/Irrlicht/CLimitReadFile.h index 04638215..817ab2de 100644 --- a/source/Irrlicht/CLimitReadFile.h +++ b/source/Irrlicht/CLimitReadFile.h @@ -2,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_LIMIT_READ_FILE_H_INCLUDED__ -#define __C_LIMIT_READ_FILE_H_INCLUDED__ +#ifndef IRR_C_LIMIT_READ_FILE_H_INCLUDED +#define IRR_C_LIMIT_READ_FILE_H_INCLUDED #include "IReadFile.h" #include "irrString.h" @@ -65,4 +65,3 @@ namespace io } // end namespace irr #endif - diff --git a/source/Irrlicht/CLogger.h b/source/Irrlicht/CLogger.h index a881eabc..c6357874 100644 --- a/source/Irrlicht/CLogger.h +++ b/source/Irrlicht/CLogger.h @@ -2,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_LOGGER_H_INCLUDED__ -#define __C_LOGGER_H_INCLUDED__ +#ifndef IRR_C_LOGGER_H_INCLUDED +#define IRR_C_LOGGER_H_INCLUDED #include "ILogger.h" #include "os.h" @@ -53,4 +53,3 @@ private: } // end namespace #endif - diff --git a/source/Irrlicht/CMD2MeshFileLoader.h b/source/Irrlicht/CMD2MeshFileLoader.h index eecd81e8..b2e9b159 100644 --- a/source/Irrlicht/CMD2MeshFileLoader.h +++ b/source/Irrlicht/CMD2MeshFileLoader.h @@ -2,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_MD2_MESH_FILE_LOADER_H_INCLUDED__ -#define __C_MD2_MESH_FILE_LOADER_H_INCLUDED__ +#ifndef IRR_C_MD2_MESH_FILE_LOADER_H_INCLUDED +#define IRR_C_MD2_MESH_FILE_LOADER_H_INCLUDED #include "IMeshLoader.h" @@ -41,5 +41,4 @@ private: } // end namespace scene } // end namespace irr -#endif // __C_MD2_MESH_LOADER_H_INCLUDED__ - +#endif // IRR_C_MD2_MESH_LOADER_H_INCLUDED diff --git a/source/Irrlicht/CMD3MeshFileLoader.h b/source/Irrlicht/CMD3MeshFileLoader.h index 36a5692d..d6778577 100644 --- a/source/Irrlicht/CMD3MeshFileLoader.h +++ b/source/Irrlicht/CMD3MeshFileLoader.h @@ -2,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_MD3_MESH_FILE_LOADER_H_INCLUDED__ -#define __C_MD3_MESH_FILE_LOADER_H_INCLUDED__ +#ifndef IRR_C_MD3_MESH_FILE_LOADER_H_INCLUDED +#define IRR_C_MD3_MESH_FILE_LOADER_H_INCLUDED #include "IMeshLoader.h" #include "IFileSystem.h" @@ -46,4 +46,3 @@ private: } // end namespace irr #endif - diff --git a/source/Irrlicht/CMS3DMeshFileLoader.h b/source/Irrlicht/CMS3DMeshFileLoader.h index d505926c..ed5b72d2 100644 --- a/source/Irrlicht/CMS3DMeshFileLoader.h +++ b/source/Irrlicht/CMS3DMeshFileLoader.h @@ -2,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_MS3D_MESH_FILE_LOADER_H_INCLUDED__ -#define __C_MS3D_MESH_FILE_LOADER_H_INCLUDED__ +#ifndef IRR_C_MS3D_MESH_FILE_LOADER_H_INCLUDED +#define IRR_C_MS3D_MESH_FILE_LOADER_H_INCLUDED #include "IMeshLoader.h" #include "IVideoDriver.h" @@ -45,5 +45,3 @@ private: } // end namespace irr #endif - - diff --git a/source/Irrlicht/CMY3DHelper.h b/source/Irrlicht/CMY3DHelper.h index c1566d11..ab9cf7f4 100644 --- a/source/Irrlicht/CMY3DHelper.h +++ b/source/Irrlicht/CMY3DHelper.h @@ -15,8 +15,8 @@ // some useful functions //********************************************************************** -#ifndef __C_MY3D_HELPER_H_INCLUDED__ -#define __C_MY3D_HELPER_H_INCLUDED__ +#ifndef IRR_C_MY3D_HELPER_H_INCLUDED +#define IRR_C_MY3D_HELPER_H_INCLUDED #include "irrTypes.h" @@ -441,5 +441,4 @@ int rle_decode ( } //end namespace irr -#endif // __C_MY3D_HELPER_H_INCLUDED__ - +#endif // IRR_C_MY3D_HELPER_H_INCLUDED diff --git a/source/Irrlicht/CMemoryFile.h b/source/Irrlicht/CMemoryFile.h index c6fe7e81..fb59170c 100644 --- a/source/Irrlicht/CMemoryFile.h +++ b/source/Irrlicht/CMemoryFile.h @@ -2,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_MEMORY_READ_FILE_H_INCLUDED__ -#define __C_MEMORY_READ_FILE_H_INCLUDED__ +#ifndef IRR_C_MEMORY_READ_FILE_H_INCLUDED +#define IRR_C_MEMORY_READ_FILE_H_INCLUDED #include "IMemoryReadFile.h" #include "IWriteFile.h" @@ -104,4 +104,3 @@ namespace io } // end namespace irr #endif - diff --git a/source/Irrlicht/CMeshCache.h b/source/Irrlicht/CMeshCache.h index afd2725e..4bc52f72 100644 --- a/source/Irrlicht/CMeshCache.h +++ b/source/Irrlicht/CMeshCache.h @@ -2,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_MESH_CACHE_H_INCLUDED__ -#define __C_MESH_CACHE_H_INCLUDED__ +#ifndef IRR_C_MESH_CACHE_H_INCLUDED +#define IRR_C_MESH_CACHE_H_INCLUDED #include "IMeshCache.h" #include "irrArray.h" @@ -120,4 +120,3 @@ namespace scene } // end namespace irr #endif - diff --git a/source/Irrlicht/CMeshManipulator.h b/source/Irrlicht/CMeshManipulator.h index 5b1738cb..68eecbe5 100644 --- a/source/Irrlicht/CMeshManipulator.h +++ b/source/Irrlicht/CMeshManipulator.h @@ -2,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_MESH_MANIPULATOR_H_INCLUDED__ -#define __C_MESH_MANIPULATOR_H_INCLUDED__ +#ifndef IRR_C_MESH_MANIPULATOR_H_INCLUDED +#define IRR_C_MESH_MANIPULATOR_H_INCLUDED #include "IMeshManipulator.h" @@ -97,5 +97,4 @@ public: } // end namespace scene } // end namespace irr - #endif diff --git a/source/Irrlicht/CMeshSceneNode.h b/source/Irrlicht/CMeshSceneNode.h index 26679915..3b1c1b1c 100644 --- a/source/Irrlicht/CMeshSceneNode.h +++ b/source/Irrlicht/CMeshSceneNode.h @@ -2,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_MESH_SCENE_NODE_H_INCLUDED__ -#define __C_MESH_SCENE_NODE_H_INCLUDED__ +#ifndef IRR_C_MESH_SCENE_NODE_H_INCLUDED +#define IRR_C_MESH_SCENE_NODE_H_INCLUDED #include "IMeshSceneNode.h" #include "IMesh.h" @@ -100,4 +100,3 @@ namespace scene } // end namespace irr #endif - diff --git a/source/Irrlicht/CMetaTriangleSelector.h b/source/Irrlicht/CMetaTriangleSelector.h index 9a488dfc..ba11aa8c 100644 --- a/source/Irrlicht/CMetaTriangleSelector.h +++ b/source/Irrlicht/CMetaTriangleSelector.h @@ -2,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_META_TRIANGLE_SELECTOR_H_INCLUDED__ -#define __C_META_TRIANGLE_SELECTOR_H_INCLUDED__ +#ifndef IRR_C_META_TRIANGLE_SELECTOR_H_INCLUDED +#define IRR_C_META_TRIANGLE_SELECTOR_H_INCLUDED #include "IMetaTriangleSelector.h" #include "irrArray.h" @@ -76,4 +76,3 @@ private: #endif - diff --git a/source/Irrlicht/CMountPointReader.h b/source/Irrlicht/CMountPointReader.h index 47ba33e0..043add79 100644 --- a/source/Irrlicht/CMountPointReader.h +++ b/source/Irrlicht/CMountPointReader.h @@ -2,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_MOUNT_READER_H_INCLUDED__ -#define __C_MOUNT_READER_H_INCLUDED__ +#ifndef IRR_C_MOUNT_READER_H_INCLUDED +#define IRR_C_MOUNT_READER_H_INCLUDED #include "IrrCompileConfig.h" @@ -89,4 +89,4 @@ namespace io } // irr #endif // __IRR_COMPILE_WITH_MOUNT_ARCHIVE_LOADER_ -#endif // __C_MOUNT_READER_H_INCLUDED__ +#endif // IRR_C_MOUNT_READER_H_INCLUDED diff --git a/source/Irrlicht/CNPKReader.h b/source/Irrlicht/CNPKReader.h index 3d488379..ca6c2e20 100644 --- a/source/Irrlicht/CNPKReader.h +++ b/source/Irrlicht/CNPKReader.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 __C_NPK_READER_H_INCLUDED__ -#define __C_NPK_READER_H_INCLUDED__ +#ifndef IRR_C_NPK_READER_H_INCLUDED +#define IRR_C_NPK_READER_H_INCLUDED #include "IrrCompileConfig.h" @@ -121,5 +121,4 @@ namespace io #endif // __IRR_COMPILE_WITH_NPK_ARCHIVE_LOADER_ -#endif // __C_NPK_READER_H_INCLUDED__ - +#endif // IRR_C_NPK_READER_H_INCLUDED diff --git a/source/Irrlicht/CNullDriver.h b/source/Irrlicht/CNullDriver.h index f1fa6a26..711a49ac 100644 --- a/source/Irrlicht/CNullDriver.h +++ b/source/Irrlicht/CNullDriver.h @@ -2,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_VIDEO_NULL_H_INCLUDED__ -#define __C_VIDEO_NULL_H_INCLUDED__ +#ifndef IRR_C_VIDEO_NULL_H_INCLUDED +#define IRR_C_VIDEO_NULL_H_INCLUDED #include "IVideoDriver.h" #include "IFileSystem.h" @@ -900,5 +900,4 @@ namespace video } // end namespace video } // end namespace irr - #endif diff --git a/source/Irrlicht/COBJMeshFileLoader.h b/source/Irrlicht/COBJMeshFileLoader.h index 9b677b84..e7c9fbf2 100644 --- a/source/Irrlicht/COBJMeshFileLoader.h +++ b/source/Irrlicht/COBJMeshFileLoader.h @@ -2,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_OBJ_MESH_FILE_LOADER_H_INCLUDED__ -#define __C_OBJ_MESH_FILE_LOADER_H_INCLUDED__ +#ifndef IRR_C_OBJ_MESH_FILE_LOADER_H_INCLUDED +#define IRR_C_OBJ_MESH_FILE_LOADER_H_INCLUDED #include "IMeshLoader.h" #include "IFileSystem.h" @@ -119,4 +119,3 @@ private: } // end namespace irr #endif - diff --git a/source/Irrlicht/COCTLoader.h b/source/Irrlicht/COCTLoader.h index 7e70eaaf..75c6ff1d 100644 --- a/source/Irrlicht/COCTLoader.h +++ b/source/Irrlicht/COCTLoader.h @@ -40,8 +40,8 @@ // 4. You may not use this software to directly or indirectly cause harm to others. -#ifndef __C_OCT_LOADER_H_INCLUDED__ -#define __C_OCT_LOADER_H_INCLUDED__ +#ifndef IRR_C_OCT_LOADER_H_INCLUDED +#define IRR_C_OCT_LOADER_H_INCLUDED #include "IMeshLoader.h" #include "IReadFile.h" @@ -138,4 +138,3 @@ namespace scene } // end namespace irr #endif - diff --git a/source/Irrlicht/COSOperator.h b/source/Irrlicht/COSOperator.h index 8e282547..b887baae 100644 --- a/source/Irrlicht/COSOperator.h +++ b/source/Irrlicht/COSOperator.h @@ -2,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_OS_OPERATOR_H_INCLUDED__ -#define __C_OS_OPERATOR_H_INCLUDED__ +#ifndef IRR_C_OS_OPERATOR_H_INCLUDED +#define IRR_C_OS_OPERATOR_H_INCLUDED #include "IOSOperator.h" @@ -57,4 +57,3 @@ private: } // end namespace #endif - diff --git a/source/Irrlicht/COctreeSceneNode.h b/source/Irrlicht/COctreeSceneNode.h index cff3db83..816e2c9b 100644 --- a/source/Irrlicht/COctreeSceneNode.h +++ b/source/Irrlicht/COctreeSceneNode.h @@ -2,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_OCTREE_SCENE_NODE_H_INCLUDED__ -#define __C_OCTREE_SCENE_NODE_H_INCLUDED__ +#ifndef IRR_C_OCTREE_SCENE_NODE_H_INCLUDED +#define IRR_C_OCTREE_SCENE_NODE_H_INCLUDED #include "IOctreeSceneNode.h" #include "Octree.h" @@ -129,4 +129,3 @@ namespace scene } // end namespace irr #endif - diff --git a/source/Irrlicht/COctreeTriangleSelector.h b/source/Irrlicht/COctreeTriangleSelector.h index 3faa6afd..bcd92184 100644 --- a/source/Irrlicht/COctreeTriangleSelector.h +++ b/source/Irrlicht/COctreeTriangleSelector.h @@ -2,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_OCTREE_TRIANGLE_SELECTOR_H_INCLUDED__ -#define __C_OCTREE_TRIANGLE_SELECTOR_H_INCLUDED__ +#ifndef IRR_C_OCTREE_TRIANGLE_SELECTOR_H_INCLUDED +#define IRR_C_OCTREE_TRIANGLE_SELECTOR_H_INCLUDED #include "CTriangleSelector.h" @@ -80,6 +80,4 @@ private: } // end namespace scene } // end namespace irr - #endif - diff --git a/source/Irrlicht/COgreMeshFileLoader.h b/source/Irrlicht/COgreMeshFileLoader.h index 19700db7..facab78d 100644 --- a/source/Irrlicht/COgreMeshFileLoader.h +++ b/source/Irrlicht/COgreMeshFileLoader.h @@ -3,8 +3,8 @@ // For conditions of distribution and use, see copyright notice in irrlicht.h // originally written by Christian Stehno, modified by Nikolaus Gebhardt -#ifndef __C_OGRE_MESH_FILE_LOADER_H_INCLUDED__ -#define __C_OGRE_MESH_FILE_LOADER_H_INCLUDED__ +#ifndef IRR_C_OGRE_MESH_FILE_LOADER_H_INCLUDED +#define IRR_C_OGRE_MESH_FILE_LOADER_H_INCLUDED #include "IMeshLoader.h" #include "IFileSystem.h" @@ -266,4 +266,3 @@ private: } // end namespace irr #endif - diff --git a/source/Irrlicht/COpenGLCacheHandler.h b/source/Irrlicht/COpenGLCacheHandler.h index f7d14c03..54365ba4 100644 --- a/source/Irrlicht/COpenGLCacheHandler.h +++ b/source/Irrlicht/COpenGLCacheHandler.h @@ -2,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_OPENGL_CACHE_HANDLER_H_INCLUDED__ -#define __C_OPENGL_CACHE_HANDLER_H_INCLUDED__ +#ifndef IRR_C_OPENGL_CACHE_HANDLER_H_INCLUDED +#define IRR_C_OPENGL_CACHE_HANDLER_H_INCLUDED #include "IrrCompileConfig.h" diff --git a/source/Irrlicht/COpenGLCommon.h b/source/Irrlicht/COpenGLCommon.h index 4d38c3a0..63fe07a9 100644 --- a/source/Irrlicht/COpenGLCommon.h +++ b/source/Irrlicht/COpenGLCommon.h @@ -2,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_OPENGL_COMMON_H_INCLUDED__ -#define __C_OPENGL_COMMON_H_INCLUDED__ +#ifndef IRR_C_OPENGL_COMMON_H_INCLUDED +#define IRR_C_OPENGL_COMMON_H_INCLUDED #include "IrrCompileConfig.h" diff --git a/source/Irrlicht/COpenGLCoreCacheHandler.h b/source/Irrlicht/COpenGLCoreCacheHandler.h index 4775e501..7173f248 100644 --- a/source/Irrlicht/COpenGLCoreCacheHandler.h +++ b/source/Irrlicht/COpenGLCoreCacheHandler.h @@ -2,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_OGLCORE_CACHE_HANDLER_H_INCLUDED__ -#define __C_OGLCORE_CACHE_HANDLER_H_INCLUDED__ +#ifndef IRR_C_OGLCORE_CACHE_HANDLER_H_INCLUDED +#define IRR_C_OGLCORE_CACHE_HANDLER_H_INCLUDED #include "IrrCompileConfig.h" diff --git a/source/Irrlicht/COpenGLCoreFeature.h b/source/Irrlicht/COpenGLCoreFeature.h index 6ec58227..738348fd 100644 --- a/source/Irrlicht/COpenGLCoreFeature.h +++ b/source/Irrlicht/COpenGLCoreFeature.h @@ -2,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_OGLCORE_FEATURE_H_INCLUDED__ -#define __C_OGLCORE_FEATURE_H_INCLUDED__ +#ifndef IRR_C_OGLCORE_FEATURE_H_INCLUDED +#define IRR_C_OGLCORE_FEATURE_H_INCLUDED #include "IrrCompileConfig.h" diff --git a/source/Irrlicht/COpenGLCoreRenderTarget.h b/source/Irrlicht/COpenGLCoreRenderTarget.h index fa91850e..d49cd188 100644 --- a/source/Irrlicht/COpenGLCoreRenderTarget.h +++ b/source/Irrlicht/COpenGLCoreRenderTarget.h @@ -2,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_OGLCORE_RENDER_TARGET_H_INCLUDED__ -#define __C_OGLCORE_RENDER_TARGET_H_INCLUDED__ +#ifndef IRR_C_OGLCORE_RENDER_TARGET_H_INCLUDED +#define IRR_C_OGLCORE_RENDER_TARGET_H_INCLUDED #include "IrrCompileConfig.h" diff --git a/source/Irrlicht/COpenGLCoreTexture.h b/source/Irrlicht/COpenGLCoreTexture.h index 3a5e8336..071d4339 100644 --- a/source/Irrlicht/COpenGLCoreTexture.h +++ b/source/Irrlicht/COpenGLCoreTexture.h @@ -2,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_OGLCORE_TEXTURE_H_INCLUDED__ -#define __C_OGLCORE_TEXTURE_H_INCLUDED__ +#ifndef IRR_C_OGLCORE_TEXTURE_H_INCLUDED +#define IRR_C_OGLCORE_TEXTURE_H_INCLUDED #include "IrrCompileConfig.h" diff --git a/source/Irrlicht/COpenGLDriver.h b/source/Irrlicht/COpenGLDriver.h index c7ec20db..b51890f8 100644 --- a/source/Irrlicht/COpenGLDriver.h +++ b/source/Irrlicht/COpenGLDriver.h @@ -2,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_VIDEO_OPEN_GL_H_INCLUDED__ -#define __C_VIDEO_OPEN_GL_H_INCLUDED__ +#ifndef IRR_C_VIDEO_OPEN_GL_H_INCLUDED +#define IRR_C_VIDEO_OPEN_GL_H_INCLUDED #include "IrrCompileConfig.h" @@ -528,4 +528,3 @@ namespace video #endif // _IRR_COMPILE_WITH_OPENGL_ #endif - diff --git a/source/Irrlicht/COpenGLExtensionHandler.h b/source/Irrlicht/COpenGLExtensionHandler.h index 1ce0e020..3830abb5 100644 --- a/source/Irrlicht/COpenGLExtensionHandler.h +++ b/source/Irrlicht/COpenGLExtensionHandler.h @@ -2,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_OPEN_GL_FEATURE_MAP_H_INCLUDED__ -#define __C_OPEN_GL_FEATURE_MAP_H_INCLUDED__ +#ifndef IRR_C_OPEN_GL_FEATURE_MAP_H_INCLUDED +#define IRR_C_OPEN_GL_FEATURE_MAP_H_INCLUDED #include "IrrCompileConfig.h" @@ -3439,4 +3439,3 @@ inline void COpenGLExtensionHandler::extGlSwapInterval(int interval) #endif #endif - diff --git a/source/Irrlicht/COpenGLMaterialRenderer.h b/source/Irrlicht/COpenGLMaterialRenderer.h index 902d6e75..43028352 100644 --- a/source/Irrlicht/COpenGLMaterialRenderer.h +++ b/source/Irrlicht/COpenGLMaterialRenderer.h @@ -2,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_OPENGL_MATERIAL_RENDERER_H_INCLUDED__ -#define __C_OPENGL_MATERIAL_RENDERER_H_INCLUDED__ +#ifndef IRR_C_OPENGL_MATERIAL_RENDERER_H_INCLUDED +#define IRR_C_OPENGL_MATERIAL_RENDERER_H_INCLUDED #include "IrrCompileConfig.h" #ifdef _IRR_COMPILE_WITH_OPENGL_ @@ -855,4 +855,3 @@ protected: #endif #endif - diff --git a/source/Irrlicht/COpenGLNormalMapRenderer.h b/source/Irrlicht/COpenGLNormalMapRenderer.h index af8767b8..20fbb81b 100644 --- a/source/Irrlicht/COpenGLNormalMapRenderer.h +++ b/source/Irrlicht/COpenGLNormalMapRenderer.h @@ -2,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_OPENGL_NORMAL_MAP_RENDERER_H_INCLUDED__ -#define __C_OPENGL_NORMAL_MAP_RENDERER_H_INCLUDED__ +#ifndef IRR_C_OPENGL_NORMAL_MAP_RENDERER_H_INCLUDED +#define IRR_C_OPENGL_NORMAL_MAP_RENDERER_H_INCLUDED #include "IrrCompileConfig.h" @@ -48,4 +48,3 @@ protected: #endif #endif - diff --git a/source/Irrlicht/COpenGLParallaxMapRenderer.h b/source/Irrlicht/COpenGLParallaxMapRenderer.h index 9173ae4e..2afd75b2 100644 --- a/source/Irrlicht/COpenGLParallaxMapRenderer.h +++ b/source/Irrlicht/COpenGLParallaxMapRenderer.h @@ -2,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_OPENGL_PARALLAX_MAP_RENDERER_H_INCLUDED__ -#define __C_OPENGL_PARALLAX_MAP_RENDERER_H_INCLUDED__ +#ifndef IRR_C_OPENGL_PARALLAX_MAP_RENDERER_H_INCLUDED +#define IRR_C_OPENGL_PARALLAX_MAP_RENDERER_H_INCLUDED #include "IrrCompileConfig.h" @@ -54,4 +54,3 @@ protected: #endif #endif - diff --git a/source/Irrlicht/COpenGLSLMaterialRenderer.h b/source/Irrlicht/COpenGLSLMaterialRenderer.h index aa5f4216..389157c6 100644 --- a/source/Irrlicht/COpenGLSLMaterialRenderer.h +++ b/source/Irrlicht/COpenGLSLMaterialRenderer.h @@ -2,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_OPENGL_SHADER_LANGUAGE_MATERIAL_RENDERER_H_INCLUDED__ -#define __C_OPENGL_SHADER_LANGUAGE_MATERIAL_RENDERER_H_INCLUDED__ +#ifndef IRR_C_OPENGL_SHADER_LANGUAGE_MATERIAL_RENDERER_H_INCLUDED +#define IRR_C_OPENGL_SHADER_LANGUAGE_MATERIAL_RENDERER_H_INCLUDED #include "IrrCompileConfig.h" @@ -133,4 +133,3 @@ protected: #endif // compile with OpenGL #endif // if included - diff --git a/source/Irrlicht/COpenGLShaderMaterialRenderer.h b/source/Irrlicht/COpenGLShaderMaterialRenderer.h index 4336b5e0..06ebf309 100644 --- a/source/Irrlicht/COpenGLShaderMaterialRenderer.h +++ b/source/Irrlicht/COpenGLShaderMaterialRenderer.h @@ -2,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_OPENGL_SHADER_MATERIAL_RENDERER_H_INCLUDED__ -#define __C_OPENGL_SHADER_MATERIAL_RENDERER_H_INCLUDED__ +#ifndef IRR_C_OPENGL_SHADER_MATERIAL_RENDERER_H_INCLUDED +#define IRR_C_OPENGL_SHADER_MATERIAL_RENDERER_H_INCLUDED #include "IrrCompileConfig.h" @@ -94,4 +94,3 @@ protected: #endif #endif - diff --git a/source/Irrlicht/CPLYMeshFileLoader.h b/source/Irrlicht/CPLYMeshFileLoader.h index 65a3bb05..1d6270f5 100644 --- a/source/Irrlicht/CPLYMeshFileLoader.h +++ b/source/Irrlicht/CPLYMeshFileLoader.h @@ -2,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_PLY_MESH_FILE_LOADER_H_INCLUDED__ -#define __C_PLY_MESH_FILE_LOADER_H_INCLUDED__ +#ifndef IRR_C_PLY_MESH_FILE_LOADER_H_INCLUDED +#define IRR_C_PLY_MESH_FILE_LOADER_H_INCLUDED #include "IMeshLoader.h" #include "ISceneManager.h" @@ -145,4 +145,3 @@ private: } // end namespace irr #endif - diff --git a/source/Irrlicht/CPakReader.h b/source/Irrlicht/CPakReader.h index 1edef29d..bb7cc185 100644 --- a/source/Irrlicht/CPakReader.h +++ b/source/Irrlicht/CPakReader.h @@ -2,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_PAK_READER_H_INCLUDED__ -#define __C_PAK_READER_H_INCLUDED__ +#ifndef IRR_C_PAK_READER_H_INCLUDED +#define IRR_C_PAK_READER_H_INCLUDED #include "IrrCompileConfig.h" @@ -118,5 +118,4 @@ namespace io #endif // __IRR_COMPILE_WITH_PAK_ARCHIVE_LOADER_ -#endif // __C_PAK_READER_H_INCLUDED__ - +#endif // IRR_C_PAK_READER_H_INCLUDED diff --git a/source/Irrlicht/CParticleAnimatedMeshSceneNodeEmitter.h b/source/Irrlicht/CParticleAnimatedMeshSceneNodeEmitter.h index 250cb6b0..3b2c46aa 100644 --- a/source/Irrlicht/CParticleAnimatedMeshSceneNodeEmitter.h +++ b/source/Irrlicht/CParticleAnimatedMeshSceneNodeEmitter.h @@ -2,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_PARTICLE_ANIMATED_MESH_SCENE_NODE_EMITTER_H_INCLUDED__ -#define __C_PARTICLE_ANIMATED_MESH_SCENE_NODE_EMITTER_H_INCLUDED__ +#ifndef IRR_C_PARTICLE_ANIMATED_MESH_SCENE_NODE_EMITTER_H_INCLUDED +#define IRR_C_PARTICLE_ANIMATED_MESH_SCENE_NODE_EMITTER_H_INCLUDED #include "IParticleAnimatedMeshSceneNodeEmitter.h" #include "irrArray.h" @@ -155,6 +155,4 @@ private: } // end namespace scene } // end namespace irr - -#endif // __C_PARTICLE_ANIMATED_MESH_SCENE_NODE_EMITTER_H_INCLUDED__ - +#endif // IRR_C_PARTICLE_ANIMATED_MESH_SCENE_NODE_EMITTER_H_INCLUDED diff --git a/source/Irrlicht/CParticleAttractionAffector.h b/source/Irrlicht/CParticleAttractionAffector.h index 0a44cb93..a435deb3 100644 --- a/source/Irrlicht/CParticleAttractionAffector.h +++ b/source/Irrlicht/CParticleAttractionAffector.h @@ -2,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_PARTICLE_ATTRACTION_AFFECTOR_H_INCLUDED__ -#define __C_PARTICLE_ATTRACTION_AFFECTOR_H_INCLUDED__ +#ifndef IRR_C_PARTICLE_ATTRACTION_AFFECTOR_H_INCLUDED +#define IRR_C_PARTICLE_ATTRACTION_AFFECTOR_H_INCLUDED #include "IrrCompileConfig.h" #ifdef _IRR_COMPILE_WITH_PARTICLES_ @@ -86,5 +86,4 @@ private: #endif // _IRR_COMPILE_WITH_PARTICLES_ -#endif // __C_PARTICLE_ATTRACTION_AFFECTOR_H_INCLUDED__ - +#endif // IRR_C_PARTICLE_ATTRACTION_AFFECTOR_H_INCLUDED diff --git a/source/Irrlicht/CParticleBoxEmitter.h b/source/Irrlicht/CParticleBoxEmitter.h index d8b9c742..4f970019 100644 --- a/source/Irrlicht/CParticleBoxEmitter.h +++ b/source/Irrlicht/CParticleBoxEmitter.h @@ -2,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_PARTICLE_BOX_EMITTER_H_INCLUDED__ -#define __C_PARTICLE_BOX_EMITTER_H_INCLUDED__ +#ifndef IRR_C_PARTICLE_BOX_EMITTER_H_INCLUDED +#define IRR_C_PARTICLE_BOX_EMITTER_H_INCLUDED #include "IrrCompileConfig.h" #ifdef _IRR_COMPILE_WITH_PARTICLES_ @@ -133,4 +133,3 @@ private: #endif // _IRR_COMPILE_WITH_PARTICLES_ #endif - diff --git a/source/Irrlicht/CParticleCylinderEmitter.h b/source/Irrlicht/CParticleCylinderEmitter.h index 5da10168..4e94e8d2 100644 --- a/source/Irrlicht/CParticleCylinderEmitter.h +++ b/source/Irrlicht/CParticleCylinderEmitter.h @@ -2,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_PARTICLE_CYLINDER_EMITTER_H_INCLUDED__ -#define __C_PARTICLE_CYLINDER_EMITTER_H_INCLUDED__ +#ifndef IRR_C_PARTICLE_CYLINDER_EMITTER_H_INCLUDED +#define IRR_C_PARTICLE_CYLINDER_EMITTER_H_INCLUDED #include "IrrCompileConfig.h" #ifdef _IRR_COMPILE_WITH_PARTICLES_ @@ -164,4 +164,3 @@ private: #endif // _IRR_COMPILE_WITH_PARTICLES_ #endif - diff --git a/source/Irrlicht/CParticleFadeOutAffector.h b/source/Irrlicht/CParticleFadeOutAffector.h index be1d8b48..3143bc40 100644 --- a/source/Irrlicht/CParticleFadeOutAffector.h +++ b/source/Irrlicht/CParticleFadeOutAffector.h @@ -2,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_PARTICLE_FADE_OUT_AFFECTOR_H_INCLUDED__ -#define __C_PARTICLE_FADE_OUT_AFFECTOR_H_INCLUDED__ +#ifndef IRR_C_PARTICLE_FADE_OUT_AFFECTOR_H_INCLUDED +#define IRR_C_PARTICLE_FADE_OUT_AFFECTOR_H_INCLUDED #include "IrrCompileConfig.h" #ifdef _IRR_COMPILE_WITH_PARTICLES_ @@ -65,4 +65,3 @@ private: #endif // _IRR_COMPILE_WITH_PARTICLES_ #endif - diff --git a/source/Irrlicht/CParticleGravityAffector.h b/source/Irrlicht/CParticleGravityAffector.h index 0f85ca13..d3bd6196 100644 --- a/source/Irrlicht/CParticleGravityAffector.h +++ b/source/Irrlicht/CParticleGravityAffector.h @@ -2,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_PARTICLE_GRAVITY_AFFECTOR_H_INCLUDED__ -#define __C_PARTICLE_GRAVITY_AFFECTOR_H_INCLUDED__ +#ifndef IRR_C_PARTICLE_GRAVITY_AFFECTOR_H_INCLUDED +#define IRR_C_PARTICLE_GRAVITY_AFFECTOR_H_INCLUDED #include "IrrCompileConfig.h" #ifdef _IRR_COMPILE_WITH_PARTICLES_ @@ -65,4 +65,3 @@ private: #endif // _IRR_COMPILE_WITH_PARTICLES_ #endif - diff --git a/source/Irrlicht/CParticleMeshEmitter.h b/source/Irrlicht/CParticleMeshEmitter.h index c7a2b865..2863c939 100644 --- a/source/Irrlicht/CParticleMeshEmitter.h +++ b/source/Irrlicht/CParticleMeshEmitter.h @@ -2,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_PARTICLE_MESH_EMITTER_H_INCLUDED__ -#define __C_PARTICLE_MESH_EMITTER_H_INCLUDED__ +#ifndef IRR_C_PARTICLE_MESH_EMITTER_H_INCLUDED +#define IRR_C_PARTICLE_MESH_EMITTER_H_INCLUDED #include "IrrCompileConfig.h" #ifdef _IRR_COMPILE_WITH_PARTICLES_ @@ -159,5 +159,4 @@ private: #endif // _IRR_COMPILE_WITH_PARTICLES_ -#endif // __C_PARTICLE_MESH_EMITTER_H_INCLUDED__ - +#endif // IRR_C_PARTICLE_MESH_EMITTER_H_INCLUDED diff --git a/source/Irrlicht/CParticlePointEmitter.h b/source/Irrlicht/CParticlePointEmitter.h index 8b13209a..c88645d2 100644 --- a/source/Irrlicht/CParticlePointEmitter.h +++ b/source/Irrlicht/CParticlePointEmitter.h @@ -2,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_PARTICLE_POINT_EMITTER_H_INCLUDED__ -#define __C_PARTICLE_POINT_EMITTER_H_INCLUDED__ +#ifndef IRR_C_PARTICLE_POINT_EMITTER_H_INCLUDED +#define IRR_C_PARTICLE_POINT_EMITTER_H_INCLUDED #include "IrrCompileConfig.h" #ifdef _IRR_COMPILE_WITH_PARTICLES_ diff --git a/source/Irrlicht/CParticleRingEmitter.h b/source/Irrlicht/CParticleRingEmitter.h index 0fb8b074..f1e62145 100644 --- a/source/Irrlicht/CParticleRingEmitter.h +++ b/source/Irrlicht/CParticleRingEmitter.h @@ -2,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_PARTICLE_RING_EMITTER_H_INCLUDED__ -#define __C_PARTICLE_RING_EMITTER_H_INCLUDED__ +#ifndef IRR_C_PARTICLE_RING_EMITTER_H_INCLUDED +#define IRR_C_PARTICLE_RING_EMITTER_H_INCLUDED #include "IrrCompileConfig.h" #ifdef _IRR_COMPILE_WITH_PARTICLES_ @@ -148,4 +148,3 @@ private: #endif // _IRR_COMPILE_WITH_PARTICLES_ #endif - diff --git a/source/Irrlicht/CParticleRotationAffector.h b/source/Irrlicht/CParticleRotationAffector.h index 9a454246..26cae503 100644 --- a/source/Irrlicht/CParticleRotationAffector.h +++ b/source/Irrlicht/CParticleRotationAffector.h @@ -2,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_PARTICLE_ROTATION_AFFECTOR_H_INCLUDED__ -#define __C_PARTICLE_ROTATION_AFFECTOR_H_INCLUDED__ +#ifndef IRR_C_PARTICLE_ROTATION_AFFECTOR_H_INCLUDED +#define IRR_C_PARTICLE_ROTATION_AFFECTOR_H_INCLUDED #include "IrrCompileConfig.h" #ifdef _IRR_COMPILE_WITH_PARTICLES_ @@ -56,4 +56,4 @@ private: #endif // _IRR_COMPILE_WITH_PARTICLES_ -#endif // __C_PARTICLE_ROTATION_AFFECTOR_H_INCLUDED__ +#endif // IRR_C_PARTICLE_ROTATION_AFFECTOR_H_INCLUDED diff --git a/source/Irrlicht/CParticleSphereEmitter.h b/source/Irrlicht/CParticleSphereEmitter.h index 21ec74ca..96060fcd 100644 --- a/source/Irrlicht/CParticleSphereEmitter.h +++ b/source/Irrlicht/CParticleSphereEmitter.h @@ -2,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_PARTICLE_SPHERE_EMITTER_H_INCLUDED__ -#define __C_PARTICLE_SPHERE_EMITTER_H_INCLUDED__ +#ifndef IRR_C_PARTICLE_SPHERE_EMITTER_H_INCLUDED +#define IRR_C_PARTICLE_SPHERE_EMITTER_H_INCLUDED #include "IrrCompileConfig.h" #ifdef _IRR_COMPILE_WITH_PARTICLES_ @@ -141,4 +141,3 @@ private: #endif // _IRR_COMPILE_WITH_PARTICLES_ #endif - diff --git a/source/Irrlicht/CParticleSystemSceneNode.h b/source/Irrlicht/CParticleSystemSceneNode.h index a9a6dc4b..1510549d 100644 --- a/source/Irrlicht/CParticleSystemSceneNode.h +++ b/source/Irrlicht/CParticleSystemSceneNode.h @@ -2,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_PARTICLE_SYSTEM_SCENE_NODE_H_INCLUDED__ -#define __C_PARTICLE_SYSTEM_SCENE_NODE_H_INCLUDED__ +#ifndef IRR_C_PARTICLE_SYSTEM_SCENE_NODE_H_INCLUDED +#define IRR_C_PARTICLE_SYSTEM_SCENE_NODE_H_INCLUDED #include "IrrCompileConfig.h" #ifdef _IRR_COMPILE_WITH_PARTICLES_ @@ -246,4 +246,3 @@ private: #endif // _IRR_COMPILE_WITH_PARTICLES_ #endif - diff --git a/source/Irrlicht/CProfiler.h b/source/Irrlicht/CProfiler.h index 7048a01c..ac4c1f2f 100644 --- a/source/Irrlicht/CProfiler.h +++ b/source/Irrlicht/CProfiler.h @@ -2,8 +2,8 @@ // For conditions of distribution and use, see copyright notice in irrlicht.h // Written by Michael Zeilfelder -#ifndef __C_PROFILER_H_INCLUDED__ -#define __C_PROFILER_H_INCLUDED__ +#ifndef IRR_C_PROFILER_H_INCLUDED +#define IRR_C_PROFILER_H_INCLUDED #include "IrrCompileConfig.h" #include "IProfiler.h" @@ -29,4 +29,4 @@ protected: }; } // namespace irr -#endif // __C_PROFILER_H_INCLUDED__ +#endif // IRR_C_PROFILER_H_INCLUDED diff --git a/source/Irrlicht/CQ3LevelMesh.h b/source/Irrlicht/CQ3LevelMesh.h index 28e74a4a..b10a2cba 100644 --- a/source/Irrlicht/CQ3LevelMesh.h +++ b/source/Irrlicht/CQ3LevelMesh.h @@ -2,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_Q3_LEVEL_MESH_H_INCLUDED__ -#define __C_Q3_LEVEL_MESH_H_INCLUDED__ +#ifndef IRR_C_Q3_LEVEL_MESH_H_INCLUDED +#define IRR_C_Q3_LEVEL_MESH_H_INCLUDED #include "IQ3LevelMesh.h" #include "IReadFile.h" @@ -485,4 +485,3 @@ namespace scene } // end namespace irr #endif - diff --git a/source/Irrlicht/CQuake3ShaderSceneNode.h b/source/Irrlicht/CQuake3ShaderSceneNode.h index 36953783..6b9948e7 100644 --- a/source/Irrlicht/CQuake3ShaderSceneNode.h +++ b/source/Irrlicht/CQuake3ShaderSceneNode.h @@ -2,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_QUAKE3_SCENE_NODE_H_INCLUDED__ -#define __C_QUAKE3_SCENE_NODE_H_INCLUDED__ +#ifndef IRR_C_QUAKE3_SCENE_NODE_H_INCLUDED +#define IRR_C_QUAKE3_SCENE_NODE_H_INCLUDED #include "IMeshSceneNode.h" #include "IQ3Shader.h" @@ -113,6 +113,4 @@ private: } // end namespace scene } // end namespace irr - #endif - diff --git a/source/Irrlicht/CReadFile.h b/source/Irrlicht/CReadFile.h index 220f3efe..4f7e1351 100644 --- a/source/Irrlicht/CReadFile.h +++ b/source/Irrlicht/CReadFile.h @@ -2,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_READ_FILE_H_INCLUDED__ -#define __C_READ_FILE_H_INCLUDED__ +#ifndef IRR_C_READ_FILE_H_INCLUDED +#define IRR_C_READ_FILE_H_INCLUDED #include #include "IReadFile.h" @@ -70,4 +70,3 @@ namespace io } // end namespace irr #endif - diff --git a/source/Irrlicht/CSMFMeshFileLoader.h b/source/Irrlicht/CSMFMeshFileLoader.h index eadc4b42..87aeb089 100644 --- a/source/Irrlicht/CSMFMeshFileLoader.h +++ b/source/Irrlicht/CSMFMeshFileLoader.h @@ -2,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_SMF_MESH_LOADER_H_INCLUDED__ -#define __C_SMF_MESH_LOADER_H_INCLUDED__ +#ifndef IRR_C_SMF_MESH_LOADER_H_INCLUDED +#define IRR_C_SMF_MESH_LOADER_H_INCLUDED #include "IMeshLoader.h" #include "SMesh.h" @@ -65,5 +65,4 @@ namespace io } // end namespace irr -#endif // __C_SMF_MESH_LOADER_H_INCLUDED__ - +#endif // IRR_C_SMF_MESH_LOADER_H_INCLUDED diff --git a/source/Irrlicht/CSTLMeshFileLoader.h b/source/Irrlicht/CSTLMeshFileLoader.h index 8b5d8f81..d5cbdecd 100644 --- a/source/Irrlicht/CSTLMeshFileLoader.h +++ b/source/Irrlicht/CSTLMeshFileLoader.h @@ -2,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_STL_MESH_FILE_LOADER_H_INCLUDED__ -#define __C_STL_MESH_FILE_LOADER_H_INCLUDED__ +#ifndef IRR_C_STL_MESH_FILE_LOADER_H_INCLUDED +#define IRR_C_STL_MESH_FILE_LOADER_H_INCLUDED #include "IMeshLoader.h" #include "irrString.h" @@ -46,4 +46,3 @@ private: } // end namespace irr #endif - diff --git a/source/Irrlicht/CSceneCollisionManager.h b/source/Irrlicht/CSceneCollisionManager.h index cfb9737f..23a42319 100644 --- a/source/Irrlicht/CSceneCollisionManager.h +++ b/source/Irrlicht/CSceneCollisionManager.h @@ -2,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_SCENE_COLLISION_MANAGER_H_INCLUDED__ -#define __C_SCENE_COLLISION_MANAGER_H_INCLUDED__ +#ifndef IRR_C_SCENE_COLLISION_MANAGER_H_INCLUDED +#define IRR_C_SCENE_COLLISION_MANAGER_H_INCLUDED #include "ISceneCollisionManager.h" #include "ISceneManager.h" @@ -150,4 +150,3 @@ namespace scene } // end namespace irr #endif - diff --git a/source/Irrlicht/CSceneLoaderIrr.h b/source/Irrlicht/CSceneLoaderIrr.h index 0267da6f..f45317b4 100644 --- a/source/Irrlicht/CSceneLoaderIrr.h +++ b/source/Irrlicht/CSceneLoaderIrr.h @@ -2,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_SCENE_LOADER_IRR_H_INCLUDED__ -#define __C_SCENE_LOADER_IRR_H_INCLUDED__ +#ifndef IRR_C_SCENE_LOADER_IRR_H_INCLUDED +#define IRR_C_SCENE_LOADER_IRR_H_INCLUDED #include "ISceneLoader.h" @@ -80,4 +80,3 @@ private: } // end namespace irr #endif - diff --git a/source/Irrlicht/CSceneManager.h b/source/Irrlicht/CSceneManager.h index c49fcd0c..ab9c975e 100644 --- a/source/Irrlicht/CSceneManager.h +++ b/source/Irrlicht/CSceneManager.h @@ -2,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_SCENE_MANAGER_H_INCLUDED__ -#define __C_SCENE_MANAGER_H_INCLUDED__ +#ifndef IRR_C_SCENE_MANAGER_H_INCLUDED +#define IRR_C_SCENE_MANAGER_H_INCLUDED #include "ISceneManager.h" #include "ISceneNode.h" @@ -673,4 +673,3 @@ namespace scene } // end namespace scene #endif - diff --git a/source/Irrlicht/CSceneNodeAnimatorCameraFPS.h b/source/Irrlicht/CSceneNodeAnimatorCameraFPS.h index 83659e30..c85dd4b9 100644 --- a/source/Irrlicht/CSceneNodeAnimatorCameraFPS.h +++ b/source/Irrlicht/CSceneNodeAnimatorCameraFPS.h @@ -2,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_SCENE_NODE_ANIMATOR_CAMERA_FPS_H_INCLUDED__ -#define __C_SCENE_NODE_ANIMATOR_CAMERA_FPS_H_INCLUDED__ +#ifndef IRR_C_SCENE_NODE_ANIMATOR_CAMERA_FPS_H_INCLUDED +#define IRR_C_SCENE_NODE_ANIMATOR_CAMERA_FPS_H_INCLUDED #include "ISceneNodeAnimatorCameraFPS.h" #include "vector2d.h" @@ -141,5 +141,4 @@ namespace scene } // end namespace scene } // end namespace irr -#endif // __C_SCENE_NODE_ANIMATOR_CAMERA_FPS_H_INCLUDED__ - +#endif // IRR_C_SCENE_NODE_ANIMATOR_CAMERA_FPS_H_INCLUDED diff --git a/source/Irrlicht/CSceneNodeAnimatorCameraMaya.h b/source/Irrlicht/CSceneNodeAnimatorCameraMaya.h index fa46756d..e1031236 100644 --- a/source/Irrlicht/CSceneNodeAnimatorCameraMaya.h +++ b/source/Irrlicht/CSceneNodeAnimatorCameraMaya.h @@ -2,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_SCENE_NODE_ANIMATOR_CAMERA_MAYA_H_INCLUDED__ -#define __C_SCENE_NODE_ANIMATOR_CAMERA_MAYA_H_INCLUDED__ +#ifndef IRR_C_SCENE_NODE_ANIMATOR_CAMERA_MAYA_H_INCLUDED +#define IRR_C_SCENE_NODE_ANIMATOR_CAMERA_MAYA_H_INCLUDED #include "ISceneNodeAnimatorCameraMaya.h" #include "ICameraSceneNode.h" @@ -127,4 +127,3 @@ namespace scene } // end namespace irr #endif - diff --git a/source/Irrlicht/CSceneNodeAnimatorCollisionResponse.h b/source/Irrlicht/CSceneNodeAnimatorCollisionResponse.h index a38c41f9..2ebea321 100644 --- a/source/Irrlicht/CSceneNodeAnimatorCollisionResponse.h +++ b/source/Irrlicht/CSceneNodeAnimatorCollisionResponse.h @@ -2,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_SCENE_NODE_ANIMATOR_COLLISION_RESPONSE_H_INCLUDED__ -#define __C_SCENE_NODE_ANIMATOR_COLLISION_RESPONSE_H_INCLUDED__ +#ifndef IRR_C_SCENE_NODE_ANIMATOR_COLLISION_RESPONSE_H_INCLUDED +#define IRR_C_SCENE_NODE_ANIMATOR_COLLISION_RESPONSE_H_INCLUDED #include "ISceneNodeAnimatorCollisionResponse.h" @@ -154,4 +154,3 @@ namespace scene } // end namespace irr #endif - diff --git a/source/Irrlicht/CSceneNodeAnimatorDelete.h b/source/Irrlicht/CSceneNodeAnimatorDelete.h index 98660c0e..1144b019 100644 --- a/source/Irrlicht/CSceneNodeAnimatorDelete.h +++ b/source/Irrlicht/CSceneNodeAnimatorDelete.h @@ -2,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_SCENE_NODE_ANIMATOR_DELETE_H_INCLUDED__ -#define __C_SCENE_NODE_ANIMATOR_DELETE_H_INCLUDED__ +#ifndef IRR_C_SCENE_NODE_ANIMATOR_DELETE_H_INCLUDED +#define IRR_C_SCENE_NODE_ANIMATOR_DELETE_H_INCLUDED #include "ISceneNodeAnimatorFinishing.h" @@ -43,4 +43,3 @@ namespace scene } // end namespace irr #endif - diff --git a/source/Irrlicht/CSceneNodeAnimatorFlyCircle.h b/source/Irrlicht/CSceneNodeAnimatorFlyCircle.h index 3ac263e1..bcc9151a 100644 --- a/source/Irrlicht/CSceneNodeAnimatorFlyCircle.h +++ b/source/Irrlicht/CSceneNodeAnimatorFlyCircle.h @@ -2,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_SCENE_NODE_ANIMATOR_FLY_CIRCLE_H_INCLUDED__ -#define __C_SCENE_NODE_ANIMATOR_FLY_CIRCLE_H_INCLUDED__ +#ifndef IRR_C_SCENE_NODE_ANIMATOR_FLY_CIRCLE_H_INCLUDED +#define IRR_C_SCENE_NODE_ANIMATOR_FLY_CIRCLE_H_INCLUDED #include "ISceneNode.h" @@ -60,4 +60,3 @@ namespace scene } // end namespace irr #endif - diff --git a/source/Irrlicht/CSceneNodeAnimatorFlyStraight.h b/source/Irrlicht/CSceneNodeAnimatorFlyStraight.h index 6254c8b2..49bf62fd 100644 --- a/source/Irrlicht/CSceneNodeAnimatorFlyStraight.h +++ b/source/Irrlicht/CSceneNodeAnimatorFlyStraight.h @@ -2,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_SCENE_NODE_ANIMATOR_FLY_STRAIGHT_H_INCLUDED__ -#define __C_SCENE_NODE_ANIMATOR_FLY_STRAIGHT_H_INCLUDED__ +#ifndef IRR_C_SCENE_NODE_ANIMATOR_FLY_STRAIGHT_H_INCLUDED +#define IRR_C_SCENE_NODE_ANIMATOR_FLY_STRAIGHT_H_INCLUDED #include "ISceneNodeAnimatorFinishing.h" diff --git a/source/Irrlicht/CSceneNodeAnimatorFollowSpline.h b/source/Irrlicht/CSceneNodeAnimatorFollowSpline.h index 2cb0c156..0a5c719f 100644 --- a/source/Irrlicht/CSceneNodeAnimatorFollowSpline.h +++ b/source/Irrlicht/CSceneNodeAnimatorFollowSpline.h @@ -2,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_SCENE_NODE_ANIMATOR_FOLLOW_SPLINE_H_INCLUDED__ -#define __C_SCENE_NODE_ANIMATOR_FOLLOW_SPLINE_H_INCLUDED__ +#ifndef IRR_C_SCENE_NODE_ANIMATOR_FOLLOW_SPLINE_H_INCLUDED +#define IRR_C_SCENE_NODE_ANIMATOR_FOLLOW_SPLINE_H_INCLUDED #include "ISceneNode.h" #include "irrArray.h" @@ -60,4 +60,3 @@ namespace scene } // end namespace irr #endif - diff --git a/source/Irrlicht/CSceneNodeAnimatorRotation.h b/source/Irrlicht/CSceneNodeAnimatorRotation.h index d66844f8..837451a0 100644 --- a/source/Irrlicht/CSceneNodeAnimatorRotation.h +++ b/source/Irrlicht/CSceneNodeAnimatorRotation.h @@ -2,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_SCENE_NODE_ANIMATOR_ROTATION_H_INCLUDED__ -#define __C_SCENE_NODE_ANIMATOR_ROTATION_H_INCLUDED__ +#ifndef IRR_C_SCENE_NODE_ANIMATOR_ROTATION_H_INCLUDED +#define IRR_C_SCENE_NODE_ANIMATOR_ROTATION_H_INCLUDED #include "ISceneNode.h" @@ -45,4 +45,3 @@ namespace scene } // end namespace irr #endif - diff --git a/source/Irrlicht/CSceneNodeAnimatorTexture.h b/source/Irrlicht/CSceneNodeAnimatorTexture.h index 0d183428..c0a2689c 100644 --- a/source/Irrlicht/CSceneNodeAnimatorTexture.h +++ b/source/Irrlicht/CSceneNodeAnimatorTexture.h @@ -2,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_SCENE_NODE_ANIMATOR_TEXTURE_H_INCLUDED__ -#define __C_SCENE_NODE_ANIMATOR_TEXTURE_H_INCLUDED__ +#ifndef IRR_C_SCENE_NODE_ANIMATOR_TEXTURE_H_INCLUDED +#define IRR_C_SCENE_NODE_ANIMATOR_TEXTURE_H_INCLUDED #include "irrArray.h" #include "ISceneNodeAnimatorFinishing.h" @@ -56,4 +56,3 @@ namespace scene } // end namespace irr #endif - diff --git a/source/Irrlicht/CShadowVolumeSceneNode.h b/source/Irrlicht/CShadowVolumeSceneNode.h index 4cf9fdff..1179c39c 100644 --- a/source/Irrlicht/CShadowVolumeSceneNode.h +++ b/source/Irrlicht/CShadowVolumeSceneNode.h @@ -2,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_SHADOW_VOLUME_SCENE_NODE_H_INCLUDED__ -#define __C_SHADOW_VOLUME_SCENE_NODE_H_INCLUDED__ +#ifndef IRR_C_SHADOW_VOLUME_SCENE_NODE_H_INCLUDED +#define IRR_C_SHADOW_VOLUME_SCENE_NODE_H_INCLUDED #include "IShadowVolumeSceneNode.h" diff --git a/source/Irrlicht/CSkinnedMesh.h b/source/Irrlicht/CSkinnedMesh.h index eaf8bbba..b51c0384 100644 --- a/source/Irrlicht/CSkinnedMesh.h +++ b/source/Irrlicht/CSkinnedMesh.h @@ -4,8 +4,8 @@ //New skinned mesh -#ifndef __C_SKINNED_MESH_H_INCLUDED__ -#define __C_SKINNED_MESH_H_INCLUDED__ +#ifndef IRR_C_SKINNED_MESH_H_INCLUDED +#define IRR_C_SKINNED_MESH_H_INCLUDED #include "ISkinnedMesh.h" #include "SMeshBuffer.h" @@ -212,4 +212,3 @@ private: } // end namespace irr #endif - diff --git a/source/Irrlicht/CSkyBoxSceneNode.h b/source/Irrlicht/CSkyBoxSceneNode.h index 58dbe852..5bdcdefd 100644 --- a/source/Irrlicht/CSkyBoxSceneNode.h +++ b/source/Irrlicht/CSkyBoxSceneNode.h @@ -2,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_SKY_BOX_SCENE_NODE_H_INCLUDED__ -#define __C_SKY_BOX_SCENE_NODE_H_INCLUDED__ +#ifndef IRR_C_SKY_BOX_SCENE_NODE_H_INCLUDED +#define IRR_C_SKY_BOX_SCENE_NODE_H_INCLUDED #include "ISceneNode.h" #include "S3DVertex.h" @@ -59,4 +59,3 @@ namespace scene } // end namespace irr #endif - diff --git a/source/Irrlicht/CSkyDomeSceneNode.h b/source/Irrlicht/CSkyDomeSceneNode.h index 46b96d24..68d8c081 100644 --- a/source/Irrlicht/CSkyDomeSceneNode.h +++ b/source/Irrlicht/CSkyDomeSceneNode.h @@ -3,8 +3,8 @@ // For conditions of distribution and use, see copyright notice in irrlicht.h // Code for this scene node has been contributed by Anders la Cour-Harbo (alc) -#ifndef __C_SKY_DOME_SCENE_NODE_H_INCLUDED__ -#define __C_SKY_DOME_SCENE_NODE_H_INCLUDED__ +#ifndef IRR_C_SKY_DOME_SCENE_NODE_H_INCLUDED +#define IRR_C_SKY_DOME_SCENE_NODE_H_INCLUDED #include "ISceneNode.h" #include "SMeshBuffer.h" @@ -47,4 +47,3 @@ class CSkyDomeSceneNode : public ISceneNode } #endif - diff --git a/source/Irrlicht/CSoftware2MaterialRenderer.h b/source/Irrlicht/CSoftware2MaterialRenderer.h index 4f8b5b97..3fa42acf 100644 --- a/source/Irrlicht/CSoftware2MaterialRenderer.h +++ b/source/Irrlicht/CSoftware2MaterialRenderer.h @@ -2,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_SOFTWARE2_MATERIAL_RENDERER_H_INCLUDED__ -#define __C_SOFTWARE2_MATERIAL_RENDERER_H_INCLUDED__ +#ifndef IRR_C_SOFTWARE2_MATERIAL_RENDERER_H_INCLUDED +#define IRR_C_SOFTWARE2_MATERIAL_RENDERER_H_INCLUDED #include "SoftwareDriver2_compile_config.h" @@ -87,4 +87,3 @@ public: } // end namespace irr #endif - diff --git a/source/Irrlicht/CSoftwareDriver.h b/source/Irrlicht/CSoftwareDriver.h index 0c8dc817..c51eb29b 100644 --- a/source/Irrlicht/CSoftwareDriver.h +++ b/source/Irrlicht/CSoftwareDriver.h @@ -2,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_VIDEO_SOFTWARE_H_INCLUDED__ -#define __C_VIDEO_SOFTWARE_H_INCLUDED__ +#ifndef IRR_C_SOFTWARE_DRIVER_H_INCLUDED +#define IRR_C_SOFTWARE_DRIVER_H_INCLUDED #include "ITriangleRenderer.h" #include "CNullDriver.h" @@ -175,6 +175,4 @@ namespace video } // end namespace video } // end namespace irr - #endif - diff --git a/source/Irrlicht/CSoftwareDriver2.h b/source/Irrlicht/CSoftwareDriver2.h index 16690231..53634b74 100644 --- a/source/Irrlicht/CSoftwareDriver2.h +++ b/source/Irrlicht/CSoftwareDriver2.h @@ -2,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_VIDEO_2_SOFTWARE_H_INCLUDED__ -#define __C_VIDEO_2_SOFTWARE_H_INCLUDED__ +#ifndef IRR_C_VIDEO_2_SOFTWARE_H_INCLUDED +#define IRR_C_VIDEO_2_SOFTWARE_H_INCLUDED #include "SoftwareDriver2_compile_config.h" #include "IBurningShader.h" @@ -447,4 +447,3 @@ namespace video #endif - diff --git a/source/Irrlicht/CSoftwareTexture.h b/source/Irrlicht/CSoftwareTexture.h index 72e08a5a..ceca1193 100644 --- a/source/Irrlicht/CSoftwareTexture.h +++ b/source/Irrlicht/CSoftwareTexture.h @@ -2,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_SOFTWARE_TEXTURE_H_INCLUDED__ -#define __C_SOFTWARE_TEXTURE_H_INCLUDED__ +#ifndef IRR_C_SOFTWARE_TEXTURE_H_INCLUDED +#define IRR_C_SOFTWARE_TEXTURE_H_INCLUDED #include "ITexture.h" #include "IRenderTarget.h" @@ -70,4 +70,3 @@ protected: } // end namespace irr #endif - diff --git a/source/Irrlicht/CSoftwareTexture2.h b/source/Irrlicht/CSoftwareTexture2.h index 97791ad3..d625fb10 100644 --- a/source/Irrlicht/CSoftwareTexture2.h +++ b/source/Irrlicht/CSoftwareTexture2.h @@ -2,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_SOFTWARE_2_TEXTURE_H_INCLUDED__ -#define __C_SOFTWARE_2_TEXTURE_H_INCLUDED__ +#ifndef IRR_C_SOFTWARE_2_TEXTURE_H_INCLUDED +#define IRR_C_SOFTWARE_2_TEXTURE_H_INCLUDED #include "SoftwareDriver2_compile_config.h" @@ -180,6 +180,4 @@ protected: } // end namespace video } // end namespace irr -#endif // __C_SOFTWARE_2_TEXTURE_H_INCLUDED__ - - +#endif // IRR_C_SOFTWARE_2_TEXTURE_H_INCLUDED diff --git a/source/Irrlicht/CSphereSceneNode.h b/source/Irrlicht/CSphereSceneNode.h index 6f1b3e37..97bd252d 100644 --- a/source/Irrlicht/CSphereSceneNode.h +++ b/source/Irrlicht/CSphereSceneNode.h @@ -2,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_SPHERE_SCENE_NODE_H_INCLUDED__ -#define __C_SPHERE_SCENE_NODE_H_INCLUDED__ +#ifndef IRR_C_SPHERE_SCENE_NODE_H_INCLUDED +#define IRR_C_SPHERE_SCENE_NODE_H_INCLUDED #include "IMeshSceneNode.h" #include "IMesh.h" @@ -93,4 +93,3 @@ namespace scene } // end namespace irr #endif - diff --git a/source/Irrlicht/CTRTextureGouraud.h b/source/Irrlicht/CTRTextureGouraud.h index 8c5805bc..2ba6c888 100644 --- a/source/Irrlicht/CTRTextureGouraud.h +++ b/source/Irrlicht/CTRTextureGouraud.h @@ -2,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_TRIANGLE_RENDERER_TEXTURE_GOURAUD_H_INCLUDED__ -#define __C_TRIANGLE_RENDERER_TEXTURE_GOURAUD_H_INCLUDED__ +#ifndef IRR_C_TRIANGLE_RENDERER_TEXTURE_GOURAUD_H_INCLUDED +#define IRR_C_TRIANGLE_RENDERER_TEXTURE_GOURAUD_H_INCLUDED #include "IrrCompileConfig.h" @@ -82,4 +82,3 @@ namespace video #endif #endif - diff --git a/source/Irrlicht/CTarReader.h b/source/Irrlicht/CTarReader.h index 946732be..a446fcc5 100644 --- a/source/Irrlicht/CTarReader.h +++ b/source/Irrlicht/CTarReader.h @@ -2,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_TAR_READER_H_INCLUDED__ -#define __C_TAR_READER_H_INCLUDED__ +#ifndef IRR_C_TAR_READER_H_INCLUDED +#define IRR_C_TAR_READER_H_INCLUDED #include "IrrCompileConfig.h" @@ -133,4 +133,4 @@ namespace io } // end namespace irr #endif // __IRR_COMPILE_WITH_TAR_ARCHIVE_LOADER_ -#endif // __C_TAR_READER_H_INCLUDED__ +#endif // IRR_C_TAR_READER_H_INCLUDED diff --git a/source/Irrlicht/CTerrainSceneNode.h b/source/Irrlicht/CTerrainSceneNode.h index a22234b1..d9cacf40 100644 --- a/source/Irrlicht/CTerrainSceneNode.h +++ b/source/Irrlicht/CTerrainSceneNode.h @@ -4,10 +4,10 @@ // The code for the TerrainSceneNode is based on the GeoMipMapSceneNode // developed by Spintz. He made it available for Irrlicht and allowed it to be -// distributed under this licence. I only modified some parts. A lot of thanks go to him. +// distributed under this license. I only modified some parts. A lot of thanks go to him. -#ifndef __C_TERRAIN_SCENE_NODE_H__ -#define __C_TERRAIN_SCENE_NODE_H__ +#ifndef IRR_C_TERRAIN_SCENE_NODE_H +#define IRR_C_TERRAIN_SCENE_NODE_H #include "ITerrainSceneNode.h" #include "IDynamicMeshBuffer.h" @@ -331,6 +331,4 @@ namespace scene } // end namespace scene } // end namespace irr -#endif // __C_TERRAIN_SCENE_NODE_H__ - - +#endif // IRR_C_TERRAIN_SCENE_NODE_H diff --git a/source/Irrlicht/CTerrainTriangleSelector.h b/source/Irrlicht/CTerrainTriangleSelector.h index 13a0be7f..59af7330 100644 --- a/source/Irrlicht/CTerrainTriangleSelector.h +++ b/source/Irrlicht/CTerrainTriangleSelector.h @@ -4,10 +4,10 @@ // The code for the TerrainTriangleSelector is based on the GeoMipMapSelector // developed by Spintz. He made it available for Irrlicht and allowed it to be -// distributed under this licence. I only modified some parts. A lot of thanks go to him. +// distributed under this license. I only modified some parts. A lot of thanks go to him. -#ifndef __C_TERRAIN_TRIANGLE_SELECTOR_H__ -#define __C_TERRAIN_TRIANGLE_SELECTOR_H__ +#ifndef IRR_C_TERRAIN_TRIANGLE_SELECTOR_H +#define IRR_C_TERRAIN_TRIANGLE_SELECTOR_H #include "ITriangleSelector.h" #include "irrArray.h" @@ -99,5 +99,4 @@ private: } // end namespace scene } // end namespace irr - -#endif // __C_TERRAIN_TRIANGLE_SELECTOR_H__ +#endif // IRR_C_TERRAIN_TRIANGLE_SELECTOR_H diff --git a/source/Irrlicht/CTextSceneNode.h b/source/Irrlicht/CTextSceneNode.h index a8da5120..2d2c71ea 100644 --- a/source/Irrlicht/CTextSceneNode.h +++ b/source/Irrlicht/CTextSceneNode.h @@ -2,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_TEXT_SCENE_NODE_H_INCLUDED__ -#define __C_TEXT_SCENE_NODE_H_INCLUDED__ +#ifndef IRR_C_TEXT_SCENE_NODE_H_INCLUDED +#define IRR_C_TEXT_SCENE_NODE_H_INCLUDED #include "ITextSceneNode.h" #include "IBillboardTextSceneNode.h" @@ -177,4 +177,3 @@ namespace scene } // end namespace irr #endif - diff --git a/source/Irrlicht/CTimer.h b/source/Irrlicht/CTimer.h index ff58b90e..6cfc64ed 100644 --- a/source/Irrlicht/CTimer.h +++ b/source/Irrlicht/CTimer.h @@ -2,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_IRR_C_TIMER_H_INCLUDED__ -#define __C_IRR_C_TIMER_H_INCLUDED__ +#ifndef IRR_C_IRR_C_TIMER_H_INCLUDED +#define IRR_C_IRR_C_TIMER_H_INCLUDED #include "ITimer.h" #include "os.h" @@ -104,4 +104,3 @@ namespace irr } // end namespace #endif - diff --git a/source/Irrlicht/CTriangleBBSelector.h b/source/Irrlicht/CTriangleBBSelector.h index 7fb9639d..6fe10cd8 100644 --- a/source/Irrlicht/CTriangleBBSelector.h +++ b/source/Irrlicht/CTriangleBBSelector.h @@ -2,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_TRIANGLE_BB_SELECTOR_H_INCLUDED__ -#define __C_TRIANGLE_BB_SELECTOR_H_INCLUDED__ +#ifndef IRR_C_TRIANGLE_BB_SELECTOR_H_INCLUDED +#define IRR_C_TRIANGLE_BB_SELECTOR_H_INCLUDED #include "CTriangleSelector.h" @@ -44,6 +44,4 @@ protected: } // end namespace scene } // end namespace irr - #endif - diff --git a/source/Irrlicht/CTriangleSelector.h b/source/Irrlicht/CTriangleSelector.h index 5adfca90..138fca91 100644 --- a/source/Irrlicht/CTriangleSelector.h +++ b/source/Irrlicht/CTriangleSelector.h @@ -2,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_TRIANGLE_SELECTOR_H_INCLUDED__ -#define __C_TRIANGLE_SELECTOR_H_INCLUDED__ +#ifndef IRR_C_TRIANGLE_SELECTOR_H_INCLUDED +#define IRR_C_TRIANGLE_SELECTOR_H_INCLUDED #include "ITriangleSelector.h" #include "IMesh.h" diff --git a/source/Irrlicht/CWADReader.h b/source/Irrlicht/CWADReader.h index 3a758825..8d9a01af 100644 --- a/source/Irrlicht/CWADReader.h +++ b/source/Irrlicht/CWADReader.h @@ -2,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_WAD_READER_H_INCLUDED__ -#define __C_WAD_READER_H_INCLUDED__ +#ifndef IRR_C_WAD_READER_H_INCLUDED +#define IRR_C_WAD_READER_H_INCLUDED #include "IrrCompileConfig.h" #ifdef __IRR_COMPILE_WITH_WAD_ARCHIVE_LOADER_ @@ -169,8 +169,6 @@ namespace io } // end namespace io } // end namespace irr -#endif - - -#endif // #ifdef __IRR_COMPILE_WITH_WAD_ARCHIVE_LOADER_ +#endif // #ifdef __IRR_COMPILE_WITH_WAD_ARCHIVE_LOADER_ +#endif diff --git a/source/Irrlicht/CWGLManager.h b/source/Irrlicht/CWGLManager.h index 138c8677..54d83fcc 100644 --- a/source/Irrlicht/CWGLManager.h +++ b/source/Irrlicht/CWGLManager.h @@ -2,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_WGL_MANAGER_H_INCLUDED__ -#define __C_WGL_MANAGER_H_INCLUDED__ +#ifndef IRR_C_WGL_MANAGER_H_INCLUDED +#define IRR_C_WGL_MANAGER_H_INCLUDED #include "IrrCompileConfig.h" diff --git a/source/Irrlicht/CWaterSurfaceSceneNode.h b/source/Irrlicht/CWaterSurfaceSceneNode.h index dbb01ec3..cdea73dc 100644 --- a/source/Irrlicht/CWaterSurfaceSceneNode.h +++ b/source/Irrlicht/CWaterSurfaceSceneNode.h @@ -2,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_WATER_SURFACE_SCENE_NODE_H_INCLUDED__ -#define __C_WATER_SURFACE_SCENE_NODE_H_INCLUDED__ +#ifndef IRR_C_WATER_SURFACE_SCENE_NODE_H_INCLUDED +#define IRR_C_WATER_SURFACE_SCENE_NODE_H_INCLUDED #include "CMeshSceneNode.h" @@ -58,4 +58,3 @@ namespace scene } // end namespace irr #endif - diff --git a/source/Irrlicht/CWriteFile.h b/source/Irrlicht/CWriteFile.h index 91639cb3..9f6f4505 100644 --- a/source/Irrlicht/CWriteFile.h +++ b/source/Irrlicht/CWriteFile.h @@ -2,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_WRITE_FILE_H_INCLUDED__ -#define __C_WRITE_FILE_H_INCLUDED__ +#ifndef IRR_C_WRITE_FILE_H_INCLUDED +#define IRR_C_WRITE_FILE_H_INCLUDED #include #include "IWriteFile.h" @@ -61,4 +61,3 @@ namespace io } // end namespace irr #endif - diff --git a/source/Irrlicht/CXMLReader.h b/source/Irrlicht/CXMLReader.h index 328b92a8..1b7fa590 100644 --- a/source/Irrlicht/CXMLReader.h +++ b/source/Irrlicht/CXMLReader.h @@ -2,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_XML_READER_H_INCLUDED__ -#define __C_XML_READER_H_INCLUDED__ +#ifndef IRR_C_XML_READER_H_INCLUDED +#define IRR_C_XML_READER_H_INCLUDED #include "IXMLReader.h" @@ -27,4 +27,3 @@ namespace io } // end namespace io #endif - diff --git a/source/Irrlicht/CXMLWriter.h b/source/Irrlicht/CXMLWriter.h index 94c42250..a00f76f2 100644 --- a/source/Irrlicht/CXMLWriter.h +++ b/source/Irrlicht/CXMLWriter.h @@ -2,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_XML_WRITER_H_INCLUDED__ -#define __C_XML_WRITER_H_INCLUDED__ +#ifndef IRR_C_XML_WRITER_H_INCLUDED +#define IRR_C_XML_WRITER_H_INCLUDED #include "IXMLWriter.h" @@ -153,4 +153,3 @@ namespace io #endif // _IRR_COMPILE_WITH_XML_ #endif - diff --git a/source/Irrlicht/CXMeshFileLoader.h b/source/Irrlicht/CXMeshFileLoader.h index 434e3341..a5f7f7e4 100644 --- a/source/Irrlicht/CXMeshFileLoader.h +++ b/source/Irrlicht/CXMeshFileLoader.h @@ -2,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_X_MESH_FILE_LOADER_H_INCLUDED__ -#define __C_X_MESH_FILE_LOADER_H_INCLUDED__ +#ifndef IRR_C_X_MESH_FILE_LOADER_H_INCLUDED +#define IRR_C_X_MESH_FILE_LOADER_H_INCLUDED #include "IMeshLoader.h" #include "irrString.h" diff --git a/source/Irrlicht/CZBuffer.h b/source/Irrlicht/CZBuffer.h index 02a02423..2dbf2cc2 100644 --- a/source/Irrlicht/CZBuffer.h +++ b/source/Irrlicht/CZBuffer.h @@ -2,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_Z_BUFFER_H_INCLUDED__ -#define __C_Z_BUFFER_H_INCLUDED__ +#ifndef IRR_C_Z_BUFFER_H_INCLUDED +#define IRR_C_Z_BUFFER_H_INCLUDED #include "IZBuffer.h" @@ -49,4 +49,3 @@ namespace video } // end namespace irr #endif - diff --git a/source/Irrlicht/CZipReader.h b/source/Irrlicht/CZipReader.h index 51e7f4cc..80ba6440 100644 --- a/source/Irrlicht/CZipReader.h +++ b/source/Irrlicht/CZipReader.h @@ -2,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_ZIP_READER_H_INCLUDED__ -#define __C_ZIP_READER_H_INCLUDED__ +#ifndef IRR_C_ZIP_READER_H_INCLUDED +#define IRR_C_ZIP_READER_H_INCLUDED #include "IrrCompileConfig.h" @@ -227,5 +227,4 @@ namespace io } // end namespace irr #endif // __IRR_COMPILE_WITH_ZIP_ARCHIVE_LOADER_ -#endif // __C_ZIP_READER_H_INCLUDED__ - +#endif // IRR_C_ZIP_READER_H_INCLUDED diff --git a/source/Irrlicht/Irrlicht10.0.vcxproj b/source/Irrlicht/Irrlicht10.0.vcxproj index 5ee55af6..895bf233 100644 --- a/source/Irrlicht/Irrlicht10.0.vcxproj +++ b/source/Irrlicht/Irrlicht10.0.vcxproj @@ -839,8 +839,11 @@ + + + diff --git a/source/Irrlicht/Irrlicht10.0.vcxproj.filters b/source/Irrlicht/Irrlicht10.0.vcxproj.filters index d0744c8c..d11efd1f 100644 --- a/source/Irrlicht/Irrlicht10.0.vcxproj.filters +++ b/source/Irrlicht/Irrlicht10.0.vcxproj.filters @@ -1423,6 +1423,15 @@ include\io + + include\video + + + include\scene + + + include + diff --git a/source/Irrlicht/Octree.h b/source/Irrlicht/Octree.h index e9c092b8..52543525 100644 --- a/source/Irrlicht/Octree.h +++ b/source/Irrlicht/Octree.h @@ -2,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_OCTREE_H_INCLUDED__ -#define __C_OCTREE_H_INCLUDED__ +#ifndef IRR_C_OCTREE_H_INCLUDED +#define IRR_C_OCTREE_H_INCLUDED #include "SViewFrustum.h" #include "S3DVertex.h" @@ -386,4 +386,3 @@ private: } // end namespace #endif -