From 2ed3fba575a2fd2af0e4fb023f792fb6d842be41 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Sat, 7 Jan 2017 21:53:00 +0100 Subject: [PATCH] Adapted plugin constructor signatures to Corrade::PluginManager updates. --- src/Magnum/Audio/AbstractImporter.cpp | 2 +- src/Magnum/Audio/AbstractImporter.h | 2 +- src/Magnum/Text/AbstractFont.cpp | 2 +- src/Magnum/Text/AbstractFont.h | 2 +- src/Magnum/Text/AbstractFontConverter.cpp | 2 +- src/Magnum/Text/AbstractFontConverter.h | 2 +- src/Magnum/Trade/AbstractImageConverter.cpp | 2 +- src/Magnum/Trade/AbstractImageConverter.h | 2 +- src/Magnum/Trade/AbstractImporter.cpp | 2 +- src/Magnum/Trade/AbstractImporter.h | 2 +- src/MagnumPlugins/MagnumFont/MagnumFont.cpp | 2 +- src/MagnumPlugins/MagnumFont/MagnumFont.h | 2 +- src/MagnumPlugins/MagnumFontConverter/MagnumFontConverter.cpp | 2 +- src/MagnumPlugins/MagnumFontConverter/MagnumFontConverter.h | 2 +- src/MagnumPlugins/ObjImporter/ObjImporter.cpp | 2 +- src/MagnumPlugins/ObjImporter/ObjImporter.h | 2 +- src/MagnumPlugins/TgaImageConverter/TgaImageConverter.cpp | 2 +- src/MagnumPlugins/TgaImageConverter/TgaImageConverter.h | 2 +- src/MagnumPlugins/TgaImporter/TgaImporter.cpp | 2 +- src/MagnumPlugins/TgaImporter/TgaImporter.h | 2 +- src/MagnumPlugins/WavAudioImporter/WavImporter.cpp | 2 +- src/MagnumPlugins/WavAudioImporter/WavImporter.h | 2 +- 22 files changed, 22 insertions(+), 22 deletions(-) diff --git a/src/Magnum/Audio/AbstractImporter.cpp b/src/Magnum/Audio/AbstractImporter.cpp index 5391e25f2..e1ae8068a 100644 --- a/src/Magnum/Audio/AbstractImporter.cpp +++ b/src/Magnum/Audio/AbstractImporter.cpp @@ -35,7 +35,7 @@ AbstractImporter::AbstractImporter() = default; AbstractImporter::AbstractImporter(PluginManager::Manager& manager): PluginManager::AbstractManagingPlugin{manager} {} -AbstractImporter::AbstractImporter(PluginManager::AbstractManager& manager, std::string plugin): PluginManager::AbstractManagingPlugin{manager, std::move(plugin)} {} +AbstractImporter::AbstractImporter(PluginManager::AbstractManager& manager, const std::string& plugin): PluginManager::AbstractManagingPlugin{manager, plugin} {} bool AbstractImporter::openData(Containers::ArrayView data) { CORRADE_ASSERT(features() & Feature::OpenData, diff --git a/src/Magnum/Audio/AbstractImporter.h b/src/Magnum/Audio/AbstractImporter.h index 3d6b9ef1f..22907c33e 100644 --- a/src/Magnum/Audio/AbstractImporter.h +++ b/src/Magnum/Audio/AbstractImporter.h @@ -95,7 +95,7 @@ class MAGNUM_AUDIO_EXPORT AbstractImporter: public PluginManager::AbstractManagi explicit AbstractImporter(PluginManager::Manager& 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(); } diff --git a/src/Magnum/Text/AbstractFont.cpp b/src/Magnum/Text/AbstractFont.cpp index d0cc4fd44..c2e62133d 100644 --- a/src/Magnum/Text/AbstractFont.cpp +++ b/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>>& data, const Float size) { CORRADE_ASSERT(features() & Feature::OpenData, diff --git a/src/Magnum/Text/AbstractFont.h b/src/Magnum/Text/AbstractFont.h index c8a90eb5c..be0c33fba 100644 --- a/src/Magnum/Text/AbstractFont.h +++ b/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(); } diff --git a/src/Magnum/Text/AbstractFontConverter.cpp b/src/Magnum/Text/AbstractFontConverter.cpp index f47462665..efadc5ad2 100644 --- a/src/Magnum/Text/AbstractFontConverter.cpp +++ b/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>> AbstractFontConverter::exportFontToData(AbstractFont& font, GlyphCache& cache, const std::string& filename, const std::string& characters) const { CORRADE_ASSERT(features() >= (Feature::ExportFont|Feature::ConvertData), diff --git a/src/Magnum/Text/AbstractFontConverter.h b/src/Magnum/Text/AbstractFontConverter.h index 5d5c3810c..0eb1f2bcc 100644 --- a/src/Magnum/Text/AbstractFontConverter.h +++ b/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(); } diff --git a/src/Magnum/Trade/AbstractImageConverter.cpp b/src/Magnum/Trade/AbstractImageConverter.cpp index 1bbb92cc0..44b8adf9b 100644 --- a/src/Magnum/Trade/AbstractImageConverter.cpp +++ b/src/Magnum/Trade/AbstractImageConverter.cpp @@ -38,7 +38,7 @@ AbstractImageConverter::AbstractImageConverter() = default; AbstractImageConverter::AbstractImageConverter(PluginManager::Manager& manager): PluginManager::AbstractManagingPlugin{manager} {} -AbstractImageConverter::AbstractImageConverter(PluginManager::AbstractManager& manager, std::string plugin): PluginManager::AbstractManagingPlugin{manager, std::move(plugin)} {} +AbstractImageConverter::AbstractImageConverter(PluginManager::AbstractManager& manager, const std::string& plugin): PluginManager::AbstractManagingPlugin{manager, plugin} {} std::optional AbstractImageConverter::exportToImage(const ImageView2D& image) { CORRADE_ASSERT(features() & Feature::ConvertImage, diff --git a/src/Magnum/Trade/AbstractImageConverter.h b/src/Magnum/Trade/AbstractImageConverter.h index facb2eaad..834662e27 100644 --- a/src/Magnum/Trade/AbstractImageConverter.h +++ b/src/Magnum/Trade/AbstractImageConverter.h @@ -120,7 +120,7 @@ class MAGNUM_EXPORT AbstractImageConverter: public PluginManager::AbstractManagi explicit AbstractImageConverter(PluginManager::Manager& 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(); } diff --git a/src/Magnum/Trade/AbstractImporter.cpp b/src/Magnum/Trade/AbstractImporter.cpp index 21e76c3ac..5cc1cbe34 100644 --- a/src/Magnum/Trade/AbstractImporter.cpp +++ b/src/Magnum/Trade/AbstractImporter.cpp @@ -47,7 +47,7 @@ AbstractImporter::AbstractImporter() = default; AbstractImporter::AbstractImporter(PluginManager::Manager& manager): PluginManager::AbstractManagingPlugin{manager} {} -AbstractImporter::AbstractImporter(PluginManager::AbstractManager& manager, std::string plugin): PluginManager::AbstractManagingPlugin(manager, std::move(plugin)) {} +AbstractImporter::AbstractImporter(PluginManager::AbstractManager& manager, const std::string& plugin): PluginManager::AbstractManagingPlugin{manager, plugin} {} bool AbstractImporter::openData(Containers::ArrayView data) { CORRADE_ASSERT(features() & Feature::OpenData, diff --git a/src/Magnum/Trade/AbstractImporter.h b/src/Magnum/Trade/AbstractImporter.h index 780da4ce3..1deafb8a6 100644 --- a/src/Magnum/Trade/AbstractImporter.h +++ b/src/Magnum/Trade/AbstractImporter.h @@ -105,7 +105,7 @@ class MAGNUM_EXPORT AbstractImporter: public PluginManager::AbstractManagingPlug explicit AbstractImporter(PluginManager::Manager& 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(); } diff --git a/src/MagnumPlugins/MagnumFont/MagnumFont.cpp b/src/MagnumPlugins/MagnumFont/MagnumFont.cpp index 6f1bb04e1..a104643c9 100644 --- a/src/MagnumPlugins/MagnumFont/MagnumFont.cpp +++ b/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(); } diff --git a/src/MagnumPlugins/MagnumFont/MagnumFont.h b/src/MagnumPlugins/MagnumFont/MagnumFont.h index 5f12a7ca3..7a36a713f 100644 --- a/src/MagnumPlugins/MagnumFont/MagnumFont.h +++ b/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(); diff --git a/src/MagnumPlugins/MagnumFontConverter/MagnumFontConverter.cpp b/src/MagnumPlugins/MagnumFontConverter/MagnumFontConverter.cpp index ff56e2fe5..18f3b478c 100644 --- a/src/MagnumPlugins/MagnumFontConverter/MagnumFontConverter.cpp +++ b/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; diff --git a/src/MagnumPlugins/MagnumFontConverter/MagnumFontConverter.h b/src/MagnumPlugins/MagnumFontConverter/MagnumFontConverter.h index 8c72749c0..2e756c7d2 100644 --- a/src/MagnumPlugins/MagnumFontConverter/MagnumFontConverter.h +++ b/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; diff --git a/src/MagnumPlugins/ObjImporter/ObjImporter.cpp b/src/MagnumPlugins/ObjImporter/ObjImporter.cpp index d2059cb16..218827291 100644 --- a/src/MagnumPlugins/ObjImporter/ObjImporter.cpp +++ b/src/MagnumPlugins/ObjImporter/ObjImporter.cpp @@ -109,7 +109,7 @@ template void reindex(const std::vector& 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; diff --git a/src/MagnumPlugins/ObjImporter/ObjImporter.h b/src/MagnumPlugins/ObjImporter/ObjImporter.h index 74e6d85dd..7bdeea742 100644 --- a/src/MagnumPlugins/ObjImporter/ObjImporter.h +++ b/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(); diff --git a/src/MagnumPlugins/TgaImageConverter/TgaImageConverter.cpp b/src/MagnumPlugins/TgaImageConverter/TgaImageConverter.cpp index d4e37710c..d5ba0ab0f 100644 --- a/src/MagnumPlugins/TgaImageConverter/TgaImageConverter.cpp +++ b/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; } diff --git a/src/MagnumPlugins/TgaImageConverter/TgaImageConverter.h b/src/MagnumPlugins/TgaImageConverter/TgaImageConverter.h index 82b5dee32..3092c1274 100644 --- a/src/MagnumPlugins/TgaImageConverter/TgaImageConverter.h +++ b/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; diff --git a/src/MagnumPlugins/TgaImporter/TgaImporter.cpp b/src/MagnumPlugins/TgaImporter/TgaImporter.cpp index 2923e0a86..52f69ba45 100644 --- a/src/MagnumPlugins/TgaImporter/TgaImporter.cpp +++ b/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; diff --git a/src/MagnumPlugins/TgaImporter/TgaImporter.h b/src/MagnumPlugins/TgaImporter/TgaImporter.h index bce37aa53..1f3c544db 100644 --- a/src/MagnumPlugins/TgaImporter/TgaImporter.h +++ b/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(); diff --git a/src/MagnumPlugins/WavAudioImporter/WavImporter.cpp b/src/MagnumPlugins/WavAudioImporter/WavImporter.cpp index 449effa49..ab350e909 100644 --- a/src/MagnumPlugins/WavAudioImporter/WavImporter.cpp +++ b/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; } diff --git a/src/MagnumPlugins/WavAudioImporter/WavImporter.h b/src/MagnumPlugins/WavAudioImporter/WavImporter.h index 83dff2d04..fdb881eb1 100644 --- a/src/MagnumPlugins/WavAudioImporter/WavImporter.h +++ b/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;