From 85de3109a9566f9af1db1260315bf6b8ffe533fe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= <mosra@centrum.cz>
Date: Sat, 18 Aug 2012 09:57:58 +0200
Subject: [PATCH] Adapted to Corrade changes.

---
 src/Framebuffer.h            |  6 +++---
 src/SceneGraph/Object.h      | 18 +++++++++---------
 src/Trade/AbstractImporter.h |  4 ++--
 3 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/src/Framebuffer.h b/src/Framebuffer.h
index b6e98c34b..b7eca5f0d 100644
--- a/src/Framebuffer.h
+++ b/src/Framebuffer.h
@@ -19,7 +19,7 @@
  * @brief Class Magnum::Framebuffer
  */
 
-#include <Containers/Set.h>
+#include <Containers/EnumSet.h>
 
 #include "BufferedImage.h"
 #include "CubeMapTexture.h"
@@ -110,7 +110,7 @@ class MAGNUM_EXPORT Framebuffer {
             Stencil = GL_STENCIL_BUFFER_BIT /**< Stencil value */
         };
 
-        typedef Corrade::Containers::Set<Clear, GLbitfield> ClearMask; /**< @brief Mask for clearing */
+        typedef Corrade::Containers::EnumSet<Clear, GLbitfield> ClearMask; /**< @brief Mask for clearing */
 
         /**
          * @brief Clear framebuffer
@@ -1010,7 +1010,7 @@ class MAGNUM_EXPORT Framebuffer {
          * @requires_gl
          * @requires_gl30 Extension @extension{EXT,framebuffer_object}
          */
-        typedef Corrade::Containers::Set<Blit, GLbitfield> BlitMask;
+        typedef Corrade::Containers::EnumSet<Blit, GLbitfield> BlitMask;
 
         /**
          * @brief Copy block of pixels from read to draw framebuffer
diff --git a/src/SceneGraph/Object.h b/src/SceneGraph/Object.h
index 23c3e2a37..3f7d18803 100644
--- a/src/SceneGraph/Object.h
+++ b/src/SceneGraph/Object.h
@@ -19,7 +19,7 @@
  * @brief Class Magnum::SceneGraph::Object
  */
 
-#include <Containers/DoubleLinkedList.h>
+#include <Containers/LinkedList.h>
 
 #include "Magnum.h"
 
@@ -43,7 +43,7 @@ namespace Magnum { namespace SceneGraph {
  * @todo Transform transformation when changing parent, so the object stays in
  * place.
  */
-template<class MatrixType, class VectorType, class ObjectType, class SceneType, class CameraType> class SCENEGRAPH_EXPORT Object: public Corrade::Containers::DoubleLinkedList<ObjectType>, public Corrade::Containers::DoubleLinkedListItem<ObjectType, ObjectType> {
+template<class MatrixType, class VectorType, class ObjectType, class SceneType, class CameraType> class SCENEGRAPH_EXPORT Object: public Corrade::Containers::LinkedList<ObjectType>, public Corrade::Containers::LinkedListItem<ObjectType, ObjectType> {
     #ifndef DOXYGEN_GENERATING_OUTPUT
     Object(const Object<MatrixType, VectorType, ObjectType, SceneType, CameraType>& other) = delete;
     Object(Object<MatrixType, VectorType, ObjectType, SceneType, CameraType>&& other) = delete;
@@ -82,22 +82,22 @@ template<class MatrixType, class VectorType, class ObjectType, class SceneType,
         SceneType* scene();
 
         /** @brief Parent object or `nullptr`, if this is root object */
-        inline ObjectType* parent() { return Corrade::Containers::DoubleLinkedListItem<ObjectType, ObjectType>::list(); }
+        inline ObjectType* parent() { return Corrade::Containers::LinkedListItem<ObjectType, ObjectType>::list(); }
 
         /** @brief Previous sibling object or `nullptr`, if this is first object */
-        inline ObjectType* previousSibling() { return Corrade::Containers::DoubleLinkedListItem<ObjectType, ObjectType>::previous(); }
+        inline ObjectType* previousSibling() { return Corrade::Containers::LinkedListItem<ObjectType, ObjectType>::previous(); }
 
         /** @brief Next sibling object or `nullptr`, if this is last object */
-        inline ObjectType* nextSibling() { return Corrade::Containers::DoubleLinkedListItem<ObjectType, ObjectType>::next(); }
+        inline ObjectType* nextSibling() { return Corrade::Containers::LinkedListItem<ObjectType, ObjectType>::next(); }
 
         /** @brief Whether this object has children */
-        inline bool hasChildren() const { return !Corrade::Containers::DoubleLinkedList<ObjectType>::isEmpty(); }
+        inline bool hasChildren() const { return !Corrade::Containers::LinkedList<ObjectType>::isEmpty(); }
 
         /** @brief First child object or `nullptr`, if this object has no children */
-        inline ObjectType* firstChild() { return Corrade::Containers::DoubleLinkedList<ObjectType>::first(); }
+        inline ObjectType* firstChild() { return Corrade::Containers::LinkedList<ObjectType>::first(); }
 
         /** @brief Last child object or `nullptr`, if this object has no children */
-        inline ObjectType* lastChild() { return Corrade::Containers::DoubleLinkedList<ObjectType>::last(); }
+        inline ObjectType* lastChild() { return Corrade::Containers::LinkedList<ObjectType>::last(); }
 
         /** @brief Set parent object */
         ObjectType* setParent(ObjectType* parent);
@@ -306,7 +306,7 @@ class SCENEGRAPH_EXPORT Object2D: public Object<Matrix3, Vector2, Object2D, Scen
          *      if you want to move it above all.
          */
         inline Object2D* move(Object2D* under) {
-            list()->Corrade::Containers::DoubleLinkedList<Object2D>::move(this, under);
+            list()->Corrade::Containers::LinkedList<Object2D>::move(this, under);
             return this;
         }
 };
diff --git a/src/Trade/AbstractImporter.h b/src/Trade/AbstractImporter.h
index f978f6e94..0258b2b32 100644
--- a/src/Trade/AbstractImporter.h
+++ b/src/Trade/AbstractImporter.h
@@ -19,7 +19,7 @@
  * @brief Class Magnum::Trade::AbstractImporter
  */
 
-#include <Containers/Set.h>
+#include <Containers/EnumSet.h>
 #include <PluginManager/Plugin.h>
 
 #include "ImageData.h"
@@ -65,7 +65,7 @@ class MAGNUM_EXPORT AbstractImporter: public Corrade::PluginManager::Plugin {
         };
 
         /** @brief Set of features supported by this importer */
-        typedef Corrade::Containers::Set<Feature, int> Features;
+        typedef Corrade::Containers::EnumSet<Feature, int> Features;
 
         /** @brief Constructor */
         inline AbstractImporter(Corrade::PluginManager::AbstractPluginManager* manager = nullptr, const std::string& plugin = ""): Plugin(manager, plugin) {}