From f052fc43ec029ecf7b9d421c8ea4c3d8a845115e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= <mosra@centrum.cz>
Date: Mon, 20 Jul 2020 19:18:29 +0200
Subject: [PATCH] Trade: oh, those material APIs were also long-deprecated.
 Delete.

---
 doc/changelog.dox                       |  5 +++++
 src/Magnum/Trade/AbstractMaterialData.h | 12 ------------
 src/Magnum/Trade/PhongMaterialData.cpp  |  2 --
 src/Magnum/Trade/PhongMaterialData.h    |  7 -------
 4 files changed, 5 insertions(+), 21 deletions(-)

diff --git a/doc/changelog.dox b/doc/changelog.dox
index c2cd2d4c4..54a0affc2 100644
--- a/doc/changelog.dox
+++ b/doc/changelog.dox
@@ -133,6 +133,11 @@ See also:
     -   @ref Trade::CameraData constructor not taking an explicit type enum,
         use @ref Trade::CameraData::CameraData(CameraType, Rad, Float, Float, Float, const void*)
         instead
+    -   @ref Trade::AbstractMaterialData constructor taking just two parameters
+        and @ref Trade::PhongMaterialData constructor taking three parameters,
+        use @ref Trade::AbstractMaterialData::AbstractMaterialData(MaterialType, Flags, MaterialAlphaMode, Float, const void*)
+        and @ref Trade::PhongMaterialData::PhongMaterialData(Flags, MaterialAlphaMode, Float, Float, const void*)
+        instead
 -   All includes of @ref Corrade/Containers/PointerStl.h and
     @ref Corrade/Containers/ArrayViewStl.h that were added in 2019.01 for
     preserving backwards compatibility after the move from @ref std::unique_ptr
diff --git a/src/Magnum/Trade/AbstractMaterialData.h b/src/Magnum/Trade/AbstractMaterialData.h
index d3b879e69..37bc0ae28 100644
--- a/src/Magnum/Trade/AbstractMaterialData.h
+++ b/src/Magnum/Trade/AbstractMaterialData.h
@@ -34,10 +34,6 @@
 #include "Magnum/Magnum.h"
 #include "Magnum/Trade/visibility.h"
 
-#ifdef MAGNUM_BUILD_DEPRECATED
-#include <Corrade/Utility/Macros.h>
-#endif
-
 namespace Magnum { namespace Trade {
 
 /**
@@ -161,14 +157,6 @@ class MAGNUM_TRADE_EXPORT AbstractMaterialData {
          */
         explicit AbstractMaterialData(MaterialType type, Flags flags, MaterialAlphaMode alphaMode, Float alphaMask, const void* importerState = nullptr) noexcept;
 
-        #ifdef MAGNUM_BUILD_DEPRECATED
-        /** @brief Constructor
-         * @m_deprecated_since{2018,10} Use @ref AbstractMaterialData(MaterialType, Flags, MaterialAlphaMode, Float, const void*)
-         *      instead.
-         */
-        explicit CORRADE_DEPRECATED("use AbstractMaterialData(MaterialType, UnsignedInt, MaterialAlphaMode, Float) instead") AbstractMaterialData(MaterialType type, const void* importerState = nullptr) noexcept: AbstractMaterialData{type, {}, MaterialAlphaMode::Opaque, 0.5f, importerState} {}
-        #endif
-
     private:
         MaterialType _type;
         MaterialAlphaMode _alphaMode;
diff --git a/src/Magnum/Trade/PhongMaterialData.cpp b/src/Magnum/Trade/PhongMaterialData.cpp
index 36706dcbb..c0e667dea 100644
--- a/src/Magnum/Trade/PhongMaterialData.cpp
+++ b/src/Magnum/Trade/PhongMaterialData.cpp
@@ -64,8 +64,6 @@ PhongMaterialData::PhongMaterialData(const Flags flags, const Color4& ambientCol
 
 #ifdef MAGNUM_BUILD_DEPRECATED
 PhongMaterialData::PhongMaterialData(const Flags flags, const MaterialAlphaMode alphaMode, const Float alphaMask, const Float shininess, const void* const importerState) noexcept: PhongMaterialData{flags, 0x000000ff_rgbaf, {}, 0xffffffff_rgbaf, {}, 0xffffffff_rgbaf, {}, {}, {}, alphaMode, alphaMask, shininess, importerState} {}
-
-PhongMaterialData::PhongMaterialData(const Flags flags, const Float shininess, const void* const importerState) noexcept: PhongMaterialData{flags, 0x000000ff_rgbaf, {}, 0xffffffff_rgbaf, {}, 0xffffffff_rgbaf, {}, {}, {}, MaterialAlphaMode::Opaque, 0.5f, shininess, importerState} {}
 #endif
 
 PhongMaterialData::PhongMaterialData(PhongMaterialData&& other) noexcept = default;
diff --git a/src/Magnum/Trade/PhongMaterialData.h b/src/Magnum/Trade/PhongMaterialData.h
index 3c8a17811..3565b8892 100644
--- a/src/Magnum/Trade/PhongMaterialData.h
+++ b/src/Magnum/Trade/PhongMaterialData.h
@@ -180,13 +180,6 @@ class MAGNUM_TRADE_EXPORT PhongMaterialData: public AbstractMaterialData {
          *      instead.
          */
         explicit CORRADE_DEPRECATED("use PhongMaterialData(Flags, const Color4&, UnsignedInt, const Color4&, UnsignedInt, const Color4&, UnsignedInt, UnsignedInt, const Matrix3&, MaterialAlphaMode, Float, Float, const void*) instead") PhongMaterialData(Flags flags, MaterialAlphaMode alphaMode, Float alphaMask, Float shininess, const void* importerState = nullptr) noexcept;
-
-        /**
-         * @brief Constructor
-         * @m_deprecated_since{2018,10} Use @ref PhongMaterialData(Flags, MaterialAlphaMode, Float, Float, const void*)
-         *      instead.
-         */
-        explicit CORRADE_DEPRECATED("use PhongMaterialData(Flags, MaterialAlphaMode, Float, Float, const void*) instead") PhongMaterialData(Flags flags, Float shininess, const void* importerState = nullptr) noexcept;
         #endif
 
         /** @brief Copying is not allowed */