From 6c434c7b2115d23fd46018547d7343b1002bb65e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= <mosra@centrum.cz>
Date: Wed, 7 Aug 2019 21:24:38 +0200
Subject: [PATCH] Primitives: remove cruft deprecated in 2018.04.

---
 doc/changelog.dox                   | 11 ++++++++
 src/Magnum/Primitives/Capsule.cpp   | 16 ------------
 src/Magnum/Primitives/Capsule.h     | 40 -----------------------------
 src/Magnum/Primitives/Circle.cpp    | 12 ---------
 src/Magnum/Primitives/Circle.h      | 22 ----------------
 src/Magnum/Primitives/Crosshair.cpp | 12 ---------
 src/Magnum/Primitives/Crosshair.h   | 30 ----------------------
 src/Magnum/Primitives/Cube.cpp      | 16 ------------
 src/Magnum/Primitives/Cube.h        | 28 --------------------
 src/Magnum/Primitives/Cylinder.cpp  | 12 ---------
 src/Magnum/Primitives/Cylinder.h    | 28 --------------------
 src/Magnum/Primitives/Icosphere.cpp |  8 ------
 src/Magnum/Primitives/Icosphere.h   | 17 ------------
 src/Magnum/Primitives/Line.cpp      | 12 ---------
 src/Magnum/Primitives/Line.h        | 28 --------------------
 src/Magnum/Primitives/Plane.cpp     | 12 ---------
 src/Magnum/Primitives/Plane.h       | 27 -------------------
 src/Magnum/Primitives/Square.cpp    | 12 ---------
 src/Magnum/Primitives/Square.h      | 27 -------------------
 src/Magnum/Primitives/UVSphere.cpp  | 12 ---------
 src/Magnum/Primitives/UVSphere.h    | 27 -------------------
 21 files changed, 11 insertions(+), 398 deletions(-)

diff --git a/doc/changelog.dox b/doc/changelog.dox
index 206bc975c..6df21d496 100644
--- a/doc/changelog.dox
+++ b/doc/changelog.dox
@@ -576,6 +576,14 @@ See also:
     related to this change:
     -   @cpp GL::Mesh::IndexType @ce and @cpp GL::Mesh::indexSize() @ce,
         use @ref GL::MeshIndexType and @ref GL::Mesh::indexTypeSize() instead
+-   Removed @cpp Primitives::Capsule2D @ce, @cpp Primitives::Capsule3D @ce,
+    @cpp Primitives::Circle @ce, @cpp Primitives::Crosshair2D @ce,
+    @cpp Primitives::Crosshair3D @ce, @cpp Primitives::Cube @ce,
+    @cpp Primitives::Cylinder @ce, @cpp Primitives::Icosphere @ce,
+    @cpp Primitives::Line @ce, @cpp Primitives::Plane @ce,
+    @cpp Primitives::Square @ce and @cpp Primitives::UVSphere @ce classes
+    deprecated in 2018.04. The same functionality is available through free
+    functions in the @ref Primitives namespace, use those instead.
 -   Removed templated overloads of @ref GL::Buffer::data(),
     @ref GL::Buffer::subData() and @ref GL::Buffer::map() deprecated since
     2017. Use the non-templated versions together with
@@ -1656,6 +1664,9 @@ Released 2018-05-01, tagged as
     functions instead
 -   Class @cpp Primitives::Icosphere @ce is deprecated, use the
     @ref Primitives::icosphereSolid() free function instead
+-   Class @cpp Primitives::Line @ce is deprecated, use the
+    @ref Primitives::line2D() and @ref Primitives::line3D() free functions
+    instead
 -   Class @cpp Primitives::Plane @ce is deprecated, use
     @ref Primitives::planeSolid() and @ref Primitives::planeWireframe() free
     functions instead
diff --git a/src/Magnum/Primitives/Capsule.cpp b/src/Magnum/Primitives/Capsule.cpp
index 2af14472f..c72556e2c 100644
--- a/src/Magnum/Primitives/Capsule.cpp
+++ b/src/Magnum/Primitives/Capsule.cpp
@@ -151,20 +151,4 @@ Trade::MeshData3D capsule3DWireframe(const UnsignedInt hemisphereRings, const Un
     return capsule.finalize();
 }
 
