diff --git a/doc/changelog.dox b/doc/changelog.dox index 3edf67796..7fdd0ccbd 100644 --- a/doc/changelog.dox +++ b/doc/changelog.dox @@ -1751,6 +1751,10 @@ See also: - Templated @cpp Image*::data() @ce APIs returning a pointer which allowed for dangerous data access without any bounds, type or layout checks, use @ref Image::pixels() instead + - @cpp GL::TextureFormat::R3B3G2 @ce containing a typo, use + @ref GL::TextureFormat::R3G3B2 instead + - @cpp Platform::GlfwApplication::Key::Smicolon @ce containing a typo, + use @ref Platform::GlfwApplication::Key::Semicolon instead - @cpp Trade::ImporterFileCallbackPolicy @ce, use the @ref InputFileCallbackPolicy enum instead; additionally there was @cpp Trade::ImporterFileCallbackPolicy::LoadPernament @ce containing a diff --git a/src/Magnum/GL/TextureFormat.h b/src/Magnum/GL/TextureFormat.h index f28bda213..70b7067b7 100644 --- a/src/Magnum/GL/TextureFormat.h +++ b/src/Magnum/GL/TextureFormat.h @@ -34,10 +34,6 @@ #include "Magnum/GL/OpenGL.h" #include "Magnum/GL/visibility.h" -#ifdef MAGNUM_BUILD_DEPRECATED -#include -#endif - namespace Magnum { namespace GL { /** @@ -953,14 +949,6 @@ enum class TextureFormat: GLenum { */ R3G3B2 = GL_R3_G3_B2, - #ifdef MAGNUM_BUILD_DEPRECATED - /** RGB, normalized unsigned, red and green component 3bit, blue 2bit. - * @m_deprecated_since{2019,10} This one had a misleading typo in the name, - * use @ref TextureFormat::R3G3B2 instead. - */ - R3B3G2 CORRADE_DEPRECATED_ENUM("use R3G3B2 instead") = R3G3B2, - #endif - /** * RGB, each component normalized unsigned 4bit. * @requires_gl Packed 12bit types are not available in OpenGL ES or WebGL. diff --git a/src/Magnum/Platform/GlfwApplication.h b/src/Magnum/Platform/GlfwApplication.h index b75d18fb9..9b3c15c93 100644 --- a/src/Magnum/Platform/GlfwApplication.h +++ b/src/Magnum/Platform/GlfwApplication.h @@ -1180,14 +1180,6 @@ enum class GlfwApplication::Key: Int { Percent = '%', Semicolon = GLFW_KEY_SEMICOLON, /**< Semicolon (`;`) */ - - #ifdef MAGNUM_BUILD_DEPRECATED - /** Semicolon (`;`) - * @m_deprecated_since{2019,01} Use @ref Key::Semicolon instead. - */ - Smicolon CORRADE_DEPRECATED_ENUM("use Key::Semicolon instead") = Semicolon, - #endif - Equal = GLFW_KEY_EQUAL, /**< Equal */ /**