From 6583f6c219c018fe96385106c79402255edb4fb4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Mon, 26 Mar 2018 18:11:01 +0200 Subject: [PATCH] Don't use deprecated functionality. --- src/MagnumPlugins/AnyAudioImporter/AnyImporter.cpp | 2 +- src/MagnumPlugins/AnyImageConverter/AnyImageConverter.cpp | 2 +- src/MagnumPlugins/AnyImageImporter/AnyImageImporter.cpp | 2 +- src/MagnumPlugins/AnySceneImporter/AnySceneImporter.cpp | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/MagnumPlugins/AnyAudioImporter/AnyImporter.cpp b/src/MagnumPlugins/AnyAudioImporter/AnyImporter.cpp index caf387edd..1242f183b 100644 --- a/src/MagnumPlugins/AnyAudioImporter/AnyImporter.cpp +++ b/src/MagnumPlugins/AnyAudioImporter/AnyImporter.cpp @@ -68,7 +68,7 @@ void AnyImporter::doOpenFile(const std::string& filename) { /* Try to open the file (error output should be printed by the plugin itself) */ - std::unique_ptr importer = static_cast*>(manager())->instance(plugin); + std::unique_ptr importer = static_cast*>(manager())->instantiate(plugin); if(!importer->openFile(filename)) return; /* Success, save the instance */ diff --git a/src/MagnumPlugins/AnyImageConverter/AnyImageConverter.cpp b/src/MagnumPlugins/AnyImageConverter/AnyImageConverter.cpp index 37c39eb61..925daf35b 100644 --- a/src/MagnumPlugins/AnyImageConverter/AnyImageConverter.cpp +++ b/src/MagnumPlugins/AnyImageConverter/AnyImageConverter.cpp @@ -73,7 +73,7 @@ bool AnyImageConverter::doExportToFile(const ImageView2D& image, const std::stri /* Try to convert the file (error output should be printed by the plugin itself) */ - return static_cast*>(manager())->instance(plugin)->exportToFile(image, filename); + return static_cast*>(manager())->instantiate(plugin)->exportToFile(image, filename); } bool AnyImageConverter::doExportToFile(const CompressedImageView2D&, const std::string& filename) { diff --git a/src/MagnumPlugins/AnyImageImporter/AnyImageImporter.cpp b/src/MagnumPlugins/AnyImageImporter/AnyImageImporter.cpp index fa6a9b9c7..1b1c311b1 100644 --- a/src/MagnumPlugins/AnyImageImporter/AnyImageImporter.cpp +++ b/src/MagnumPlugins/AnyImageImporter/AnyImageImporter.cpp @@ -111,7 +111,7 @@ void AnyImageImporter::doOpenFile(const std::string& filename) { /* Try to open the file (error output should be printed by the plugin itself) */ - std::unique_ptr importer = static_cast*>(manager())->instance(plugin); + std::unique_ptr importer = static_cast*>(manager())->instantiate(plugin); if(!importer->openFile(filename)) return; /* Success, save the instance */ diff --git a/src/MagnumPlugins/AnySceneImporter/AnySceneImporter.cpp b/src/MagnumPlugins/AnySceneImporter/AnySceneImporter.cpp index 5c61c2d87..186f56734 100644 --- a/src/MagnumPlugins/AnySceneImporter/AnySceneImporter.cpp +++ b/src/MagnumPlugins/AnySceneImporter/AnySceneImporter.cpp @@ -128,7 +128,7 @@ void AnySceneImporter::doOpenFile(const std::string& filename) { /* Try to open the file (error output should be printed by the plugin itself) */ - std::unique_ptr importer = static_cast*>(manager())->instance(plugin); + std::unique_ptr importer = static_cast*>(manager())->instantiate(plugin); if(!importer->openFile(filename)) return; /* Success, save the instance */