diff --git a/src/MagnumPlugins/AnyImageImporter/AnyImageImporter.cpp b/src/MagnumPlugins/AnyImageImporter/AnyImageImporter.cpp index c7c50839c..fa6a9b9c7 100644 --- a/src/MagnumPlugins/AnyImageImporter/AnyImageImporter.cpp +++ b/src/MagnumPlugins/AnyImageImporter/AnyImageImporter.cpp @@ -120,6 +120,6 @@ void AnyImageImporter::doOpenFile(const std::string& filename) { UnsignedInt AnyImageImporter::doImage2DCount() const { return _in->image2DCount(); } -std::optional AnyImageImporter::doImage2D(const UnsignedInt id) { return _in->image2D(id); } +Containers::Optional AnyImageImporter::doImage2D(const UnsignedInt id) { return _in->image2D(id); } }} diff --git a/src/MagnumPlugins/AnyImageImporter/AnyImageImporter.h b/src/MagnumPlugins/AnyImageImporter/AnyImageImporter.h index f08adfb9d..5f8037d11 100644 --- a/src/MagnumPlugins/AnyImageImporter/AnyImageImporter.h +++ b/src/MagnumPlugins/AnyImageImporter/AnyImageImporter.h @@ -116,7 +116,7 @@ class MAGNUM_ANYIMAGEIMPORTER_EXPORT AnyImageImporter: public AbstractImporter { MAGNUM_ANYIMAGEIMPORTER_LOCAL void doOpenFile(const std::string& filename) override; MAGNUM_ANYIMAGEIMPORTER_LOCAL UnsignedInt doImage2DCount() const override; - MAGNUM_ANYIMAGEIMPORTER_LOCAL std::optional doImage2D(UnsignedInt id) override; + MAGNUM_ANYIMAGEIMPORTER_LOCAL Containers::Optional doImage2D(UnsignedInt id) override; std::unique_ptr _in; }; diff --git a/src/MagnumPlugins/AnyImageImporter/Test/Test.cpp b/src/MagnumPlugins/AnyImageImporter/Test/Test.cpp index 65b77bd55..1933e0908 100644 --- a/src/MagnumPlugins/AnyImageImporter/Test/Test.cpp +++ b/src/MagnumPlugins/AnyImageImporter/Test/Test.cpp @@ -63,7 +63,7 @@ void AnyImageImporterTest::tga() { CORRADE_VERIFY(importer.openFile(TGA_FILE)); /* Check only size, as it is good enough proof that it is working */ - std::optional image = importer.image2D(0); + Containers::Optional image = importer.image2D(0); CORRADE_VERIFY(image); CORRADE_COMPARE(image->size(), Vector2i(2, 3)); } @@ -76,7 +76,7 @@ void AnyImageImporterTest::jpeg() { CORRADE_VERIFY(importer.openFile(JPEG_FILE)); /* Check only size, as it is good enough proof that it is working */ - std::optional image = importer.image2D(0); + Containers::Optional image = importer.image2D(0); CORRADE_VERIFY(image); CORRADE_COMPARE(image->size(), Vector2i(3, 2)); } @@ -89,7 +89,7 @@ void AnyImageImporterTest::png() { CORRADE_VERIFY(importer.openFile(PNG_FILE)); /* Check only size, as it is good enough proof that it is working */ - std::optional image = importer.image2D(0); + Containers::Optional image = importer.image2D(0); CORRADE_VERIFY(image); CORRADE_COMPARE(image->size(), Vector2i(3, 2)); } diff --git a/src/MagnumPlugins/AnySceneImporter/AnySceneImporter.cpp b/src/MagnumPlugins/AnySceneImporter/AnySceneImporter.cpp index 2d500604f..5c61c2d87 100644 --- a/src/MagnumPlugins/AnySceneImporter/AnySceneImporter.cpp +++ b/src/MagnumPlugins/AnySceneImporter/AnySceneImporter.cpp @@ -140,17 +140,17 @@ Int AnySceneImporter::doDefaultScene() { return _in->defaultScene(); } UnsignedInt AnySceneImporter::doSceneCount() const { return _in->sceneCount(); } Int AnySceneImporter::doSceneForName(const std::string& name) { return _in->sceneForName(name); } std::string AnySceneImporter::doSceneName(const UnsignedInt id) { return _in->sceneName(id); } -std::optional AnySceneImporter::doScene(const UnsignedInt id) { return _in->scene(id); } +Containers::Optional AnySceneImporter::doScene(const UnsignedInt id) { return _in->scene(id); } UnsignedInt AnySceneImporter::doLightCount() const { return _in->lightCount(); } Int AnySceneImporter::doLightForName(const std::string& name) { return _in->lightForName(name); } std::string AnySceneImporter::doLightName(const UnsignedInt id) { return _in->lightName(id); } -std::optional AnySceneImporter::doLight(const UnsignedInt id) { return _in->light(id); } +Containers::Optional AnySceneImporter::doLight(const UnsignedInt id) { return _in->light(id); } UnsignedInt AnySceneImporter::doCameraCount() const { return _in->cameraCount(); } Int AnySceneImporter::doCameraForName(const std::string& name) { return _in->cameraForName(name); } std::string AnySceneImporter::doCameraName(const UnsignedInt id) { return _in->cameraName(id); } -std::optional AnySceneImporter::doCamera(const UnsignedInt id) { return _in->camera(id); } +Containers::Optional AnySceneImporter::doCamera(const UnsignedInt id) { return _in->camera(id); } UnsignedInt AnySceneImporter::doObject2DCount() const { return _in->object2DCount(); } Int AnySceneImporter::doObject2DForName(const std::string& name) { return _in->object2DForName(name); } @@ -165,12 +165,12 @@ std::unique_ptr AnySceneImporter::doObject3D(const UnsignedInt id) UnsignedInt AnySceneImporter::doMesh2DCount() const { return _in->mesh2DCount(); } Int AnySceneImporter::doMesh2DForName(const std::string& name) { return _in->mesh2DForName(name); } std::string AnySceneImporter::doMesh2DName(const UnsignedInt id) { return _in->mesh2DName(id); } -std::optional AnySceneImporter::doMesh2D(const UnsignedInt id) { return _in->mesh2D(id); } +Containers::Optional AnySceneImporter::doMesh2D(const UnsignedInt id) { return _in->mesh2D(id); } UnsignedInt AnySceneImporter::doMesh3DCount() const { return _in->mesh3DCount(); } Int AnySceneImporter::doMesh3DForName(const std::string& name) { return _in->mesh3DForName(name); } std::string AnySceneImporter::doMesh3DName(const UnsignedInt id) { return _in->mesh3DName(id); } -std::optional AnySceneImporter::doMesh3D(const UnsignedInt id) { return _in->mesh3D(id); } +Containers::Optional AnySceneImporter::doMesh3D(const UnsignedInt id) { return _in->mesh3D(id); } UnsignedInt AnySceneImporter::doMaterialCount() const { return _in->materialCount(); } Int AnySceneImporter::doMaterialForName(const std::string& name) { return _in->materialForName(name); } @@ -180,21 +180,21 @@ std::unique_ptr AnySceneImporter::doMaterial(const Unsigne UnsignedInt AnySceneImporter::doTextureCount() const { return _in->textureCount(); } Int AnySceneImporter::doTextureForName(const std::string& name) { return _in->textureForName(name); } std::string AnySceneImporter::doTextureName(const UnsignedInt id) { return _in->textureName(id); } -std::optional AnySceneImporter::doTexture(const UnsignedInt id) { return _in->texture(id); } +Containers::Optional AnySceneImporter::doTexture(const UnsignedInt id) { return _in->texture(id); } UnsignedInt AnySceneImporter::doImage1DCount() const { return _in->image1DCount(); } Int AnySceneImporter::doImage1DForName(const std::string& name) { return _in->image1DForName(name); } std::string AnySceneImporter::doImage1DName(const UnsignedInt id) { return _in->image1DName(id); } -std::optional AnySceneImporter::doImage1D(const UnsignedInt id) { return _in->image1D(id); } +Containers::Optional AnySceneImporter::doImage1D(const UnsignedInt id) { return _in->image1D(id); } UnsignedInt AnySceneImporter::doImage2DCount() const { return _in->image2DCount(); } Int AnySceneImporter::doImage2DForName(const std::string& name) { return _in->image2DForName(name); } std::string AnySceneImporter::doImage2DName(const UnsignedInt id) { return _in->image2DName(id); } -std::optional AnySceneImporter::doImage2D(const UnsignedInt id) { return _in->image2D(id); } +Containers::Optional AnySceneImporter::doImage2D(const UnsignedInt id) { return _in->image2D(id); } UnsignedInt AnySceneImporter::doImage3DCount() const { return _in->image3DCount(); } Int AnySceneImporter::doImage3DForName(const std::string& name) { return _in->image3DForName(name); } std::string AnySceneImporter::doImage3DName(const UnsignedInt id) { return _in->image3DName(id); } -std::optional AnySceneImporter::doImage3D(const UnsignedInt id) { return _in->image3D(id); } +Containers::Optional AnySceneImporter::doImage3D(const UnsignedInt id) { return _in->image3D(id); } }} diff --git a/src/MagnumPlugins/AnySceneImporter/AnySceneImporter.h b/src/MagnumPlugins/AnySceneImporter/AnySceneImporter.h index ed2401710..8c69d440b 100644 --- a/src/MagnumPlugins/AnySceneImporter/AnySceneImporter.h +++ b/src/MagnumPlugins/AnySceneImporter/AnySceneImporter.h @@ -129,17 +129,17 @@ class MAGNUM_ANYSCENEIMPORTER_EXPORT AnySceneImporter: public AbstractImporter { MAGNUM_ANYSCENEIMPORTER_LOCAL UnsignedInt doSceneCount() const override; MAGNUM_ANYSCENEIMPORTER_LOCAL Int doSceneForName(const std::string& name) override; MAGNUM_ANYSCENEIMPORTER_LOCAL std::string doSceneName(UnsignedInt id) override; - MAGNUM_ANYSCENEIMPORTER_LOCAL std::optional doScene(UnsignedInt id) override; + MAGNUM_ANYSCENEIMPORTER_LOCAL Containers::Optional doScene(UnsignedInt id) override; MAGNUM_ANYSCENEIMPORTER_LOCAL UnsignedInt doLightCount() const override; MAGNUM_ANYSCENEIMPORTER_LOCAL Int doLightForName(const std::string& name) override; MAGNUM_ANYSCENEIMPORTER_LOCAL std::string doLightName(UnsignedInt id) override; - MAGNUM_ANYSCENEIMPORTER_LOCAL std::optional doLight(UnsignedInt id) override; + MAGNUM_ANYSCENEIMPORTER_LOCAL Containers::Optional doLight(UnsignedInt id) override; MAGNUM_ANYSCENEIMPORTER_LOCAL UnsignedInt doCameraCount() const override; MAGNUM_ANYSCENEIMPORTER_LOCAL Int doCameraForName(const std::string& name) override; MAGNUM_ANYSCENEIMPORTER_LOCAL std::string doCameraName(UnsignedInt id) override; - MAGNUM_ANYSCENEIMPORTER_LOCAL std::optional doCamera(UnsignedInt id) override; + MAGNUM_ANYSCENEIMPORTER_LOCAL Containers::Optional doCamera(UnsignedInt id) override; MAGNUM_ANYSCENEIMPORTER_LOCAL UnsignedInt doObject2DCount() const override; MAGNUM_ANYSCENEIMPORTER_LOCAL Int doObject2DForName(const std::string& name) override; @@ -154,12 +154,12 @@ class MAGNUM_ANYSCENEIMPORTER_EXPORT AnySceneImporter: public AbstractImporter { MAGNUM_ANYSCENEIMPORTER_LOCAL UnsignedInt doMesh2DCount() const override; MAGNUM_ANYSCENEIMPORTER_LOCAL Int doMesh2DForName(const std::string& name) override; MAGNUM_ANYSCENEIMPORTER_LOCAL std::string doMesh2DName(UnsignedInt id) override; - MAGNUM_ANYSCENEIMPORTER_LOCAL std::optional doMesh2D(UnsignedInt id) override; + MAGNUM_ANYSCENEIMPORTER_LOCAL Containers::Optional doMesh2D(UnsignedInt id) override; MAGNUM_ANYSCENEIMPORTER_LOCAL UnsignedInt doMesh3DCount() const override; MAGNUM_ANYSCENEIMPORTER_LOCAL Int doMesh3DForName(const std::string& name) override; MAGNUM_ANYSCENEIMPORTER_LOCAL std::string doMesh3DName(UnsignedInt id) override; - MAGNUM_ANYSCENEIMPORTER_LOCAL std::optional doMesh3D(UnsignedInt id) override; + MAGNUM_ANYSCENEIMPORTER_LOCAL Containers::Optional doMesh3D(UnsignedInt id) override; MAGNUM_ANYSCENEIMPORTER_LOCAL UnsignedInt doMaterialCount() const override; MAGNUM_ANYSCENEIMPORTER_LOCAL Int doMaterialForName(const std::string& name) override; @@ -169,22 +169,22 @@ class MAGNUM_ANYSCENEIMPORTER_EXPORT AnySceneImporter: public AbstractImporter { MAGNUM_ANYSCENEIMPORTER_LOCAL UnsignedInt doTextureCount() const override; MAGNUM_ANYSCENEIMPORTER_LOCAL Int doTextureForName(const std::string& name) override; MAGNUM_ANYSCENEIMPORTER_LOCAL std::string doTextureName(UnsignedInt id) override; - MAGNUM_ANYSCENEIMPORTER_LOCAL std::optional doTexture(UnsignedInt id) override; + MAGNUM_ANYSCENEIMPORTER_LOCAL Containers::Optional doTexture(UnsignedInt id) override; MAGNUM_ANYSCENEIMPORTER_LOCAL UnsignedInt doImage1DCount() const override; MAGNUM_ANYSCENEIMPORTER_LOCAL Int doImage1DForName(const std::string& name) override; MAGNUM_ANYSCENEIMPORTER_LOCAL std::string doImage1DName(UnsignedInt id) override; - MAGNUM_ANYSCENEIMPORTER_LOCAL std::optional doImage1D(UnsignedInt id) override; + MAGNUM_ANYSCENEIMPORTER_LOCAL Containers::Optional doImage1D(UnsignedInt id) override; MAGNUM_ANYSCENEIMPORTER_LOCAL UnsignedInt doImage2DCount() const override; MAGNUM_ANYSCENEIMPORTER_LOCAL Int doImage2DForName(const std::string& name) override; MAGNUM_ANYSCENEIMPORTER_LOCAL std::string doImage2DName(UnsignedInt id) override; - MAGNUM_ANYSCENEIMPORTER_LOCAL std::optional doImage2D(UnsignedInt id) override; + MAGNUM_ANYSCENEIMPORTER_LOCAL Containers::Optional doImage2D(UnsignedInt id) override; MAGNUM_ANYSCENEIMPORTER_LOCAL UnsignedInt doImage3DCount() const override; MAGNUM_ANYSCENEIMPORTER_LOCAL Int doImage3DForName(const std::string& name) override; MAGNUM_ANYSCENEIMPORTER_LOCAL std::string doImage3DName(UnsignedInt id) override; - MAGNUM_ANYSCENEIMPORTER_LOCAL std::optional doImage3D(UnsignedInt id) override; + MAGNUM_ANYSCENEIMPORTER_LOCAL Containers::Optional doImage3D(UnsignedInt id) override; std::unique_ptr _in; }; diff --git a/src/MagnumPlugins/AnySceneImporter/Test/Test.cpp b/src/MagnumPlugins/AnySceneImporter/Test/Test.cpp index 409fb4022..a43bea6bf 100644 --- a/src/MagnumPlugins/AnySceneImporter/Test/Test.cpp +++ b/src/MagnumPlugins/AnySceneImporter/Test/Test.cpp @@ -62,7 +62,7 @@ void AnySceneImporterTest::obj() { CORRADE_VERIFY(importer.openFile(OBJ_FILE)); /* Check only size, as it is good enough proof that it is working */ - std::optional mesh = importer.mesh3D(0); + Containers::Optional mesh = importer.mesh3D(0); CORRADE_VERIFY(mesh); CORRADE_COMPARE(mesh->positions(0).size(), 3); } @@ -75,7 +75,7 @@ void AnySceneImporterTest::ply() { CORRADE_VERIFY(importer.openFile(PLY_FILE)); /* Check only size, as it is good enough proof that it is working */ - std::optional mesh = importer.mesh3D(0); + Containers::Optional mesh = importer.mesh3D(0); CORRADE_VERIFY(mesh); CORRADE_COMPARE(mesh->positions(0).size(), 5); }