-#ifdef MAGNUM_BUILD_DEPRECATED
-/* LCOV_EXCL_START */
-Trade::MeshData2D Capsule2D::wireframe(const UnsignedInt hemisphereRings, const UnsignedInt cylinderRings, const Float halfLength) {
-    return capsule2DWireframe(hemisphereRings, cylinderRings, halfLength);
-}
-
-Trade::MeshData3D Capsule3D::solid(const UnsignedInt hemisphereRings, const UnsignedInt cylinderRings, const UnsignedInt segments, const Float halfLength, const CapsuleTextureCoords textureCoords) {
-    return capsule3DSolid(hemisphereRings, cylinderRings, segments, halfLength, textureCoords);
-}
-
-Trade::MeshData3D Capsule3D::wireframe(const UnsignedInt hemisphereRings, const UnsignedInt cylinderRings, const UnsignedInt segments, const Float halfLength) {
-    return capsule3DWireframe(hemisphereRings, cylinderRings, segments, halfLength);
-}
-/* LCOV_EXCL_STOP */
-#endif
-
 }}
diff --git a/src/Magnum/Primitives/Capsule.h b/src/Magnum/Primitives/Capsule.h
index ca5a8a755..fbc53ffd3 100644
--- a/src/Magnum/Primitives/Capsule.h
+++ b/src/Magnum/Primitives/Capsule.h
@@ -32,10 +32,6 @@
 #include "Magnum/Primitives/visibility.h"
 #include "Magnum/Trade/Trade.h"
 
-#ifdef MAGNUM_BUILD_DEPRECATED
-#include <Corrade/Utility/Macros.h>
-#endif
-
 namespace Magnum { namespace Primitives {
 
 /**
@@ -56,19 +52,6 @@ Indexed @ref MeshPrimitive::Lines.
 */
 MAGNUM_PRIMITIVES_EXPORT Trade::MeshData2D capsule2DWireframe(UnsignedInt hemisphereRings, UnsignedInt cylinderRings, Float halfLength);
 
-#ifdef MAGNUM_BUILD_DEPRECATED
-/**
-@brief 2D capsule
-@deprecated Use @ref capsule2DWireframe() instead.
-*/
-struct MAGNUM_PRIMITIVES_EXPORT Capsule2D {
-    /** @copybrief capsule2DWireframe()
-     * @deprecated Use @ref capsule2DWireframe() instead.
-     */
-    CORRADE_DEPRECATED("use capsule2DWireframe() instead") static Trade::MeshData2D wireframe(UnsignedInt hemisphereRings, UnsignedInt cylinderRings, Float halfLength);
-};
-#endif
-
 /**
 @brief Whether to generate capsule texture coordinates
 
@@ -125,29 +108,6 @@ Indexed @ref MeshPrimitive::Lines.
 */
 MAGNUM_PRIMITIVES_EXPORT Trade::MeshData3D capsule3DWireframe(UnsignedInt hemisphereRings, UnsignedInt cylinderRings, UnsignedInt segments, Float halfLength);
 
-#ifdef MAGNUM_BUILD_DEPRECATED
-/**
-@brief 3D capsule
-@deprecated Use @ref capsule3DSolid() or @ref capsule3DWireframe() instead.
-*/
-struct MAGNUM_PRIMITIVES_EXPORT Capsule3D {
-    /** @brief @copybrief CapsuleTextureCoords
-     * @deprecated Use @ref CapsuleTextureCoords instead.
-     */
-    typedef CORRADE_DEPRECATED("use CapsuleTextureCoords instead") CapsuleTextureCoords TextureCoords;
-
-    /** @brief @copybrief capsule3DSolid()
-     * @deprecated Use @ref capsule3DSolid() instead.
-     */
-    CORRADE_DEPRECATED("use capsule3DSolid() instead") static Trade::MeshData3D solid(UnsignedInt hemisphereRings, UnsignedInt cylinderRings, UnsignedInt segments, Float halfLength, CapsuleTextureCoords textureCoords = CapsuleTextureCoords::DontGenerate);
-
-    /** @brief @copybrief capsule3DWireframe()
-     * @deprecated Use @ref capsule3DWireframe() instead.
-     */
-    CORRADE_DEPRECATED("use capsule3DWireframe() instead") static Trade::MeshData3D wireframe(UnsignedInt hemisphereRings, UnsignedInt cylinderRings, UnsignedInt segments, Float halfLength);
-};
-#endif
-
 }}
 
 #endif
