From 3a1c776557353123e1c7affcd17a9bf712806801 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= <mosra@centrum.cz>
Date: Thu, 30 Jan 2014 20:45:16 +0100
Subject: [PATCH] Adapted to Corrade::PluginManager changes.

---
 doc/plugins.dox                                |  4 ----
 src/Magnum/Text/fontconverter.cpp              | 14 ++++----------
 .../TextureTools/distancefieldconverter.cpp    | 18 ++++++------------
 3 files changed, 10 insertions(+), 26 deletions(-)

diff --git a/doc/plugins.dox b/doc/plugins.dox
index ddc64c1db..95ab27ca7 100644
--- a/doc/plugins.dox
+++ b/doc/plugins.dox
@@ -120,10 +120,6 @@ lifetime of all plugin instances created from it.
         std::exit(1);
     }
     std::unique_ptr<Trade::AbstractImporter> tgaImporter = manager.instance("TgaImporter");
-    if(!tgaImporter) {
-        Error() << "Cannot instantiate TgaImporter plugin";
-        std::exit(2);
-    }
 
     // Use the plugin...
 
diff --git a/src/Magnum/Text/fontconverter.cpp b/src/Magnum/Text/fontconverter.cpp
index fb7b6782b..df510b7aa 100644
--- a/src/Magnum/Text/fontconverter.cpp
+++ b/src/Magnum/Text/fontconverter.cpp
@@ -72,21 +72,15 @@ int FontConverter::exec() {
 
     /* Load font */
     PluginManager::Manager<Text::AbstractFont> fontManager(Utility::Directory::join(MAGNUM_PLUGINS_DIR, "fonts/"));
-    std::unique_ptr<Text::AbstractFont> font;
-    if(!(fontManager.load(args.value("font")) & PluginManager::LoadState::Loaded) ||
-       !(font = fontManager.instance(args.value("font")))) {
-        Error() << "Cannot load plugin" << args.value("font") << "from" << fontManager.pluginDirectory();
+    if(!(fontManager.load(args.value("font")) & PluginManager::LoadState::Loaded))
         std::exit(1);
-    }
+    std::unique_ptr<Text::AbstractFont> font = fontManager.instance(args.value("font"));
 
     /* Load font converter */
     PluginManager::Manager<Text::AbstractFontConverter> converterManager(Utility::Directory::join(MAGNUM_PLUGINS_DIR, "fontconverters/"));
-    std::unique_ptr<Text::AbstractFontConverter> converter;
-    if(!(converterManager.load(args.value("converter")) & PluginManager::LoadState::Loaded) ||
-       !(converter = converterManager.instance(args.value("converter")))) {
-        Error() << "Cannot load plugin" << args.value("converter") << "from" << converterManager.pluginDirectory();
+    if(!(converterManager.load(args.value("converter")) & PluginManager::LoadState::Loaded))
         std::exit(1);
-    }
+    std::unique_ptr<Text::AbstractFontConverter> converter = converterManager.instance(args.value("converter"));
 
     /* Open font */
     if(!font->openFile(args.value("input"), args.value<Float>("font-size"))) {
diff --git a/src/Magnum/TextureTools/distancefieldconverter.cpp b/src/Magnum/TextureTools/distancefieldconverter.cpp
index 073b6bd0a..bc386bb31 100644
--- a/src/Magnum/TextureTools/distancefieldconverter.cpp
+++ b/src/Magnum/TextureTools/distancefieldconverter.cpp
@@ -66,23 +66,17 @@ DistanceFieldConverter::DistanceFieldConverter(const Arguments& arguments): Wind
 }
 
 int DistanceFieldConverter::exec() {
-    /* Load plugins */
+    /* Load importer plugin */
     PluginManager::Manager<Trade::AbstractImporter> importerManager(MAGNUM_IMPORTER_PLUGIN_DIR);
-    if(!(importerManager.load(args.value("importer")) & PluginManager::LoadState::Loaded)) {
-        Error() << "Cannot load importer plugin" << args.value("importer") << "from" << MAGNUM_IMPORTER_PLUGIN_DIR;
+    if(!(importerManager.load(args.value("importer")) & PluginManager::LoadState::Loaded))
         return 1;
-    }
+    std::unique_ptr<Trade::AbstractImporter> importer = importerManager.instance(args.value("importer"));
+
+    /* Load converter plugin */
     PluginManager::Manager<Trade::AbstractImageConverter> converterManager(MAGNUM_IMAGECONVERTER_PLUGIN_DIR);
-    if(!(converterManager.load(args.value("converter")) & PluginManager::LoadState::Loaded)) {
-        Error() << "Cannot load converter plugin" << args.value("converter") << "from" << MAGNUM_IMAGECONVERTER_PLUGIN_DIR;
+    if(!(converterManager.load(args.value("converter")) & PluginManager::LoadState::Loaded))
         return 1;
-    }
-
-    /* Instance plugins */
-    std::unique_ptr<Trade::AbstractImporter> importer = importerManager.instance(args.value("importer"));
-    CORRADE_INTERNAL_ASSERT(importer);
     std::unique_ptr<Trade::AbstractImageConverter> converter = converterManager.instance(args.value("converter"));
-    CORRADE_INTERNAL_ASSERT(converter);
 
     /* Open input file */
     std::optional<Trade::ImageData2D> image;