From ecb7c42dac9ef1bc1d2bafb4e7a62cb9e931f84b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= <mosra@centrum.cz>
Date: Fri, 23 Feb 2018 11:37:48 +0100
Subject: [PATCH] Removed long-deprecated ImageReference.h and the
 ImageReference alias.

Use ImageView instead.
---
 src/Magnum/CMakeLists.txt   |  3 +-
 src/Magnum/ImageReference.h | 67 -------------------------------------
 src/Magnum/Magnum.h         |  7 ----
 3 files changed, 1 insertion(+), 76 deletions(-)
 delete mode 100644 src/Magnum/ImageReference.h

diff --git a/src/Magnum/CMakeLists.txt b/src/Magnum/CMakeLists.txt
index e97cbf271..a6429c76f 100644
--- a/src/Magnum/CMakeLists.txt
+++ b/src/Magnum/CMakeLists.txt
@@ -136,8 +136,7 @@ set(Magnum_PRIVATE_HEADERS
 if(BUILD_DEPRECATED)
     list(APPEND Magnum_HEADERS
         Color.h
-        ColorFormat.h
-        ImageReference.h)
+        ColorFormat.h)
 endif()
 
 # Desktop-only stuff
diff --git a/src/Magnum/ImageReference.h b/src/Magnum/ImageReference.h
deleted file mode 100644
index 825acdc31..000000000
--- a/src/Magnum/ImageReference.h
+++ /dev/null
@@ -1,67 +0,0 @@
-#ifndef Magnum_ImageReference_h
-#define Magnum_ImageReference_h
-/*
-    This file is part of Magnum.
-
-    Copyright © 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018
-              Vladimír Vondruš <mosra@centrum.cz>
-
-    Permission is hereby granted, free of charge, to any person obtaining a
-    copy of this software and associated documentation files (the "Software"),
-    to deal in the Software without restriction, including without limitation
-    the rights to use, copy, modify, merge, publish, distribute, sublicense,
-    and/or sell copies of the Software, and to permit persons to whom the
-    Software is furnished to do so, subject to the following conditions:
-
-    The above copyright notice and this permission notice shall be included
-    in all copies or substantial portions of the Software.
-
-    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-    IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-    FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
-    THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-    LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-    FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-    DEALINGS IN THE SOFTWARE.
-*/
-
-/** @file
- * @deprecated Use @ref Magnum/ImageView.h instead.
- */
-
-#include "Magnum/configure.h"
-
-#ifdef MAGNUM_BUILD_DEPRECATED
-#include "Magnum/ImageView.h"
-CORRADE_DEPRECATED_FILE("use Magnum/ImageView.h instead")
-
-namespace Magnum {
-
-/** @brief @copybrief ImageView
- * @deprecated Use @ref ImageView instead.
- */
-#ifndef CORRADE_MSVC2015_COMPATIBILITY /* Multiple definitions still broken */
-template<UnsignedInt dimensions> using CORRADE_DEPRECATED_ALIAS("use ImageView instead") ImageReference = ImageView<dimensions>;
-#endif
-
-/** @brief @copybrief ImageView1D
- * @deprecated Use @ref ImageView1D instead.
- */
-typedef CORRADE_DEPRECATED("use ImageView1D instead") ImageView1D ImageReference1D;
-
-/** @brief @copybrief ImageView2D
- * @deprecated Use @ref ImageView2D instead.
- */
-typedef CORRADE_DEPRECATED("use ImageView2D instead") ImageView2D ImageReference2D;
-
-/** @brief @copybrief ImageView3D
- * @deprecated Use @ref ImageView3D instead.
- */
-typedef CORRADE_DEPRECATED("use ImageView3D instead") ImageView3D ImageReference3D;
-
-}
-#else
-#error use Magnum/ImageView.h instead
-#endif
-
-#endif
diff --git a/src/Magnum/Magnum.h b/src/Magnum/Magnum.h
index 671a5f305..212a92e06 100644
--- a/src/Magnum/Magnum.h
+++ b/src/Magnum/Magnum.h
@@ -739,13 +739,6 @@ typedef ImageView<1> ImageView1D;
 typedef ImageView<2> ImageView2D;
 typedef ImageView<3> ImageView3D;
 
-#ifdef MAGNUM_BUILD_DEPRECATED
-template<UnsignedInt dimensions> using ImageReference CORRADE_DEPRECATED_ALIAS("use ImageView instead") = ImageView<dimensions>;
-typedef CORRADE_DEPRECATED("use ImageView1D instead") ImageView1D ImageReference1D;
-typedef CORRADE_DEPRECATED("use ImageView2D instead") ImageView2D ImageReference2D;
-typedef CORRADE_DEPRECATED("use ImageView3D instead") ImageView3D ImageReference3D;
-#endif
-
 template<UnsignedInt> class CompressedImageView;
 typedef CompressedImageView<1> CompressedImageView1D;
 typedef CompressedImageView<2> CompressedImageView2D;