Browse Source

Remove InputFileCallbackPolicy enum aliases deprecated in 2019.10.

pull/659/head
Vladimír Vondruš 1 year ago
parent
commit
899602d3f4
  1. 4
      doc/changelog.dox
  2. 12
      src/Magnum/FileCallback.h
  3. 9
      src/Magnum/Trade/AbstractImporter.h
  4. 4
      src/Magnum/Trade/Trade.h

4
doc/changelog.dox

@ -1745,6 +1745,10 @@ See also:
- @cpp TextureTools::distanceField() @ce, use the
@ref TextureTools::DistanceFieldGL class instead.
- Removed APIs deprecated in 2019.10, in particular:
- @cpp Trade::ImporterFileCallbackPolicy @ce, use the
@ref InputFileCallbackPolicy enum instead; additionally there was
@cpp Trade::ImporterFileCallbackPolicy::LoadPernament @ce containing a
typo, use @ref InputFileCallbackPolicy::LoadPermanent instead
- @cpp DebugTools::ForceRendererOptions::scale() @ce, use
@ref DebugTools::ForceRendererOptions::size() instead
- @cpp Math::Color3::Hsv @ce and @cpp Math::Color4::Hsv @ce

12
src/Magnum/FileCallback.h

@ -33,10 +33,6 @@
#include "Magnum/Magnum.h"
#include "Magnum/visibility.h"
#ifdef MAGNUM_BUILD_DEPRECATED
#include <Corrade/Utility/Macros.h>
#endif
namespace Magnum {
/**
@ -75,14 +71,6 @@ enum class InputFileCallbackPolicy: UnsignedByte {
*/
LoadPermanent,
#ifdef MAGNUM_BUILD_DEPRECATED
/**
* @m_deprecated_since{2019,10} Use @ref InputFileCallbackPolicy::LoadPermanent
* instead.
*/
LoadPernament CORRADE_DEPRECATED_ENUM("use LoadPermanent instead") = LoadPermanent,
#endif
/**
* A file that has been previously loaded by this callback can be closed
* now (and its memory freed). This is just a hint, it's not *required* for

9
src/Magnum/Trade/AbstractImporter.h

@ -41,8 +41,6 @@
#ifdef MAGNUM_BUILD_DEPRECATED
/* For APIs that used to take or return a std::string */
#include <Corrade/Containers/StringStl.h>
#include "Magnum/FileCallback.h"
#endif
namespace Magnum { namespace Trade {
@ -92,13 +90,6 @@ MAGNUM_TRADE_EXPORT Debug& operator<<(Debug& debug, ImporterFeature value);
/** @debugoperatorenum{ImporterFeatures} */
MAGNUM_TRADE_EXPORT Debug& operator<<(Debug& debug, ImporterFeatures value);
#ifdef MAGNUM_BUILD_DEPRECATED
/** @brief @copybrief InputFileCallbackPolicy
* @m_deprecated_since{2019,10} Use @ref InputFileCallbackPolicy instead.
*/
typedef CORRADE_DEPRECATED("use InputFileCallbackPolicy instead") InputFileCallbackPolicy ImporterFileCallbackPolicy;
#endif
/**
@brief Importer flag
@m_since{2020,06}

4
src/Magnum/Trade/Trade.h

@ -45,10 +45,6 @@ class AbstractImageConverter;
class AbstractImporter;
class AbstractSceneConverter;
#ifdef MAGNUM_BUILD_DEPRECATED
typedef CORRADE_DEPRECATED("use InputFileCallbackPolicy instead") InputFileCallbackPolicy ImporterFileCallbackPolicy;
#endif
enum class MaterialAttribute: UnsignedInt;
enum class MaterialTextureSwizzle: UnsignedInt;
enum class MaterialAttributeType: UnsignedByte;

Loading…
Cancel
Save