From 90577d5bfca026b7d5aae21f43aabb4ae6584c93 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Wed, 20 Mar 2019 13:20:00 +0100 Subject: [PATCH] Platform: removed deprecated Application constructors taking nullptr. Deprecated since 2017, use the ones taking NoCreate instead. --- doc/changelog.dox | 3 +++ src/Magnum/Platform/AndroidApplication.h | 8 -------- src/Magnum/Platform/GlfwApplication.h | 8 -------- 3 files changed, 3 insertions(+), 16 deletions(-) diff --git a/doc/changelog.dox b/doc/changelog.dox index 8b79b038b..f92ef37c9 100644 --- a/doc/changelog.dox +++ b/doc/changelog.dox @@ -321,6 +321,9 @@ See also: and @ref GL::Context::DetectedDriver::Angle instead - Removed @cpp GL::CubeMapTexture::Coordinate @ce deprecated since 2016, use @ref GL::CubeMapCoordinate instead +- Removed remaining @ref Platform::Sdl2Application "Platform::*Application" + constructors taking @cpp nullptr @ce instead of @ref NoCreate, deprecated + since 2017 - Removed the `Shapes` library together with `DebugTools::ShapeRenderer`, which was a failed design experiment deprecated since version 2018.10 (see [mosra/magnum#148](https://github.com/mosra/magnum/issues/148)) diff --git a/src/Magnum/Platform/AndroidApplication.h b/src/Magnum/Platform/AndroidApplication.h index 0d4654359..e7ebbf55a 100644 --- a/src/Magnum/Platform/AndroidApplication.h +++ b/src/Magnum/Platform/AndroidApplication.h @@ -208,14 +208,6 @@ class AndroidApplication { */ explicit AndroidApplication(const Arguments& arguments, NoCreateT); - #ifdef MAGNUM_BUILD_DEPRECATED - /** - * @brief @copybrief AndroidApplication(const Arguments&, NoCreateT) - * @deprecated Use @ref AndroidApplication(const Arguments&, NoCreateT) instead. - */ - CORRADE_DEPRECATED("use AndroidApplication(const Arguments&, NoCreateT) instead") explicit AndroidApplication(const Arguments& arguments, std::nullptr_t): AndroidApplication{arguments, NoCreate} {} - #endif - /** @brief Copying is not allowed */ AndroidApplication(const AndroidApplication&) = delete; diff --git a/src/Magnum/Platform/GlfwApplication.h b/src/Magnum/Platform/GlfwApplication.h index 2fe12fd23..98aaec470 100644 --- a/src/Magnum/Platform/GlfwApplication.h +++ b/src/Magnum/Platform/GlfwApplication.h @@ -212,14 +212,6 @@ class GlfwApplication { */ explicit GlfwApplication(const Arguments& arguments, NoCreateT); - #ifdef MAGNUM_BUILD_DEPRECATED - /** - * @brief @copybrief GlfwApplication(const Arguments&, NoCreateT) - * @deprecated Use @ref GlfwApplication(const Arguments&, NoCreateT) instead. - */ - CORRADE_DEPRECATED("use GlfwApplication(const Arguments&, NoCreateT) instead") explicit GlfwApplication(const Arguments& arguments, std::nullptr_t): GlfwApplication{arguments, NoCreate} {} - #endif - /** @brief Copying is not allowed */ GlfwApplication(const GlfwApplication&) = delete;