cleanup: replace remaining #ifndef #define with #pragma once

This commit is contained in:
Loic Blot 2023-10-09 08:57:29 +02:00 committed by sfan5
parent 4a7d3de89a
commit dd14486d3f
23 changed files with 24 additions and 75 deletions

View File

@ -2,8 +2,7 @@
// This file is part of the "Irrlicht Engine". // This file is part of the "Irrlicht Engine".
// For conditions of distribution and use, see copyright notice in irrlicht.h // For conditions of distribution and use, see copyright notice in irrlicht.h
#ifndef __IRR_I_CONTEXT_MANAGER_H_INCLUDED__ #pragma once
#define __IRR_I_CONTEXT_MANAGER_H_INCLUDED__
#include "SExposedVideoData.h" #include "SExposedVideoData.h"
#include "SIrrCreationParameters.h" #include "SIrrCreationParameters.h"
@ -60,4 +59,3 @@ namespace video
} // end namespace irr } // end namespace irr
#endif

View File

@ -2,9 +2,7 @@
// This file is part of the "Irrlicht Engine". // This file is part of the "Irrlicht Engine".
// For conditions of distribution and use, see copyright notice in irrlicht.h // For conditions of distribution and use, see copyright notice in irrlicht.h
#ifndef __IRR_I_MESH_WRITER_H_INCLUDED__ #pragma once
#define __IRR_I_MESH_WRITER_H_INCLUDED__
#include "IReferenceCounted.h" #include "IReferenceCounted.h"
#include "EMeshWriterEnums.h" #include "EMeshWriterEnums.h"
@ -54,5 +52,4 @@ namespace scene
} // end namespace } // end namespace
} // end namespace } // end namespace
#endif

View File

@ -2,8 +2,7 @@
// This file is part of the "Irrlicht Engine". // This file is part of the "Irrlicht Engine".
// For conditions of distribution and use, see copyright notice in irrlicht.h // For conditions of distribution and use, see copyright notice in irrlicht.h
#ifndef __IRR_I_VIDEO_DRIVER_H_INCLUDED__ #pragma once
#define __IRR_I_VIDEO_DRIVER_H_INCLUDED__
#include "rect.h" #include "rect.h"
#include "SColor.h" #include "SColor.h"
@ -1211,4 +1210,3 @@ namespace video
} // end namespace irr } // end namespace irr
#endif

View File

@ -2,8 +2,7 @@
// This file is part of the "Irrlicht Engine". // This file is part of the "Irrlicht Engine".
// For conditions of distribution and use, see copyright notice in irrlicht.h // For conditions of distribution and use, see copyright notice in irrlicht.h
#ifndef __IRR_COMPILE_CONFIG_H_INCLUDED__ #pragma once
#define __IRR_COMPILE_CONFIG_H_INCLUDED__
//! Identifies the IrrlichtMt fork customized for the Minetest engine //! Identifies the IrrlichtMt fork customized for the Minetest engine
#define IRRLICHT_VERSION_MT_REVISION 12 #define IRRLICHT_VERSION_MT_REVISION 12
@ -29,5 +28,3 @@
#ifndef IRRLICHT_API #ifndef IRRLICHT_API
#define IRRLICHT_API #define IRRLICHT_API
#endif #endif
#endif // __IRR_COMPILE_CONFIG_H_INCLUDED__

View File

