From 529513d5364185391451cf880c5a508e60b3a940 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= <mosra@centrum.cz>
Date: Wed, 29 Jan 2014 15:22:12 +0100
Subject: [PATCH] Removed redundant `Buffer` suffixes from FramebufferBlit
 enum.

The old values are now aliases to new ones, are marked as deprecated and
will be removed in future release.
---
 src/Magnum/AbstractFramebuffer.h      | 30 ++++++++++++++++++++-------
 src/Magnum/Test/FramebufferGLTest.cpp |  2 +-
 2 files changed, 24 insertions(+), 8 deletions(-)

diff --git a/src/Magnum/AbstractFramebuffer.h b/src/Magnum/AbstractFramebuffer.h
index d74b0656a..f375e49a8 100644
--- a/src/Magnum/AbstractFramebuffer.h
+++ b/src/Magnum/AbstractFramebuffer.h
@@ -43,9 +43,9 @@ namespace Magnum {
 @see @ref AbstractFramebuffer, @ref FramebufferClearMask
 */
 enum class FramebufferClear: GLbitfield {
-    Color = GL_COLOR_BUFFER_BIT,    /**< Color */
-    Depth = GL_DEPTH_BUFFER_BIT,    /**< Depth value */
-    Stencil = GL_STENCIL_BUFFER_BIT /**< Stencil value */
+    Color = GL_COLOR_BUFFER_BIT,    /**< Color buffer */
+    Depth = GL_DEPTH_BUFFER_BIT,    /**< Depth buffer */
+    Stencil = GL_STENCIL_BUFFER_BIT /**< Stencil buffer */
 };
 
 /**
@@ -63,12 +63,28 @@ typedef Containers::EnumSet<FramebufferClear, GLbitfield,
 @requires_gl30 %Extension @extension{ARB,framebuffer_object}
 @requires_gles30 %Extension @es_extension{ANGLE,framebuffer_blit} or
     @es_extension{NV,framebuffer_blit} in OpenGL ES 2.0
-@todo Remove redundant `%Buffer`
 */
 enum class FramebufferBlit: GLbitfield {
-    ColorBuffer = GL_COLOR_BUFFER_BIT,    /**< Color buffer */
-    DepthBuffer = GL_DEPTH_BUFFER_BIT,    /**< Depth buffer */
-    StencilBuffer = GL_STENCIL_BUFFER_BIT /**< Stencil buffer */
+    #ifdef MAGNUM_BUILD_DEPRECATED
+    /** @copydoc FramebufferBlit::Color
+     * @deprecated Use @ref Magnum::FramebufferBlit::Color "FramebufferBlit::Color" instead.
+     */
+    ColorBuffer = GL_COLOR_BUFFER_BIT,
+
+    /** @copydoc FramebufferBlit::Depth
+     * @deprecated Use @ref Magnum::FramebufferBlit::Depth "FramebufferBlit::Depth" instead.
+     */
+    DepthBuffer = GL_DEPTH_BUFFER_BIT,
+
+    /** @copydoc FramebufferBlit::Stencil
+     * @deprecated Use @ref Magnum::FramebufferBlit::Stencil "FramebufferBlit::Stencil" instead.
+     */
+    StencilBuffer = GL_STENCIL_BUFFER_BIT,
+    #endif
+
+    Color = GL_COLOR_BUFFER_BIT,    /**< Color buffer */
+    Depth = GL_DEPTH_BUFFER_BIT,    /**< Depth buffer */
+    Stencil = GL_STENCIL_BUFFER_BIT /**< Stencil buffer */
 };
 
 /**
diff --git a/src/Magnum/Test/FramebufferGLTest.cpp b/src/Magnum/Test/FramebufferGLTest.cpp
index f7e4be20e..0d617906a 100644
--- a/src/Magnum/Test/FramebufferGLTest.cpp
+++ b/src/Magnum/Test/FramebufferGLTest.cpp
@@ -879,7 +879,7 @@ void FramebufferGLTest::blit() {
     CORRADE_COMPARE(image.data<Color4ub>()[0], Color4ub());
 
     /* And have given color after */
-    Framebuffer::blit(a, b, a.viewport(), FramebufferBlit::ColorBuffer);
+    Framebuffer::blit(a, b, a.viewport(), FramebufferBlit::Color);
     b.read({}, Vector2i(1), image);
 
     MAGNUM_VERIFY_NO_ERROR();