From 6bf91f4cdd8ad550a7b5a67df68e1f0e521039e3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Wed, 12 Dec 2018 00:51:42 +0100 Subject: [PATCH] Platform: removed deprecated constructors taking nullptr. Deprecated in windowless apps in 6feda42f134a8e7aeb071ccaa44a1941967275da (June 2016) and for windowed apps in eeba2ac8489aa2979446e8d27b387f9d11d17ccc (March 2017). Use constructors taking the NoCreate tag instead. --- doc/changelog.dox | 3 +++ src/Magnum/Platform/GlxApplication.h | 8 -------- src/Magnum/Platform/ScreenedApplication.h | 8 -------- src/Magnum/Platform/Sdl2Application.h | 8 -------- src/Magnum/Platform/WindowlessCglApplication.h | 8 -------- src/Magnum/Platform/WindowlessEglApplication.h | 8 -------- src/Magnum/Platform/WindowlessGlxApplication.h | 8 -------- src/Magnum/Platform/WindowlessIosApplication.h | 8 -------- src/Magnum/Platform/WindowlessWglApplication.h | 8 -------- src/Magnum/Platform/WindowlessWindowsEglApplication.h | 8 -------- src/Magnum/Platform/XEglApplication.h | 8 -------- 11 files changed, 3 insertions(+), 80 deletions(-) diff --git a/doc/changelog.dox b/doc/changelog.dox index 1656e2825..d7034bc10 100644 --- a/doc/changelog.dox +++ b/doc/changelog.dox @@ -167,6 +167,9 @@ See also: - Removed five-argument @ref Trade::MeshData2D and six-argument @ref Trade::MeshData3D constructors that were deprecated since February 2017. Use the full six/seven-argument versions instead. +- Removed @ref Platform application constructors taking @cpp nullptr @ce, + deprecated in June 2016 for windowless apps and in March 2017 for windowed + apps. Use constructors taking the @ref NoCreate tag instead. @section changelog-2018-10 2018.10 diff --git a/src/Magnum/Platform/GlxApplication.h b/src/Magnum/Platform/GlxApplication.h index 558b765b9..338970b34 100644 --- a/src/Magnum/Platform/GlxApplication.h +++ b/src/Magnum/Platform/GlxApplication.h @@ -102,14 +102,6 @@ class GlxApplication: public AbstractXApplication { /** @copydoc Sdl2Application::Sdl2Application(const Arguments&, NoCreateT) */ explicit GlxApplication(const Arguments& arguments, NoCreateT); - #ifdef MAGNUM_BUILD_DEPRECATED - /** - * @brief @copybrief GlxApplication(const Arguments&, NoCreateT) - * @deprecated Use @ref GlxApplication(const Arguments&, NoCreateT) instead. - */ - CORRADE_DEPRECATED("use GlxApplication(const Arguments&, NoCreateT) instead") explicit GlxApplication(const Arguments& arguments, std::nullptr_t): GlxApplication{arguments, NoCreate} {} - #endif - protected: /* Nobody will need to have (and delete) GlxApplication*, thus this is faster than public pure virtual destructor */ diff --git a/src/Magnum/Platform/ScreenedApplication.h b/src/Magnum/Platform/ScreenedApplication.h index c9174bcf4..36549d56b 100644 --- a/src/Magnum/Platform/ScreenedApplication.h +++ b/src/Magnum/Platform/ScreenedApplication.h @@ -130,14 +130,6 @@ template class BasicScreenedApplication: public Application, */ explicit BasicScreenedApplication(const typename Application::Arguments& arguments, NoCreateT); - #ifdef MAGNUM_BUILD_DEPRECATED - /** - * @brief @copybrief BasicScreenedApplication(const typename Application::Arguments&, NoCreateT) - * @deprecated Use @ref BasicScreenedApplication(const typename Application::Arguments&, NoCreateT) instead. - */ - CORRADE_DEPRECATED("use BasicScreenedApplication(const Arguments&, NoCreateT) instead") explicit BasicScreenedApplication(const typename Application::Arguments& arguments, std::nullptr_t): BasicScreenedApplication{arguments, NoCreate} {} - #endif - /** * @brief Add screen to application * @return Reference to self (for method chaining) diff --git a/src/Magnum/Platform/Sdl2Application.h b/src/Magnum/Platform/Sdl2Application.h index c07e8cf52..519fa071f 100644 --- a/src/Magnum/Platform/Sdl2Application.h +++ b/src/Magnum/Platform/Sdl2Application.h @@ -443,14 +443,6 @@ class Sdl2Application { */ explicit Sdl2Application(const Arguments& arguments, NoCreateT); - #ifdef MAGNUM_BUILD_DEPRECATED - /** - * @brief @copybrief Sdl2Application(const Arguments&, NoCreateT) - * @deprecated Use @ref Sdl2Application(const Arguments&, NoCreateT) instead. - */ - CORRADE_DEPRECATED("use Sdl2Application(const Arguments&, NoCreateT) instead") explicit Sdl2Application(const Arguments& arguments, std::nullptr_t): Sdl2Application{arguments, NoCreate} {} - #endif - /** @brief Copying is not allowed */ Sdl2Application(const Sdl2Application&) = delete; diff --git a/src/Magnum/Platform/WindowlessCglApplication.h b/src/Magnum/Platform/WindowlessCglApplication.h index 7b10802e1..b6ee277d7 100644 --- a/src/Magnum/Platform/WindowlessCglApplication.h +++ b/src/Magnum/Platform/WindowlessCglApplication.h @@ -242,14 +242,6 @@ class WindowlessCglApplication { */ explicit WindowlessCglApplication(const Arguments& arguments, NoCreateT); - #ifdef MAGNUM_BUILD_DEPRECATED - /** - * @brief @copybrief WindowlessCglApplication(const Arguments&, NoCreateT) - * @deprecated Use @ref WindowlessCglApplication(const Arguments&, NoCreateT) instead. - */ - CORRADE_DEPRECATED("use WindowlessCglApplication(const Arguments&, NoCreateT) instead") explicit WindowlessCglApplication(const Arguments& arguments, std::nullptr_t): WindowlessCglApplication{arguments, NoCreate} {} - #endif - /** @brief Copying is not allowed */ WindowlessCglApplication(const WindowlessCglApplication&) = delete; diff --git a/src/Magnum/Platform/WindowlessEglApplication.h b/src/Magnum/Platform/WindowlessEglApplication.h index ac18af82a..83082537f 100644 --- a/src/Magnum/Platform/WindowlessEglApplication.h +++ b/src/Magnum/Platform/WindowlessEglApplication.h @@ -381,14 +381,6 @@ class WindowlessEglApplication { */ explicit WindowlessEglApplication(const Arguments& arguments, NoCreateT); - #ifdef MAGNUM_BUILD_DEPRECATED - /** - * @brief @copybrief WindowlessEglApplication(const Arguments&, NoCreateT) - * @deprecated Use @ref WindowlessEglApplication(const Arguments&, NoCreateT) instead. - */ - CORRADE_DEPRECATED("use WindowlessEglApplication(const Arguments&, NoCreateT) instead") explicit WindowlessEglApplication(const Arguments& arguments, std::nullptr_t): WindowlessEglApplication{arguments, NoCreate} {} - #endif - /** @brief Copying is not allowed */ WindowlessEglApplication(const WindowlessEglApplication&) = delete; diff --git a/src/Magnum/Platform/WindowlessGlxApplication.h b/src/Magnum/Platform/WindowlessGlxApplication.h index 943d46a00..963c86bc1 100644 --- a/src/Magnum/Platform/WindowlessGlxApplication.h +++ b/src/Magnum/Platform/WindowlessGlxApplication.h @@ -337,14 +337,6 @@ class WindowlessGlxApplication { */ explicit WindowlessGlxApplication(const Arguments& arguments, NoCreateT); - #ifdef MAGNUM_BUILD_DEPRECATED - /** - * @brief @copybrief WindowlessGlxApplication(const Arguments&, NoCreateT) - * @deprecated Use @ref WindowlessGlxApplication(const Arguments&, NoCreateT) instead. - */ - CORRADE_DEPRECATED("use WindowlessGlxApplication(const Arguments&, NoCreateT) instead") explicit WindowlessGlxApplication(const Arguments& arguments, std::nullptr_t): WindowlessGlxApplication{arguments, NoCreate} {} - #endif - /** @brief Copying is not allowed */ WindowlessGlxApplication(const WindowlessGlxApplication&) = delete; diff --git a/src/Magnum/Platform/WindowlessIosApplication.h b/src/Magnum/Platform/WindowlessIosApplication.h index 749ac877c..62da80fed 100644 --- a/src/Magnum/Platform/WindowlessIosApplication.h +++ b/src/Magnum/Platform/WindowlessIosApplication.h @@ -240,14 +240,6 @@ class WindowlessIosApplication { */ explicit WindowlessIosApplication(const Arguments& arguments, NoCreateT); - #ifdef MAGNUM_BUILD_DEPRECATED - /** - * @brief @copybrief WindowlessIosApplication(const Arguments&, NoCreateT) - * @deprecated Use @ref WindowlessIosApplication(const Arguments&, NoCreateT) instead. - */ - CORRADE_DEPRECATED("use WindowlessIosApplication(const Arguments&, NoCreateT) instead") explicit WindowlessIosApplication(const Arguments& arguments, std::nullptr_t): WindowlessIosApplication{arguments, NoCreate} {} - #endif - /** @brief Copying is not allowed */ WindowlessIosApplication(const WindowlessIosApplication&) = delete; diff --git a/src/Magnum/Platform/WindowlessWglApplication.h b/src/Magnum/Platform/WindowlessWglApplication.h index 07e59dbe0..4672a2f72 100644 --- a/src/Magnum/Platform/WindowlessWglApplication.h +++ b/src/Magnum/Platform/WindowlessWglApplication.h @@ -335,14 +335,6 @@ class WindowlessWglApplication { */ explicit WindowlessWglApplication(const Arguments& arguments, NoCreateT); - #ifdef MAGNUM_BUILD_DEPRECATED - /** - * @brief @copybrief WindowlessWglApplication(const Arguments&, NoCreateT) - * @deprecated Use @ref WindowlessWglApplication(const Arguments&, NoCreateT) instead. - */ - CORRADE_DEPRECATED("use WindowlessWglApplication(const Arguments&, NoCreateT) instead") explicit WindowlessWglApplication(const Arguments& arguments, std::nullptr_t): WindowlessWglApplication{arguments, NoCreate} {} - #endif - /** @brief Copying is not allowed */ WindowlessWglApplication(const WindowlessWglApplication&) = delete; diff --git a/src/Magnum/Platform/WindowlessWindowsEglApplication.h b/src/Magnum/Platform/WindowlessWindowsEglApplication.h index 33a226de5..9889dda83 100644 --- a/src/Magnum/Platform/WindowlessWindowsEglApplication.h +++ b/src/Magnum/Platform/WindowlessWindowsEglApplication.h @@ -307,14 +307,6 @@ class WindowlessWindowsEglApplication { */ explicit WindowlessWindowsEglApplication(const Arguments& arguments, NoCreateT); - #ifdef MAGNUM_BUILD_DEPRECATED - /** - * @brief @copybrief WindowlessWindowsEglApplication(const Arguments&, NoCreateT) - * @deprecated Use @ref WindowlessWindowsEglApplication(const Arguments&, NoCreateT) instead. - */ - CORRADE_DEPRECATED("use WindowlessWindowsEglApplication(const Arguments&, NoCreateT) instead") explicit WindowlessWindowsEglApplication(const Arguments& arguments, std::nullptr_t): WindowlessWindowsEglApplication{arguments, NoCreate} {} - #endif - /** @brief Copying is not allowed */ WindowlessWindowsEglApplication(const WindowlessWindowsEglApplication&) = delete; diff --git a/src/Magnum/Platform/XEglApplication.h b/src/Magnum/Platform/XEglApplication.h index 8c2d3609a..8e93efccc 100644 --- a/src/Magnum/Platform/XEglApplication.h +++ b/src/Magnum/Platform/XEglApplication.h @@ -103,14 +103,6 @@ class XEglApplication: public AbstractXApplication { /** @copydoc Sdl2Application::Sdl2Application(const Arguments&, NoCreateT) */ explicit XEglApplication(const Arguments& arguments, NoCreateT); - #ifdef MAGNUM_BUILD_DEPRECATED - /** - * @brief @copybrief XEglApplication(const Arguments&, NoCreateT) - * @deprecated Use @ref XEglApplication(const Arguments&, NoCreateT) instead. - */ - CORRADE_DEPRECATED("use XEglApplication(const Arguments&, NoCreateT) instead") explicit XEglApplication(const Arguments& arguments, std::nullptr_t): XEglApplication{arguments, NoCreate} {} - #endif - protected: /* Nobody will need to have (and delete) XEglApplication*, thus this is faster than public pure virtual destructor */