diff --git a/src/Magnum/CMakeLists.txt b/src/Magnum/CMakeLists.txt index a762e18f6..82b7dc436 100644 --- a/src/Magnum/CMakeLists.txt +++ b/src/Magnum/CMakeLists.txt @@ -185,11 +185,6 @@ if(NOT TARGET_WEBGL) ImageFormat.h MultisampleTexture.h) endif() - - if(BUILD_DEPRECATED) - list(APPEND Magnum_HEADERS - DebugMessage.h) - endif() endif() # Desktop, OpenGL ES and WebGL 2.0 stuff that is not available in WebGL 1.0 diff --git a/src/Magnum/DebugMessage.h b/src/Magnum/DebugMessage.h deleted file mode 100644 index 2004cae53..000000000 --- a/src/Magnum/DebugMessage.h +++ /dev/null @@ -1,41 +0,0 @@ -#ifndef Magnum_DebugMessage_h -#define Magnum_DebugMessage_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/DebugOutput.h instead. - */ - -#include "Magnum/configure.h" - -#ifdef MAGNUM_BUILD_DEPRECATED -#include "Magnum/DebugOutput.h" -CORRADE_DEPRECATED_FILE("use Magnum/DebugOutput.h instead") -#else -#error use Magnum/DebugOutput.h instead -#endif - -#endif diff --git a/src/Magnum/DebugOutput.cpp b/src/Magnum/DebugOutput.cpp index 5e77435e7..ee569cc06 100644 --- a/src/Magnum/DebugOutput.cpp +++ b/src/Magnum/DebugOutput.cpp @@ -289,20 +289,6 @@ Debug& operator<<(Debug& debug, const DebugMessage::Source value) { _c(ThirdParty) _c(Application) #undef _c - #ifdef MAGNUM_BUILD_DEPRECATED - #ifdef __GNUC__ - #pragma GCC diagnostic push - #pragma GCC diagnostic ignored "-Wdeprecated-declarations" - #endif - case DebugMessage::Source::Api: - case DebugMessage::Source::WindowSystem: - case DebugMessage::Source::ShaderCompiler: - case DebugMessage::Source::Other: - return debug << DebugOutput::Source(value); - #ifdef __GNUC__ - #pragma GCC diagnostic pop - #endif - #endif /* LCOV_EXCL_STOP */ } diff --git a/src/Magnum/DebugOutput.h b/src/Magnum/DebugOutput.h index 9a561e936..f79078df2 100644 --- a/src/Magnum/DebugOutput.h +++ b/src/Magnum/DebugOutput.h @@ -38,10 +38,6 @@ #include "Magnum/Magnum.h" #include "Magnum/visibility.h" -#ifdef MAGNUM_BUILD_DEPRECATED -#include -#endif - #ifndef MAGNUM_TARGET_WEBGL namespace Magnum { @@ -488,23 +484,6 @@ class MAGNUM_EXPORT DebugMessage { * @todoc use m_enum_values_as_keywords once deprecated values are gone */ enum class Source: GLenum { - #ifdef MAGNUM_BUILD_DEPRECATED - /** @copydoc DebugOutput::Source::Api - * @deprecated Use @ref DebugOutput::Source::Api instead. - */ - Api CORRADE_DEPRECATED_ENUM("use DebugOutput::Source::Api instead") = GLenum(DebugOutput::Source::Api), - - /** @copydoc DebugOutput::Source::WindowSystem - * @deprecated Use @ref DebugOutput::Source::WindowSystem instead. - */ - WindowSystem CORRADE_DEPRECATED_ENUM("use DebugOutput::Source::WindowSystem instead") = GLenum(DebugOutput::Source::WindowSystem), - - /** @copydoc DebugOutput::Source::ShaderCompiler - * @deprecated Use @ref DebugOutput::Source::ShaderCompiler instead. - */ - ShaderCompiler CORRADE_DEPRECATED_ENUM("use DebugOutput::Source::ShaderCompiler instead") = GLenum(DebugOutput::Source::ShaderCompiler), - #endif - /** * External debugger or third-party middleware * @m_keywords{GL_DEBUG_SOURCE_THIRD_PARTY} @@ -524,13 +503,6 @@ class MAGNUM_EXPORT DebugMessage { #else Application = GL_DEBUG_SOURCE_APPLICATION_KHR, #endif - - #ifdef MAGNUM_BUILD_DEPRECATED - /** @copydoc DebugOutput::Source::Other - * @deprecated Use @ref DebugOutput::Source::Other instead. - */ - Other CORRADE_DEPRECATED_ENUM("use DebugOutput::Source::Other instead") = GLenum(DebugOutput::Source::Other) - #endif }; /** @@ -590,82 +562,6 @@ class MAGNUM_EXPORT DebugMessage { #endif }; - #ifdef MAGNUM_BUILD_DEPRECATED - /** @brief @copybrief DebugOutput::Severity - * @deprecated Use @ref DebugOutput::Severity instead. - */ - CORRADE_DEPRECATED("use DebugOutput::Severity instead") typedef DebugOutput::Severity Severity; - - /** @brief @copybrief DebugOutput::Callback - * @deprecated Use @ref DebugOutput::Callback instead. - */ - /* Can't mark this as deprecated because compiler then complains when I use it as a parameter in setCallback() */ - typedef CORRADE_DEPRECATED("use DebugOutput::Callback instead") void(*Callback)(DebugMessage::Source, DebugMessage::Type, UnsignedInt, DebugOutput::Severity, const std::string&, const void*); - - /** @brief @copybrief DebugOutput::maxLoggedMessages() - * @deprecated Use @ref DebugOutput::maxLoggedMessages() instead. - */ - CORRADE_DEPRECATED("use DebugOutput::maxLoggedMessages() instead") static Int maxLoggedMessages() { - return DebugOutput::maxLoggedMessages(); - } - - /** @brief @copybrief DebugOutput::maxMessageLength() - * @deprecated Use @ref DebugOutput::maxMessageLength() instead. - */ - CORRADE_DEPRECATED("use DebugOutput::maxMessageLength() instead") static Int maxMessageLength() { - return DebugOutput::maxMessageLength(); - } - - /** @brief @copybrief DebugOutput::setEnabled() - * @deprecated Use @ref DebugOutput::setEnabled() instead. - */ - #ifdef DOXYGEN_GENERATING_OUTPUT - template static void setEnabled(T... args); - #else - CORRADE_DEPRECATED("use DebugOutput::setEnabled() instead") static void setEnabled(Source source, Type type, std::initializer_list ids, bool enabled) { - DebugOutput::setEnabled(DebugOutput::Source(source), DebugOutput::Type(type), ids, enabled); - } - CORRADE_DEPRECATED("use DebugOutput::setEnabled() instead") static void setEnabled(Source source, Type type, DebugOutput::Severity severity, bool enabled) { - DebugOutput::setEnabled(DebugOutput::Source(source), DebugOutput::Type(type), severity, enabled); - } - CORRADE_DEPRECATED("use DebugOutput::setEnabled() instead") static void setEnabled(Source source, Type type, bool enabled) { - DebugOutput::setEnabled(DebugOutput::Source(source), DebugOutput::Type(type), enabled); - } - CORRADE_DEPRECATED("use DebugOutput::setEnabled() instead") static void setEnabled(Source source, DebugOutput::Severity severity, bool enabled) { - DebugOutput::setEnabled(DebugOutput::Source(source), severity, enabled); - } - CORRADE_DEPRECATED("use DebugOutput::setEnabled() instead") static void setEnabled(Source source, bool enabled) { - DebugOutput::setEnabled(DebugOutput::Source(source), enabled); - } - CORRADE_DEPRECATED("use DebugOutput::setEnabled() instead") static void setEnabled(Type type, DebugOutput::Severity severity, bool enabled) { - DebugOutput::setEnabled(DebugOutput::Type(type), severity, enabled); - } - CORRADE_DEPRECATED("use DebugOutput::setEnabled() instead") static void setEnabled(Type type, bool enabled) { - DebugOutput::setEnabled(DebugOutput::Type(type), enabled); - } - CORRADE_DEPRECATED("use DebugOutput::setEnabled() instead") static void setEnabled(DebugOutput::Severity severity, bool enabled) { - DebugOutput::setEnabled(severity, enabled); - } - CORRADE_DEPRECATED("use DebugOutput::setEnabled() instead") static void setEnabled(bool enabled) { - DebugOutput::setEnabled(enabled); - } - #endif - - /** @brief @copybrief DebugOutput::setCallback() - * @deprecated Use @ref DebugOutput::setCallback() instead. - */ - CORRADE_DEPRECATED("use DebugOutput::setCallback() instead") static void setCallback(DebugOutput::Callback callback, const void* userParam = nullptr) { - DebugOutput::setCallback(reinterpret_cast(callback), userParam); - } - - /** @brief @copybrief DebugOutput::setDefaultCallback() - * @deprecated Use @ref DebugOutput::setDefaultCallback() instead. - */ - CORRADE_DEPRECATED("use DebugOutput::setDefaultCallback() instead") static void setDefaultCallback() { - DebugOutput::setDefaultCallback(); - } - #endif - /** * @brief Insert message * @param source Message source