From 44a368ef0e12cc7d1cf69c842e7e4c0e5c751216 Mon Sep 17 00:00:00 2001 From: sfan5 Date: Sun, 25 Feb 2024 22:01:20 +0100 Subject: [PATCH] Migrate public headers to `#pragma once` --- include/CMeshBuffer.h | 7 +------ include/EAttributes.h | 5 +---- include/ECullingTypes.h | 7 +------ include/EDebugSceneTypes.h | 7 +------ include/EDeviceTypes.h | 6 +----- include/EDriverFeatures.h | 7 +------ include/EDriverTypes.h | 6 +----- include/EFocusFlags.h | 6 +----- include/EGUIAlignment.h | 5 +---- include/EGUIElementTypes.h | 9 +-------- include/EHardwareBufferFlags.h | 6 +----- include/EMaterialProps.h | 7 +------ include/EMaterialTypes.h | 7 +------ include/EMeshWriterEnums.h | 7 +------ include/EPrimitiveTypes.h | 6 +----- include/EReadFileType.h | 6 +----- include/ESceneNodeTypes.h | 7 +------ include/EShaderTypes.h | 6 +----- include/EVertexAttributes.h | 5 +---- include/IAnimatedMesh.h | 6 +----- include/IAnimatedMeshSceneNode.h | 6 +----- include/IAttributes.h | 5 +---- include/IBillboardSceneNode.h | 7 +------ include/IBoneSceneNode.h | 6 +----- include/ICameraSceneNode.h | 6 +----- include/ICursorControl.h | 6 +----- include/IDummyTransformationSceneNode.h | 7 +------ include/IEventReceiver.h | 6 +----- include/IFileArchive.h | 6 +----- include/IFileList.h | 7 +------ include/IFileSystem.h | 6 +----- include/IGPUProgrammingServices.h | 6 +----- include/IGUIButton.h | 6 +----- include/IGUICheckBox.h | 6 +----- include/IGUIComboBox.h | 6 +----- include/IGUIEditBox.h | 6 +----- include/IGUIElement.h | 6 +----- include/IGUIEnvironment.h | 6 +----- include/IGUIFileOpenDialog.h | 6 +----- include/IGUIFont.h | 6 +----- include/IGUIFontBitmap.h | 6 +----- include/IGUIImage.h | 5 +---- include/IGUIImageList.h | 6 +----- include/IGUIListBox.h | 6 +----- include/IGUIScrollBar.h | 6 +----- include/IGUISkin.h | 6 +----- include/IGUISpriteBank.h | 6 +----- include/IGUIStaticText.h | 6 +----- include/IGUITabControl.h | 6 +----- include/IGUIToolbar.h | 6 +----- include/IImage.h | 6 +----- include/IImageLoader.h | 6 +----- include/IImageWriter.h | 6 +----- include/IIndexBuffer.h | 6 +----- include/ILogger.h | 6 +----- include/IMaterialRenderer.h | 6 +----- include/IMaterialRendererServices.h | 6 +----- include/IMemoryReadFile.h | 6 +----- include/IMesh.h | 6 +----- include/IMeshBuffer.h | 5 +---- include/IMeshCache.h | 6 +----- include/IMeshLoader.h | 5 +---- include/IMeshManipulator.h | 6 +----- include/IMeshSceneNode.h | 7 +------ include/IOSOperator.h | 5 +---- include/IReadFile.h | 6 +----- include/IReferenceCounted.h | 6 +----- include/IRenderTarget.h | 5 +---- include/ISceneCollisionManager.h | 5 +---- include/ISceneManager.h | 6 +----- include/ISceneNode.h | 6 +----- include/IShaderConstantSetCallBack.h | 6 +----- include/ISkinnedMesh.h | 6 +----- include/ITexture.h | 6 +----- include/ITimer.h | 5 +---- include/IVertexBuffer.h | 6 +----- include/IWriteFile.h | 6 +----- include/IrrlichtDevice.h | 6 +----- include/S3DVertex.h | 6 +----- include/SAnimatedMesh.h | 6 +----- include/SColor.h | 5 +---- include/SExposedVideoData.h | 7 +------ include/SIrrCreationParameters.h | 6 +----- include/SMaterial.h | 5 +---- include/SMaterialLayer.h | 5 +---- include/SMesh.h | 6 +----- include/SOverrideMaterial.h | 6 +----- include/SSkinMeshBuffer.h | 6 +----- include/SVertexIndex.h | 6 +----- include/SVertexManipulator.h | 6 +----- include/SViewFrustum.h | 6 +----- include/SceneParameters.h | 6 +----- include/exampleHelper.h | 5 +---- include/fast_atof.h | 6 +----- include/irrlicht.h | 6 +----- 95 files changed, 95 insertions(+), 476 deletions(-) diff --git a/include/CMeshBuffer.h b/include/CMeshBuffer.h index 4957398..9004af7 100644 --- a/include/CMeshBuffer.h +++ b/include/CMeshBuffer.h @@ -2,8 +2,7 @@ // This file is part of the "Irrlicht Engine". // For conditions of distribution and use, see copyright notice in irrlicht.h -#ifndef __T_MESH_BUFFER_H_INCLUDED__ -#define __T_MESH_BUFFER_H_INCLUDED__ +#pragma once #include "irrArray.h" #include "IMeshBuffer.h" @@ -293,7 +292,3 @@ namespace scene typedef CMeshBuffer SMeshBufferTangents; } // end namespace scene } // end namespace irr - -#endif - - diff --git a/include/EAttributes.h b/include/EAttributes.h index a96141a..54954ca 100644 --- a/include/EAttributes.h +++ b/include/EAttributes.h @@ -2,8 +2,7 @@ // This file is part of the "Irrlicht Engine". // For conditions of distribution and use, see copyright notice in irrlicht.h -#ifndef __E_ATTRIBUTES_H_INCLUDED__ -#define __E_ATTRIBUTES_H_INCLUDED__ +#pragma once namespace irr { @@ -31,5 +30,3 @@ enum E_ATTRIBUTE_TYPE } // end namespace io } // end namespace irr - -#endif diff --git a/include/ECullingTypes.h b/include/ECullingTypes.h index 50a46bc..e8d2b06 100644 --- a/include/ECullingTypes.h +++ b/include/ECullingTypes.h @@ -2,8 +2,7 @@ // This file is part of the "Irrlicht Engine". // For conditions of distribution and use, see copyright notice in irrlicht.h -#ifndef __E_CULLING_TYPES_H_INCLUDED__ -#define __E_CULLING_TYPES_H_INCLUDED__ +#pragma once #include "irrTypes.h" @@ -35,7 +34,3 @@ namespace scene } // end namespace scene } // end namespace irr - - -#endif // __E_CULLING_TYPES_H_INCLUDED__ - diff --git a/include/EDebugSceneTypes.h b/include/EDebugSceneTypes.h index 86e5235..67721b8 100644 --- a/include/EDebugSceneTypes.h +++ b/include/EDebugSceneTypes.h @@ -2,8 +2,7 @@ // This file is part of the "Irrlicht Engine". // For conditions of distribution and use, see copyright notice in irrlicht.h -#ifndef __E_DEBUG_SCENE_TYPES_H_INCLUDED__ -#define __E_DEBUG_SCENE_TYPES_H_INCLUDED__ +#pragma once namespace irr { @@ -41,7 +40,3 @@ namespace scene } // end namespace scene } // end namespace irr - - -#endif // __E_DEBUG_SCENE_TYPES_H_INCLUDED__ - diff --git a/include/EDeviceTypes.h b/include/EDeviceTypes.h index 43f0c58..617168c 100644 --- a/include/EDeviceTypes.h +++ b/include/EDeviceTypes.h @@ -2,8 +2,7 @@ // This file is part of the "Irrlicht Engine". // For conditions of distribution and use, see copyright notice in irrlicht.h -#ifndef __E_DEVICE_TYPES_H_INCLUDED__ -#define __E_DEVICE_TYPES_H_INCLUDED__ +#pragma once namespace irr { @@ -45,6 +44,3 @@ namespace irr }; } // end namespace irr - -#endif // __E_DEVICE_TYPES_H_INCLUDED__ - diff --git a/include/EDriverFeatures.h b/include/EDriverFeatures.h index d9e70df..2a2ef5b 100644 --- a/include/EDriverFeatures.h +++ b/include/EDriverFeatures.h @@ -2,8 +2,7 @@ // This file is part of the "Irrlicht Engine". // For conditions of distribution and use, see copyright notice in irrlicht.h -#ifndef __E_DRIVER_FEATURES_H_INCLUDED__ -#define __E_DRIVER_FEATURES_H_INCLUDED__ +#pragma once namespace irr { @@ -136,7 +135,3 @@ namespace video } // end namespace video } // end namespace irr - - -#endif - diff --git a/include/EDriverTypes.h b/include/EDriverTypes.h index c6e3bcc..f41e42d 100644 --- a/include/EDriverTypes.h +++ b/include/EDriverTypes.h @@ -2,8 +2,7 @@ // This file is part of the "Irrlicht Engine". // For conditions of distribution and use, see copyright notice in irrlicht.h -#ifndef __E_DRIVER_TYPES_H_INCLUDED__ -#define __E_DRIVER_TYPES_H_INCLUDED__ +#pragma once #include "irrTypes.h" @@ -43,6 +42,3 @@ namespace video } // end namespace video } // end namespace irr - - -#endif diff --git a/include/EFocusFlags.h b/include/EFocusFlags.h index 7788844..2c22947 100644 --- a/include/EFocusFlags.h +++ b/include/EFocusFlags.h @@ -1,8 +1,7 @@ // This file is part of the "Irrlicht Engine". // For conditions of distribution and use, see copyright notice in irrlicht.h -#ifndef E_FOCUS_FLAGS_H_INCLUDED__ -#define E_FOCUS_FLAGS_H_INCLUDED__ +#pragma once namespace irr { @@ -33,6 +32,3 @@ enum EFOCUS_FLAG } // namespace gui } // namespace irr - -#endif - diff --git a/include/EGUIAlignment.h b/include/EGUIAlignment.h index fa59ad6..4c3c44a 100644 --- a/include/EGUIAlignment.h +++ b/include/EGUIAlignment.h @@ -2,8 +2,7 @@ // This file is part of the "Irrlicht Engine". // For conditions of distribution and use, see copyright notice in irrlicht.h -#ifndef __E_GUI_ALIGNMENT_H_INCLUDED__ -#define __E_GUI_ALIGNMENT_H_INCLUDED__ +#pragma once #include "irrTypes.h" @@ -35,5 +34,3 @@ const c8* const GUIAlignmentNames[] = } // namespace gui } // namespace irr - -#endif // __E_GUI_ALIGNMENT_H_INCLUDED__ diff --git a/include/EGUIElementTypes.h b/include/EGUIElementTypes.h index 395ef60..aea49f4 100644 --- a/include/EGUIElementTypes.h +++ b/include/EGUIElementTypes.h @@ -2,8 +2,7 @@ // This file is part of the "Irrlicht Engine". // For conditions of distribution and use, see copyright notice in irrlicht.h -#ifndef __E_GUI_ELEMENT_TYPES_H_INCLUDED__ -#define __E_GUI_ELEMENT_TYPES_H_INCLUDED__ +#pragma once #include "irrTypes.h" @@ -133,9 +132,3 @@ const c8* const GUIElementTypeNames[] = } // end namespace gui } // end namespace irr - -#endif - - - - diff --git a/include/EHardwareBufferFlags.h b/include/EHardwareBufferFlags.h index 27d5610..e50d2cf 100644 --- a/include/EHardwareBufferFlags.h +++ b/include/EHardwareBufferFlags.h @@ -2,8 +2,7 @@ // This file is part of the "Irrlicht Engine". // For conditions of distribution and use, see copyright notice in irrlicht.h -#ifndef __E_HARDWARE_BUFFER_FLAGS_INCLUDED__ -#define __E_HARDWARE_BUFFER_FLAGS_INCLUDED__ +#pragma once namespace irr { @@ -39,6 +38,3 @@ namespace scene } // end namespace scene } // end namespace irr - -#endif - diff --git a/include/EMaterialProps.h b/include/EMaterialProps.h index 6b68dc8..975cd60 100644 --- a/include/EMaterialProps.h +++ b/include/EMaterialProps.h @@ -2,8 +2,7 @@ // This file is part of the "Irrlicht Engine". // For conditions of distribution and use, see copyright notice in irrlicht.h -#ifndef __E_MATERIAL_PROPS_H_INCLUDED__ -#define __E_MATERIAL_PROPS_H_INCLUDED__ +#pragma once namespace irr { @@ -81,7 +80,3 @@ namespace video } // end namespace video } // end namespace irr - - -#endif // __E_MATERIAL_PROPS_H_INCLUDED__ - diff --git a/include/EMaterialTypes.h b/include/EMaterialTypes.h index 9055491..7bfe3dc 100644 --- a/include/EMaterialTypes.h +++ b/include/EMaterialTypes.h @@ -2,8 +2,7 @@ // This file is part of the "Irrlicht Engine". // For conditions of distribution and use, see copyright notice in irrlicht.h -#ifndef __E_MATERIAL_TYPES_H_INCLUDED__ -#define __E_MATERIAL_TYPES_H_INCLUDED__ +#pragma once #include "irrTypes.h" @@ -74,7 +73,3 @@ namespace video } // end namespace video } // end namespace irr - - -#endif // __E_MATERIAL_TYPES_H_INCLUDED__ - diff --git a/include/EMeshWriterEnums.h b/include/EMeshWriterEnums.h index f3e2649..d06e341 100644 --- a/include/EMeshWriterEnums.h +++ b/include/EMeshWriterEnums.h @@ -2,8 +2,7 @@ // This file is part of the "Irrlicht Engine". // For conditions of distribution and use, see copyright notice in irrlicht.h -#ifndef __E_MESH_WRITER_ENUMS_H_INCLUDED__ -#define __E_MESH_WRITER_ENUMS_H_INCLUDED__ +#pragma once #include "irrTypes.h" @@ -59,7 +58,3 @@ namespace scene } // end namespace scene } // end namespace irr - - -#endif // __E_MESH_WRITER_ENUMS_H_INCLUDED__ - diff --git a/include/EPrimitiveTypes.h b/include/EPrimitiveTypes.h index 870bbf9..c2830d0 100644 --- a/include/EPrimitiveTypes.h +++ b/include/EPrimitiveTypes.h @@ -2,8 +2,7 @@ // This file is part of the "Irrlicht Engine". // For conditions of distribution and use, see copyright notice in irrlicht.h -#ifndef __E_PRIMITIVE_TYPES_H_INCLUDED__ -#define __E_PRIMITIVE_TYPES_H_INCLUDED__ +#pragma once namespace irr { @@ -42,6 +41,3 @@ namespace scene } // end namespace scene } // end namespace irr - -#endif - diff --git a/include/EReadFileType.h b/include/EReadFileType.h index 2a7fd0e..0e00eaf 100644 --- a/include/EReadFileType.h +++ b/include/EReadFileType.h @@ -2,8 +2,7 @@ // This file is part of the "Irrlicht Engine". // For conditions of distribution and use, see copyright notice in irrlicht.h -#ifndef __E_READ_FILE_TYPES_H_INCLUDED__ -#define __E_READ_FILE_TYPES_H_INCLUDED__ +#pragma once #include "irrTypes.h" @@ -29,6 +28,3 @@ namespace io }; } // end namespace io } // end namespace irr - - -#endif diff --git a/include/ESceneNodeTypes.h b/include/ESceneNodeTypes.h index 6bf857f..e1e6c76 100644 --- a/include/ESceneNodeTypes.h +++ b/include/ESceneNodeTypes.h @@ -2,8 +2,7 @@ // This file is part of the "Irrlicht Engine". // For conditions of distribution and use, see copyright notice in irrlicht.h -#ifndef __E_SCENE_NODE_TYPES_H_INCLUDED__ -#define __E_SCENE_NODE_TYPES_H_INCLUDED__ +#pragma once #include "irrTypes.h" @@ -50,7 +49,3 @@ namespace scene } // end namespace scene } // end namespace irr - - -#endif - diff --git a/include/EShaderTypes.h b/include/EShaderTypes.h index 691930c..f5f87a7 100644 --- a/include/EShaderTypes.h +++ b/include/EShaderTypes.h @@ -1,5 +1,4 @@ -#ifndef __E_SHADER_TYPES_H_INCLUDED__ -#define __E_SHADER_TYPES_H_INCLUDED__ +#pragma once #include "irrTypes.h" @@ -85,6 +84,3 @@ const c8* const GEOMETRY_SHADER_TYPE_NAMES[] = { } // end namespace video } // end namespace irr - -#endif // __E_SHADER_TYPES_H_INCLUDED__ - diff --git a/include/EVertexAttributes.h b/include/EVertexAttributes.h index d7dce51..67461c4 100644 --- a/include/EVertexAttributes.h +++ b/include/EVertexAttributes.h @@ -1,5 +1,4 @@ -#ifndef __E_VERTEX_ATTRIBUTES_H_INCLUDED__ -#define __E_VERTEX_ATTRIBUTES_H_INCLUDED__ +#pragma once namespace irr { @@ -34,5 +33,3 @@ const char* const sBuiltInVertexAttributeNames[] = } // end namespace video } // end namespace irr - -#endif //__E_VERTEX_ATTRIBUTES_H_INCLUDED__ \ No newline at end of file diff --git a/include/IAnimatedMesh.h b/include/IAnimatedMesh.h index 228a4c1..f5ad6fe 100644 --- a/include/IAnimatedMesh.h +++ b/include/IAnimatedMesh.h @@ -2,8 +2,7 @@ // This file is part of the "Irrlicht Engine". // For conditions of distribution and use, see copyright notice in irrlicht.h -#ifndef __I_ANIMATED_MESH_H_INCLUDED__ -#define __I_ANIMATED_MESH_H_INCLUDED__ +#pragma once #include "aabbox3d.h" #include "IMesh.h" @@ -69,6 +68,3 @@ namespace scene } // end namespace scene } // end namespace irr - -#endif - diff --git a/include/IAnimatedMeshSceneNode.h b/include/IAnimatedMeshSceneNode.h index 4ec90d1..c15caab 100644 --- a/include/IAnimatedMeshSceneNode.h +++ b/include/IAnimatedMeshSceneNode.h @@ -2,8 +2,7 @@ // This file is part of the "Irrlicht Engine". // For conditions of distribution and use, see copyright notice in irrlicht.h -#ifndef __I_ANIMATED_MESH_SCENE_NODE_H_INCLUDED__ -#define __I_ANIMATED_MESH_SCENE_NODE_H_INCLUDED__ +#pragma once #include "ISceneNode.h" #include "IBoneSceneNode.h" @@ -172,6 +171,3 @@ namespace scene } // end namespace scene } // end namespace irr - -#endif - diff --git a/include/IAttributes.h b/include/IAttributes.h index b96c121..5b8b1ba 100644 --- a/include/IAttributes.h +++ b/include/IAttributes.h @@ -2,8 +2,7 @@ // This file is part of the "Irrlicht Engine". // For conditions of distribution and use, see copyright notice in irrlicht.h -#ifndef __I_ATTRIBUTES_H_INCLUDED__ -#define __I_ATTRIBUTES_H_INCLUDED__ +#pragma once #include "IReferenceCounted.h" #include "EAttributes.h" @@ -128,5 +127,3 @@ public: } // end namespace io } // end namespace irr - -#endif diff --git a/include/IBillboardSceneNode.h b/include/IBillboardSceneNode.h index 66082b4..a05c949 100644 --- a/include/IBillboardSceneNode.h +++ b/include/IBillboardSceneNode.h @@ -2,8 +2,7 @@ // This file is part of the "Irrlicht Engine". // For conditions of distribution and use, see copyright notice in irrlicht.h -#ifndef __I_BILLBOARD_SCENE_NODE_H_INCLUDED__ -#define __I_BILLBOARD_SCENE_NODE_H_INCLUDED__ +#pragma once #include "ISceneNode.h" @@ -90,7 +89,3 @@ public: } // end namespace scene } // end namespace irr - - -#endif - diff --git a/include/IBoneSceneNode.h b/include/IBoneSceneNode.h index 741aca2..f57b902 100644 --- a/include/IBoneSceneNode.h +++ b/include/IBoneSceneNode.h @@ -2,8 +2,7 @@ // This file is part of the "Irrlicht Engine". // For conditions of distribution and use, see copyright notice in irrlicht.h -#ifndef __I_BONE_SCENE_NODE_H_INCLUDED__ -#define __I_BONE_SCENE_NODE_H_INCLUDED__ +#pragma once #include "ISceneNode.h" @@ -99,6 +98,3 @@ namespace scene } // end namespace scene } // end namespace irr - -#endif - diff --git a/include/ICameraSceneNode.h b/include/ICameraSceneNode.h index 35f725d..acc7e5d 100644 --- a/include/ICameraSceneNode.h +++ b/include/ICameraSceneNode.h @@ -2,8 +2,7 @@ // This file is part of the "Irrlicht Engine". // For conditions of distribution and use, see copyright notice in irrlicht.h -#ifndef __I_CAMERA_SCENE_NODE_H_INCLUDED__ -#define __I_CAMERA_SCENE_NODE_H_INCLUDED__ +#pragma once #include "ISceneNode.h" #include "IEventReceiver.h" @@ -184,6 +183,3 @@ namespace scene } // end namespace scene } // end namespace irr - -#endif - diff --git a/include/ICursorControl.h b/include/ICursorControl.h index 27d4809..2b7a4dc 100644 --- a/include/ICursorControl.h +++ b/include/ICursorControl.h @@ -2,8 +2,7 @@ // This file is part of the "Irrlicht Engine". // For conditions of distribution and use, see copyright notice in irrlicht.h -#ifndef __I_CURSOR_CONTROL_H_INCLUDED__ -#define __I_CURSOR_CONTROL_H_INCLUDED__ +#pragma once #include "IReferenceCounted.h" #include "position2d.h" @@ -197,6 +196,3 @@ namespace gui } // end namespace gui } // end namespace irr - -#endif - diff --git a/include/IDummyTransformationSceneNode.h b/include/IDummyTransformationSceneNode.h index d5e7f00..fb823ea 100644 --- a/include/IDummyTransformationSceneNode.h +++ b/include/IDummyTransformationSceneNode.h @@ -2,8 +2,7 @@ // This file is part of the "Irrlicht Engine". // For conditions of distribution and use, see copyright notice in irrlicht.h -#ifndef __I_DUMMY_TRANSFORMATION_SCENE_NODE_H_INCLUDED__ -#define __I_DUMMY_TRANSFORMATION_SCENE_NODE_H_INCLUDED__ +#pragma once #include "ISceneNode.h" @@ -36,7 +35,3 @@ public: } // end namespace scene } // end namespace irr - - -#endif - diff --git a/include/IEventReceiver.h b/include/IEventReceiver.h index c56add9..8cea6e3 100644 --- a/include/IEventReceiver.h +++ b/include/IEventReceiver.h @@ -2,8 +2,7 @@ // This file is part of the "Irrlicht Engine". // For conditions of distribution and use, see copyright notice in irrlicht.h -#ifndef __I_EVENT_RECEIVER_H_INCLUDED__ -#define __I_EVENT_RECEIVER_H_INCLUDED__ +#pragma once #include "ILogger.h" #include "Keycodes.h" @@ -637,6 +636,3 @@ struct SJoystickInfo } // end namespace irr - -#endif - diff --git a/include/IFileArchive.h b/include/IFileArchive.h index 8952aca..2294a67 100644 --- a/include/IFileArchive.h +++ b/include/IFileArchive.h @@ -2,8 +2,7 @@ // This file is part of the "Irrlicht Engine". // For conditions of distribution and use, see copyright notice in irrlicht.h -#ifndef __I_FILE_ARCHIVE_H_INCLUDED__ -#define __I_FILE_ARCHIVE_H_INCLUDED__ +#pragma once #include "IReadFile.h" #include "IFileList.h" @@ -143,6 +142,3 @@ public: } // end namespace io } // end namespace irr - -#endif - diff --git a/include/IFileList.h b/include/IFileList.h index dd40bd3..cdef3e6 100644 --- a/include/IFileList.h +++ b/include/IFileList.h @@ -2,8 +2,7 @@ // This file is part of the "Irrlicht Engine". // For conditions of distribution and use, see copyright notice in irrlicht.h -#ifndef __I_FILE_LIST_H_INCLUDED__ -#define __I_FILE_LIST_H_INCLUDED__ +#pragma once #include "IReferenceCounted.h" #include "path.h" @@ -88,7 +87,3 @@ public: } // end namespace irr } // end namespace io - - -#endif - diff --git a/include/IFileSystem.h b/include/IFileSystem.h index 47edade..635c797 100644 --- a/include/IFileSystem.h +++ b/include/IFileSystem.h @@ -2,8 +2,7 @@ // This file is part of the "Irrlicht Engine". // For conditions of distribution and use, see copyright notice in irrlicht.h -#ifndef __I_FILE_SYSTEM_H_INCLUDED__ -#define __I_FILE_SYSTEM_H_INCLUDED__ +#pragma once #include "IReferenceCounted.h" #include "IFileArchive.h" @@ -268,6 +267,3 @@ public: } // end namespace io } // end namespace irr - -#endif - diff --git a/include/IGPUProgrammingServices.h b/include/IGPUProgrammingServices.h index f172314..470e26a 100644 --- a/include/IGPUProgrammingServices.h +++ b/include/IGPUProgrammingServices.h @@ -2,8 +2,7 @@ // This file is part of the "Irrlicht Engine". // For conditions of distribution and use, see copyright notice in irrlicht.h -#ifndef __I_GPU_PROGRAMMING_SERVICES_H_INCLUDED__ -#define __I_GPU_PROGRAMMING_SERVICES_H_INCLUDED__ +#pragma once #include "EShaderTypes.h" #include "EMaterialTypes.h" @@ -370,6 +369,3 @@ public: } // end namespace video } // end namespace irr - -#endif - diff --git a/include/IGUIButton.h b/include/IGUIButton.h index d498c57..a146e72 100644 --- a/include/IGUIButton.h +++ b/include/IGUIButton.h @@ -2,8 +2,7 @@ // This file is part of the "Irrlicht Engine". // For conditions of distribution and use, see copyright notice in irrlicht.h -#ifndef __I_GUI_BUTTON_H_INCLUDED__ -#define __I_GUI_BUTTON_H_INCLUDED__ +#pragma once #include "IGUIElement.h" @@ -263,6 +262,3 @@ namespace gui } // end namespace gui } // end namespace irr - -#endif - diff --git a/include/IGUICheckBox.h b/include/IGUICheckBox.h index bf9099d..d3a0f3a 100644 --- a/include/IGUICheckBox.h +++ b/include/IGUICheckBox.h @@ -2,8 +2,7 @@ // This file is part of the "Irrlicht Engine". // For conditions of distribution and use, see copyright notice in irrlicht.h -#ifndef __I_GUI_CHECKBOX_H_INCLUDED__ -#define __I_GUI_CHECKBOX_H_INCLUDED__ +#pragma once #include "IGUIElement.h" @@ -48,6 +47,3 @@ namespace gui } // end namespace gui } // end namespace irr - -#endif - diff --git a/include/IGUIComboBox.h b/include/IGUIComboBox.h index 3bc0acf..e63fee8 100644 --- a/include/IGUIComboBox.h +++ b/include/IGUIComboBox.h @@ -2,8 +2,7 @@ // This file is part of the "Irrlicht Engine". // For conditions of distribution and use, see copyright notice in irrlicht.h -#ifndef __I_GUI_COMBO_BOX_H_INCLUDED__ -#define __I_GUI_COMBO_BOX_H_INCLUDED__ +#pragma once #include "IGUIElement.h" @@ -73,6 +72,3 @@ namespace gui } // end namespace gui } // end namespace irr - -#endif - diff --git a/include/IGUIEditBox.h b/include/IGUIEditBox.h index 9be5563..67ca5a1 100644 --- a/include/IGUIEditBox.h +++ b/include/IGUIEditBox.h @@ -2,8 +2,7 @@ // This file is part of the "Irrlicht Engine". // For conditions of distribution and use, see copyright notice in irrlicht.h -#ifndef __I_GUI_EDIT_BOX_H_INCLUDED__ -#define __I_GUI_EDIT_BOX_H_INCLUDED__ +#pragma once #include "IGUIElement.h" #include "SColor.h" @@ -152,6 +151,3 @@ namespace gui } // end namespace gui } // end namespace irr - -#endif - diff --git a/include/IGUIElement.h b/include/IGUIElement.h index b8c9c18..552ccf1 100644 --- a/include/IGUIElement.h +++ b/include/IGUIElement.h @@ -2,8 +2,7 @@ // This file is part of the "Irrlicht Engine". // For conditions of distribution and use, see copyright notice in irrlicht.h -#ifndef __I_GUI_ELEMENT_H_INCLUDED__ -#define __I_GUI_ELEMENT_H_INCLUDED__ +#pragma once #include "IReferenceCounted.h" #include "rect.h" @@ -1031,6 +1030,3 @@ protected: } // end namespace gui } // end namespace irr - -#endif - diff --git a/include/IGUIEnvironment.h b/include/IGUIEnvironment.h index 653a199..833d00f 100644 --- a/include/IGUIEnvironment.h +++ b/include/IGUIEnvironment.h @@ -2,8 +2,7 @@ // This file is part of the "Irrlicht Engine". // For conditions of distribution and use, see copyright notice in irrlicht.h -#ifndef __I_GUI_ENVIRONMENT_H_INCLUDED__ -#define __I_GUI_ENVIRONMENT_H_INCLUDED__ +#pragma once #include "IReferenceCounted.h" #include "IGUISkin.h" @@ -416,6 +415,3 @@ public: } // end namespace gui } // end namespace irr - -#endif - diff --git a/include/IGUIFileOpenDialog.h b/include/IGUIFileOpenDialog.h index d018120..ec8e1a6 100644 --- a/include/IGUIFileOpenDialog.h +++ b/include/IGUIFileOpenDialog.h @@ -2,8 +2,7 @@ // This file is part of the "Irrlicht Engine". // For conditions of distribution and use, see copyright notice in irrlicht.h -#ifndef __I_GUI_FILE_OPEN_DIALOG_H_INCLUDED__ -#define __I_GUI_FILE_OPEN_DIALOG_H_INCLUDED__ +#pragma once #include "IGUIElement.h" #include "path.h" @@ -45,6 +44,3 @@ namespace gui } // end namespace gui } // end namespace irr - -#endif - diff --git a/include/IGUIFont.h b/include/IGUIFont.h index 2e97c82..49641ec 100644 --- a/include/IGUIFont.h +++ b/include/IGUIFont.h @@ -2,8 +2,7 @@ // This file is part of the "Irrlicht Engine". // For conditions of distribution and use, see copyright notice in irrlicht.h -#ifndef __I_GUI_FONT_H_INCLUDED__ -#define __I_GUI_FONT_H_INCLUDED__ +#pragma once #include "IReferenceCounted.h" #include "SColor.h" @@ -99,6 +98,3 @@ public: } // end namespace gui } // end namespace irr - -#endif - diff --git a/include/IGUIFontBitmap.h b/include/IGUIFontBitmap.h index 4e84ca0..029ca11 100644 --- a/include/IGUIFontBitmap.h +++ b/include/IGUIFontBitmap.h @@ -2,8 +2,7 @@ // This file is part of the "Irrlicht Engine". // For conditions of distribution and use, see copyright notice in irrlicht.h -#ifndef __I_GUI_FONT_BITMAP_H_INCLUDED__ -#define __I_GUI_FONT_BITMAP_H_INCLUDED__ +#pragma once #include "IGUIFont.h" @@ -41,6 +40,3 @@ public: } // end namespace gui } // end namespace irr - -#endif - diff --git a/include/IGUIImage.h b/include/IGUIImage.h index d9319ca..77aca5c 100644 --- a/include/IGUIImage.h +++ b/include/IGUIImage.h @@ -2,8 +2,7 @@ // This file is part of the "Irrlicht Engine". // For conditions of distribution and use, see copyright notice in irrlicht.h -#ifndef __I_GUI_IMAGE_H_INCLUDED__ -#define __I_GUI_IMAGE_H_INCLUDED__ +#pragma once #include "IGUIElement.h" @@ -83,5 +82,3 @@ namespace gui } // end namespace gui } // end namespace irr - -#endif diff --git a/include/IGUIImageList.h b/include/IGUIImageList.h index a283824..fd34296 100644 --- a/include/IGUIImageList.h +++ b/include/IGUIImageList.h @@ -1,8 +1,7 @@ // This file is part of the "Irrlicht Engine". // written by Reinhard Ostermeier, reinhard@nospam.r-ostermeier.de -#ifndef __I_GUI_IMAGE_LIST_H_INCLUDED__ -#define __I_GUI_IMAGE_LIST_H_INCLUDED__ +#pragma once #include "IGUIElement.h" #include "rect.h" @@ -40,6 +39,3 @@ public: } // end namespace gui } // end namespace irr - -#endif - diff --git a/include/IGUIListBox.h b/include/IGUIListBox.h index 8c7749d..fe16f08 100644 --- a/include/IGUIListBox.h +++ b/include/IGUIListBox.h @@ -2,8 +2,7 @@ // This file is part of the "Irrlicht Engine". // For conditions of distribution and use, see copyright notice in irrlicht.h -#ifndef __I_GUI_LIST_BOX_H_INCLUDED__ -#define __I_GUI_LIST_BOX_H_INCLUDED__ +#pragma once #include "IGUIElement.h" #include "SColor.h" @@ -137,6 +136,3 @@ namespace gui } // end namespace gui } // end namespace irr - -#endif - diff --git a/include/IGUIScrollBar.h b/include/IGUIScrollBar.h index 4064ef9..c885562 100644 --- a/include/IGUIScrollBar.h +++ b/include/IGUIScrollBar.h @@ -2,8 +2,7 @@ // This file is part of the "Irrlicht Engine". // For conditions of distribution and use, see copyright notice in irrlicht.h -#ifndef __I_GUI_SCROLL_BAR_H_INCLUDED__ -#define __I_GUI_SCROLL_BAR_H_INCLUDED__ +#pragma once #include "IGUIElement.h" @@ -60,6 +59,3 @@ namespace gui } // end namespace gui } // end namespace irr - -#endif - diff --git a/include/IGUISkin.h b/include/IGUISkin.h index 0c5200a..595f425 100644 --- a/include/IGUISkin.h +++ b/include/IGUISkin.h @@ -2,8 +2,7 @@ // This file is part of the "Irrlicht Engine". // For conditions of distribution and use, see copyright notice in irrlicht.h -#ifndef __I_GUI_SKIN_H_INCLUDED__ -#define __I_GUI_SKIN_H_INCLUDED__ +#pragma once #include "IReferenceCounted.h" #include "EGUIAlignment.h" @@ -575,6 +574,3 @@ namespace gui } // end namespace gui } // end namespace irr - -#endif - diff --git a/include/IGUISpriteBank.h b/include/IGUISpriteBank.h index 48d0593..0242e1b 100644 --- a/include/IGUISpriteBank.h +++ b/include/IGUISpriteBank.h @@ -2,8 +2,7 @@ // This file is part of the "Irrlicht Engine". // For conditions of distribution and use, see copyright notice in irrlicht.h -#ifndef __I_GUI_SPRITE_BANK_H_INCLUDED__ -#define __I_GUI_SPRITE_BANK_H_INCLUDED__ +#pragma once #include "IReferenceCounted.h" #include "irrArray.h" @@ -137,6 +136,3 @@ public: } // end namespace gui } // end namespace irr - -#endif // __I_GUI_SPRITE_BANK_H_INCLUDED__ - diff --git a/include/IGUIStaticText.h b/include/IGUIStaticText.h index 88b3795..be72171 100644 --- a/include/IGUIStaticText.h +++ b/include/IGUIStaticText.h @@ -2,8 +2,7 @@ // This file is part of the "Irrlicht Engine". // For conditions of distribution and use, see copyright notice in irrlicht.h -#ifndef __I_GUI_STATIC_TEXT_H_INCLUDED__ -#define __I_GUI_STATIC_TEXT_H_INCLUDED__ +#pragma once #include "IGUIElement.h" #include "SColor.h" @@ -134,6 +133,3 @@ namespace gui } // end namespace gui } // end namespace irr - -#endif - diff --git a/include/IGUITabControl.h b/include/IGUITabControl.h index 928bf82..5b042d2 100644 --- a/include/IGUITabControl.h +++ b/include/IGUITabControl.h @@ -2,8 +2,7 @@ // This file is part of the "Irrlicht Engine". // For conditions of distribution and use, see copyright notice in irrlicht.h -#ifndef __I_GUI_TAB_CONTROL_H_INCLUDED__ -#define __I_GUI_TAB_CONTROL_H_INCLUDED__ +#pragma once #include "IGUIElement.h" #include "SColor.h" @@ -150,6 +149,3 @@ namespace gui } // end namespace gui } // end namespace irr - -#endif - diff --git a/include/IGUIToolbar.h b/include/IGUIToolbar.h index 08519fc..7573685 100644 --- a/include/IGUIToolbar.h +++ b/include/IGUIToolbar.h @@ -2,8 +2,7 @@ // This file is part of the "Irrlicht Engine". // For conditions of distribution and use, see copyright notice in irrlicht.h -#ifndef __I_GUI_TOOL_BAR_H_INCLUDED__ -#define __I_GUI_TOOL_BAR_H_INCLUDED__ +#pragma once #include "IGUIElement.h" @@ -35,6 +34,3 @@ namespace gui } // end namespace gui } // end namespace irr - -#endif - diff --git a/include/IImage.h b/include/IImage.h index 738d1e0..7675959 100644 --- a/include/IImage.h +++ b/include/IImage.h @@ -2,8 +2,7 @@ // This file is part of the "Irrlicht Engine". // For conditions of distribution and use, see copyright notice in irrlicht.h -#ifndef __I_IMAGE_H_INCLUDED__ -#define __I_IMAGE_H_INCLUDED__ +#pragma once #include "IReferenceCounted.h" #include "position2d.h" @@ -465,6 +464,3 @@ protected: } // end namespace video } // end namespace irr - -#endif - diff --git a/include/IImageLoader.h b/include/IImageLoader.h index 5a7c3f8..12623c6 100644 --- a/include/IImageLoader.h +++ b/include/IImageLoader.h @@ -2,8 +2,7 @@ // This file is part of the "Irrlicht Engine". // For conditions of distribution and use, see copyright notice in irrlicht.h -#ifndef __I_SURFACE_LOADER_H_INCLUDED__ -#define __I_SURFACE_LOADER_H_INCLUDED__ +#pragma once #include "IReferenceCounted.h" #include "IImage.h" @@ -50,6 +49,3 @@ public: } // end namespace video } // end namespace irr - -#endif - diff --git a/include/IImageWriter.h b/include/IImageWriter.h index fd00793..632d8b5 100644 --- a/include/IImageWriter.h +++ b/include/IImageWriter.h @@ -2,8 +2,7 @@ // This file is part of the "Irrlicht Engine". // For conditions of distribution and use, see copyright notice in irrlicht.h -#ifndef _I_IMAGE_WRITER_H_INCLUDED__ -#define _I_IMAGE_WRITER_H_INCLUDED__ +#pragma once #include "IReferenceCounted.h" #include "irrString.h" @@ -40,6 +39,3 @@ public: } // namespace video } // namespace irr - -#endif // _I_IMAGE_WRITER_H_INCLUDED__ - diff --git a/include/IIndexBuffer.h b/include/IIndexBuffer.h index 0fe0d62..c1a35f5 100644 --- a/include/IIndexBuffer.h +++ b/include/IIndexBuffer.h @@ -2,8 +2,7 @@ // This file is part of the "Irrlicht Engine". // For conditions of distribution and use, see copyright notice in irrlicht.h -#ifndef __I_INDEX_BUFFER_H_INCLUDED__ -#define __I_INDEX_BUFFER_H_INCLUDED__ +#pragma once #include "IReferenceCounted.h" #include "irrArray.h" @@ -60,6 +59,3 @@ namespace scene } // end namespace scene } // end namespace irr - -#endif - diff --git a/include/ILogger.h b/include/ILogger.h index 335c59b..48dfc5f 100644 --- a/include/ILogger.h +++ b/include/ILogger.h @@ -2,8 +2,7 @@ // This file is part of the "Irrlicht Engine". // For conditions of distribution and use, see copyright notice in irrlicht.h -#ifndef __I_LOGGER_H_INCLUDED__ -#define __I_LOGGER_H_INCLUDED__ +#pragma once #include "IReferenceCounted.h" @@ -76,6 +75,3 @@ public: }; } // end namespace - -#endif - diff --git a/include/IMaterialRenderer.h b/include/IMaterialRenderer.h index d325bb1..b959a49 100644 --- a/include/IMaterialRenderer.h +++ b/include/IMaterialRenderer.h @@ -2,8 +2,7 @@ // This file is part of the "Irrlicht Engine". // For conditions of distribution and use, see copyright notice in irrlicht.h -#ifndef __I_MATERIAL_RENDERER_H_INCLUDED__ -#define __I_MATERIAL_RENDERER_H_INCLUDED__ +#pragma once #include "IReferenceCounted.h" #include "SMaterial.h" @@ -102,6 +101,3 @@ public: } // end namespace video } // end namespace irr - -#endif - diff --git a/include/IMaterialRendererServices.h b/include/IMaterialRendererServices.h index 94251f0..2eb13a7 100644 --- a/include/IMaterialRendererServices.h +++ b/include/IMaterialRendererServices.h @@ -2,8 +2,7 @@ // This file is part of the "Irrlicht Engine". // For conditions of distribution and use, see copyright notice in irrlicht.h -#ifndef __I_MATERIAL_RENDERER_SERVICES_H_INCLUDED__ -#define __I_MATERIAL_RENDERER_SERVICES_H_INCLUDED__ +#pragma once #include "SMaterial.h" #include "S3DVertex.h" @@ -81,6 +80,3 @@ public: } // end namespace video } // end namespace irr - -#endif - diff --git a/include/IMemoryReadFile.h b/include/IMemoryReadFile.h index 7589b9d..7b18d53 100644 --- a/include/IMemoryReadFile.h +++ b/include/IMemoryReadFile.h @@ -2,8 +2,7 @@ // This file is part of the "Irrlicht Engine". // For conditions of distribution and use, see copyright notice in irrlicht.h -#ifndef __I_MEMORY_READ_FILE_H_INCLUDED__ -#define __I_MEMORY_READ_FILE_H_INCLUDED__ +#pragma once #include "IReadFile.h" @@ -26,6 +25,3 @@ namespace io }; } // end namespace io } // end namespace irr - -#endif - diff --git a/include/IMesh.h b/include/IMesh.h index b00f22f..2884d74 100644 --- a/include/IMesh.h +++ b/include/IMesh.h @@ -2,8 +2,7 @@ // This file is part of the "Irrlicht Engine". // For conditions of distribution and use, see copyright notice in irrlicht.h -#ifndef __I_MESH_H_INCLUDED__ -#define __I_MESH_H_INCLUDED__ +#pragma once #include "IReferenceCounted.h" #include "SMaterial.h" @@ -124,6 +123,3 @@ namespace scene } // end namespace scene } // end namespace irr - -#endif - diff --git a/include/IMeshBuffer.h b/include/IMeshBuffer.h index a96b1a8..8b32ac1 100644 --- a/include/IMeshBuffer.h +++ b/include/IMeshBuffer.h @@ -2,8 +2,7 @@ // This file is part of the "Irrlicht Engine". // For conditions of distribution and use, see copyright notice in irrlicht.h -#ifndef __I_MESH_BUFFER_H_INCLUDED__ -#define __I_MESH_BUFFER_H_INCLUDED__ +#pragma once #include "IReferenceCounted.h" #include "SMaterial.h" @@ -176,5 +175,3 @@ namespace scene } // end namespace scene } // end namespace irr - -#endif diff --git a/include/IMeshCache.h b/include/IMeshCache.h index 506fc32..1c2782b 100644 --- a/include/IMeshCache.h +++ b/include/IMeshCache.h @@ -2,8 +2,7 @@ // This file is part of the "Irrlicht Engine". // For conditions of distribution and use, see copyright notice in irrlicht.h -#ifndef __I_MESH_CACHE_H_INCLUDED__ -#define __I_MESH_CACHE_H_INCLUDED__ +#pragma once #include "IReferenceCounted.h" #include "path.h" @@ -132,6 +131,3 @@ namespace scene } // end namespace scene } // end namespace irr - -#endif - diff --git a/include/IMeshLoader.h b/include/IMeshLoader.h index 6472ca8..6162fb4 100644 --- a/include/IMeshLoader.h +++ b/include/IMeshLoader.h @@ -2,8 +2,7 @@ // This file is part of the "Irrlicht Engine". // For conditions of distribution and use, see copyright notice in irrlicht.h -#ifndef __I_MESH_LOADER_H_INCLUDED__ -#define __I_MESH_LOADER_H_INCLUDED__ +#pragma once #include "IReferenceCounted.h" #include "path.h" @@ -51,5 +50,3 @@ public: } // end namespace scene } // end namespace irr - -#endif diff --git a/include/IMeshManipulator.h b/include/IMeshManipulator.h index 517ac4f..fe0d8e9 100644 --- a/include/IMeshManipulator.h +++ b/include/IMeshManipulator.h @@ -2,8 +2,7 @@ // This file is part of the "Irrlicht Engine". // For conditions of distribution and use, see copyright notice in irrlicht.h -#ifndef __I_MESH_MANIPULATOR_H_INCLUDED__ -#define __I_MESH_MANIPULATOR_H_INCLUDED__ +#pragma once #include "IReferenceCounted.h" #include "vector3d.h" @@ -182,6 +181,3 @@ protected: } // end namespace scene } // end namespace irr - - -#endif diff --git a/include/IMeshSceneNode.h b/include/IMeshSceneNode.h index e842128..f31b423 100644 --- a/include/IMeshSceneNode.h +++ b/include/IMeshSceneNode.h @@ -2,8 +2,7 @@ // This file is part of the "Irrlicht Engine". // For conditions of distribution and use, see copyright notice in irrlicht.h -#ifndef __I_MESH_SCENE_NODE_H_INCLUDED__ -#define __I_MESH_SCENE_NODE_H_INCLUDED__ +#pragma once #include "ISceneNode.h" @@ -51,7 +50,3 @@ public: } // end namespace scene } // end namespace irr - - -#endif - diff --git a/include/IOSOperator.h b/include/IOSOperator.h index 05949e4..9f7d09b 100644 --- a/include/IOSOperator.h +++ b/include/IOSOperator.h @@ -2,8 +2,7 @@ // This file is part of the "Irrlicht Engine". // For conditions of distribution and use, see copyright notice in irrlicht.h -#ifndef __I_OS_OPERATOR_H_INCLUDED__ -#define __I_OS_OPERATOR_H_INCLUDED__ +#pragma once #include "IReferenceCounted.h" #include "irrString.h" @@ -45,5 +44,3 @@ public: }; } // end namespace - -#endif diff --git a/include/IReadFile.h b/include/IReadFile.h index 5be0d06..3dab3b8 100644 --- a/include/IReadFile.h +++ b/include/IReadFile.h @@ -2,8 +2,7 @@ // This file is part of the "Irrlicht Engine". // For conditions of distribution and use, see copyright notice in irrlicht.h -#ifndef __I_READ_FILE_H_INCLUDED__ -#define __I_READ_FILE_H_INCLUDED__ +#pragma once #include "IReferenceCounted.h" #include "coreutil.h" @@ -56,6 +55,3 @@ namespace io } // end namespace io } // end namespace irr - -#endif - diff --git a/include/IReferenceCounted.h b/include/IReferenceCounted.h index 0eb23a5..3de94fa 100644 --- a/include/IReferenceCounted.h +++ b/include/IReferenceCounted.h @@ -2,8 +2,7 @@ // This file is part of the "Irrlicht Engine". // For conditions of distribution and use, see copyright notice in irrlicht.h -#ifndef __I_IREFERENCE_COUNTED_H_INCLUDED__ -#define __I_IREFERENCE_COUNTED_H_INCLUDED__ +#pragma once #include "irrTypes.h" @@ -165,6 +164,3 @@ namespace irr }; } // end namespace irr - -#endif - diff --git a/include/IRenderTarget.h b/include/IRenderTarget.h index 7320e2c..c0fb1bb 100644 --- a/include/IRenderTarget.h +++ b/include/IRenderTarget.h @@ -2,8 +2,7 @@ // This file is part of the "Irrlicht Engine". // For conditions of distribution and use, see copyright notice in irrlicht.h -#ifndef __I_RENDER_TARGET_H_INCLUDED__ -#define __I_RENDER_TARGET_H_INCLUDED__ +#pragma once #include "IReferenceCounted.h" #include "EDriverTypes.h" @@ -125,5 +124,3 @@ namespace video } } - -#endif diff --git a/include/ISceneCollisionManager.h b/include/ISceneCollisionManager.h index 601200b..200e8c0 100644 --- a/include/ISceneCollisionManager.h +++ b/include/ISceneCollisionManager.h @@ -2,8 +2,7 @@ // This file is part of the "Irrlicht Engine". // For conditions of distribution and use, see copyright notice in irrlicht.h -#ifndef __I_SCENE_COLLISION_MANAGER_H_INCLUDED__ -#define __I_SCENE_COLLISION_MANAGER_H_INCLUDED__ +#pragma once #include "IReferenceCounted.h" #include "position2d.h" @@ -34,5 +33,3 @@ namespace scene } // end namespace scene } // end namespace irr - -#endif diff --git a/include/ISceneManager.h b/include/ISceneManager.h index 50869e3..26357fd 100644 --- a/include/ISceneManager.h +++ b/include/ISceneManager.h @@ -2,8 +2,7 @@ // This file is part of the "Irrlicht Engine". // For conditions of distribution and use, see copyright notice in irrlicht.h -#ifndef __I_SCENE_MANAGER_H_INCLUDED__ -#define __I_SCENE_MANAGER_H_INCLUDED__ +#pragma once #include "IReferenceCounted.h" #include "irrArray.h" @@ -640,6 +639,3 @@ namespace scene } // end namespace scene } // end namespace irr - -#endif - diff --git a/include/ISceneNode.h b/include/ISceneNode.h index ab1a0fc..9cc38f9 100644 --- a/include/ISceneNode.h +++ b/include/ISceneNode.h @@ -2,8 +2,7 @@ // This file is part of the "Irrlicht Engine". // For conditions of distribution and use, see copyright notice in irrlicht.h -#ifndef __I_SCENE_NODE_H_INCLUDED__ -#define __I_SCENE_NODE_H_INCLUDED__ +#pragma once #include "IReferenceCounted.h" #include "ESceneNodeTypes.h" @@ -638,6 +637,3 @@ namespace scene } // end namespace scene } // end namespace irr - -#endif - diff --git a/include/IShaderConstantSetCallBack.h b/include/IShaderConstantSetCallBack.h index f88393f..1bc7e4a 100644 --- a/include/IShaderConstantSetCallBack.h +++ b/include/IShaderConstantSetCallBack.h @@ -2,8 +2,7 @@ // This file is part of the "Irrlicht Engine". // For conditions of distribution and use, see copyright notice in irrlicht.h -#ifndef __I_SHADER_CONSTANT_SET_CALLBACT_H_INCLUDED__ -#define __I_SHADER_CONSTANT_SET_CALLBACT_H_INCLUDED__ +#pragma once #include "IReferenceCounted.h" @@ -80,6 +79,3 @@ public: } // end namespace video } // end namespace irr - -#endif - diff --git a/include/ISkinnedMesh.h b/include/ISkinnedMesh.h index 7782185..a8bc262 100644 --- a/include/ISkinnedMesh.h +++ b/include/ISkinnedMesh.h @@ -2,8 +2,7 @@ // This file is part of the "Irrlicht Engine". // For conditions of distribution and use, see copyright notice in irrlicht.h -#ifndef __I_SKINNED_MESH_H_INCLUDED__ -#define __I_SKINNED_MESH_H_INCLUDED__ +#pragma once #include "irrArray.h" #include "IBoneSceneNode.h" @@ -222,6 +221,3 @@ namespace scene } // end namespace scene } // end namespace irr - -#endif - diff --git a/include/ITexture.h b/include/ITexture.h index baae29b..8724e20 100644 --- a/include/ITexture.h +++ b/include/ITexture.h @@ -2,8 +2,7 @@ // This file is part of the "Irrlicht Engine". // For conditions of distribution and use, see copyright notice in irrlicht.h -#ifndef __I_TEXTURE_H_INCLUDED__ -#define __I_TEXTURE_H_INCLUDED__ +#pragma once #include "IReferenceCounted.h" #include "IImage.h" @@ -340,6 +339,3 @@ protected: } // end namespace video } // end namespace irr - -#endif - diff --git a/include/ITimer.h b/include/ITimer.h index 2faee80..22c79f6 100644 --- a/include/ITimer.h +++ b/include/ITimer.h @@ -2,8 +2,7 @@ // This file is part of the "Irrlicht Engine". // For conditions of distribution and use, see copyright notice in irrlicht.h -#ifndef __I_TIMER_H_INCLUDED__ -#define __I_TIMER_H_INCLUDED__ +#pragma once #include "IReferenceCounted.h" @@ -64,5 +63,3 @@ public: }; } // end namespace irr - -#endif diff --git a/include/IVertexBuffer.h b/include/IVertexBuffer.h index 8f25a73..883cae5 100644 --- a/include/IVertexBuffer.h +++ b/include/IVertexBuffer.h @@ -2,8 +2,7 @@ // This file is part of the "Irrlicht Engine". // For conditions of distribution and use, see copyright notice in irrlicht.h -#ifndef __I_VERTEX_BUFFER_H_INCLUDED__ -#define __I_VERTEX_BUFFER_H_INCLUDED__ +#pragma once #include "IReferenceCounted.h" #include "irrArray.h" @@ -48,6 +47,3 @@ namespace scene } // end namespace scene } // end namespace irr - -#endif - diff --git a/include/IWriteFile.h b/include/IWriteFile.h index eba505c..c07c540 100644 --- a/include/IWriteFile.h +++ b/include/IWriteFile.h @@ -2,8 +2,7 @@ // This file is part of the "Irrlicht Engine". // For conditions of distribution and use, see copyright notice in irrlicht.h -#ifndef __I_WRITE_FILE_H_INCLUDED__ -#define __I_WRITE_FILE_H_INCLUDED__ +#pragma once #include "IReferenceCounted.h" #include "path.h" @@ -46,6 +45,3 @@ namespace io } // end namespace io } // end namespace irr - -#endif - diff --git a/include/IrrlichtDevice.h b/include/IrrlichtDevice.h index 048bc94..bdaa102 100644 --- a/include/IrrlichtDevice.h +++ b/include/IrrlichtDevice.h @@ -2,8 +2,7 @@ // This file is part of the "Irrlicht Engine". // For conditions of distribution and use, see copyright notice in irrlicht.h -#ifndef __I_IRRLICHT_DEVICE_H_INCLUDED__ -#define __I_IRRLICHT_DEVICE_H_INCLUDED__ +#pragma once #include "IReferenceCounted.h" #include "dimension2d.h" @@ -337,6 +336,3 @@ namespace irr }; } // end namespace irr - -#endif - diff --git a/include/S3DVertex.h b/include/S3DVertex.h index f0ad151..1b7ad96 100644 --- a/include/S3DVertex.h +++ b/include/S3DVertex.h @@ -2,8 +2,7 @@ // This file is part of the "Irrlicht Engine". // For conditions of distribution and use, see copyright notice in irrlicht.h -#ifndef __S_3D_VERTEX_H_INCLUDED__ -#define __S_3D_VERTEX_H_INCLUDED__ +#pragma once #include "vector3d.h" #include "vector2d.h" @@ -279,6 +278,3 @@ inline u32 getVertexPitchFromType(E_VERTEX_TYPE vertexType) } // end namespace video } // end namespace irr - -#endif - diff --git a/include/SAnimatedMesh.h b/include/SAnimatedMesh.h index 5b5f9a4..5c5934d 100644 --- a/include/SAnimatedMesh.h +++ b/include/SAnimatedMesh.h @@ -2,8 +2,7 @@ // This file is part of the "Irrlicht Engine". // For conditions of distribution and use, see copyright notice in irrlicht.h -#ifndef __S_ANIMATED_MESH_H_INCLUDED__ -#define __S_ANIMATED_MESH_H_INCLUDED__ +#pragma once #include "IAnimatedMesh.h" #include "IMesh.h" @@ -177,6 +176,3 @@ namespace scene } // end namespace scene } // end namespace irr - -#endif - diff --git a/include/SColor.h b/include/SColor.h index 710421c..bdb8f2c 100644 --- a/include/SColor.h +++ b/include/SColor.h @@ -2,8 +2,7 @@ // This file is part of the "Irrlicht Engine". // For conditions of distribution and use, see copyright notice in irrlicht.h -#ifndef __COLOR_H_INCLUDED__ -#define __COLOR_H_INCLUDED__ +#pragma once #include "irrTypes.h" #include "irrMath.h" @@ -750,5 +749,3 @@ namespace video } // end namespace video } // end namespace irr - -#endif diff --git a/include/SExposedVideoData.h b/include/SExposedVideoData.h index 4aa22df..f630dc9 100644 --- a/include/SExposedVideoData.h +++ b/include/SExposedVideoData.h @@ -2,8 +2,7 @@ // This file is part of the "Irrlicht Engine". // For conditions of distribution and use, see copyright notice in irrlicht.h -#ifndef __S_EXPOSED_VIDEO_DATA_H_INCLUDED__ -#define __S_EXPOSED_VIDEO_DATA_H_INCLUDED__ +#pragma once namespace irr { @@ -78,7 +77,3 @@ struct SExposedVideoData } // end namespace video } // end namespace irr - - -#endif - diff --git a/include/SIrrCreationParameters.h b/include/SIrrCreationParameters.h index 5e37459..61819cc 100644 --- a/include/SIrrCreationParameters.h +++ b/include/SIrrCreationParameters.h @@ -2,8 +2,7 @@ // This file is part of the "Irrlicht Engine". // For conditions of distribution and use, see copyright notice in irrlicht.h -#ifndef __I_IRRLICHT_CREATION_PARAMETERS_H_INCLUDED__ -#define __I_IRRLICHT_CREATION_PARAMETERS_H_INCLUDED__ +#pragma once #include "EDriverTypes.h" #include "EDeviceTypes.h" @@ -291,6 +290,3 @@ namespace irr } // end namespace irr - -#endif - diff --git a/include/SMaterial.h b/include/SMaterial.h index 8d29ef6..05024c0 100644 --- a/include/SMaterial.h +++ b/include/SMaterial.h @@ -2,8 +2,7 @@ // This file is part of the "Irrlicht Engine". // For conditions of distribution and use, see copyright notice in irrlicht.h -#ifndef __S_MATERIAL_H_INCLUDED__ -#define __S_MATERIAL_H_INCLUDED__ +#pragma once #include "SColor.h" #include "matrix4.h" @@ -571,5 +570,3 @@ namespace video IRRLICHT_API extern SMaterial IdentityMaterial; } // end namespace video } // end namespace irr - -#endif diff --git a/include/SMaterialLayer.h b/include/SMaterialLayer.h index 47a2997..33e4544 100644 --- a/include/SMaterialLayer.h +++ b/include/SMaterialLayer.h @@ -2,8 +2,7 @@ // This file is part of the "Irrlicht Engine". // For conditions of distribution and use, see copyright notice in irrlicht.h -#ifndef __S_MATERIAL_LAYER_H_INCLUDED__ -#define __S_MATERIAL_LAYER_H_INCLUDED__ +#pragma once #include "matrix4.h" @@ -243,5 +242,3 @@ namespace video } // end namespace video } // end namespace irr - -#endif // __S_MATERIAL_LAYER_H_INCLUDED__ diff --git a/include/SMesh.h b/include/SMesh.h index 94e4f20..314882b 100644 --- a/include/SMesh.h +++ b/include/SMesh.h @@ -2,8 +2,7 @@ // This file is part of the "Irrlicht Engine". // For conditions of distribution and use, see copyright notice in irrlicht.h -#ifndef __S_MESH_H_INCLUDED__ -#define __S_MESH_H_INCLUDED__ +#pragma once #include "IMesh.h" #include "IMeshBuffer.h" @@ -141,6 +140,3 @@ namespace scene } // end namespace scene } // end namespace irr - -#endif - diff --git a/include/SOverrideMaterial.h b/include/SOverrideMaterial.h index dc03de0..6b95c66 100644 --- a/include/SOverrideMaterial.h +++ b/include/SOverrideMaterial.h @@ -2,8 +2,7 @@ // This file is part of the "Irrlicht Engine". // For conditions of distribution and use, see copyright notice in irrlicht.h -#ifndef __S_OVERRIDE_MATERIAL_H_INCLUDED__ -#define __S_OVERRIDE_MATERIAL_H_INCLUDED__ +#pragma once #include "SMaterial.h" @@ -175,6 +174,3 @@ namespace video } // end namespace video } // end namespace irr - -#endif // __S_OVERRIDE_MATERIAL_H_INCLUDED__ - diff --git a/include/SSkinMeshBuffer.h b/include/SSkinMeshBuffer.h index dbc5461..f31115f 100644 --- a/include/SSkinMeshBuffer.h +++ b/include/SSkinMeshBuffer.h @@ -2,8 +2,7 @@ // This file is part of the "Irrlicht Engine". // For conditions of distribution and use, see copyright notice in irrlicht.h -#ifndef __I_SKIN_MESH_BUFFER_H_INCLUDED__ -#define __I_SKIN_MESH_BUFFER_H_INCLUDED__ +#pragma once #include "IMeshBuffer.h" #include "S3DVertex.h" @@ -424,6 +423,3 @@ struct SSkinMeshBuffer : public IMeshBuffer } // end namespace scene } // end namespace irr - -#endif - diff --git a/include/SVertexIndex.h b/include/SVertexIndex.h index 2a53932..1015009 100644 --- a/include/SVertexIndex.h +++ b/include/SVertexIndex.h @@ -2,8 +2,7 @@ // This file is part of the "Irrlicht Engine". // For conditions of distribution and use, see copyright notice in irrlicht.h -#ifndef __S_VERTEX_INDEX_H_INCLUDED__ -#define __S_VERTEX_INDEX_H_INCLUDED__ +#pragma once #include "irrTypes.h" @@ -21,6 +20,3 @@ enum E_INDEX_TYPE } // end namespace video } // end namespace irr - -#endif - diff --git a/include/SVertexManipulator.h b/include/SVertexManipulator.h index 36a6114..93645ea 100644 --- a/include/SVertexManipulator.h +++ b/include/SVertexManipulator.h @@ -2,8 +2,7 @@ // This file is part of the "Irrlicht Engine". // For conditions of distribution and use, see copyright notice in irrlicht.h -#ifndef __S_VERTEX_MANIPULATOR_H_INCLUDED__ -#define __S_VERTEX_MANIPULATOR_H_INCLUDED__ +#pragma once #include "matrix4.h" #include "S3DVertex.h" @@ -41,6 +40,3 @@ namespace scene } // end namespace scene } // end namespace irr - - -#endif diff --git a/include/SViewFrustum.h b/include/SViewFrustum.h index c75ebb9..1515448 100644 --- a/include/SViewFrustum.h +++ b/include/SViewFrustum.h @@ -2,8 +2,7 @@ // This file is part of the "Irrlicht Engine". // For conditions of distribution and use, see copyright notice in irrlicht.h -#ifndef __S_VIEW_FRUSTUM_H_INCLUDED__ -#define __S_VIEW_FRUSTUM_H_INCLUDED__ +#pragma once #include "plane3d.h" #include "vector3d.h" @@ -457,6 +456,3 @@ namespace scene } // end namespace scene } // end namespace irr - -#endif - diff --git a/include/SceneParameters.h b/include/SceneParameters.h index b5c5fc1..73921fe 100644 --- a/include/SceneParameters.h +++ b/include/SceneParameters.h @@ -2,8 +2,7 @@ // This file is part of the "Irrlicht Engine". // For conditions of distribution and use, see copyright notice in irrlicht.h -#ifndef __I_SCENE_PARAMETERS_H_INCLUDED__ -#define __I_SCENE_PARAMETERS_H_INCLUDED__ +#pragma once #include "irrTypes.h" @@ -50,6 +49,3 @@ namespace scene } // end namespace scene } // end namespace irr - -#endif - diff --git a/include/exampleHelper.h b/include/exampleHelper.h index 6d1628f..698430c 100755 --- a/include/exampleHelper.h +++ b/include/exampleHelper.h @@ -2,8 +2,7 @@ // This file is part of the "Irrlicht Engine". // For conditions of distribution and use, see copyright notice in irrlicht.h -#ifndef __EXAMPLE_HELPER_H_INCLUDED__ -#define __EXAMPLE_HELPER_H_INCLUDED__ +#pragma once #include "path.h" @@ -20,5 +19,3 @@ static io::path getExampleMediaPath() } } // end namespace irr - -#endif diff --git a/include/fast_atof.h b/include/fast_atof.h index 73f4332..85fcd77 100644 --- a/include/fast_atof.h +++ b/include/fast_atof.h @@ -2,8 +2,7 @@ // This file is part of the "Irrlicht Engine" and the "irrXML" project. // For conditions of distribution and use, see copyright notice in irrlicht.h and irrXML.h -#ifndef __FAST_ATOF_H_INCLUDED__ -#define __FAST_ATOF_H_INCLUDED__ +#pragma once #include "irrMath.h" #include "irrString.h" @@ -365,6 +364,3 @@ inline float fast_atof(const char* floatAsString, const char** out=0) } // end namespace core } // end namespace irr - -#endif - diff --git a/include/irrlicht.h b/include/irrlicht.h index d7aba07..ea888af 100644 --- a/include/irrlicht.h +++ b/include/irrlicht.h @@ -26,8 +26,7 @@ in the jpeglib, the zlib and libPng for further information. */ -#ifndef __IRRLICHT_H_INCLUDED__ -#define __IRRLICHT_H_INCLUDED__ +#pragma once #include "aabbox3d.h" #include "CMeshBuffer.h" @@ -321,6 +320,3 @@ namespace irr /*! \file irrlicht.h \brief Main header file of the irrlicht, the only file needed to include. */ - -#endif -