From b61a33d30a282325acd54e5597fbab52f132b729 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:39:15 +0100
Subject: [PATCH] Removed long-deprecated Color.h and BasicColor[34] typedefs.

Use Math/Color.h and Math::Color[34] instead.
---
 src/Magnum/CMakeLists.txt |  1 -
 src/Magnum/Color.h        | 62 ---------------------------------------
 src/Magnum/Magnum.h       |  5 ----
 3 files changed, 68 deletions(-)
 delete mode 100644 src/Magnum/Color.h

diff --git a/src/Magnum/CMakeLists.txt b/src/Magnum/CMakeLists.txt
index a6429c76f..3c04481d9 100644
--- a/src/Magnum/CMakeLists.txt
+++ b/src/Magnum/CMakeLists.txt
@@ -135,7 +135,6 @@ set(Magnum_PRIVATE_HEADERS
 # Deprecated stuff
 if(BUILD_DEPRECATED)
     list(APPEND Magnum_HEADERS
-        Color.h
         ColorFormat.h)
 endif()
 
diff --git a/src/Magnum/Color.h b/src/Magnum/Color.h
deleted file mode 100644
index f1c88dcf6..000000000
--- a/src/Magnum/Color.h
+++ /dev/null
@@ -1,62 +0,0 @@
-#ifndef Magnum_Color_h
-#define Magnum_Color_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/Math/Color.h instead.
- */
-
-#include "Magnum/configure.h"
-
-#ifdef MAGNUM_BUILD_DEPRECATED
-#include <Corrade/Utility/Macros.h>
-
-#include "Magnum/Magnum.h"
-#include "Magnum/Math/Color.h"
-CORRADE_DEPRECATED_FILE("use Magnum/Math/Color.h instead")
-
-namespace Magnum {
-
-/** @brief @copybrief Math::Color3
- * @deprecated Use @ref Math::Color3 instead.
- */
-#ifndef CORRADE_MSVC2015_COMPATIBILITY /* Multiple definitions still broken */
-template<class T> using BasicColor3 CORRADE_DEPRECATED_ALIAS("use Math::Color3 instead") = Math::Color3<T>;
-#endif
-
-/** @brief @copybrief Math::Color4
- * @deprecated Use @ref Math::Color4 instead.
- */
-#ifndef CORRADE_MSVC2015_COMPATIBILITY /* Multiple definitions still broken */
-template<class T> using BasicColor4 CORRADE_DEPRECATED_ALIAS("use Math::Color4 instead") = Math::Color4<T>;
-#endif
-
-}
-#else
-#error use Magnum/Math/Color.h instead
-#endif
-
-#endif
diff --git a/src/Magnum/Magnum.h b/src/Magnum/Magnum.h
index 212a92e06..5ee588182 100644
--- a/src/Magnum/Magnum.h
+++ b/src/Magnum/Magnum.h
@@ -699,11 +699,6 @@ class BufferTexture;
 enum class BufferTextureFormat: GLenum;
 #endif
 
-#ifdef MAGNUM_BUILD_DEPRECATED
-template<class T> using BasicColor3 CORRADE_DEPRECATED_ALIAS("use Math::Color3 instead") = Math::Color3<T>;
-template<class T> using BasicColor4 CORRADE_DEPRECATED_ALIAS("use Math::Color4 instead") = Math::Color4<T>;
-#endif
-
 class Context;
 
 class CubeMapTexture;