ic
/
magnum
mirror of https://github.com/mosra/magnum.git
6
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Adapt to PluginManager changes.

pull/168/merge
Vladimír Vondruš 2 years ago
parent
a83e77b108
commit
3dd88dc058
6 changed files with 2 additions and 8 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 5
      src/Magnum/Trade/Implementation/converterUtilities.h
  2. 1
      src/MagnumPlugins/AnyImageConverter/AnyImageConverter.cpp
  3. 1
      src/MagnumPlugins/AnyImageImporter/AnyImageImporter.cpp
  4. 1
      src/MagnumPlugins/AnySceneConverter/AnySceneConverter.cpp
  5. 1
      src/MagnumPlugins/AnySceneImporter/AnySceneImporter.cpp
  6. 1
      src/MagnumPlugins/AnyShaderConverter/AnyConverter.cpp

5
src/Magnum/Trade/Implementation/converterUtilities.h
Unescape View File

@ -58,10 +58,9 @@ template<class T> void printPluginInfo(const Debug::Flags useColor, const T& plu
Debug d{useColor}; Debug d{useColor};
d << Debug::boldColor(Debug::Color::Default) << "Plugin name:" << Debug::boldColor(Debug::Color::Yellow) << metadata->name() << Debug::resetColor; d << Debug::boldColor(Debug::Color::Default) << "Plugin name:" << Debug::boldColor(Debug::Color::Yellow) << metadata->name() << Debug::resetColor;
const std::vector<std::string> aliases = metadata->provides(); if(const Containers::StringIterable aliases = metadata->provides()) {
if(!aliases.empty()) {
d << Debug::newline << Debug::boldColor(Debug::Color::Default) << "Aliases:" << Debug::resetColor; d << Debug::newline << Debug::boldColor(Debug::Color::Default) << "Aliases:" << Debug::resetColor;
for(const std::string& alias: aliases) { for(const Containers::StringView alias: aliases) {
d << Debug::newline << " "; d << Debug::newline << " ";
if(alias == plugin.plugin()) if(alias == plugin.plugin())
d << Debug::color(Debug::Color::Yellow); d << Debug::color(Debug::Color::Yellow);

1
src/MagnumPlugins/AnyImageConverter/AnyImageConverter.cpp
Unescape View File

@ -29,7 +29,6 @@
#include <Corrade/PluginManager/Manager.h> #include <Corrade/PluginManager/Manager.h>
#include <Corrade/PluginManager/PluginMetadata.h> #include <Corrade/PluginManager/PluginMetadata.h>
#include <Corrade/Utility/Assert.h> #include <Corrade/Utility/Assert.h>
#include <Corrade/Utility/DebugStl.h> /* for PluginMetadata::name() */
#include <Corrade/Utility/Path.h> #include <Corrade/Utility/Path.h>
#include <Corrade/Utility/String.h> /* lowercase() */ #include <Corrade/Utility/String.h> /* lowercase() */

1
src/MagnumPlugins/AnyImageImporter/AnyImageImporter.cpp
Unescape View File

@ -31,7 +31,6 @@
#include <Corrade/PluginManager/Manager.h> #include <Corrade/PluginManager/Manager.h>
#include <Corrade/PluginManager/PluginMetadata.h> #include <Corrade/PluginManager/PluginMetadata.h>
#include <Corrade/Utility/Assert.h> #include <Corrade/Utility/Assert.h>
#include <Corrade/Utility/DebugStl.h> /* for PluginMetadata::name() */
#include <Corrade/Utility/Format.h> #include <Corrade/Utility/Format.h>
#include <Corrade/Utility/Path.h> #include <Corrade/Utility/Path.h>
#include <Corrade/Utility/String.h> /* lowercase() */ #include <Corrade/Utility/String.h> /* lowercase() */

1
src/MagnumPlugins/AnySceneConverter/AnySceneConverter.cpp
Unescape View File

@ -31,7 +31,6 @@
#include <Corrade/PluginManager/Manager.h> #include <Corrade/PluginManager/Manager.h>
#include <Corrade/PluginManager/PluginMetadata.h> #include <Corrade/PluginManager/PluginMetadata.h>
#include <Corrade/Utility/Assert.h> #include <Corrade/Utility/Assert.h>
#include <Corrade/Utility/DebugStl.h> /* for PluginMetadata::name() */
#include <Corrade/Utility/Macros.h> /* CORRADE_UNUSED */ #include <Corrade/Utility/Macros.h> /* CORRADE_UNUSED */
#include <Corrade/Utility/Path.h> #include <Corrade/Utility/Path.h>
#include <Corrade/Utility/String.h> /* lowercase() */ #include <Corrade/Utility/String.h> /* lowercase() */

1
src/MagnumPlugins/AnySceneImporter/AnySceneImporter.cpp
Unescape View File

@ -29,7 +29,6 @@
#include <Corrade/PluginManager/Manager.h> #include <Corrade/PluginManager/Manager.h>
#include <Corrade/PluginManager/PluginMetadata.h> #include <Corrade/PluginManager/PluginMetadata.h>
#include <Corrade/Utility/Assert.h> #include <Corrade/Utility/Assert.h>
#include <Corrade/Utility/DebugStl.h> /* for PluginMetadata::name() */
#include <Corrade/Utility/Path.h> #include <Corrade/Utility/Path.h>
#include <Corrade/Utility/String.h> /* lowercase() */ #include <Corrade/Utility/String.h> /* lowercase() */

1
src/MagnumPlugins/AnyShaderConverter/AnyConverter.cpp
Unescape View File

@ -31,7 +31,6 @@
#include <Corrade/PluginManager/Manager.h> #include <Corrade/PluginManager/Manager.h>
#include <Corrade/PluginManager/PluginMetadata.h> #include <Corrade/PluginManager/PluginMetadata.h>
#include <Corrade/Utility/Assert.h> #include <Corrade/Utility/Assert.h>
#include <Corrade/Utility/DebugStl.h> /* for PluginMetadata::name() */
#include <Corrade/Utility/Format.h> #include <Corrade/Utility/Format.h>
#include <Corrade/Utility/Path.h> #include <Corrade/Utility/Path.h>
#include <Corrade/Utility/String.h> /* lowercase() */ #include <Corrade/Utility/String.h> /* lowercase() */

Write Preview
Loading…
Cancel
Save