@ -2,8 +2,7 @@
// This file is part of the "Irrlicht Engine". // This file is part of the "Irrlicht Engine".
// For conditions of distribution and use, see copyright notice in irrlicht.h // For conditions of distribution and use, see copyright notice in irrlicht.h
#ifndef __IRR_KEY_CODES_H_INCLUDED__ #pragma once
#define __IRR_KEY_CODES_H_INCLUDED__
namespace irr namespace irr
{ {
@ -90,7 +89,7 @@ namespace irr
KEY_KEY_X = 0x58, // X key KEY_KEY_X = 0x58, // X key
KEY_KEY_Y = 0x59, // Y key KEY_KEY_Y = 0x59, // Y key
KEY_KEY_Z = 0x5A, // Z key KEY_KEY_Z = 0x5A, // Z key
KEY_LWIN = 0x5B, // Left Windows key (Microsoft® Natural® keyboard) KEY_LWIN = 0x5B, // Left Windows key (Microsoft Natural keyboard)
KEY_RWIN = 0x5C, // Right Windows key (Natural keyboard) KEY_RWIN = 0x5C, // Right Windows key (Natural keyboard)
KEY_APPS = 0x5D, // Applications key (Natural keyboard) KEY_APPS = 0x5D, // Applications key (Natural keyboard)
KEY_SLEEP = 0x5F, // Computer Sleep key KEY_SLEEP = 0x5F, // Computer Sleep key
@ -185,5 +184,4 @@ namespace irr
} // end namespace irr } // end namespace irr
#endif

View File

@ -2,8 +2,7 @@
// This file is part of the "Irrlicht Engine". // This file is part of the "Irrlicht Engine".
// For conditions of distribution and use, see copyright notice in irrlicht.h // For conditions of distribution and use, see copyright notice in irrlicht.h
#ifndef __IRR_AABBOX_3D_H_INCLUDED__ #pragma once
#define __IRR_AABBOX_3D_H_INCLUDED__
#include "irrMath.h" #include "irrMath.h"
#include "plane3d.h" #include "plane3d.h"
@ -364,6 +363,3 @@ class aabbox3d
} // end namespace core } // end namespace core
} // end namespace irr } // end namespace irr
#endif

View File

@ -2,8 +2,7 @@
// This file is part of the "Irrlicht Engine". // This file is part of the "Irrlicht Engine".
// For conditions of distribution and use, see copyright notice in irrlicht.h // For conditions of distribution and use, see copyright notice in irrlicht.h
#ifndef __IRR_CORE_UTIL_H_INCLUDED__ #pragma once
#define __IRR_CORE_UTIL_H_INCLUDED__
#include "irrString.h" #include "irrString.h"
#include "path.h" #include "path.h"
@ -202,4 +201,3 @@ inline bool isupper(s32 c) { return c >= 'A' && c <= 'Z'; }
} // end namespace core } // end namespace core
} // end namespace irr } // end namespace irr
#endif

View File

@ -2,8 +2,7 @@
// This file is part of the "Irrlicht Engine". // This file is part of the "Irrlicht Engine".
// For conditions of distribution and use, see copyright notice in irrlicht.h // For conditions of distribution and use, see copyright notice in irrlicht.h
#ifndef __IRR_DIMENSION2D_H_INCLUDED__ #pragma once
#define __IRR_DIMENSION2D_H_INCLUDED__
#include "irrTypes.h" #include "irrTypes.h"
#include "irrMath.h" // for irr::core::equals() #include "irrMath.h" // for irr::core::equals()
@ -220,5 +219,4 @@ namespace core
} // end namespace core } // end namespace core
} // end namespace irr } // end namespace irr
#endif

View File

@ -2,9 +2,7 @@
// This file is part of the "Irrlicht Engine" and the "irrXML" project. // 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 // For conditions of distribution and use, see copyright notice in irrlicht.h and irrXML.h
#ifndef __IRR_ARRAY_H_INCLUDED__ #pragma once
#define __IRR_ARRAY_H_INCLUDED__
#include <algorithm> #include <algorithm>
#include <iterator> #include <iterator>
#include <vector> #include <vector>
@ -438,5 +436,4 @@ private:
} // end namespace core } // end namespace core
} // end namespace irr } // end namespace irr
#endif

View File

@ -2,8 +2,7 @@
// This file is part of the "Irrlicht Engine". // This file is part of the "Irrlicht Engine".
// For conditions of distribution and use, see copyright notice in irrlicht.h // For conditions of distribution and use, see copyright notice in irrlicht.h
#ifndef __IRR_MATH_H_INCLUDED__ #pragma once
#define __IRR_MATH_H_INCLUDED__
#include "irrTypes.h" #include "irrTypes.h"
#include <math.h> #include <math.h>
@ -479,4 +478,3 @@ namespace core
using irr::core::IR; using irr::core::IR;
using irr::core::FR; using irr::core::FR;
#endif

View File

@ -2,8 +2,7 @@
// This file is part of the "Irrlicht Engine" and the "irrXML" project. // 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 // For conditions of distribution and use, see copyright notice in irrlicht.h and irrXML.h
#ifndef __IRR_STRING_H_INCLUDED__ #pragma once
#define __IRR_STRING_H_INCLUDED__
#include "irrTypes.h" #include "irrTypes.h"
#include <string> #include <string>
@ -994,5 +993,4 @@ inline size_t wStringToUTF8(stringc &destination, const stringw &source)
} // end namespace core } // end namespace core
} // end namespace irr } // end namespace irr
#endif

