diff --git a/src/Magnum/Text/CMakeLists.txt b/src/Magnum/Text/CMakeLists.txt index 495994d90..de84e7ed8 100644 --- a/src/Magnum/Text/CMakeLists.txt +++ b/src/Magnum/Text/CMakeLists.txt @@ -40,11 +40,6 @@ set(MagnumText_HEADERS visibility.h) -if(MAGNUM_BUILD_DEPRECATED) - set(MagnumText_HEADERS ${MagnumText_HEADERS} - TextRenderer.h) -endif() - # Text library add_library(MagnumText ${SHARED_OR_STATIC} ${MagnumText_SRCS} diff --git a/src/Magnum/Text/Text.h b/src/Magnum/Text/Text.h index cbfed63e6..5d1a31a44 100644 --- a/src/Magnum/Text/Text.h +++ b/src/Magnum/Text/Text.h @@ -47,11 +47,6 @@ class AbstractRenderer; template class Renderer; typedef Renderer<2> Renderer2D; typedef Renderer<3> Renderer3D; - -#ifdef MAGNUM_BUILD_DEPRECATED -typedef Renderer<2> TextRenderer2D; -typedef Renderer<3> TextRenderer3D; -#endif #endif }} diff --git a/src/Magnum/Text/TextRenderer.h b/src/Magnum/Text/TextRenderer.h deleted file mode 100644 index 00939c332..000000000 --- a/src/Magnum/Text/TextRenderer.h +++ /dev/null @@ -1,55 +0,0 @@ -#ifndef Magnum_Text_TextRenderer_h -#define Magnum_Text_TextRenderer_h -/* - This file is part of Magnum. - - Copyright © 2010, 2011, 2012, 2013, 2014, 2015 - Vladimír Vondruš - - Permission is hereby granted, free of charge, to any person obtaining a - copy of this software and associated documentation files (the "Software"), - to deal in the Software without restriction, including without limitation - the rights to use, copy, modify, merge, publish, distribute, sublicense, - and/or sell copies of the Software, and to permit persons to whom the - Software is furnished to do so, subject to the following conditions: - - The above copyright notice and this permission notice shall be included - in all copies or substantial portions of the Software. - - THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL - THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING - FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER - DEALINGS IN THE SOFTWARE. -*/ - -/** @file - * @brief Typedef @ref Magnum::Text::TextRenderer2D, @ref Magnum::Text::TextRenderer3D - * @deprecated Use @ref Renderer.h instead. - */ - -#include "Magnum/Text/Renderer.h" - -#ifdef MAGNUM_BUILD_DEPRECATED -namespace Magnum { namespace Text { - -/** -@copybrief Renderer2D -@deprecated Use @ref Magnum::Text::Renderer2D "Renderer2D" instead. -*/ -typedef CORRADE_DEPRECATED("use Renderer2D instead") Renderer<2> TextRenderer2D; - -/** -@copybrief Renderer3D -@deprecated Use @ref Magnum::Text::Renderer3D "Renderer3D" instead. -*/ -typedef CORRADE_DEPRECATED("use Renderer2D instead") Renderer<3> TextRenderer3D; - -}} -#else -#error -#endif - -#endif