diff --git a/src/Magnum/Primitives/Circle.cpp b/src/Magnum/Primitives/Circle.cpp
index ee5b94e11..8853074ae 100644
--- a/src/Magnum/Primitives/Circle.cpp
+++ b/src/Magnum/Primitives/Circle.cpp
@@ -112,16 +112,4 @@ Trade::MeshData3D circle3DWireframe(const UnsignedInt segments) {
     return Trade::MeshData3D{MeshPrimitive::LineLoop, {}, {std::move(positions)}, {}, {}, {}, nullptr};
 }
 
-#ifdef MAGNUM_BUILD_DEPRECATED
-/* LCOV_EXCL_START */
-Trade::MeshData2D Circle::solid(const UnsignedInt segments) {
-    return circle2DSolid(segments);
-}
-
-Trade::MeshData2D Circle::wireframe(const UnsignedInt segments) {
-    return circle2DWireframe(segments);
-}
-/* LCOV_EXCL_STOP */
-#endif
-
 }}
diff --git a/src/Magnum/Primitives/Circle.h b/src/Magnum/Primitives/Circle.h
index 1e8405242..e484f09a2 100644
--- a/src/Magnum/Primitives/Circle.h
+++ b/src/Magnum/Primitives/Circle.h
@@ -32,10 +32,6 @@
 #include "Magnum/Primitives/visibility.h"
 #include "Magnum/Trade/Trade.h"
 
-#ifdef MAGNUM_BUILD_DEPRECATED
-#include <Corrade/Utility/Macros.h>
-#endif
-
 namespace Magnum { namespace Primitives {
 
 /**
@@ -62,24 +58,6 @@ Circle with radius @cpp 1.0f @ce. Non-indexed @ref MeshPrimitive::LineLoop.
 */
 MAGNUM_PRIMITIVES_EXPORT Trade::MeshData2D circle2DWireframe(UnsignedInt segments);
 
-#ifdef MAGNUM_BUILD_DEPRECATED
-/**
-@brief 2D circle primitive
-@deprecated Use @ref circle2DSolid() or @ref circle2DWireframe() instead.
-*/
-struct MAGNUM_PRIMITIVES_EXPORT Circle {
-    /** @brief @copybrief circle2DSolid()
-     * @deprecated Use @ref circle2DSolid() instead.
-     */
-    CORRADE_DEPRECATED("use circle2DSolid() instead") static Trade::MeshData2D solid(UnsignedInt segments);
-
-    /** @brief @copybrief circle2DWireframe()
-     * @deprecated Use @ref circle2DWireframe() instead.
-     */
-    CORRADE_DEPRECATED("use circle2DWireframe() instead") static Trade::MeshData2D wireframe(UnsignedInt segments);
-};
-#endif
-
 /**
 @brief Solid 3D circle
 @param segments  Number of segments. Must be greater or equal to @cpp 3 @ce.
diff --git a/src/Magnum/Primitives/Crosshair.cpp b/src/Magnum/Primitives/Crosshair.cpp
index 257b6f45c..eed1fefe1 100644
--- a/src/Magnum/Primitives/Crosshair.cpp
+++ b/src/Magnum/Primitives/Crosshair.cpp
@@ -47,16 +47,4 @@ Trade::MeshData3D crosshair3D() {
     }}, {}, {}, {}, nullptr};
 }
 
-#ifdef MAGNUM_BUILD_DEPRECATED
-/* LCOV_EXCL_START */
-Trade::MeshData2D Crosshair2D::wireframe() {
-    return crosshair2D();
-}
-
-Trade::MeshData3D Crosshair3D::wireframe() {
-    return crosshair3D();
-}
-/* LCOV_EXCL_STOP */
-#endif
-
 }}
diff --git a/src/Magnum/Primitives/Crosshair.h b/src/Magnum/Primitives/Crosshair.h
index dee269bc2..72151394d 100644
--- a/src/Magnum/Primitives/Crosshair.h
+++ b/src/Magnum/Primitives/Crosshair.h
@@ -32,10 +32,6 @@
 #include "Magnum/Primitives/visibility.h"
 #include "Magnum/Trade/Trade.h"
 
