Browse Source

Adapted to Corrade changes.

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

2
src/Audio/AbstractImporter.cpp

@ -32,7 +32,7 @@ namespace Magnum { namespace Audio {
AbstractImporter::AbstractImporter() = default; AbstractImporter::AbstractImporter() = default;
AbstractImporter::AbstractImporter(PluginManager::AbstractManager* manager, std::string plugin): PluginManager::AbstractPlugin(manager, std::move(plugin)) {} AbstractImporter::AbstractImporter(PluginManager::AbstractManager& manager, std::string plugin): PluginManager::AbstractPlugin(manager, std::move(plugin)) {}
bool AbstractImporter::openData(Containers::ArrayReference<const unsigned char> data) { bool AbstractImporter::openData(Containers::ArrayReference<const unsigned char> data) {
CORRADE_ASSERT(features() & Feature::OpenData, CORRADE_ASSERT(features() & Feature::OpenData,

2
src/Audio/AbstractImporter.h

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

2
src/Plugins/MagnumFont/MagnumFont.cpp

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

2
src/Plugins/MagnumFont/MagnumFont.h

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

2
src/Plugins/MagnumFontConverter/MagnumFontConverter.cpp

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

2
src/Plugins/MagnumFontConverter/MagnumFontConverter.h

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

2
src/Plugins/TgaImageConverter/TgaImageConverter.cpp

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

2
src/Plugins/TgaImageConverter/TgaImageConverter.h

@ -65,7 +65,7 @@ class MAGNUM_TRADE_TGAIMAGECONVERTER_EXPORT TgaImageConverter: public AbstractIm
explicit TgaImageConverter(); explicit TgaImageConverter();
/** @brief Plugin manager constructor */ /** @brief Plugin manager constructor */
explicit TgaImageConverter(PluginManager::AbstractManager* manager, std::string plugin); explicit TgaImageConverter(PluginManager::AbstractManager& manager, std::string plugin);
private: private:
Features MAGNUM_TRADE_TGAIMAGECONVERTER_LOCAL doFeatures() const override; Features MAGNUM_TRADE_TGAIMAGECONVERTER_LOCAL doFeatures() const override;

2
src/Plugins/TgaImporter/TgaImporter.cpp

@ -46,7 +46,7 @@ namespace Magnum { namespace Trade {
TgaImporter::TgaImporter(): in(nullptr) {} TgaImporter::TgaImporter(): in(nullptr) {}
TgaImporter::TgaImporter(PluginManager::AbstractManager* manager, std::string plugin): AbstractImporter(manager, std::move(plugin)), in(nullptr) {} TgaImporter::TgaImporter(PluginManager::AbstractManager& manager, std::string plugin): AbstractImporter(manager, std::move(plugin)), in(nullptr) {}
TgaImporter::~TgaImporter() { close(); } TgaImporter::~TgaImporter() { close(); }

2
src/Plugins/TgaImporter/TgaImporter.h

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

2
src/Plugins/WavAudioImporter/WavImporter.cpp

@ -34,7 +34,7 @@ namespace Magnum { namespace Audio {
WavImporter::WavImporter() = default; WavImporter::WavImporter() = default;
WavImporter::WavImporter(PluginManager::AbstractManager* manager, std::string plugin): AbstractImporter(manager, std::move(plugin)) {} WavImporter::WavImporter(PluginManager::AbstractManager& manager, std::string plugin): AbstractImporter(manager, std::move(plugin)) {}
WavImporter::~WavImporter() { close(); } WavImporter::~WavImporter() { close(); }

2
src/Plugins/WavAudioImporter/WavImporter.h

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

2
src/Text/AbstractFont.cpp

@ -34,7 +34,7 @@ namespace Magnum { namespace Text {
AbstractFont::AbstractFont(): _size(0.0f) {} 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, std::string plugin): AbstractPlugin(manager, std::move(plugin)), _size(0.0f), _lineHeight(0.0f) {}
bool AbstractFont::openData(const std::vector<std::pair<std::string, Containers::ArrayReference<const unsigned char>>>& data, const Float size) { bool AbstractFont::openData(const std::vector<std::pair<std::string, Containers::ArrayReference<const unsigned char>>>& data, const Float size) {
CORRADE_ASSERT(features() & Feature::OpenData, CORRADE_ASSERT(features() & Feature::OpenData,

2
src/Text/AbstractFont.h

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

2
src/Text/AbstractFontConverter.cpp

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

2
src/Text/AbstractFontConverter.h

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

2
src/Trade/AbstractImageConverter.cpp

@ -32,7 +32,7 @@ namespace Magnum { namespace Trade {
AbstractImageConverter::AbstractImageConverter() = default; AbstractImageConverter::AbstractImageConverter() = default;
AbstractImageConverter::AbstractImageConverter(PluginManager::AbstractManager* manager, std::string plugin): AbstractPlugin(manager, std::move(plugin)) {} AbstractImageConverter::AbstractImageConverter(PluginManager::AbstractManager& manager, std::string plugin): AbstractPlugin(manager, std::move(plugin)) {}
Image2D* AbstractImageConverter::exportToImage(const ImageReference2D& image) const { Image2D* AbstractImageConverter::exportToImage(const ImageReference2D& image) const {
CORRADE_ASSERT(features() & Feature::ConvertImage, CORRADE_ASSERT(features() & Feature::ConvertImage,

2
src/Trade/AbstractImageConverter.h

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

2
src/Trade/AbstractImporter.cpp

@ -43,7 +43,7 @@ namespace Magnum { namespace Trade {
AbstractImporter::AbstractImporter() = default; AbstractImporter::AbstractImporter() = default;
AbstractImporter::AbstractImporter(PluginManager::AbstractManager* manager, std::string plugin): AbstractPlugin(manager, std::move(plugin)) {} AbstractImporter::AbstractImporter(PluginManager::AbstractManager& manager, std::string plugin): AbstractPlugin(manager, std::move(plugin)) {}
bool AbstractImporter::openData(Containers::ArrayReference<const unsigned char> data) { bool AbstractImporter::openData(Containers::ArrayReference<const unsigned char> data) {
CORRADE_ASSERT(features() & Feature::OpenData, CORRADE_ASSERT(features() & Feature::OpenData,

2
src/Trade/AbstractImporter.h

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

Loading…
Cancel
Save