Use Path::{path,filename}() instead of split() where it makes sense.

doc/generated/atlas.cpp

@@ -124,7 +124,7 @@ int main() {
     } {
         constexpr Float displaySizeDivisor = 1.0f;
 
-        Containers::Optional<Containers::Array<char>> sizeData = Utility::Path::read(Utility::Path::join(Utility::Path::split(__FILE__).first(), "../../src/Magnum/TextureTools/Test/AtlasTestFiles/oxygen-glyphs.bin"));
+        Containers::Optional<Containers::Array<char>> sizeData = Utility::Path::read(Utility::Path::join(Utility::Path::path(__FILE__), "../../src/Magnum/TextureTools/Test/AtlasTestFiles/oxygen-glyphs.bin"));
         CORRADE_INTERNAL_ASSERT(sizeData);
 
         auto sizes16 = Containers::arrayCast<Vector2s>(*sizeData);

src/Magnum/DebugTools/CompareImage.cpp

@@ -783,7 +783,7 @@ void ImageComparatorBase::saveDiagnostic(TestSuite::ComparisonStatusFlags, Utili
     }
 
     const ImageView2D image{PixelStorage{}.setAlignment(1), _state->actualFormat, Vector2i{Int(pixels.size()[1]), Int(pixels.size()[0])}, data};
-    const Containers::String filename = Utility::Path::join(path, Utility::Path::split(_state->expectedFilename).second());
+    const Containers::String filename = Utility::Path::join(path, Utility::Path::filename(_state->expectedFilename));
 
     /* Export the data the base view/view comparator saved. Ignore failures,
        we're in the middle of a fail anyway (and everything will print messages

src/Magnum/GL/Test/RendererGLTest.cpp

@@ -116,7 +116,7 @@ RendererGLTest::RendererGLTest() {
         && std::getenv("SIMULATOR_UDID")
         #endif
     ) {
-        _testDir = Utility::Path::join(Utility::Path::split(*Utility::Path::executableLocation()).first(), "RendererGLTestFiles");
+        _testDir = Utility::Path::join(Utility::Path::path(*Utility::Path::executableLocation()), "RendererGLTestFiles");
     } else
     #endif
     {

src/Magnum/SceneTools/sceneconverter.cpp

@@ -586,7 +586,7 @@ well, the IDs reference attributes of the first mesh.)")
     PluginManager::Manager<Trade::AbstractImporter> importerManager{
         #ifndef CORRADE_PLUGINMANAGER_NO_DYNAMIC_PLUGIN_SUPPORT
         args.value("plugin-dir").empty() ? Containers::String{} :
-        Utility::Path::join(args.value("plugin-dir"), Utility::Path::split(Trade::AbstractImporter::pluginSearchPaths().back()).second())
+        Utility::Path::join(args.value("plugin-dir"), Utility::Path::filename(Trade::AbstractImporter::pluginSearchPaths().back()))
         #endif
     };
 
@@ -596,7 +596,7 @@ well, the IDs reference attributes of the first mesh.)")
     PluginManager::Manager<Trade::AbstractImageConverter> imageConverterManager{
         #ifndef CORRADE_PLUGINMANAGER_NO_DYNAMIC_PLUGIN_SUPPORT
         args.value("plugin-dir").empty() ? Containers::String{} :
-        Utility::Path::join(args.value("plugin-dir"), Utility::Path::split(Trade::AbstractImageConverter::pluginSearchPaths().back()).second())
+        Utility::Path::join(args.value("plugin-dir"), Utility::Path::filename(Trade::AbstractImageConverter::pluginSearchPaths().back()))
         #endif
     };
 
@@ -604,7 +604,7 @@ well, the IDs reference attributes of the first mesh.)")
     PluginManager::Manager<Trade::AbstractSceneConverter> converterManager{
         #ifndef CORRADE_PLUGINMANAGER_NO_DYNAMIC_PLUGIN_SUPPORT
         args.value("plugin-dir").empty() ? Containers::String{} :
-        Utility::Path::join(args.value("plugin-dir"), Utility::Path::split(Trade::AbstractSceneConverter::pluginSearchPaths().back()).second())
+        Utility::Path::join(args.value("plugin-dir"), Utility::Path::filename(Trade::AbstractSceneConverter::pluginSearchPaths().back()))
         #endif
     };
     converterManager.registerExternalManager(imageConverterManager);

src/Magnum/ShaderTools/shaderconverter.cpp

@@ -369,7 +369,7 @@ see documentation of a particular converter for more information.)")
     PluginManager::Manager<ShaderTools::AbstractConverter> converterManager{
         #ifndef CORRADE_PLUGINMANAGER_NO_DYNAMIC_PLUGIN_SUPPORT
         args.value("plugin-dir").empty() ? Containers::String{} :
-        Utility::Path::join(args.value("plugin-dir"), Utility::Path::split(ShaderTools::AbstractConverter::pluginSearchPaths().back()).second())
+        Utility::Path::join(args.value("plugin-dir"), Utility::Path::filename(ShaderTools::AbstractConverter::pluginSearchPaths().back()))
         #endif
     };
 

src/Magnum/Shaders/Test/DistanceFieldVectorGLTest.cpp

@@ -35,11 +35,6 @@
 #include <Corrade/Utility/Path.h>
 #include <Corrade/Utility/System.h>
 
-#ifdef CORRADE_TARGET_APPLE
-#include <Corrade/Containers/Pair.h>
-#include <Corrade/Utility/System.h> /* isSandboxed() */
-#endif
-
 #include "Magnum/Image.h"
 #include "Magnum/ImageView.h"
 #include "Magnum/PixelFormat.h"
@@ -395,7 +390,7 @@ DistanceFieldVectorGLTest::DistanceFieldVectorGLTest() {
         && std::getenv("SIMULATOR_UDID")
         #endif
     ) {
-        _testDir = Utility::Path::split(*Utility::Path::executableLocation()).first();
+        _testDir = Utility::Path::path(*Utility::Path::executableLocation());
     } else
     #endif
     {

src/Magnum/Shaders/Test/FlatGLTest.cpp

@@ -36,11 +36,6 @@
 #include <Corrade/Utility/Path.h>
 #include <Corrade/Utility/System.h>
 
-#ifdef CORRADE_TARGET_APPLE
-#include <Corrade/Containers/Pair.h>
-#include <Corrade/Utility/System.h> /* isSandboxed() */
-#endif
-
 #include "Magnum/Image.h"
 #include "Magnum/ImageView.h"
 #include "Magnum/PixelFormat.h"
@@ -1174,7 +1169,7 @@ FlatGLTest::FlatGLTest() {
         && std::getenv("SIMULATOR_UDID")
         #endif
     ) {
-        _testDir = Utility::Path::split(*Utility::Path::executableLocation()).first();
+        _testDir = Utility::Path::path(*Utility::Path::executableLocation());
     } else
     #endif
     {

src/Magnum/Shaders/Test/MeshVisualizerGLTest.cpp

@@ -37,11 +37,6 @@
 #include <Corrade/Utility/Path.h>
 #include <Corrade/Utility/System.h>
 
-#ifdef CORRADE_TARGET_APPLE
-#include <Corrade/Containers/Pair.h>
-#include <Corrade/Utility/System.h> /* isSandboxed() */
-#endif
-
 #include "Magnum/DebugTools/ColorMap.h"
 #include "Magnum/DebugTools/CompareImage.h"
 #include "Magnum/GL/Context.h"
@@ -1765,7 +1760,7 @@ MeshVisualizerGLTest::MeshVisualizerGLTest() {
         && std::getenv("SIMULATOR_UDID")
         #endif
     ) {
-        _testDir = Utility::Path::split(*Utility::Path::executableLocation()).first();
+        _testDir = Utility::Path::path(*Utility::Path::executableLocation());
     } else
     #endif
     {

src/Magnum/Shaders/Test/PhongGLTest.cpp

@@ -37,10 +37,6 @@
 #include <Corrade/Utility/Path.h>
 #include <Corrade/Utility/System.h>
 
-#ifdef CORRADE_TARGET_APPLE
-#include <Corrade/Containers/Pair.h>
-#endif
-
 #include "Magnum/Image.h"
 #include "Magnum/ImageView.h"
 #include "Magnum/PixelFormat.h"
@@ -1557,7 +1553,7 @@ PhongGLTest::PhongGLTest() {
         && std::getenv("SIMULATOR_UDID")
         #endif
     ) {
-        _testDir = Utility::Path::split(*Utility::Path::executableLocation()).first();
+        _testDir = Utility::Path::path(*Utility::Path::executableLocation());
     } else
     #endif
     {

src/Magnum/Shaders/Test/VectorGLTest.cpp

@@ -35,11 +35,6 @@
 #include <Corrade/Utility/Path.h>
 #include <Corrade/Utility/System.h>
 
-#ifdef CORRADE_TARGET_APPLE
-#include <Corrade/Containers/Pair.h>
-#include <Corrade/Utility/System.h> /* isSandboxed() */
-#endif
-
 #include "Magnum/Image.h"
 #include "Magnum/ImageView.h"
 #include "Magnum/PixelFormat.h"
@@ -391,7 +386,7 @@ VectorGLTest::VectorGLTest() {
         && std::getenv("SIMULATOR_UDID")
         #endif
     ) {
-        _testDir = Utility::Path::split(*Utility::Path::executableLocation()).first();
+        _testDir = Utility::Path::path(*Utility::Path::executableLocation());
     } else
     #endif
     {

src/Magnum/Shaders/Test/VertexColorGLTest.cpp

@@ -34,11 +34,6 @@
 #include <Corrade/Utility/Path.h>
 #include <Corrade/Utility/System.h>
 
-#ifdef CORRADE_TARGET_APPLE
-#include <Corrade/Containers/Pair.h>
-#include <Corrade/Utility/System.h> /* isSandboxed() */
-#endif
-
 #include "Magnum/DebugTools/CompareImage.h"
 #include "Magnum/Image.h"
 #include "Magnum/ImageView.h"
@@ -344,7 +339,7 @@ VertexColorGLTest::VertexColorGLTest() {
         && std::getenv("SIMULATOR_UDID")
         #endif
     ) {
-        _testDir = Utility::Path::split(*Utility::Path::executableLocation()).first();
+        _testDir = Utility::Path::path(*Utility::Path::executableLocation());
     } else
     #endif
     {

src/Magnum/Text/fontconverter.cpp

@@ -24,7 +24,6 @@
     DEALINGS IN THE SOFTWARE.
 */
 
-#include <Corrade/Containers/Pair.h>
 #include <Corrade/PluginManager/Manager.h>
 #include <Corrade/Utility/Arguments.h>
 #include <Corrade/Utility/DebugStl.h>
@@ -165,7 +164,7 @@ int FontConverter::exec() {
     PluginManager::Manager<Trade::AbstractImageConverter> imageConverterManager{
         #ifndef CORRADE_PLUGINMANAGER_NO_DYNAMIC_PLUGIN_SUPPORT
         args.value("plugin-dir").empty() ? Containers::String{} :
-        Utility::Path::join(args.value("plugin-dir"), Utility::Path::split(Trade::AbstractImageConverter::pluginSearchPaths().back()).second())
+        Utility::Path::join(args.value("plugin-dir"), Utility::Path::filename(Trade::AbstractImageConverter::pluginSearchPaths().back()))
         #endif
     };
 
@@ -173,7 +172,7 @@ int FontConverter::exec() {
     PluginManager::Manager<AbstractFont> fontManager{
         #ifndef CORRADE_PLUGINMANAGER_NO_DYNAMIC_PLUGIN_SUPPORT
         args.value("plugin-dir").empty() ? Containers::String{} :
-        Utility::Path::join(args.value("plugin-dir"), Utility::Path::split(AbstractFont::pluginSearchPaths().back()).second())
+        Utility::Path::join(args.value("plugin-dir"), Utility::Path::filename(AbstractFont::pluginSearchPaths().back()))
         #endif
     };
     Containers::Pointer<AbstractFont> font = fontManager.loadAndInstantiate(args.value("font"));
@@ -184,7 +183,7 @@ int FontConverter::exec() {
     PluginManager::Manager<AbstractFontConverter> converterManager{
         #ifndef CORRADE_PLUGINMANAGER_NO_DYNAMIC_PLUGIN_SUPPORT
         args.value("plugin-dir").empty() ? Containers::String{} :
-        Utility::Path::join(args.value("plugin-dir"), Utility::Path::split(AbstractFontConverter::pluginSearchPaths().back()).second())
+        Utility::Path::join(args.value("plugin-dir"), Utility::Path::filename(AbstractFontConverter::pluginSearchPaths().back()))
         #endif
     };
     converterManager.registerExternalManager(imageConverterManager);

src/Magnum/TextureTools/Test/DistanceFieldGLTest.cpp

@@ -31,7 +31,6 @@
 #include <Corrade/Utility/Path.h>
 
 #ifdef CORRADE_TARGET_APPLE
-#include <Corrade/Containers/Pair.h>
 #include <Corrade/Utility/System.h> /* isSandboxed() */
 #endif
 
@@ -125,7 +124,7 @@ DistanceFieldGLTest::DistanceFieldGLTest() {
         && std::getenv("SIMULATOR_UDID")
         #endif
     ) {
-        _testDir = Utility::Path::join(Utility::Path::split(*Utility::Path::executableLocation()).first(), "DistanceFieldGLTestFiles");
+        _testDir = Utility::Path::join(Utility::Path::path(*Utility::Path::executableLocation()), "DistanceFieldGLTestFiles");
     } else
     #endif
     {

src/Magnum/TextureTools/distancefieldconverter.cpp

@@ -25,7 +25,6 @@
 */
 
 #include <Corrade/Containers/Optional.h>
-#include <Corrade/Containers/Pair.h>
 #include <Corrade/Utility/Arguments.h>
 #include <Corrade/Utility/DebugStl.h> /** @todo remove once Arguments is std::string-free */
 #include <Corrade/Utility/Path.h>
@@ -165,7 +164,7 @@ int DistanceFieldConverter::exec() {
     PluginManager::Manager<Trade::AbstractImporter> importerManager{
         #ifndef CORRADE_PLUGINMANAGER_NO_DYNAMIC_PLUGIN_SUPPORT
         args.value("plugin-dir").empty() ? Containers::String{} :
-        Utility::Path::join(args.value("plugin-dir"), Utility::Path::split(Trade::AbstractImporter::pluginSearchPaths().back()).second())
+        Utility::Path::join(args.value("plugin-dir"), Utility::Path::filename(Trade::AbstractImporter::pluginSearchPaths().back()))
         #endif
     };
     Containers::Pointer<Trade::AbstractImporter> importer = importerManager.loadAndInstantiate(args.value("importer"));
@@ -175,7 +174,7 @@ int DistanceFieldConverter::exec() {
     PluginManager::Manager<Trade::AbstractImageConverter> converterManager{
         #ifndef CORRADE_PLUGINMANAGER_NO_DYNAMIC_PLUGIN_SUPPORT
         args.value("plugin-dir").empty() ? Containers::String{} :
-        Utility::Path::join(args.value("plugin-dir"), Utility::Path::split(Trade::AbstractImageConverter::pluginSearchPaths().back()).second())
+        Utility::Path::join(args.value("plugin-dir"), Utility::Path::filename(Trade::AbstractImageConverter::pluginSearchPaths().back()))
         #endif
     };
     Containers::Pointer<Trade::AbstractImageConverter> converter = converterManager.loadAndInstantiate(args.value("converter"));

src/Magnum/Trade/imageconverter.cpp

@@ -26,7 +26,6 @@
 
 #include <Corrade/Containers/Optional.h>
 #include <Corrade/Containers/GrowableArray.h>
-#include <Corrade/Containers/Pair.h>
 #include <Corrade/Containers/StaticArray.h>
 #include <Corrade/Containers/StridedArrayView.h>
 #include <Corrade/PluginManager/Manager.h>
@@ -523,13 +522,13 @@ no -C / --converter is specified, AnyImageConverter is used.)")
     PluginManager::Manager<Trade::AbstractImporter> importerManager{
         #ifndef CORRADE_PLUGINMANAGER_NO_DYNAMIC_PLUGIN_SUPPORT
         args.value("plugin-dir").empty() ? Containers::String{} :
-        Utility::Path::join(args.value("plugin-dir"), Utility::Path::split(Trade::AbstractImporter::pluginSearchPaths().back()).second())
+        Utility::Path::join(args.value("plugin-dir"), Utility::Path::filename(Trade::AbstractImporter::pluginSearchPaths().back()))
         #endif
     };
     PluginManager::Manager<Trade::AbstractImageConverter> converterManager{
         #ifndef CORRADE_PLUGINMANAGER_NO_DYNAMIC_PLUGIN_SUPPORT
         args.value("plugin-dir").empty() ? Containers::String{} :
-        Utility::Path::join(args.value("plugin-dir"), Utility::Path::split(Trade::AbstractImageConverter::pluginSearchPaths().back()).second())
+        Utility::Path::join(args.value("plugin-dir"), Utility::Path::filename(Trade::AbstractImageConverter::pluginSearchPaths().back()))
         #endif
     };
 

src/MagnumPlugins/AnyShaderConverter/AnyConverter.cpp

@@ -125,7 +125,7 @@ Containers::StringView stringForFormat(const Format format) {
 Format formatForExtension(const char* prefix, const Containers::StringView filename) {
     /* Can't reliably lowercase just the extension as we detect double
        extensions as well. But we can lowercase just the filename, at least. */
-    const Containers::String normalized = Utility::String::lowercase(Utility::Path::split(filename).second());
+    const Containers::String normalized = Utility::String::lowercase(Utility::Path::filename(filename));
 
     /* https://github.com/KhronosGroup/SPIRV-Tools/blob/a715b1b4053519ad0f2bdb2d22ace35d35867cff/README.md#command-line-tools
        "It's a convention to name SPIR-V assembly and binary files with suffix

src/MagnumPlugins/MagnumFont/MagnumFont.cpp

@@ -139,7 +139,7 @@ auto MagnumFont::doOpenData(const Containers::ArrayView<const char> data, const
 
 auto MagnumFont::doOpenFile(const Containers::StringView filename, const Float size) -> Properties {
     _opened.emplace();
-    _opened->filePath.emplace(Utility::Path::split(filename).first());
+    _opened->filePath.emplace(Utility::Path::path(filename));
 
     return AbstractFont::doOpenFile(filename, size);
 }

src/MagnumPlugins/MagnumFontConverter/MagnumFontConverter.cpp

@@ -79,7 +79,7 @@ std::vector<std::pair<std::string, Containers::Array<char>>> MagnumFontConverter
     Utility::Configuration configuration;
 
     configuration.setValue("version", 1);
-    configuration.setValue("image", Utility::Path::split(filename).second() + ".tga");
+    configuration.setValue("image", Utility::Path::filename(filename) + ".tga");
     configuration.setValue("originalImageSize", cache.size().xy());
     configuration.setValue("padding", cache.padding());
     configuration.setValue("fontSize", font.size());