Browse Source

SceneGraph: removed long-deprecated feature and child accessors.

Use methods on linked list returned by AbstractObject::features() and
Object::children() instead.
pull/231/head
Vladimír Vondruš 8 years ago
parent
commit
e0ae65a212
  1. 34
      src/Magnum/SceneGraph/AbstractObject.h
  2. 30
      src/Magnum/SceneGraph/Object.h

34
src/Magnum/SceneGraph/AbstractObject.h

@ -37,10 +37,6 @@
#include "Magnum/SceneGraph/SceneGraph.h"
#include "Magnum/SceneGraph/visibility.h"
#ifdef MAGNUM_BUILD_DEPRECATED
#include <Corrade/Utility/Macros.h>
#endif
namespace Magnum { namespace SceneGraph {
/**
@ -118,36 +114,6 @@ template<UnsignedInt dimensions, class T> class AbstractObject
return static_cast<const Containers::LinkedList<AbstractFeature<dimensions, T>>&>(*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
*

30
src/Magnum/SceneGraph/Object.h

@ -197,36 +197,6 @@ template<class Transformation> class Object: public AbstractObject<Transformatio
return static_cast<const Containers::LinkedList<Object<Transformation>>&>(*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<Transformation>* firstChild() { return children().first(); }
/** @overload
* @deprecated Use `children.first()` instead.
*/
CORRADE_DEPRECATED("use children().first()") const Object<Transformation>* 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<Transformation>* lastChild() { return children().last(); }
/** @overload
* @deprecated Use `children().last()` instead.
*/
CORRADE_DEPRECATED("use children().last()") const Object<Transformation>* lastChild() const { return children().last(); }
#endif
/**
* @brief Add a child
*

Loading…
Cancel
Save