From 1df0d7538b6ea51bbea040b5290e9697a47b2c2c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Wed, 8 Jan 2025 12:31:20 +0100 Subject: [PATCH] DebugTools: remove declarations of long-removed deprecated APIs. These were removed in e7aeaf78d006137981193552460d19f188ccf8ea for the 2020.06 release, but somehow these declarations, deprecated back in 2019.10, were still left there. Since they were useless anyway, I don't even list this in the changelog. --- src/Magnum/DebugTools/ForceRenderer.h | 14 -------------- src/Magnum/DebugTools/ObjectRenderer.h | 10 ---------- 2 files changed, 24 deletions(-) diff --git a/src/Magnum/DebugTools/ForceRenderer.h b/src/Magnum/DebugTools/ForceRenderer.h index a5f4344b1..4eaac93c3 100644 --- a/src/Magnum/DebugTools/ForceRenderer.h +++ b/src/Magnum/DebugTools/ForceRenderer.h @@ -140,20 +140,6 @@ template class ForceRenderer: public SceneGraph::Drawabl */ explicit ForceRenderer(ResourceManager&, SceneGraph::AbstractObject&, const VectorTypeFor&, VectorTypeFor&&, ResourceKey = ResourceKey(), SceneGraph::DrawableGroup* = nullptr) = delete; - #ifdef MAGNUM_BUILD_DEPRECATED - /** - * @brief Constructor - * @m_deprecated_since{2019,10} Implicit @ref ResourceManager singleton - * is deprecated, use @ref ForceRenderer(ResourceManager&, SceneGraph::AbstractObject&, const VectorTypeFor&, const VectorTypeFor&, ResourceKey, SceneGraph::DrawableGroup*) - * instead. - */ - explicit CORRADE_DEPRECATED("implicit ResourceManager singleton is deprecated, use a constructor with explicit ResourceManager reference instead") ForceRenderer(SceneGraph::AbstractObject& object, const VectorTypeFor& forcePosition, const VectorTypeFor& force, ResourceKey options = ResourceKey(), SceneGraph::DrawableGroup* drawables = nullptr); - - #ifndef DOXYGEN_GENERATOR_OUTPUT - explicit CORRADE_DEPRECATED("implicit ResourceManager singleton is deprecated, use a constructor with explicit DebugTools::ResourceManager reference instead") ForceRenderer(SceneGraph::AbstractObject&, const VectorTypeFor&, VectorTypeFor&&, ResourceKey = ResourceKey(), SceneGraph::DrawableGroup* = nullptr) = delete; - #endif - #endif - ~ForceRenderer(); private: diff --git a/src/Magnum/DebugTools/ObjectRenderer.h b/src/Magnum/DebugTools/ObjectRenderer.h index 76f88df10..f36c4a303 100644 --- a/src/Magnum/DebugTools/ObjectRenderer.h +++ b/src/Magnum/DebugTools/ObjectRenderer.h @@ -106,16 +106,6 @@ template class ObjectRenderer: public SceneGraph::Drawab */ explicit ObjectRenderer(ResourceManager& manager, SceneGraph::AbstractObject& object, ResourceKey options = ResourceKey(), SceneGraph::DrawableGroup* drawables = nullptr); - #ifdef MAGNUM_BUILD_DEPRECATED - /** - * @brief Constructor - * @m_deprecated_since{2019,10} Implicit @ref ResourceManager singleton - * is deprecated, use @ref ObjectRenderer(ResourceManager&, SceneGraph::AbstractObject&, ResourceKey, SceneGraph::DrawableGroup*) - * instead. - */ - explicit CORRADE_DEPRECATED("implicit ResourceManager singleton is deprecated, use a constructor with explicit ResourceManager reference instead") ObjectRenderer(SceneGraph::AbstractObject& object, ResourceKey options = ResourceKey(), SceneGraph::DrawableGroup* drawables = nullptr); - #endif - ~ObjectRenderer(); private: