Browse Source

Adapted plugin constructor signatures to Corrade::PluginManager updates.

pull/190/head
Vladimír Vondruš 9 years ago
parent
commit
2ed3fba575
  1. 2
      src/Magnum/Audio/AbstractImporter.cpp
  2. 2
      src/Magnum/Audio/AbstractImporter.h
  3. 2
      src/Magnum/Text/AbstractFont.cpp
  4. 2
      src/Magnum/Text/AbstractFont.h
  5. 2
      src/Magnum/Text/AbstractFontConverter.cpp
  6. 2
      src/Magnum/Text/AbstractFontConverter.h
  7. 2
      src/Magnum/Trade/AbstractImageConverter.cpp
  8. 2
      src/Magnum/Trade/AbstractImageConverter.h
  9. 2
      src/Magnum/Trade/AbstractImporter.cpp
  10. 2
      src/Magnum/Trade/AbstractImporter.h
  11. 2
      src/MagnumPlugins/MagnumFont/MagnumFont.cpp
  12. 2
      src/MagnumPlugins/MagnumFont/MagnumFont.h
  13. 2
      src/MagnumPlugins/MagnumFontConverter/MagnumFontConverter.cpp
  14. 2
      src/MagnumPlugins/MagnumFontConverter/MagnumFontConverter.h
  15. 2
      src/MagnumPlugins/ObjImporter/ObjImporter.cpp
  16. 2
      src/MagnumPlugins/ObjImporter/ObjImporter.h
  17. 2
      src/MagnumPlugins/TgaImageConverter/TgaImageConverter.cpp
  18. 2
      src/MagnumPlugins/TgaImageConverter/TgaImageConverter.h
  19. 2
      src/MagnumPlugins/TgaImporter/TgaImporter.cpp
  20. 2
      src/MagnumPlugins/TgaImporter/TgaImporter.h
  21. 2
      src/MagnumPlugins/WavAudioImporter/WavImporter.cpp
  22. 2
      src/MagnumPlugins/WavAudioImporter/WavImporter.h

2
src/Magnum/Audio/AbstractImporter.cpp