-#ifdef MAGNUM_BUILD_DEPRECATED
-#include <Corrade/Utility/Macros.h>
-#endif
-
 namespace Magnum { namespace Primitives {
 
 /**
@@ -49,19 +45,6 @@ namespace Magnum { namespace Primitives {
 */
 MAGNUM_PRIMITIVES_EXPORT Trade::MeshData2D crosshair2D();
 
-#ifdef MAGNUM_BUILD_DEPRECATED
-/**
-@brief 2D crosshair
-@deprecated Use @ref crosshair2D() instead.
-*/
-struct MAGNUM_PRIMITIVES_EXPORT Crosshair2D {
-    /** @brief @copybrief crosshair2D()
-     * @deprecated Use @ref crosshair2D() instead.
-     */
-    CORRADE_DEPRECATED("use crosshair2D() instead") static Trade::MeshData2D wireframe();
-};
-#endif
-
 /**
 @brief 3D crosshair
 
@@ -73,19 +56,6 @@ struct MAGNUM_PRIMITIVES_EXPORT Crosshair2D {
 */
 MAGNUM_PRIMITIVES_EXPORT Trade::MeshData3D crosshair3D();
 
-#ifdef MAGNUM_BUILD_DEPRECATED
-/**
-@brief 3D crosshair
-@deprecated Use @ref crosshair3D() instead.
-*/
-struct MAGNUM_PRIMITIVES_EXPORT Crosshair3D {
-    /** @brief @copybrief crosshair3D()
-     * @deprecated Use @ref crosshair3D() instead.
-     */
-    CORRADE_DEPRECATED("use crosshair3D() instead") static Trade::MeshData3D wireframe();
-};
-#endif
-
 }}
 
 #endif
diff --git a/src/Magnum/Primitives/Cube.cpp b/src/Magnum/Primitives/Cube.cpp
index 66d1224b2..b5d8c4716 100644
--- a/src/Magnum/Primitives/Cube.cpp
+++ b/src/Magnum/Primitives/Cube.cpp
@@ -163,20 +163,4 @@ Trade::MeshData3D cubeWireframe() {
     }}, {}, {}, {}, nullptr};
 }
 
-#ifdef MAGNUM_BUILD_DEPRECATED
-/* LCOV_EXCL_START */
-Trade::MeshData3D Cube::solid() {
-    return cubeSolid();
-}
-
-Trade::MeshData3D Cube::solidStrip() {
-    return cubeSolidStrip();
-}
-
-Trade::MeshData3D Cube::wireframe() {
-    return cubeWireframe();
-}
-/* LCOV_EXCL_STOP */
-#endif
-
 }}
diff --git a/src/Magnum/Primitives/Cube.h b/src/Magnum/Primitives/Cube.h
index e3a421e24..4e31f7f69 100644
--- a/src/Magnum/Primitives/Cube.h
+++ b/src/Magnum/Primitives/Cube.h
@@ -32,10 +32,6 @@
 #include "Magnum/Primitives/visibility.h"
 #include "Magnum/Trade/Trade.h"
 
-#ifdef MAGNUM_BUILD_DEPRECATED
-#include <Corrade/Utility/Macros.h>
-#endif
-
 namespace Magnum { namespace Primitives {
 
 /**
@@ -72,30 +68,6 @@ Indexed @ref MeshPrimitive::Lines.
 */
 MAGNUM_PRIMITIVES_EXPORT Trade::MeshData3D cubeWireframe();
 
-#ifdef MAGNUM_BUILD_DEPRECATED
-/**
-@brief 3D cube
-@deprecated Use @ref cubeSolid(), @ref cubeSolidStrip() or @ref cubeWireframe()
-    instead.
-*/
-struct MAGNUM_PRIMITIVES_EXPORT Cube {
-    /** @brief @copybrief cubeSolid()
-     * @deprecated Use @ref cubeSolid() instead.
-     */
-    CORRADE_DEPRECATED("use cubeSolid() instead") static Trade::MeshData3D solid();
-
-    /** @brief @copybrief cubeSolidStrip()
-     * @deprecated Use @ref cubeSolidStrip() instead.
-     */
-    CORRADE_DEPRECATED("use cubeSolidStrip() instead") static Trade::MeshData3D solidStrip();
-
-    /** @brief @copybrief cubeWireframe()
-     * @deprecated Use @ref cubeWireframe() instead.
-     */
-    CORRADE_DEPRECATED("use cubeWireframe() instead") static Trade::MeshData3D wireframe();
-};
-#endif
-
 }}
 
 #endif
