diff --git a/doc/changelog.dox b/doc/changelog.dox index e6ff4b5bb..1656e2825 100644 --- a/doc/changelog.dox +++ b/doc/changelog.dox @@ -164,6 +164,9 @@ See also: @ref GL::OpenGLTester library instead. Note that the deprecated `Magnum/OpenGLTester.h` header is still present, along with all other deprecated GL-specific headers and APIs in the project root. +- Removed five-argument @ref Trade::MeshData2D and six-argument + @ref Trade::MeshData3D constructors that were deprecated since February + 2017. Use the full six/seven-argument versions instead. @section changelog-2018-10 2018.10 diff --git a/src/Magnum/Trade/MeshData2D.cpp b/src/Magnum/Trade/MeshData2D.cpp index 87a79750f..5fd54731a 100644 --- a/src/Magnum/Trade/MeshData2D.cpp +++ b/src/Magnum/Trade/MeshData2D.cpp @@ -33,10 +33,6 @@ MeshData2D::MeshData2D(const MeshPrimitive primitive, std::vector i CORRADE_ASSERT(!_positions.empty(), "Trade::MeshData2D: no position array specified", ); } -#ifdef MAGNUM_BUILD_DEPRECATED -MeshData2D::MeshData2D(const MeshPrimitive primitive, std::vector indices, std::vector> positions, std::vector> textureCoords2D, const void* const importerState): MeshData2D{primitive, std::move(indices), std::move(positions), std::move(textureCoords2D), {}, importerState} {} /* LCOV_EXCL_LINE */ -#endif - MeshData2D::MeshData2D(MeshData2D&&) #if !defined(__GNUC__) || __GNUC__*100 + __GNUC_MINOR__ != 409 noexcept diff --git a/src/Magnum/Trade/MeshData2D.h b/src/Magnum/Trade/MeshData2D.h index 8f04aca65..36432a36f 100644 --- a/src/Magnum/Trade/MeshData2D.h +++ b/src/Magnum/Trade/MeshData2D.h @@ -68,13 +68,6 @@ class MAGNUM_TRADE_EXPORT MeshData2D { */ explicit MeshData2D(MeshPrimitive primitive, std::vector indices, std::vector> positions, std::vector> textureCoords2D, std::vector> colors, const void* importerState = nullptr); - #ifdef MAGNUM_BUILD_DEPRECATED - /** @brief @copybrief MeshData2D(MeshPrimitive, std::vector, std::vector>, std::vector>, std::vector>, const void*) - * @deprecated Use @ref MeshData2D(MeshPrimitive, std::vector, std::vector>, std::vector>, std::vector>, const void*) instead. - */ - CORRADE_DEPRECATED("Use MeshData2D(MeshPrimitive, std::vector, std::vector>, std::vector>, std::vector>, const void*) instead") explicit MeshData2D(MeshPrimitive primitive, std::vector indices, std::vector> positions, std::vector> textureCoords2D, const void* importerState = nullptr); - #endif - /** @brief Copying is not allowed */ MeshData2D(const MeshData2D&) = delete; diff --git a/src/Magnum/Trade/MeshData3D.cpp b/src/Magnum/Trade/MeshData3D.cpp index 9d0d248bc..40fe02204 100644 --- a/src/Magnum/Trade/MeshData3D.cpp +++ b/src/Magnum/Trade/MeshData3D.cpp @@ -33,10 +33,6 @@ MeshData3D::MeshData3D(const MeshPrimitive primitive, std::vector i CORRADE_ASSERT(!_positions.empty(), "Trade::MeshData3D: no position array specified", ); } -#ifdef MAGNUM_BUILD_DEPRECATED -MeshData3D::MeshData3D(const MeshPrimitive primitive, std::vector indices, std::vector> positions, std::vector> normals, std::vector> textureCoords2D, const void* const importerState): MeshData3D{primitive, std::move(indices), std::move(positions), std::move(normals), std::move(textureCoords2D), {}, importerState} {} /* LCOV_EXCL_LINE */ -#endif - MeshData3D::MeshData3D(MeshData3D&&) #if !defined(__GNUC__) || __GNUC__*100 + __GNUC_MINOR__ != 409 noexcept diff --git a/src/Magnum/Trade/MeshData3D.h b/src/Magnum/Trade/MeshData3D.h index 84bb2ab05..5b742f1d8 100644 --- a/src/Magnum/Trade/MeshData3D.h +++ b/src/Magnum/Trade/MeshData3D.h @@ -69,13 +69,6 @@ class MAGNUM_TRADE_EXPORT MeshData3D { */ explicit MeshData3D(MeshPrimitive primitive, std::vector indices, std::vector> positions, std::vector> normals, std::vector> textureCoords2D, std::vector> colors, const void* importerState = nullptr); - #ifdef MAGNUM_BUILD_DEPRECATED - /** @brief @copybrief MeshData3D(MeshPrimitive, std::vector, std::vector>, std::vector>, std::vector>, std::vector>, const void*) - * @deprecated Use @ref MeshData3D(MeshPrimitive, std::vector, std::vector>, std::vector>, std::vector>, std::vector>, const void*) instead. - */ - CORRADE_DEPRECATED("Use MeshData3D(MeshPrimitive, std::vector, std::vector>, std::vector>, std::vector>, std::vector>, const void*) instead") explicit MeshData3D(MeshPrimitive primitive, std::vector indices, std::vector> positions, std::vector> normals, std::vector> textureCoords2D, const void* importerState = nullptr); - #endif - /** @brief Copying is not allowed */ MeshData3D(const MeshData3D&) = delete;