@ -35,7 +35,7 @@ AbstractImporter::AbstractImporter() = default;
AbstractImporter::AbstractImporter(PluginManager::Manager<AbstractImporter>& manager): PluginManager::AbstractManagingPlugin<AbstractImporter>{manager} {}
AbstractImporter::AbstractImporter(PluginManager::AbstractManager& manager, std::string plugin): PluginManager::AbstractManagingPlugin<AbstractImporter>{manager, std::move(plugin)} {}
AbstractImporter::AbstractImporter(PluginManager::AbstractManager& manager, const std::string& plugin): PluginManager::AbstractManagingPlugin<AbstractImporter>{manager, plugin} {}
bool AbstractImporter::openData(Containers::ArrayView<const char> data) {
CORRADE_ASSERT(features() & Feature::OpenData,

2
src/Magnum/Audio/AbstractImporter.h

@ -95,7 +95,7 @@ class MAGNUM_AUDIO_EXPORT AbstractImporter: public PluginManager::AbstractManagi
explicit AbstractImporter(PluginManager::Manager<AbstractImporter>& manager);
/** @brief Plugin manager constructor */
explicit AbstractImporter(PluginManager::AbstractManager& manager, std::string plugin);
explicit AbstractImporter(PluginManager::AbstractManager& manager, const std::string& plugin);
/** @brief Features supported by this importer */
Features features() const { return doFeatures(); }

2
src/Magnum/Text/AbstractFont.cpp

@ -36,7 +36,7 @@ namespace Magnum { namespace Text {
AbstractFont::AbstractFont(): _size(0.0f) {}
AbstractFont::AbstractFont(PluginManager::AbstractManager& manager, std::string plugin): AbstractPlugin(manager, std::move(plugin)), _size(0.0f), _lineHeight(0.0f) {}
AbstractFont::AbstractFont(PluginManager::AbstractManager& manager, const std::string& plugin): AbstractPlugin{manager, plugin}, _size{0.0f}, _lineHeight{0.0f} {}
bool AbstractFont::openData(const std::vector<std::pair<std::string, Containers::ArrayView<const char>>>& data, const Float size) {
CORRADE_ASSERT(features() & Feature::OpenData,

2
src/Magnum/Text/AbstractFont.h

@ -108,7 +108,7 @@ class MAGNUM_TEXT_EXPORT AbstractFont: public PluginManager::AbstractPlugin {
explicit AbstractFont();
/** @brief Plugin manager constructor */
explicit AbstractFont(PluginManager::AbstractManager& manager, std::string plugin);
explicit AbstractFont(PluginManager::AbstractManager& manager, const std::string& plugin);
/** @brief Features supported by this font */
Features features() const { return doFeatures(); }

2
src/Magnum/Text/AbstractFontConverter.cpp

@ -53,7 +53,7 @@ std::u32string uniqueUnicode(const std::string& characters)
AbstractFontConverter::AbstractFontConverter() = default;
AbstractFontConverter::AbstractFontConverter(PluginManager::AbstractManager& manager, std::string plugin): PluginManager::AbstractPlugin(manager, std::move(plugin)) {}
AbstractFontConverter::AbstractFontConverter(PluginManager::AbstractManager& manager, const std::string& plugin): PluginManager::AbstractPlugin{manager, plugin} {}
std::vector<std::pair<std::string, Containers::Array<char>>> AbstractFontConverter::exportFontToData(AbstractFont& font, GlyphCache& cache, const std::string& filename, const std::string& characters) const {
CORRADE_ASSERT(features() >= (Feature::ExportFont|Feature::ConvertData),

2
src/Magnum/Text/AbstractFontConverter.h

@ -133,7 +133,7 @@ class MAGNUM_TEXT_EXPORT AbstractFontConverter: public PluginManager::AbstractPl
explicit AbstractFontConverter();
/** @brief Plugin manager constructor */
explicit AbstractFontConverter(PluginManager::AbstractManager& manager, std::string plugin);
explicit AbstractFontConverter(PluginManager::AbstractManager& manager, const std::string& plugin);
/** @brief Features supported by this converter */
Features features() const { return doFeatures(); }

2
src/Magnum/Trade/AbstractImageConverter.cpp

@ -38,7 +38,7 @@ AbstractImageConverter::AbstractImageConverter() = default;
AbstractImageConverter::AbstractImageConverter(PluginManager::Manager<AbstractImageConverter>& manager): PluginManager::AbstractManagingPlugin<AbstractImageConverter>{manager} {}
AbstractImageConverter::AbstractImageConverter(PluginManager::AbstractManager& manager, std::string plugin): PluginManager::AbstractManagingPlugin<AbstractImageConverter>{manager, std::move(plugin)} {}
AbstractImageConverter::AbstractImageConverter(PluginManager::AbstractManager& manager, const std::string& plugin): PluginManager::AbstractManagingPlugin<AbstractImageConverter>{manager, plugin} {}
std::optional<Image2D> AbstractImageConverter::exportToImage(const ImageView2D& image) {
CORRADE_ASSERT(features() & Feature::ConvertImage,

2
src/Magnum/Trade/AbstractImageConverter.h

@ -120,7 +120,7 @@ class MAGNUM_EXPORT AbstractImageConverter: public PluginManager::AbstractManagi
explicit AbstractImageConverter(PluginManager::Manager<AbstractImageConverter>& manager);
/** @brief Plugin manager constructor */
explicit AbstractImageConverter(PluginManager::AbstractManager& manager, std::string plugin);
explicit AbstractImageConverter(PluginManager::AbstractManager& manager, const std::string& plugin);
/** @brief Features supported by this converter */
Features features() const { return doFeatures(); }

2
src/Magnum/Trade/AbstractImporter.cpp

@ -47,7 +47,7 @@ AbstractImporter::AbstractImporter() = default;
AbstractImporter::AbstractImporter(PluginManager::Manager<AbstractImporter>& manager): PluginManager::AbstractManagingPlugin<AbstractImporter>{manager} {}
AbstractImporter::AbstractImporter(PluginManager::AbstractManager& manager, std::string plugin): PluginManager::AbstractManagingPlugin<AbstractImporter>(manager, std::move(plugin)) {}
AbstractImporter::AbstractImporter(PluginManager::AbstractManager& manager, const std::string& plugin): PluginManager::AbstractManagingPlugin<AbstractImporter>{manager, plugin} {}
bool AbstractImporter::openData(Containers::ArrayView<const char> data) {
CORRADE_ASSERT(features() & Feature::OpenData,

2
src/Magnum/Trade/AbstractImporter.h

@ -105,7 +105,7 @@ class MAGNUM_EXPORT AbstractImporter: public PluginManager::AbstractManagingPlug
explicit AbstractImporter(PluginManager::Manager<AbstractImporter>& manager);
/** @brief Plugin manager constructor */
explicit AbstractImporter(PluginManager::AbstractManager& manager, std::string plugin);
explicit AbstractImporter(PluginManager::AbstractManager& manager, const std::string& plugin);
/** @brief Features supported by this importer */
Features features() const { return doFeatures(); }

2
src/MagnumPlugins/MagnumFont/MagnumFont.cpp

@ -60,7 +60,7 @@ namespace {
MagnumFont::MagnumFont(): _opened(nullptr) {}
MagnumFont::MagnumFont(PluginManager::AbstractManager& manager, std::string plugin): AbstractFont(manager, std::move(plugin)), _opened(nullptr) {}
MagnumFont::MagnumFont(PluginManager::AbstractManager& manager, const std::string& plugin): AbstractFont{manager, plugin}, _opened(nullptr) {}
MagnumFont::~MagnumFont() { close(); }

2
src/MagnumPlugins/MagnumFont/MagnumFont.h

@ -124,7 +124,7 @@ class MAGNUM_MAGNUMFONT_EXPORT MagnumFont: public AbstractFont {
explicit MagnumFont();
/** @brief Plugin manager constructor */
explicit MagnumFont(PluginManager::AbstractManager& manager, std::string plugin);
explicit MagnumFont(PluginManager::AbstractManager& manager, const std::string& plugin);
~MagnumFont();

2
src/MagnumPlugins/MagnumFontConverter/MagnumFontConverter.cpp

@ -39,7 +39,7 @@ namespace Magnum { namespace Text {
MagnumFontConverter::MagnumFontConverter() = default;
MagnumFontConverter::MagnumFontConverter(PluginManager::AbstractManager& manager, std::string plugin): AbstractFontConverter(manager, std::move(plugin)) {}
MagnumFontConverter::MagnumFontConverter(PluginManager::AbstractManager& manager, const std::string& plugin): AbstractFontConverter{manager, plugin} {}
auto MagnumFontConverter::doFeatures() const -> Features {
return Feature::ExportFont|Feature::ConvertData|Feature::MultiFile;

2
src/MagnumPlugins/MagnumFontConverter/MagnumFontConverter.h

@ -70,7 +70,7 @@ class MAGNUM_MAGNUMFONTCONVERTER_EXPORT MagnumFontConverter: public Text::Abstra
explicit MagnumFontConverter();
/** @brief Plugin manager constructor */
explicit MagnumFontConverter(PluginManager::AbstractManager& manager, std::string plugin);
explicit MagnumFontConverter(PluginManager::AbstractManager& manager, const std::string& plugin);
private:
MAGNUM_MAGNUMFONTCONVERTER_LOCAL Features doFeatures() const override;

2
src/MagnumPlugins/ObjImporter/ObjImporter.cpp

@ -109,7 +109,7 @@ template<class T> void reindex(const std::vector<UnsignedInt>& indices, std::vec
ObjImporter::ObjImporter() = default;
ObjImporter::ObjImporter(PluginManager::AbstractManager& manager, std::string plugin): AbstractImporter(manager, std::move(plugin)) {}
ObjImporter::ObjImporter(PluginManager::AbstractManager& manager, const std::string& plugin): AbstractImporter{manager, plugin} {}
ObjImporter::~ObjImporter() = default;

2
src/MagnumPlugins/ObjImporter/ObjImporter.h

@ -72,7 +72,7 @@ class MAGNUM_OBJIMPORTER_EXPORT ObjImporter: public AbstractImporter {
explicit ObjImporter();
/** @brief Plugin manager constructor */
explicit ObjImporter(PluginManager::AbstractManager& manager, std::string plugin);
explicit ObjImporter(PluginManager::AbstractManager& manager, const std::string& plugin);
~ObjImporter();

2
src/MagnumPlugins/TgaImageConverter/TgaImageConverter.cpp

@ -41,7 +41,7 @@ namespace Magnum { namespace Trade {
TgaImageConverter::TgaImageConverter() = default;
TgaImageConverter::TgaImageConverter(PluginManager::AbstractManager& manager, std::string plugin): AbstractImageConverter(manager, std::move(plugin)) {}
TgaImageConverter::TgaImageConverter(PluginManager::AbstractManager& manager, const std::string& plugin): AbstractImageConverter{manager, plugin} {}
auto TgaImageConverter::doFeatures() const -> Features { return Feature::ConvertData; }

2
src/MagnumPlugins/TgaImageConverter/TgaImageConverter.h

@ -70,7 +70,7 @@ class MAGNUM_TGAIMAGECONVERTER_EXPORT TgaImageConverter: public AbstractImageCon
explicit TgaImageConverter();
/** @brief Plugin manager constructor */
explicit TgaImageConverter(PluginManager::AbstractManager& manager, std::string plugin);
explicit TgaImageConverter(PluginManager::AbstractManager& manager, const std::string& plugin);
private:
Features MAGNUM_TGAIMAGECONVERTER_LOCAL doFeatures() const override;

2
src/MagnumPlugins/TgaImporter/TgaImporter.cpp

@ -46,7 +46,7 @@ namespace Magnum { namespace Trade {
TgaImporter::TgaImporter() = default;
TgaImporter::TgaImporter(PluginManager::AbstractManager& manager, std::string plugin): AbstractImporter{manager, std::move(plugin)} {}
TgaImporter::TgaImporter(PluginManager::AbstractManager& manager, const std::string& plugin): AbstractImporter{manager, plugin} {}
TgaImporter::~TgaImporter() = default;

2
src/MagnumPlugins/TgaImporter/TgaImporter.h

@ -80,7 +80,7 @@ class MAGNUM_TGAIMPORTER_EXPORT TgaImporter: public AbstractImporter {
explicit TgaImporter();
/** @brief Plugin manager constructor */
explicit TgaImporter(PluginManager::AbstractManager& manager, std::string plugin);
explicit TgaImporter(PluginManager::AbstractManager& manager, const std::string& plugin);
~TgaImporter();

2
src/MagnumPlugins/WavAudioImporter/WavImporter.cpp

@ -36,7 +36,7 @@ namespace Magnum { namespace Audio {
WavImporter::WavImporter() = default;
WavImporter::WavImporter(PluginManager::AbstractManager& manager, std::string plugin): AbstractImporter(manager, std::move(plugin)) {}
WavImporter::WavImporter(PluginManager::AbstractManager& manager, const std::string& plugin): AbstractImporter{manager, plugin} {}
auto WavImporter::doFeatures() const -> Features { return Feature::OpenData; }

2
src/MagnumPlugins/WavAudioImporter/WavImporter.h

@ -78,7 +78,7 @@ class MAGNUM_WAVAUDIOIMPORTER_EXPORT WavImporter: public AbstractImporter {
explicit WavImporter();
/** @brief Plugin manager constructor */
explicit WavImporter(PluginManager::AbstractManager& manager, std::string plugin);
explicit WavImporter(PluginManager::AbstractManager& manager, const std::string& plugin);
private:
MAGNUM_WAVAUDIOIMPORTER_LOCAL Features doFeatures() const override;

Loading…
Cancel
Save