From 05f677cc302ac8c0d6250a338d70062f9094dddc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Fri, 14 Mar 2014 11:36:43 +0100 Subject: [PATCH] Platform: removed deprecated Flags from Sdl2Application::Configuration. WindowFlags should be used instead, these would now conflict with context flags. --- src/Magnum/Platform/Sdl2Application.h | 40 --------------------------- 1 file changed, 40 deletions(-) diff --git a/src/Magnum/Platform/Sdl2Application.h b/src/Magnum/Platform/Sdl2Application.h index 30cb1643e..e4dd18f64 100644 --- a/src/Magnum/Platform/Sdl2Application.h +++ b/src/Magnum/Platform/Sdl2Application.h @@ -42,10 +42,6 @@ #include #include -#ifdef MAGNUM_BUILD_DEPRECATED -#include -#endif - namespace Magnum { class Context; @@ -441,14 +437,6 @@ class Sdl2Application::Configuration { MouseLocked = SDL_WINDOW_INPUT_GRABBED /**< Window with mouse locked */ }; - #ifdef MAGNUM_BUILD_DEPRECATED - /** - * @copybrief WindowFlag - * @deprecated Use @ref Magnum::Platform::Sdl2Application::Configuration::WindowFlag "WindowFlag" instead. - */ - typedef CORRADE_DEPRECATED("use WindowFlag instead") WindowFlag Flag; - #endif - /** * @brief Window flags * @@ -462,14 +450,6 @@ class Sdl2Application::Configuration { typedef Containers::EnumSet WindowFlags; #endif - #ifdef MAGNUM_BUILD_DEPRECATED - /** - * @copybrief WindowFlags - * @deprecated Use @ref Magnum::Platform::Sdl2Application::Configuration::WindowFlags "WindowFlags" instead. - */ - typedef CORRADE_DEPRECATED("use WindowFlags instead") WindowFlags Flags; - #endif - /*implicit*/ Configuration(); ~Configuration(); @@ -517,16 +497,6 @@ class Sdl2Application::Configuration { /** @brief Window flags */ WindowFlags windowFlags() const { return _windowFlags; } - #ifdef MAGNUM_BUILD_DEPRECATED - /** - * @copybrief windowFlags() - * @deprecated Use @ref Magnum::Platform::Sdl2Application::Configuration::windowFlags() "windowFlags()" instead. - */ - CORRADE_DEPRECATED("use windowFlags() instead") WindowFlags flags() const { - return windowFlags(); - } - #endif - /** * @brief Set window flags * @return Reference to self (for method chaining) @@ -538,16 +508,6 @@ class Sdl2Application::Configuration { return *this; } - #ifdef MAGNUM_BUILD_DEPRECATED - /** - * @copybrief setWindowFlags() - * @deprecated Use @ref Magnum::Platform::Sdl2Application::Configuration::setWindowFlags "setWindowFlags()" instead. - */ - CORRADE_DEPRECATED("use setWindowFlags() instead") Configuration& setFlags(WindowFlags flags) { - return setWindowFlags(flags); - } - #endif - #ifndef CORRADE_TARGET_EMSCRIPTEN /** * @brief Context version