Browse Source

Adapted to Corrade changes.

pull/278/head
Vladimír Vondruš 13 years ago
parent
commit
12a985526d
  1. 2
      src/Text/AbstractFont.cpp
  2. 2
      src/Text/AbstractFont.h
  3. 2
      src/Trade/AbstractImageConverter.cpp
  4. 2
      src/Trade/AbstractImageConverter.h
  5. 2
      src/Trade/AbstractImporter.cpp
  6. 2
      src/Trade/AbstractImporter.h

2
src/Text/AbstractFont.cpp

@ -28,7 +28,7 @@ namespace Magnum { namespace Text {
AbstractFont::AbstractFont(): _size(0.0f) {}
AbstractFont::AbstractFont(Corrade::PluginManager::AbstractPluginManager* manager, std::string plugin): AbstractPlugin(manager, std::move(plugin)), _size(0.0f) {}
AbstractFont::AbstractFont(Corrade::PluginManager::AbstractManager* manager, std::string plugin): AbstractPlugin(manager, std::move(plugin)), _size(0.0f) {}
AbstractLayouter::AbstractLayouter(): _glyphCount(0) {}

2
src/Text/AbstractFont.h

@ -60,7 +60,7 @@ class MAGNUM_TEXT_EXPORT AbstractFont: public Corrade::PluginManager::AbstractPl
explicit AbstractFont();
/** @brief Plugin manager constructor */
explicit AbstractFont(Corrade::PluginManager::AbstractPluginManager* manager, std::string plugin);
explicit AbstractFont(Corrade::PluginManager::AbstractManager* manager, std::string plugin);
/**
* @brief Open font from file

2
src/Trade/AbstractImageConverter.cpp

@ -30,7 +30,7 @@ namespace Magnum { namespace Trade {
AbstractImageConverter::AbstractImageConverter() = default;
AbstractImageConverter::AbstractImageConverter(Corrade::PluginManager::AbstractPluginManager* manager, std::string plugin): AbstractPlugin(manager, std::move(plugin)) {}
AbstractImageConverter::AbstractImageConverter(Corrade::PluginManager::AbstractManager* manager, std::string plugin): AbstractPlugin(manager, std::move(plugin)) {}
Image2D* AbstractImageConverter::convertToImage(const Image2D* const) const {
CORRADE_ASSERT(features() & Feature::ConvertToImage,

2
src/Trade/AbstractImageConverter.h

@ -79,7 +79,7 @@ class MAGNUM_EXPORT AbstractImageConverter: public Corrade::PluginManager::Abstr
explicit AbstractImageConverter();
/** @brief Plugin manager constructor */
explicit AbstractImageConverter(Corrade::PluginManager::AbstractPluginManager* manager, std::string plugin);
explicit AbstractImageConverter(Corrade::PluginManager::AbstractManager* manager, std::string plugin);
/** @brief Features supported by this converter */
virtual Features features() const = 0;

2
src/Trade/AbstractImporter.cpp

@ -30,7 +30,7 @@ namespace Magnum { namespace Trade {
AbstractImporter::AbstractImporter() = default;
AbstractImporter::AbstractImporter(Corrade::PluginManager::AbstractPluginManager* manager, std::string plugin): AbstractPlugin(manager, std::move(plugin)) {}
AbstractImporter::AbstractImporter(Corrade::PluginManager::AbstractManager* manager, std::string plugin): AbstractPlugin(manager, std::move(plugin)) {}
bool AbstractImporter::openData(const void* const, const std::size_t) {
CORRADE_ASSERT(features() & Feature::OpenData,

2
src/Trade/AbstractImporter.h

@ -74,7 +74,7 @@ class MAGNUM_EXPORT AbstractImporter: public Corrade::PluginManager::AbstractPlu
explicit AbstractImporter();
/** @brief Plugin manager constructor */
explicit AbstractImporter(Corrade::PluginManager::AbstractPluginManager* manager, std::string plugin);
explicit AbstractImporter(Corrade::PluginManager::AbstractManager* manager, std::string plugin);
/** @brief Features supported by this importer */
virtual Features features() const = 0;

Loading…
Cancel
Save