diff --git a/src/Magnum/Primitives/Cylinder.cpp b/src/Magnum/Primitives/Cylinder.cpp
index b0bb82d35..daf50e88e 100644
--- a/src/Magnum/Primitives/Cylinder.cpp
+++ b/src/Magnum/Primitives/Cylinder.cpp
@@ -85,16 +85,4 @@ Trade::MeshData3D cylinderWireframe(const UnsignedInt rings, const UnsignedInt s
     return cylinder.finalize();
 }
 
-#ifdef MAGNUM_BUILD_DEPRECATED
-/* LCOV_EXCL_START */
-Trade::MeshData3D Cylinder::solid(const UnsignedInt rings, const UnsignedInt segments, const Float halfLength, const CylinderFlags flags) {
-    return cylinderSolid(rings, segments, halfLength, flags);
-}
-
-Trade::MeshData3D Cylinder::wireframe(const UnsignedInt rings, const UnsignedInt segments, const Float halfLength) {
-    return cylinderWireframe(rings, segments, halfLength);
-}
-/* LCOV_EXCL_STOP */
-#endif
-
 }}
diff --git a/src/Magnum/Primitives/Cylinder.h b/src/Magnum/Primitives/Cylinder.h
index 3589aaedd..70a408028 100644
--- a/src/Magnum/Primitives/Cylinder.h
+++ b/src/Magnum/Primitives/Cylinder.h
@@ -98,34 +98,6 @@ Cylinder along Y axis of radius @cpp 1.0f @ce. Indexed
 */
 MAGNUM_PRIMITIVES_EXPORT Trade::MeshData3D cylinderWireframe(UnsignedInt rings, UnsignedInt segments, Float halfLength);
 
-#ifdef MAGNUM_BUILD_DEPRECATED
-/**
-@brief 3D cylinder
-@deprecated Use @ref cylinderSolid() or @ref cylinderWireframe() instead.
-*/
-struct MAGNUM_PRIMITIVES_EXPORT Cylinder {
-    /** @brief @copybrief CylinderFlag
-     * @deprecated Use @ref CylinderFlag instead.
-     */
-    typedef CORRADE_DEPRECATED("use CylinderFlag instead") CylinderFlag Flag;
-
-    /** @brief @copybrief CylinderFlags
-     * @deprecated Use @ref CylinderFlags instead.
-     */
-    typedef CORRADE_DEPRECATED("use CylinderFlags instead") CylinderFlags Flags;
-
-    /** @brief @copybrief cylinderSolid()
-     * @deprecated Use @ref cylinderSolid() instead.
-     */
-    CORRADE_DEPRECATED("use cylinderSolid() instead") static Trade::MeshData3D solid(UnsignedInt rings, UnsignedInt segments, Float halfLength, CylinderFlags flags = {});
-
-    /** @brief @copybrief cylinderWireframe()
-     * @deprecated Use @ref cylinderWireframe() instead.
-     */
-    CORRADE_DEPRECATED("use cylinderWireframe() instead") static Trade::MeshData3D wireframe(UnsignedInt rings, UnsignedInt segments, Float halfLength);
-};
-#endif
-
 }}
 
 #endif
diff --git a/src/Magnum/Primitives/Icosphere.cpp b/src/Magnum/Primitives/Icosphere.cpp
index 5e2b8a730..f43ab09d4 100644
--- a/src/Magnum/Primitives/Icosphere.cpp
+++ b/src/Magnum/Primitives/Icosphere.cpp
@@ -84,12 +84,4 @@ Trade::MeshData3D icosphereSolid(const UnsignedInt subdivisions) {
     return Trade::MeshData3D{MeshPrimitive::Triangles, std::move(indices), {std::move(positions)}, {std::move(normals)}, {}, {}, nullptr};
 }
 
-#ifdef MAGNUM_BUILD_DEPRECATED
-/* LCOV_EXCL_START */
-Trade::MeshData3D Icosphere::solid(const UnsignedInt subdivisions) {
-    return icosphereSolid(subdivisions);
-}
-/* LCOV_EXCL_STOP */
-#endif
-
 }}
