From 12a985526d757e03403e2c3ac6b362720f8ea3e9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Fri, 24 May 2013 20:56:20 +0200 Subject: [PATCH] Adapted to Corrade changes. --- src/Text/AbstractFont.cpp | 2 +- src/Text/AbstractFont.h | 2 +- src/Trade/AbstractImageConverter.cpp | 2 +- src/Trade/AbstractImageConverter.h | 2 +- src/Trade/AbstractImporter.cpp | 2 +- src/Trade/AbstractImporter.h | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/Text/AbstractFont.cpp b/src/Text/AbstractFont.cpp index 74f116ad3..36d6eec5f 100644 --- a/src/Text/AbstractFont.cpp +++ b/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) {} diff --git a/src/Text/AbstractFont.h b/src/Text/AbstractFont.h index 495af5f5e..66ad7cc4f 100644 --- a/src/Text/AbstractFont.h +++ b/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 diff --git a/src/Trade/AbstractImageConverter.cpp b/src/Trade/AbstractImageConverter.cpp index bb743ff92..4ccef856f 100644 --- a/src/Trade/AbstractImageConverter.cpp +++ b/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, diff --git a/src/Trade/AbstractImageConverter.h b/src/Trade/AbstractImageConverter.h index b0870c87b..03fcaaa85 100644 --- a/src/Trade/AbstractImageConverter.h +++ b/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; diff --git a/src/Trade/AbstractImporter.cpp b/src/Trade/AbstractImporter.cpp index ce792335c..9ecaaf31f 100644 --- a/src/Trade/AbstractImporter.cpp +++ b/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, diff --git a/src/Trade/AbstractImporter.h b/src/Trade/AbstractImporter.h index 54233c69b..08b3a9063 100644 --- a/src/Trade/AbstractImporter.h +++ b/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;