View File

@ -2,8 +2,7 @@
// This file is part of the "Irrlicht Engine". // This file is part of the "Irrlicht Engine".
// For conditions of distribution and use, see copyright notice in irrlicht.h // For conditions of distribution and use, see copyright notice in irrlicht.h
#ifndef __IRR_TYPES_H_INCLUDED__ #pragma once
#define __IRR_TYPES_H_INCLUDED__
#include <stdint.h> #include <stdint.h>
@ -120,4 +119,3 @@ code like 'code', but some generate warnings so we use this macro here */
((irr::u32)(irr::u8)(c0) | ((irr::u32)(irr::u8)(c1) << 8) | \ ((irr::u32)(irr::u8)(c0) | ((irr::u32)(irr::u8)(c1) << 8) | \
((irr::u32)(irr::u8)(c2) << 16) | ((irr::u32)(irr::u8)(c3) << 24 )) ((irr::u32)(irr::u8)(c2) << 16) | ((irr::u32)(irr::u8)(c3) << 24 ))
#endif // __IRR_TYPES_H_INCLUDED__

View File

@ -2,8 +2,7 @@
// This file is part of the "Irrlicht Engine". // This file is part of the "Irrlicht Engine".
// For conditions of distribution and use, see copyright notice in irrlicht.h // For conditions of distribution and use, see copyright notice in irrlicht.h
#ifndef __IRR_LINE_2D_H_INCLUDED__ #pragma once
#define __IRR_LINE_2D_H_INCLUDED__
#include "irrTypes.h" #include "irrTypes.h"
#include "vector2d.h" #include "vector2d.h"
@ -355,5 +354,4 @@ class line2d
} // end namespace core } // end namespace core
} // end namespace irr } // end namespace irr
#endif

View File

@ -2,8 +2,7 @@
// This file is part of the "Irrlicht Engine". // This file is part of the "Irrlicht Engine".
// For conditions of distribution and use, see copyright notice in irrlicht.h // For conditions of distribution and use, see copyright notice in irrlicht.h
#ifndef __IRR_LINE_3D_H_INCLUDED__ #pragma once
#define __IRR_LINE_3D_H_INCLUDED__
#include "irrTypes.h" #include "irrTypes.h"
#include "vector3d.h" #include "vector3d.h"
@ -140,5 +139,4 @@ class line3d
} // end namespace core } // end namespace core
} // end namespace irr } // end namespace irr
#endif

View File

@ -2,8 +2,7 @@
// This file is part of the "Irrlicht Engine". // This file is part of the "Irrlicht Engine".
// For conditions of distribution and use, see copyright notice in irrlicht.h // For conditions of distribution and use, see copyright notice in irrlicht.h
#ifndef __IRR_MATRIX_H_INCLUDED__ #pragma once
#define __IRR_MATRIX_H_INCLUDED__
#include "irrMath.h" #include "irrMath.h"
#include "vector3d.h" #include "vector3d.h"
@ -2363,5 +2362,4 @@ namespace core
} // end namespace core } // end namespace core
} // end namespace irr } // end namespace irr
#endif

View File

@ -2,8 +2,7 @@
// This file is part of the "Irrlicht Engine" and the "irrXML" project. // This file is part of the "Irrlicht Engine" and the "irrXML" project.
// For conditions of distribution and use, see copyright notice in irrlicht.h // For conditions of distribution and use, see copyright notice in irrlicht.h
#ifndef __IRR_PATH_H_INCLUDED__ #pragma once
#define __IRR_PATH_H_INCLUDED__
#include "irrString.h" #include "irrString.h"
@ -87,4 +86,3 @@ private:
} // io } // io
} // irr } // irr
#endif // __IRR_PATH_H_INCLUDED__

View File

@ -2,8 +2,7 @@
// This file is part of the "Irrlicht Engine". // This file is part of the "Irrlicht Engine".
// For conditions of distribution and use, see copyright notice in irrlicht.h // For conditions of distribution and use, see copyright notice in irrlicht.h
#ifndef __IRR_PLANE_3D_H_INCLUDED__ #pragma once
#define __IRR_PLANE_3D_H_INCLUDED__
#include "irrMath.h" #include "irrMath.h"
#include "vector3d.h" #include "vector3d.h"
@ -241,5 +240,4 @@ typedef plane3d<s32> plane3di;
} // end namespace core } // end namespace core
} // end namespace irr } // end namespace irr
#endif