diff --git a/src/Magnum/Primitives/Icosphere.h b/src/Magnum/Primitives/Icosphere.h
index 1582999e2..b1bceb884 100644
--- a/src/Magnum/Primitives/Icosphere.h
+++ b/src/Magnum/Primitives/Icosphere.h
@@ -32,10 +32,6 @@
 #include "Magnum/Primitives/visibility.h"
 #include "Magnum/Trade/Trade.h"
 
-#ifdef MAGNUM_BUILD_DEPRECATED
-#include <Corrade/Utility/Macros.h>
-#endif
-
 namespace Magnum { namespace Primitives {
 
 /**
@@ -57,19 +53,6 @@ result in 320 faces and so on. In particular, this is different from the
 */
 MAGNUM_PRIMITIVES_EXPORT Trade::MeshData3D icosphereSolid(UnsignedInt subdivisions);
 
-#ifdef MAGNUM_BUILD_DEPRECATED
-/**
-@brief 3D icosphere
-@deprecated Use @ref icosphereSolid() instead.
-*/
-struct MAGNUM_PRIMITIVES_EXPORT Icosphere {
-    /** @brief @copybrief icosphereSolid()
-     * @deprecated Use @ref icosphereSolid() instead.
-     */
-    CORRADE_DEPRECATED("use icosphereSolid() instead") static Trade::MeshData3D solid(UnsignedInt subdivisions);
-};
-#endif
-
 }}
 
 #endif
diff --git a/src/Magnum/Primitives/Line.cpp b/src/Magnum/Primitives/Line.cpp
index a9c6b3f32..2f78cba96 100644
--- a/src/Magnum/Primitives/Line.cpp
+++ b/src/Magnum/Primitives/Line.cpp
@@ -48,16 +48,4 @@ Trade::MeshData3D line3D() {
     return line3D({0.0f, 0.0f, 0.0f}, {1.0f, 0.0f, 0.0f});
 }
 
-#ifdef MAGNUM_BUILD_DEPRECATED
-/* LCOV_EXCL_START */
-Trade::MeshData2D Line2D::wireframe() {
-    return line2D();
-}
-
-Trade::MeshData3D Line3D::wireframe() {
-    return line3D();
-}
-/* LCOV_EXCL_STOP */
-#endif
-
 }}
diff --git a/src/Magnum/Primitives/Line.h b/src/Magnum/Primitives/Line.h
index d24f667ea..7bc9863d6 100644
--- a/src/Magnum/Primitives/Line.h
+++ b/src/Magnum/Primitives/Line.h
@@ -33,10 +33,6 @@
 #include "Magnum/Primitives/visibility.h"
 #include "Magnum/Trade/Trade.h"
 
-#ifdef MAGNUM_BUILD_DEPRECATED
-#include <Corrade/Utility/Macros.h>
-#endif
-
 namespace Magnum { namespace Primitives {
 
 /**
@@ -82,30 +78,6 @@ Unit-size line in direction of positive X axis. Equivalent to calling
 */
 MAGNUM_PRIMITIVES_EXPORT Trade::MeshData3D line3D();
 
-#ifdef MAGNUM_BUILD_DEPRECATED
-/**
-@brief 2D line
-@deprecated Use @ref line2D() instead.
-*/
-struct MAGNUM_PRIMITIVES_EXPORT Line2D {
-    /** @brief @copybrief line2D()
-     * @deprecated Use @ref line2D() instead.
-     */
-    CORRADE_DEPRECATED("use line2D() instead") static Trade::MeshData2D wireframe();
-};
-
-/**
-@brief 3D line
-@deprecated Use @ref line3D() instead.
-*/
-struct MAGNUM_PRIMITIVES_EXPORT Line3D {
-    /** @brief @copybrief line3D()
-     * @deprecated Use @ref line3D() instead.
-     */
-    CORRADE_DEPRECATED("use line3D() instead") static Trade::MeshData3D wireframe();
-};
-#endif
-
 }}
 
 #endif
diff --git a/src/Magnum/Primitives/Plane.cpp b/src/Magnum/Primitives/Plane.cpp
index cb3ce2350..48797668a 100644
--- a/src/Magnum/Primitives/Plane.cpp
+++ b/src/Magnum/Primitives/Plane.cpp
@@ -62,16 +62,4 @@ Trade::MeshData3D planeWireframe() {
     }}, {}, {}, {}, nullptr};
 }
 
