From 2ea43a8c5e3ead261ce992fc3939b7f06391662d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Wed, 31 Dec 2025 19:36:31 +0100 Subject: [PATCH] Adapt to moving CORRADE_DEPRECATED*() macros to a dedicated header. --- src/Magnum/Array.h | 2 +- src/Magnum/DebugTools/BufferData.h | 2 +- src/Magnum/DebugTools/DebugTools.h | 2 +- src/Magnum/DebugTools/Profiler.h | 2 +- src/Magnum/GL/AbstractShaderProgram.h | 2 +- src/Magnum/GL/Attribute.h | 2 +- src/Magnum/GL/PixelFormat.h | 2 +- src/Magnum/GL/Renderer.h | 2 +- src/Magnum/GL/Shader.h | 2 +- src/Magnum/Magnum.h | 2 +- src/Magnum/MaterialTools/PhongToPbrMetallicRoughness.h | 2 +- src/Magnum/Math/BoolVector.h | 2 +- src/Magnum/Math/Math.h | 2 +- src/Magnum/Math/Tags.h | 2 +- src/Magnum/Math/TypeTraits.h | 2 +- src/Magnum/MeshTools/CombineIndexedArrays.h | 2 +- src/Magnum/MeshTools/Compile.h | 2 +- src/Magnum/MeshTools/CompressIndices.h | 2 +- src/Magnum/MeshTools/FilterAttributes.h | 2 +- src/Magnum/MeshTools/FlipNormals.h | 4 ++-- src/Magnum/MeshTools/Reference.h | 2 +- src/Magnum/MeshTools/Tipsify.h | 2 +- src/Magnum/PixelFormat.h | 2 +- src/Magnum/Platform/EmscriptenApplication.h | 2 +- src/Magnum/SceneTools/FlattenMeshHierarchy.h | 2 +- src/Magnum/SceneTools/FlattenTransformationHierarchy.h | 2 +- src/Magnum/SceneTools/OrderClusterParents.h | 2 +- src/Magnum/Shaders/Shaders.h | 2 +- src/Magnum/Text/AbstractGlyphCache.h | 2 +- src/Magnum/Text/GlyphCache.h | 2 +- src/Magnum/Text/Text.h | 2 +- src/Magnum/TextureTools/Atlas.h | 2 +- src/Magnum/TextureTools/DistanceField.h | 2 +- src/Magnum/Trade/MaterialData.h | 2 +- src/Magnum/Trade/Trade.h | 2 +- src/Magnum/Vk/Enums.h | 4 ++-- 36 files changed, 38 insertions(+), 38 deletions(-) diff --git a/src/Magnum/Array.h b/src/Magnum/Array.h index deb0e95c3..1468a7335 100644 --- a/src/Magnum/Array.h +++ b/src/Magnum/Array.h @@ -39,7 +39,7 @@ #include #include #include -#include +#include #include "Magnum/Magnum.h" #include "Magnum/Math/Vector3.h" diff --git a/src/Magnum/DebugTools/BufferData.h b/src/Magnum/DebugTools/BufferData.h index d3fbb765c..b457a0e5c 100644 --- a/src/Magnum/DebugTools/BufferData.h +++ b/src/Magnum/DebugTools/BufferData.h @@ -54,7 +54,7 @@ #ifdef MAGNUM_BUILD_DEPRECATED #include -#include +#include #include "Magnum/GL/Buffer.h" #endif diff --git a/src/Magnum/DebugTools/DebugTools.h b/src/Magnum/DebugTools/DebugTools.h index 78de4e761..34933abcf 100644 --- a/src/Magnum/DebugTools/DebugTools.h +++ b/src/Magnum/DebugTools/DebugTools.h @@ -33,7 +33,7 @@ #include "Magnum/Types.h" #ifdef MAGNUM_BUILD_DEPRECATED -#include +#include #endif #ifndef DOXYGEN_GENERATING_OUTPUT diff --git a/src/Magnum/DebugTools/Profiler.h b/src/Magnum/DebugTools/Profiler.h index 5ed931c7d..a62e1f85c 100644 --- a/src/Magnum/DebugTools/Profiler.h +++ b/src/Magnum/DebugTools/Profiler.h @@ -42,7 +42,7 @@ #include #include #include -#include +#include #include "Magnum/Types.h" #include "Magnum/DebugTools/visibility.h" diff --git a/src/Magnum/GL/AbstractShaderProgram.h b/src/Magnum/GL/AbstractShaderProgram.h index c39dfdbb9..13f4eec2d 100644 --- a/src/Magnum/GL/AbstractShaderProgram.h +++ b/src/Magnum/GL/AbstractShaderProgram.h @@ -41,7 +41,7 @@ #endif #ifdef MAGNUM_BUILD_DEPRECATED -#include +#include /* For attachShaders(), which used to take a std::initializer_list, and draw({MeshView}) as well */ #include diff --git a/src/Magnum/GL/Attribute.h b/src/Magnum/GL/Attribute.h index 023f5a6f9..c132b8c9d 100644 --- a/src/Magnum/GL/Attribute.h +++ b/src/Magnum/GL/Attribute.h @@ -38,7 +38,7 @@ #include "Magnum/Math/TypeTraits.h" #ifdef MAGNUM_BUILD_DEPRECATED -#include +#include #endif namespace Magnum { namespace GL { diff --git a/src/Magnum/GL/PixelFormat.h b/src/Magnum/GL/PixelFormat.h index ad527ac2d..417990de8 100644 --- a/src/Magnum/GL/PixelFormat.h +++ b/src/Magnum/GL/PixelFormat.h @@ -37,7 +37,7 @@ #include "Magnum/GL/visibility.h" #ifdef MAGNUM_BUILD_DEPRECATED -#include +#include #endif namespace Magnum { namespace GL { diff --git a/src/Magnum/GL/Renderer.h b/src/Magnum/GL/Renderer.h index d6ef18f3d..80a2df5c4 100644 --- a/src/Magnum/GL/Renderer.h +++ b/src/Magnum/GL/Renderer.h @@ -38,7 +38,7 @@ #include "Magnum/GL/visibility.h" #ifdef MAGNUM_BUILD_DEPRECATED -#include +#include #endif namespace Magnum { namespace GL { diff --git a/src/Magnum/GL/Shader.h b/src/Magnum/GL/Shader.h index 006b5dd1d..c3991b130 100644 --- a/src/Magnum/GL/Shader.h +++ b/src/Magnum/GL/Shader.h @@ -38,7 +38,7 @@ #include "Magnum/GL/GL.h" #ifdef MAGNUM_BUILD_DEPRECATED -#include +#include /* For label() / setLabel() and all name/source stuff, which used to be a std::string. Not ideal for the return types, but at least something. */ #include diff --git a/src/Magnum/Magnum.h b/src/Magnum/Magnum.h index c01332916..9c74d557e 100644 --- a/src/Magnum/Magnum.h +++ b/src/Magnum/Magnum.h @@ -36,7 +36,7 @@ #include "Magnum/Math/Math.h" #ifdef MAGNUM_BUILD_DEPRECATED -#include +#include #endif namespace Magnum { diff --git a/src/Magnum/MaterialTools/PhongToPbrMetallicRoughness.h b/src/Magnum/MaterialTools/PhongToPbrMetallicRoughness.h index 67b6b4ade..c64dd0fa7 100644 --- a/src/Magnum/MaterialTools/PhongToPbrMetallicRoughness.h +++ b/src/Magnum/MaterialTools/PhongToPbrMetallicRoughness.h @@ -38,7 +38,7 @@ #include "Magnum/Trade/Trade.h" #ifdef MAGNUM_BUILD_DEPRECATED -#include +#include #endif namespace Magnum { namespace MaterialTools { diff --git a/src/Magnum/Math/BoolVector.h b/src/Magnum/Math/BoolVector.h index 657718585..d5ed83fb5 100644 --- a/src/Magnum/Math/BoolVector.h +++ b/src/Magnum/Math/BoolVector.h @@ -37,7 +37,7 @@ #include "Magnum/configure.h" #ifdef MAGNUM_BUILD_DEPRECATED -#include +#include #include "Magnum/Math/BitVector.h" diff --git a/src/Magnum/Math/Math.h b/src/Magnum/Math/Math.h index a7b25603e..700124500 100644 --- a/src/Magnum/Math/Math.h +++ b/src/Magnum/Math/Math.h @@ -35,7 +35,7 @@ #include "Magnum/Types.h" #ifdef MAGNUM_BUILD_DEPRECATED -#include +#include #endif #ifndef DOXYGEN_GENERATING_OUTPUT diff --git a/src/Magnum/Math/Tags.h b/src/Magnum/Math/Tags.h index 13a4f1763..f112be96f 100644 --- a/src/Magnum/Math/Tags.h +++ b/src/Magnum/Math/Tags.h @@ -33,7 +33,7 @@ #include "Magnum/Tags.h" #ifdef MAGNUM_BUILD_DEPRECATED -#include +#include #endif namespace Magnum { namespace Math { diff --git a/src/Magnum/Math/TypeTraits.h b/src/Magnum/Math/TypeTraits.h index 37144ee61..68582c41a 100644 --- a/src/Magnum/Math/TypeTraits.h +++ b/src/Magnum/Math/TypeTraits.h @@ -37,7 +37,7 @@ #include "Magnum/Types.h" #ifdef MAGNUM_BUILD_DEPRECATED -#include +#include #endif #ifdef MAGNUM_BUILD_DEPRECATED diff --git a/src/Magnum/MeshTools/CombineIndexedArrays.h b/src/Magnum/MeshTools/CombineIndexedArrays.h index 1c8165a25..ab805cb8d 100644 --- a/src/Magnum/MeshTools/CombineIndexedArrays.h +++ b/src/Magnum/MeshTools/CombineIndexedArrays.h @@ -41,7 +41,7 @@ #include #include #include -#include +#include #include "Magnum/Types.h" #include "Magnum/MeshTools/visibility.h" diff --git a/src/Magnum/MeshTools/Compile.h b/src/Magnum/MeshTools/Compile.h index 753356a75..c5e24f175 100644 --- a/src/Magnum/MeshTools/Compile.h +++ b/src/Magnum/MeshTools/Compile.h @@ -43,7 +43,7 @@ #include "Magnum/MeshTools/visibility.h" #ifdef MAGNUM_BUILD_DEPRECATED -#include +#include #endif namespace Magnum { namespace MeshTools { diff --git a/src/Magnum/MeshTools/CompressIndices.h b/src/Magnum/MeshTools/CompressIndices.h index 8dc8d6779..761102f1c 100644 --- a/src/Magnum/MeshTools/CompressIndices.h +++ b/src/Magnum/MeshTools/CompressIndices.h @@ -37,7 +37,7 @@ #include "Magnum/Trade/Trade.h" #ifdef MAGNUM_BUILD_DEPRECATED -#include +#include #include #include diff --git a/src/Magnum/MeshTools/FilterAttributes.h b/src/Magnum/MeshTools/FilterAttributes.h index 70aa509fd..f798c8433 100644 --- a/src/Magnum/MeshTools/FilterAttributes.h +++ b/src/Magnum/MeshTools/FilterAttributes.h @@ -36,7 +36,7 @@ #include "Magnum/configure.h" #ifdef MAGNUM_BUILD_DEPRECATED -#include +#include #include "Magnum/MeshTools/Filter.h" diff --git a/src/Magnum/MeshTools/FlipNormals.h b/src/Magnum/MeshTools/FlipNormals.h index 7870fe644..b1f8e3287 100644 --- a/src/Magnum/MeshTools/FlipNormals.h +++ b/src/Magnum/MeshTools/FlipNormals.h @@ -36,10 +36,10 @@ #include "Magnum/MeshTools/visibility.h" #ifdef MAGNUM_BUILD_DEPRECATED -#include #include #include -#include +#include +#include #endif namespace Magnum { namespace MeshTools { diff --git a/src/Magnum/MeshTools/Reference.h b/src/Magnum/MeshTools/Reference.h index 4380f2836..db5530ff6 100644 --- a/src/Magnum/MeshTools/Reference.h +++ b/src/Magnum/MeshTools/Reference.h @@ -36,7 +36,7 @@ #include "Magnum/configure.h" #ifdef MAGNUM_BUILD_DEPRECATED -#include +#include #include "Magnum/MeshTools/Copy.h" diff --git a/src/Magnum/MeshTools/Tipsify.h b/src/Magnum/MeshTools/Tipsify.h index 666ff3d6a..21c60b2dd 100644 --- a/src/Magnum/MeshTools/Tipsify.h +++ b/src/Magnum/MeshTools/Tipsify.h @@ -39,7 +39,7 @@ #include #include #include -#include +#include #endif namespace Magnum { namespace MeshTools { diff --git a/src/Magnum/PixelFormat.h b/src/Magnum/PixelFormat.h index f433fc135..eb49d9f44 100644 --- a/src/Magnum/PixelFormat.h +++ b/src/Magnum/PixelFormat.h @@ -36,7 +36,7 @@ #include "Magnum/visibility.h" #ifdef MAGNUM_BUILD_DEPRECATED -#include +#include #endif namespace Magnum { diff --git a/src/Magnum/Platform/EmscriptenApplication.h b/src/Magnum/Platform/EmscriptenApplication.h index ae618c8cc..0db71d8d6 100644 --- a/src/Magnum/Platform/EmscriptenApplication.h +++ b/src/Magnum/Platform/EmscriptenApplication.h @@ -52,9 +52,9 @@ #endif #ifdef MAGNUM_BUILD_DEPRECATED -#include /* Some APIs used to take or return a std::string before */ #include +#include #endif #if defined(CORRADE_TARGET_EMSCRIPTEN) || defined(DOXYGEN_GENERATING_OUTPUT) diff --git a/src/Magnum/SceneTools/FlattenMeshHierarchy.h b/src/Magnum/SceneTools/FlattenMeshHierarchy.h index b12fe862f..b25fb8548 100644 --- a/src/Magnum/SceneTools/FlattenMeshHierarchy.h +++ b/src/Magnum/SceneTools/FlattenMeshHierarchy.h @@ -39,7 +39,7 @@ #include "Magnum/configure.h" #ifdef MAGNUM_BUILD_DEPRECATED -#include +#include #include "Magnum/Magnum.h" #include "Magnum/Math/Matrix3.h" diff --git a/src/Magnum/SceneTools/FlattenTransformationHierarchy.h b/src/Magnum/SceneTools/FlattenTransformationHierarchy.h index 73ca27f17..df8d631fd 100644 --- a/src/Magnum/SceneTools/FlattenTransformationHierarchy.h +++ b/src/Magnum/SceneTools/FlattenTransformationHierarchy.h @@ -40,7 +40,7 @@ #ifdef MAGNUM_BUILD_DEPRECATED #include -#include +#include #include "Magnum/Math/Matrix3.h" #include "Magnum/Math/Matrix4.h" diff --git a/src/Magnum/SceneTools/OrderClusterParents.h b/src/Magnum/SceneTools/OrderClusterParents.h index 3ef81f864..f553d4984 100644 --- a/src/Magnum/SceneTools/OrderClusterParents.h +++ b/src/Magnum/SceneTools/OrderClusterParents.h @@ -39,7 +39,7 @@ #ifdef MAGNUM_BUILD_DEPRECATED #include -#include +#include #include "Magnum/SceneTools/Hierarchy.h" diff --git a/src/Magnum/Shaders/Shaders.h b/src/Magnum/Shaders/Shaders.h index 7b3f4a9a1..3a6c64fee 100644 --- a/src/Magnum/Shaders/Shaders.h +++ b/src/Magnum/Shaders/Shaders.h @@ -33,7 +33,7 @@ #include "Magnum/Types.h" #if defined(MAGNUM_TARGET_GL) && defined(MAGNUM_BUILD_DEPRECATED) -#include +#include #endif #ifndef DOXYGEN_GENERATING_OUTPUT diff --git a/src/Magnum/Text/AbstractGlyphCache.h b/src/Magnum/Text/AbstractGlyphCache.h index e5cf14147..f8d1acd00 100644 --- a/src/Magnum/Text/AbstractGlyphCache.h +++ b/src/Magnum/Text/AbstractGlyphCache.h @@ -42,7 +42,7 @@ #ifdef MAGNUM_BUILD_DEPRECATED #include /* std::pair */ -#include +#include #include #endif diff --git a/src/Magnum/Text/GlyphCache.h b/src/Magnum/Text/GlyphCache.h index f6ac32b00..d000e3002 100644 --- a/src/Magnum/Text/GlyphCache.h +++ b/src/Magnum/Text/GlyphCache.h @@ -38,7 +38,7 @@ #include "Magnum/configure.h" #ifdef MAGNUM_BUILD_DEPRECATED -#include +#include #include "Magnum/Text/GlyphCacheGL.h" diff --git a/src/Magnum/Text/Text.h b/src/Magnum/Text/Text.h index 970522957..da0c6c91b 100644 --- a/src/Magnum/Text/Text.h +++ b/src/Magnum/Text/Text.h @@ -33,7 +33,7 @@ #include "Magnum/Types.h" #ifdef MAGNUM_BUILD_DEPRECATED -#include +#include #endif #ifndef DOXYGEN_GENERATING_OUTPUT diff --git a/src/Magnum/TextureTools/Atlas.h b/src/Magnum/TextureTools/Atlas.h index 98fe478a6..71dcded72 100644 --- a/src/Magnum/TextureTools/Atlas.h +++ b/src/Magnum/TextureTools/Atlas.h @@ -39,7 +39,7 @@ #ifdef MAGNUM_BUILD_DEPRECATED #include "Magnum/Math/Vector2.h" -#include +#include #include #endif diff --git a/src/Magnum/TextureTools/DistanceField.h b/src/Magnum/TextureTools/DistanceField.h index f522e4c4d..408da82fe 100644 --- a/src/Magnum/TextureTools/DistanceField.h +++ b/src/Magnum/TextureTools/DistanceField.h @@ -38,7 +38,7 @@ #include "Magnum/configure.h" #ifdef MAGNUM_BUILD_DEPRECATED -#include +#include #include "Magnum/TextureTools/DistanceFieldGL.h" diff --git a/src/Magnum/Trade/MaterialData.h b/src/Magnum/Trade/MaterialData.h index 75c1ef2b5..636a9d4cb 100644 --- a/src/Magnum/Trade/MaterialData.h +++ b/src/Magnum/Trade/MaterialData.h @@ -44,7 +44,7 @@ #include "Magnum/Trade/visibility.h" #ifdef MAGNUM_BUILD_DEPRECATED -#include +#include #endif namespace Magnum { namespace Trade { diff --git a/src/Magnum/Trade/Trade.h b/src/Magnum/Trade/Trade.h index 0c4a423fc..461b4e2f4 100644 --- a/src/Magnum/Trade/Trade.h +++ b/src/Magnum/Trade/Trade.h @@ -35,7 +35,7 @@ #include "Magnum/Magnum.h" #ifdef MAGNUM_BUILD_DEPRECATED -#include +#include #endif #ifndef DOXYGEN_GENERATING_OUTPUT diff --git a/src/Magnum/Vk/Enums.h b/src/Magnum/Vk/Enums.h index ae3f62e7c..4492ff495 100644 --- a/src/Magnum/Vk/Enums.h +++ b/src/Magnum/Vk/Enums.h @@ -38,13 +38,13 @@ #include "Magnum/configure.h" #ifdef MAGNUM_BUILD_DEPRECATED +#include + #include "Magnum/Array.h" /* That's fine, we're deprecated too */ #include "Magnum/Math/Vector3.h" #include "Magnum/Vk/Vulkan.h" #include "Magnum/Vk/visibility.h" -#include - #ifndef _MAGNUM_NO_DEPRECATED_VK_ENUMS CORRADE_DEPRECATED_FILE("use headers corresponding to the suggested replacement APIs instead") #endif