Browse Source

Platform: removed long-deprecated ScreenedApplication::{front,back}Screen().

Use methods on linked list returned by screens() instead.
pull/231/head
Vladimír Vondruš 8 years ago
parent
commit
476257984b
  1. 10
      src/Magnum/Platform/Screen.h
  2. 25
      src/Magnum/Platform/ScreenedApplication.h

10
src/Magnum/Platform/Screen.h

@ -141,8 +141,9 @@ template<class Application> class BasicScreen: private Containers::LinkedListIte
/**
* @brief Next nearer screen
*
* @see @ref BasicScreenedApplication::frontScreen(),
* @ref BasicScreenedApplication::backScreen()
* Use @cpp application().screens().first() @ce to access the front
* screen and @cpp application().screens().last() @ce to access the
* back screen.
*/
BasicScreen<Application>* nextNearerScreen() {
return Containers::LinkedListItem<BasicScreen<Application>, BasicScreenedApplication<Application>>::previous();
@ -155,8 +156,9 @@ template<class Application> class BasicScreen: private Containers::LinkedListIte
/**
* @brief Next farther screen
*
* @see @ref BasicScreenedApplication::frontScreen(),
* @ref BasicScreenedApplication::backScreen()
* Use @cpp application().screens().first() @ce to access the front
* screen and @cpp application().screens().last() @ce to access the
* back screen.
*/
BasicScreen<Application>* nextFartherScreen() {
return Containers::LinkedListItem<BasicScreen<Application>, BasicScreenedApplication<Application>>::next();

25
src/Magnum/Platform/ScreenedApplication.h

@ -176,31 +176,6 @@ template<class Application> class BasicScreenedApplication: public Application,
return static_cast<const Containers::LinkedList<BasicScreen<Application>>&>(*this);
}
#ifdef MAGNUM_BUILD_DEPRECATED
/**
* @brief Front screen
* @deprecated Use `screens().first()` instead.
*/
CORRADE_DEPRECATED("use screens().first() instead") BasicScreen<Application>* frontScreen() { return screens().first(); }
/** @overload
* @deprecated Use `screens().first()` instead.
*/
CORRADE_DEPRECATED("use screens().first() instead") const BasicScreen<Application>* frontScreen() const { return screens().first(); }
/**
* @brief Back screen
* @deprecated Use `screens().last()` instead.
*/
CORRADE_DEPRECATED("use screens().last() instead") BasicScreen<Application>* backScreen() { return screens().last(); }
/**
* @overload
* @deprecated Use `screens().last()` instead.
*/
CORRADE_DEPRECATED("use screens().last() instead") const BasicScreen<Application>* backScreen() const { return screens().last(); }
#endif
protected:
/* Nobody will need to have (and delete) ScreenedApplication*, thus
this is faster than public pure virtual destructor */

Loading…
Cancel
Save