-#ifdef MAGNUM_BUILD_DEPRECATED
-/* LCOV_EXCL_START */
-Trade::MeshData3D Plane::solid(const PlaneTextureCoords textureCoords) {
-    return planeSolid(textureCoords);
-}
-
-Trade::MeshData3D Plane::wireframe() {
-    return planeWireframe();
-}
-/* LCOV_EXCL_STOP */
-#endif
-
 }}
diff --git a/src/Magnum/Primitives/Plane.h b/src/Magnum/Primitives/Plane.h
index c89057806..0f2cab9cd 100644
--- a/src/Magnum/Primitives/Plane.h
+++ b/src/Magnum/Primitives/Plane.h
@@ -32,10 +32,6 @@
 #include "Magnum/Trade/Trade.h"
 #include "Magnum/Primitives/visibility.h"
 
-#ifdef MAGNUM_BUILD_DEPRECATED
-#include <Corrade/Utility/Macros.h>
-#endif
-
 namespace Magnum { namespace Primitives {
 
 /**
@@ -73,29 +69,6 @@ MAGNUM_PRIMITIVES_EXPORT Trade::MeshData3D planeSolid(PlaneTextureCoords texture
 */
 MAGNUM_PRIMITIVES_EXPORT Trade::MeshData3D planeWireframe();
 
-#ifdef MAGNUM_BUILD_DEPRECATED
-/**
-@brief 3D plane
-@deprecated Use @ref planeSolid() or @ref planeWireframe() instead.
-*/
-struct MAGNUM_PRIMITIVES_EXPORT Plane {
-    /** @brief @copybrief PlaneTextureCoords
-     * @deprecated Use @ref PlaneTextureCoords instead.
-     */
-    typedef CORRADE_DEPRECATED("use PlaneTextureCoords instead") PlaneTextureCoords TextureCoords;
-
-    /** @brief @copybrief planeSolid()
-     * @deprecated Use @ref planeSolid() instead.
-     */
-    CORRADE_DEPRECATED("use planeSolid() instead") static Trade::MeshData3D solid(PlaneTextureCoords textureCoords = PlaneTextureCoords::DontGenerate);
-
-    /** @brief @copybrief planeWireframe()
-     * @deprecated Use @ref planeWireframe() instead.
-     */
-    CORRADE_DEPRECATED("use planeWireframe() instead") static Trade::MeshData3D wireframe();
-};
-#endif
-
 }}
 
 #endif
diff --git a/src/Magnum/Primitives/Square.cpp b/src/Magnum/Primitives/Square.cpp
index 2162eef90..93c833e95 100644
--- a/src/Magnum/Primitives/Square.cpp
+++ b/src/Magnum/Primitives/Square.cpp
@@ -57,16 +57,4 @@ Trade::MeshData2D squareWireframe() {
     }}, {}, {}, nullptr};
 }
 
-#ifdef MAGNUM_BUILD_DEPRECATED
-/* LCOV_EXCL_START */
-Trade::MeshData2D Square::solid(const SquareTextureCoords textureCoords) {
-    return squareSolid(textureCoords);
-}
-
-Trade::MeshData2D Square::wireframe() {
-    return squareWireframe();
-}
-/* LCOV_EXCL_STOP */
-#endif
-
 }}
diff --git a/src/Magnum/Primitives/Square.h b/src/Magnum/Primitives/Square.h
index 38f41c1a3..4e0940dc9 100644
--- a/src/Magnum/Primitives/Square.h
+++ b/src/Magnum/Primitives/Square.h
@@ -32,10 +32,6 @@
 #include "Magnum/Primitives/visibility.h"
 #include "Magnum/Trade/Trade.h"
 
