From e0ae65a212924b9512c84c2fc2c9e3b969c3869d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Fri, 23 Feb 2018 12:23:42 +0100 Subject: [PATCH] SceneGraph: removed long-deprecated feature and child accessors. Use methods on linked list returned by AbstractObject::features() and Object::children() instead. --- src/Magnum/SceneGraph/AbstractObject.h | 34 -------------------------- src/Magnum/SceneGraph/Object.h | 30 ----------------------- 2 files changed, 64 deletions(-) diff --git a/src/Magnum/SceneGraph/AbstractObject.h b/src/Magnum/SceneGraph/AbstractObject.h index 40a3f6c48..b3da4c601 100644 --- a/src/Magnum/SceneGraph/AbstractObject.h +++ b/src/Magnum/SceneGraph/AbstractObject.h @@ -37,10 +37,6 @@ #include "Magnum/SceneGraph/SceneGraph.h" #include "Magnum/SceneGraph/visibility.h" -#ifdef MAGNUM_BUILD_DEPRECATED -#include -#endif - namespace Magnum { namespace SceneGraph { /** @@ -118,36 +114,6 @@ template class AbstractObject return static_cast>&>(*this); } - #ifdef MAGNUM_BUILD_DEPRECATED - /** - * @brief Whether this object has features - * @deprecated Use `features().isEmpty()` instead. - */ - CORRADE_DEPRECATED("use features().isEmpty() instead") bool hasFeatures() const { return !features().isEmpty(); } - - /** - * @brief First object feature or `nullptr`, if this object has no features - * @deprecated Use `features().first()` instead. - */ - CORRADE_DEPRECATED("use features().first() instead") FeatureType* firstFeature() { return features().first(); } - - /** @overload - * @deprecated Use `features().first()` instead. - */ - CORRADE_DEPRECATED("use features().first() instead") const FeatureType* firstFeature() const { return features().first(); } - - /** - * @brief Last object feature or `nullptr`, if this object has no features - * @deprecated Use `features().last()` instead.` - */ - CORRADE_DEPRECATED("use features().last() instead") FeatureType* lastFeature() { return features().last(); } - - /** @overload - * @deprecated Use `features().last()` instead. - */ - CORRADE_DEPRECATED("use features().last() instead") const FeatureType* lastFeature() const { return features().last(); } - #endif - /** * @brief Add a feature * diff --git a/src/Magnum/SceneGraph/Object.h b/src/Magnum/SceneGraph/Object.h index 2b2329fde..cd0eadd41 100644 --- a/src/Magnum/SceneGraph/Object.h +++ b/src/Magnum/SceneGraph/Object.h @@ -197,36 +197,6 @@ template class Object: public AbstractObject>&>(*this); } - #ifdef MAGNUM_BUILD_DEPRECATED - /** - * @brief Whether this object has children - * @deprecated Use `children().isEmpty()` instead. - */ - CORRADE_DEPRECATED("use children().isEmpty()") bool hasChildren() const { return !children().isEmpty(); } - - /** - * @brief First child object or `nullptr`, if this object has no children - * @deprecated Use `children().first()` instead. - */ - CORRADE_DEPRECATED("use children().first()") Object* firstChild() { return children().first(); } - - /** @overload - * @deprecated Use `children.first()` instead. - */ - CORRADE_DEPRECATED("use children().first()") const Object* firstChild() const { return children().first(); } - - /** - * @brief Last child object or `nullptr`, if this object has no children - * @deprecated Use `children().last()` instead. - */ - CORRADE_DEPRECATED("use children().last()") Object* lastChild() { return children().last(); } - - /** @overload - * @deprecated Use `children().last()` instead. - */ - CORRADE_DEPRECATED("use children().last()") const Object* lastChild() const { return children().last(); } - #endif - /** * @brief Add a child *