Cleanup headers in irr/include/ (minetest#15181)

Zughy · Oct 18, 2024 · e5d321d · e5d321d
1 parent f2ab887
commit e5d321d
Show file tree

Hide file tree

Showing 51 changed files with 74 additions and 178 deletions.
diff --git a/irr/include/EDriverTypes.h b/irr/include/EDriverTypes.h
@@ -4,8 +4,6 @@
 
 #pragma once
 
-#include "irrTypes.h"
-
 namespace irr
 {
 namespace video

diff --git a/irr/include/IAnimatedMesh.h b/irr/include/IAnimatedMesh.h
@@ -4,7 +4,6 @@
 
 #pragma once
 
-#include "aabbox3d.h"
 #include "IMesh.h"
 
 namespace irr

diff --git a/irr/include/IAttributes.h b/irr/include/IAttributes.h
@@ -7,9 +7,6 @@
 #include "IReferenceCounted.h"
 #include "EAttributes.h"
 
-// not needed here but I can't be bothered to clean the transitive includes up.
-#include "quaternion.h"
-
 namespace irr
 {
 namespace video

diff --git a/irr/include/IGUIElement.h b/irr/include/IGUIElement.h
@@ -10,10 +10,8 @@
 #include "IEventReceiver.h"
 #include "EGUIElementTypes.h"
 #include "EGUIAlignment.h"
-#include "IAttributes.h"
 #include "IGUIEnvironment.h"
 #include <cassert>
-#include <algorithm>
 #include <list>
 #include <vector>
 

diff --git a/irr/include/IGUIEnvironment.h b/irr/include/IGUIEnvironment.h
@@ -7,7 +7,7 @@
 #include "IReferenceCounted.h"
 #include "IGUISkin.h"
 #include "rect.h"
-#include "EFocusFlags.h"
+#include "EFocusFlags.h" // IWYU pragma: export
 #include "IEventReceiver.h"
 #include "path.h"
 

diff --git a/irr/include/IGUIImageList.h b/irr/include/IGUIImageList.h
@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include "IGUIElement.h"
+#include "IReferenceCounted.h"
 #include "rect.h"
 #include "irrTypes.h"
 

diff --git a/irr/include/IGUITabControl.h b/irr/include/IGUITabControl.h
@@ -6,7 +6,6 @@
 
 #include "IGUIElement.h"
 #include "SColor.h"
-#include "IGUISkin.h"
 
 namespace irr
 {

diff --git a/irr/include/IImageLoader.h b/irr/include/IImageLoader.h
@@ -6,9 +6,7 @@
 
 #include "IReferenceCounted.h"
 #include "IImage.h"
-#include "ITexture.h"
 #include "path.h"
-#include "irrArray.h"
 
 namespace irr
 {

diff --git a/irr/include/IImageWriter.h b/irr/include/IImageWriter.h
@@ -5,8 +5,7 @@
 #pragma once
 
 #include "IReferenceCounted.h"
-#include "irrString.h"
-#include "coreutil.h"
+#include "path.h"
 
 namespace irr
 {

diff --git a/irr/include/IIndexBuffer.h b/irr/include/IIndexBuffer.h
@@ -5,7 +5,6 @@
 #pragma once
 
 #include "IReferenceCounted.h"
-#include "irrArray.h"
 #include "EHardwareBufferFlags.h"
 #include "EPrimitiveTypes.h"
 #include "SVertexIndex.h"

diff --git a/irr/include/IMaterialRendererServices.h b/irr/include/IMaterialRendererServices.h
@@ -5,7 +5,6 @@
 #pragma once
 
 #include "SMaterial.h"
-#include "S3DVertex.h"
 
 namespace irr
 {

diff --git a/irr/include/IMeshManipulator.h b/irr/include/IMeshManipulator.h
@@ -7,7 +7,6 @@
 #include "IReferenceCounted.h"
 #include "vector3d.h"
 #include "aabbox3d.h"
-#include "matrix4.h"
 #include "IAnimatedMesh.h"
 #include "IMeshBuffer.h"
 #include "SVertexManipulator.h"

diff --git a/irr/include/IReadFile.h b/irr/include/IReadFile.h
@@ -5,8 +5,8 @@
 #pragma once
 
 #include "IReferenceCounted.h"
-#include "coreutil.h"
 #include "EReadFileType.h"
+#include "path.h"
 
 namespace irr
 {

diff --git a/irr/include/ISceneManager.h b/irr/include/ISceneManager.h
@@ -6,13 +6,11 @@
 
 #include "IReferenceCounted.h"
 #include "irrArray.h"
-#include "irrString.h"
-#include "path.h"
 #include "vector3d.h"
 #include "dimension2d.h"
 #include "SColor.h"
 #include "ESceneNodeTypes.h"
-#include "SceneParameters.h"
+#include "SceneParameters.h" // IWYU pragma: export
 #include "ISkinnedMesh.h"
 
 namespace irr

diff --git a/irr/include/ISceneNode.h b/irr/include/ISceneNode.h
@@ -9,14 +9,13 @@
 #include "ECullingTypes.h"
 #include "EDebugSceneTypes.h"
 #include "SMaterial.h"
-#include "irrString.h"
 #include "irrArray.h"
 #include "aabbox3d.h"
 #include "matrix4.h"
-#include "IAttributes.h"
 
 #include <list>
 #include <optional>
+#include <string>
 
 namespace irr
 {

diff --git a/irr/include/ISkinnedMesh.h b/irr/include/ISkinnedMesh.h
@@ -5,11 +5,12 @@
 #pragma once
 
 #include "irrArray.h"
-#include "IBoneSceneNode.h"
 #include "IAnimatedMesh.h"
 #include "SSkinMeshBuffer.h"
+#include "quaternion.h"
 
 #include <optional>
+#include <string>
 
 namespace irr
 {

diff --git a/irr/include/ITexture.h b/irr/include/ITexture.h
@@ -5,11 +5,10 @@
 #pragma once
 
 #include "IReferenceCounted.h"
-#include "IImage.h"
+#include "SColor.h"
 #include "dimension2d.h"
 #include "EDriverTypes.h"
 #include "path.h"
-#include "matrix4.h"
 
 namespace irr
 {

diff --git a/irr/include/IVertexBuffer.h b/irr/include/IVertexBuffer.h
@@ -5,7 +5,6 @@
 #pragma once
 
 #include "IReferenceCounted.h"
-#include "irrArray.h"
 #include "EHardwareBufferFlags.h"
 #include "S3DVertex.h"
 

diff --git a/irr/include/IVideoDriver.h b/irr/include/IVideoDriver.h
@@ -6,6 +6,7 @@
 
 #include "rect.h"
 #include "SColor.h"
+#include "IImage.h"
 #include "ITexture.h"
 #include "irrArray.h"
 #include "matrix4.h"

diff --git a/irr/include/SMaterial.h b/irr/include/SMaterial.h
@@ -7,8 +7,8 @@
 #include "SColor.h"
 #include "matrix4.h"
 #include "irrMath.h"
-#include "EMaterialTypes.h"
-#include "EMaterialProps.h"
+#include "EMaterialTypes.h" // IWYU pragma: export
+#include "EMaterialProps.h" // IWYU pragma: export
 #include "SMaterialLayer.h"
 #include "IrrCompileConfig.h" // for IRRLICHT_API
 

diff --git a/irr/include/SMeshBuffer.h b/irr/include/SMeshBuffer.h
@@ -3,4 +3,4 @@
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
 // replaced by template
-#include "CMeshBuffer.h"
+#include "CMeshBuffer.h" // IWYU pragma: export
diff --git a/irr/include/SSkinMeshBuffer.h b/irr/include/SSkinMeshBuffer.h
@@ -8,7 +8,6 @@
 #include "CVertexBuffer.h"
 #include "CIndexBuffer.h"
 #include "S3DVertex.h"
-#include "irrArray.h"
 
 namespace irr
 {

diff --git a/irr/include/SVertexIndex.h b/irr/include/SVertexIndex.h
@@ -4,8 +4,6 @@
 
 #pragma once
 
-#include "irrTypes.h"
-
 namespace irr
 {
 namespace video

diff --git a/irr/include/SVertexManipulator.h b/irr/include/SVertexManipulator.h
@@ -4,9 +4,7 @@
 
 #pragma once
 
-#include "matrix4.h"
-#include "S3DVertex.h"
-#include "SColor.h"
+#include "vector3d.h"
 
 namespace irr
 {

diff --git a/irr/include/coreutil.h b/irr/include/coreutil.h
@@ -4,7 +4,6 @@
 
 #pragma once
 
-#include "irrString.h"
 #include "path.h"
 
 namespace irr

diff --git a/irr/include/fast_atof.h b/irr/include/fast_atof.h
@@ -4,8 +4,10 @@
 
 #pragma once
 
-#include "irrMath.h"
-#include "irrString.h"
+#include "irrTypes.h"
+#include <cfloat>
+#include <climits>
+#include <cmath>
 
 namespace irr
 {
@@ -305,7 +307,7 @@ inline const char *fast_atof_move(const char *in, f32 &result)
 		if (numDecimals < IRR_ATOF_TABLE_SIZE) {
 			value += decimal * fast_atof_table[numDecimals];
 		} else {
-			value += decimal * (f32)pow(10.f, -(float)numDecimals);
+			value += decimal * std::pow(10.f, -(float)numDecimals);
 		}
 		in = afterDecimal;
 	}
@@ -316,7 +318,7 @@ inline const char *fast_atof_move(const char *in, f32 &result)
 		// strtol10() will deal with both + and - signs,
 		// but calculate as f32 to prevent overflow at FLT_MAX
 		// Using pow with float cast instead of powf as otherwise accuracy decreases.
-		value *= (f32)pow(10.f, (f32)strtol10(in, &in));
+		value *= std::pow(10.f, (f32)strtol10(in, &in));
 	}
 
 	result = negative ? -value : value;

diff --git a/irr/include/irrArray.h b/irr/include/irrArray.h
@@ -155,7 +155,7 @@ class array
 	}
 
 	//! Assignment operator
-	const array<T> &operator=(const array<T> &other)
+	array<T> &operator=(const array<T> &other)
 	{
 		if (this == &other)
 			return *this;