-#ifdef MAGNUM_BUILD_DEPRECATED
-#include <Corrade/Utility/Macros.h>
-#endif
-
 namespace Magnum { namespace Primitives {
 
 /**
@@ -72,29 +68,6 @@ MAGNUM_PRIMITIVES_EXPORT Trade::MeshData2D squareSolid(SquareTextureCoords textu
 */
 MAGNUM_PRIMITIVES_EXPORT Trade::MeshData2D squareWireframe();
 
-#ifdef MAGNUM_BUILD_DEPRECATED
-/**
-@brief 2D square
-@deprecated Use @ref squareSolid() or @ref squareWireframe() instead.
-*/
-struct MAGNUM_PRIMITIVES_EXPORT Square {
-    /** @brief @copybrief SquareTextureCoords
-     * @deprecated Use @ref SquareTextureCoords instead.
-     */
-    typedef CORRADE_DEPRECATED("use SquareTextureCoords instead") SquareTextureCoords TextureCoords;
-
-    /** @brief @copybrief squareSolid()
-     * @deprecated Use @ref squareWireframe() instead.
-     */
-    CORRADE_DEPRECATED("use squareSolid() instead") static Trade::MeshData2D solid(SquareTextureCoords textureCoords = SquareTextureCoords::DontGenerate);
-
-    /** @brief @copybrief squareWireframe()
-     * @deprecated Use @ref squareWireframe() instead.
-     */
-    CORRADE_DEPRECATED("use squareWireframe() instead") static Trade::MeshData2D wireframe();
-};
-#endif
-
 }}
 
 #endif
diff --git a/src/Magnum/Primitives/UVSphere.cpp b/src/Magnum/Primitives/UVSphere.cpp
index 9ddf49cba..d1d889ac1 100644
--- a/src/Magnum/Primitives/UVSphere.cpp
+++ b/src/Magnum/Primitives/UVSphere.cpp
@@ -77,16 +77,4 @@ Trade::MeshData3D uvSphereWireframe(const UnsignedInt rings, const UnsignedInt s
     return sphere.finalize();
 }
 
-#ifdef MAGNUM_BUILD_DEPRECATED
-/* LCOV_EXCL_START */
-Trade::MeshData3D UVSphere::solid(const UnsignedInt rings, const UnsignedInt segments, const UVSphereTextureCoords textureCoords) {
-    return uvSphereSolid(rings, segments, textureCoords);
-}
-
-Trade::MeshData3D UVSphere::wireframe(const UnsignedInt rings, const UnsignedInt segments) {
-    return uvSphereWireframe(rings, segments);
-}
-/* LCOV_EXCL_STOP */
-#endif
-
 }}
diff --git a/src/Magnum/Primitives/UVSphere.h b/src/Magnum/Primitives/UVSphere.h
index 51e00d906..24c595905 100644
--- a/src/Magnum/Primitives/UVSphere.h
+++ b/src/Magnum/Primitives/UVSphere.h
@@ -32,10 +32,6 @@
 #include "Magnum/Trade/Trade.h"
 #include "Magnum/Primitives/visibility.h"
 
-#ifdef MAGNUM_BUILD_DEPRECATED
-#include <Corrade/Utility/Macros.h>
-#endif
-
 namespace Magnum { namespace Primitives {
 
 /**
@@ -81,29 +77,6 @@ Sphere with radius @cpp 1.0f @ce. Indexed @ref MeshPrimitive::Lines.
 */
 MAGNUM_PRIMITIVES_EXPORT Trade::MeshData3D uvSphereWireframe(UnsignedInt rings, UnsignedInt segments);
 
-#ifdef MAGNUM_BUILD_DEPRECATED
-/**
-@brief 3D UV sphere
-@deprecated Use @ref uvSphereSolid() or @ref uvSphereWireframe() instead.
-*/
-struct MAGNUM_PRIMITIVES_EXPORT UVSphere {
-    /** @brief @copybrief UVSphereTextureCoords
-     * @deprecated Use @ref UVSphereTextureCoords instead.
-     */
-    typedef CORRADE_DEPRECATED("use UVSphereTextureCoords instead") UVSphereTextureCoords TextureCoords;
-
-    /** @brief @copybrief uvSphereSolid()
-     * @deprecated Use @ref uvSphereSolid() instead.
-     */
-    CORRADE_DEPRECATED("use uvSphereSolid() instead") static Trade::MeshData3D solid(UnsignedInt rings, UnsignedInt segments, UVSphereTextureCoords textureCoords = UVSphereTextureCoords::DontGenerate);
-
-    /** @brief @copybrief uvSphereWireframe()
-     * @deprecated Use @ref uvSphereWireframe() instead.
-     */
-    CORRADE_DEPRECATED("use uvSphereWireframe() instead") static Trade::MeshData3D wireframe(UnsignedInt rings, UnsignedInt segments);
-};
-#endif
-
 }}
 
 #endif