From 7fc34f979146de99c24f3454c5c9b967d4484298 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= <mosra@centrum.cz>
Date: Mon, 25 May 2015 23:40:38 +0200
Subject: [PATCH] Removed deprecated parameter-less *Mesh::draw() overload.

Use the one with explicit shader parameter instead.
---
 src/Magnum/Mesh.h       | 16 ----------------
 src/Magnum/MeshView.cpp | 12 ------------
 src/Magnum/MeshView.h   | 12 ------------
 3 files changed, 40 deletions(-)

diff --git a/src/Magnum/Mesh.h b/src/Magnum/Mesh.h
index ed49d60af..075b1f703 100644
--- a/src/Magnum/Mesh.h
+++ b/src/Magnum/Mesh.h
@@ -841,22 +841,6 @@ class MAGNUM_EXPORT Mesh: public AbstractObject {
 
         void draw(AbstractShaderProgram&& shader) { draw(shader); } /**< @overload */
 
-        #ifdef MAGNUM_BUILD_DEPRECATED
-        /**
-         * @copybrief draw(AbstractShaderProgram&)
-         * @deprecated Use @ref draw(AbstractShaderProgram&) instead.
-         */
-        CORRADE_DEPRECATED("use draw(AbstractShaderProgram&) instead") void draw() {
-            #ifndef MAGNUM_TARGET_GLES
-            drawInternal(_count, _baseVertex, _instanceCount, _baseInstance, _indexOffset, _indexStart, _indexEnd);
-            #elif !defined(MAGNUM_TARGET_GLES2)
-            drawInternal(_count, _baseVertex, _instanceCount, _indexOffset, _indexStart, _indexEnd);
-            #else
-            drawInternal(_count, _baseVertex, _instanceCount, _indexOffset);
-            #endif
-        }
-        #endif
-
     private:
         #ifndef DOXYGEN_GENERATING_OUTPUT
         struct MAGNUM_LOCAL GenericAttribute {
diff --git a/src/Magnum/MeshView.cpp b/src/Magnum/MeshView.cpp
index 0264be0e3..154f608f4 100644
--- a/src/Magnum/MeshView.cpp
+++ b/src/Magnum/MeshView.cpp
@@ -156,16 +156,4 @@ void MeshView::draw(AbstractShaderProgram& shader) {
     #endif
 }
 
-#ifdef MAGNUM_BUILD_DEPRECATED
-void MeshView::draw() {
-    #ifndef MAGNUM_TARGET_GLES
-    _original.get().drawInternal(_count, _baseVertex, _instanceCount, _baseInstance, _indexOffset, _indexStart, _indexEnd);
-    #elif !defined(MAGNUM_TARGET_GLES2)
-    _original.get().drawInternal(_count, _baseVertex, _instanceCount, _indexOffset, _indexStart, _indexEnd);
-    #else
-    _original.get().drawInternal(_count, _baseVertex, _instanceCount, _indexOffset);
-    #endif
-}
-#endif
-
 }
diff --git a/src/Magnum/MeshView.h b/src/Magnum/MeshView.h
index 01665b0c8..b135c95ec 100644
--- a/src/Magnum/MeshView.h
+++ b/src/Magnum/MeshView.h
@@ -36,10 +36,6 @@
 #include "Magnum/OpenGL.h"
 #include "Magnum/visibility.h"
 
-#ifdef MAGNUM_BUILD_DEPRECATED
-#include <Corrade/Utility/Macros.h>
-#endif
-
 namespace Magnum {
 
 namespace Implementation { struct MeshState; }
@@ -212,14 +208,6 @@ class MAGNUM_EXPORT MeshView {
         void draw(AbstractShaderProgram& shader);
         void draw(AbstractShaderProgram&& shader) { draw(shader); } /**< @overload */
 
-        #ifdef MAGNUM_BUILD_DEPRECATED
-        /**
-         * @copybrief draw(AbstractShaderProgram&)
-         * @deprecated Use @ref draw(AbstractShaderProgram&) instead.
-         */
-        CORRADE_DEPRECATED("use draw(AbstractShaderProgram&) instead") void draw();
-        #endif
-
     private:
         #ifndef MAGNUM_TARGET_WEBGL
         static MAGNUM_LOCAL void multiDrawImplementationDefault(std::initializer_list<std::reference_wrapper<MeshView>> meshes);