View File

@ -5,8 +5,7 @@
//! As of Irrlicht 1.6, position2d is a synonym for vector2d. //! As of Irrlicht 1.6, position2d is a synonym for vector2d.
/** You should consider position2d to be deprecated, and use vector2d by preference. */ /** You should consider position2d to be deprecated, and use vector2d by preference. */
#ifndef __IRR_POSITION_H_INCLUDED__ #pragma once
#define __IRR_POSITION_H_INCLUDED__
#include "vector2d.h" #include "vector2d.h"
@ -28,5 +27,4 @@ typedef vector2d<s32> position2di;
// ...and use a #define to catch the rest, for (e.g.) position2d<f64> // ...and use a #define to catch the rest, for (e.g.) position2d<f64>
#define position2d vector2d #define position2d vector2d
#endif // __IRR_POSITION_H_INCLUDED__

View File

@ -2,8 +2,7 @@
// This file is part of the "Irrlicht Engine". // This file is part of the "Irrlicht Engine".
// For conditions of distribution and use, see copyright notice in irrlicht.h // For conditions of distribution and use, see copyright notice in irrlicht.h
#ifndef __IRR_QUATERNION_H_INCLUDED__ #pragma once
#define __IRR_QUATERNION_H_INCLUDED__
#include "irrTypes.h" #include "irrTypes.h"
#include "irrMath.h" #include "irrMath.h"
@ -754,5 +753,4 @@ inline core::quaternion& quaternion::rotationFromTo(const vector3df& from, const
} // end namespace core } // end namespace core
} // end namespace irr } // end namespace irr
#endif

View File

@ -2,8 +2,7 @@
// This file is part of the "Irrlicht Engine". // This file is part of the "Irrlicht Engine".
// For conditions of distribution and use, see copyright notice in irrlicht.h // For conditions of distribution and use, see copyright notice in irrlicht.h
#ifndef __IRR_RECT_H_INCLUDED__ #pragma once
#define __IRR_RECT_H_INCLUDED__
#include "irrTypes.h" #include "irrTypes.h"
#include "dimension2d.h" #include "dimension2d.h"
@ -284,5 +283,4 @@ namespace core
} // end namespace core } // end namespace core
} // end namespace irr } // end namespace irr
#endif

View File

@ -2,8 +2,7 @@
// This file is part of the "Irrlicht Engine". // This file is part of the "Irrlicht Engine".
// For conditions of distribution and use, see copyright notice in irrlicht.h // For conditions of distribution and use, see copyright notice in irrlicht.h
#ifndef __IRR_TRIANGLE_3D_H_INCLUDED__ #pragma once
#define __IRR_TRIANGLE_3D_H_INCLUDED__
#include "vector3d.h" #include "vector3d.h"
#include "line3d.h" #include "line3d.h"
@ -274,5 +273,4 @@ namespace core
} // end namespace core } // end namespace core
} // end namespace irr } // end namespace irr
#endif

View File

@ -2,8 +2,7 @@
// This file is part of the "Irrlicht Engine". // This file is part of the "Irrlicht Engine".
// For conditions of distribution and use, see copyright notice in irrlicht.h // For conditions of distribution and use, see copyright notice in irrlicht.h
#ifndef __IRR_POINT_2D_H_INCLUDED__ #pragma once
#define __IRR_POINT_2D_H_INCLUDED__
#include "irrMath.h" #include "irrMath.h"
#include "dimension2d.h" #include "dimension2d.h"
@ -432,5 +431,4 @@ struct hash<irr::core::vector2d<T> >
} }
#endif

View File

@ -2,8 +2,7 @@
// This file is part of the "Irrlicht Engine". // This file is part of the "Irrlicht Engine".
// For conditions of distribution and use, see copyright notice in irrlicht.h // For conditions of distribution and use, see copyright notice in irrlicht.h
#ifndef __IRR_POINT_3D_H_INCLUDED__ #pragma once
#define __IRR_POINT_3D_H_INCLUDED__
#include "irrMath.h" #include "irrMath.h"
@ -488,5 +487,4 @@ struct hash<irr::core::vector3d<T> >
} }
#endif