diff --git a/src/Magnum/CMakeLists.txt b/src/Magnum/CMakeLists.txt index 3c04481d9..85afe3122 100644 --- a/src/Magnum/CMakeLists.txt +++ b/src/Magnum/CMakeLists.txt @@ -132,12 +132,6 @@ set(Magnum_PRIVATE_HEADERS Implementation/State.h Implementation/TextureState.h) -# Deprecated stuff -if(BUILD_DEPRECATED) - list(APPEND Magnum_HEADERS - ColorFormat.h) -endif() - # Desktop-only stuff if(NOT TARGET_GLES) list(APPEND Magnum_SRCS RectangleTexture.cpp) diff --git a/src/Magnum/ColorFormat.h b/src/Magnum/ColorFormat.h deleted file mode 100644 index 900283d56..000000000 --- a/src/Magnum/ColorFormat.h +++ /dev/null @@ -1,60 +0,0 @@ -#ifndef Magnum_ColorFormat_h -#define Magnum_ColorFormat_h -/* - This file is part of Magnum. - - Copyright © 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018 - 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 - * @deprecated Use @ref Magnum/PixelFormat.h instead. - */ - -#include "Magnum/configure.h" - -#ifdef MAGNUM_BUILD_DEPRECATED -#include "Magnum/PixelFormat.h" -CORRADE_DEPRECATED_FILE("use Magnum/PixelFormat.h instead") - -namespace Magnum { - -/** @brief @copybrief PixelFormat - * @deprecated Use @ref PixelFormat instead. - */ -typedef CORRADE_DEPRECATED("use PixelFormat instead") PixelFormat ColorFormat; - -/** @brief @copybrief PixelType - * @deprecated Use @ref PixelType instead. - */ -typedef CORRADE_DEPRECATED("use PixelType instead") PixelType ColorType; - -/** @brief @copybrief CompressedPixelFormat - * @deprecated Use @ref CompressedPixelFormat instead. - */ -typedef CORRADE_DEPRECATED("use CompressedPixelFormat instead") CompressedPixelFormat CompressedColorFormat; - -} -#else -#error use Magnum/PixelFormat.h instead -#endif - -#endif diff --git a/src/Magnum/Magnum.h b/src/Magnum/Magnum.h index 5ee588182..9f55e170d 100644 --- a/src/Magnum/Magnum.h +++ b/src/Magnum/Magnum.h @@ -754,11 +754,6 @@ typedef MultisampleTexture<3> MultisampleTexture2DArray; enum class PixelFormat: GLenum; enum class PixelType: GLenum; enum class CompressedPixelFormat: GLenum; -#ifdef MAGNUM_BUILD_DEPRECATED -typedef CORRADE_DEPRECATED("use PixelFormat instead") PixelFormat ColorFormat; -typedef CORRADE_DEPRECATED("use PixelType instead") PixelType ColorType; -typedef CORRADE_DEPRECATED("use CompressedPixelFormat instead") CompressedPixelFormat CompressedColorFormat; -#endif class PixelStorage; #ifndef MAGNUM_TARGET_GLES