diff --git a/src/Magnum/Mesh.cpp b/src/Magnum/Mesh.cpp index 7fbcf5b8f..0e30d0538 100644 --- a/src/Magnum/Mesh.cpp +++ b/src/Magnum/Mesh.cpp @@ -25,7 +25,7 @@ #include "Mesh.h" -#include +#include #include #include #include @@ -105,28 +105,28 @@ UnsignedInt meshIndexTypeSize(const MeshIndexType type) { namespace Corrade { namespace Utility { -std::string ConfigurationValue::toString(Magnum::MeshPrimitive value, ConfigurationValueFlags) { +Containers::String ConfigurationValue::toString(Magnum::MeshPrimitive value, ConfigurationValueFlags) { if(Magnum::UnsignedInt(value) - 1 < Containers::arraySize(Magnum::MeshPrimitiveNames)) return Magnum::MeshPrimitiveNames[Magnum::UnsignedInt(value) - 1]; return {}; } -Magnum::MeshPrimitive ConfigurationValue::fromString(const std::string& stringValue, ConfigurationValueFlags) { +Magnum::MeshPrimitive ConfigurationValue::fromString(Containers::StringView stringValue, ConfigurationValueFlags) { for(std::size_t i = 0; i != Containers::arraySize(Magnum::MeshPrimitiveNames); ++i) if(stringValue == Magnum::MeshPrimitiveNames[i]) return Magnum::MeshPrimitive(i + 1); return {}; } -std::string ConfigurationValue::toString(Magnum::MeshIndexType value, ConfigurationValueFlags) { +Containers::String ConfigurationValue::toString(Magnum::MeshIndexType value, ConfigurationValueFlags) { if(Magnum::UnsignedInt(value) - 1 < Containers::arraySize(Magnum::MeshIndexTypeNames)) return Magnum::MeshIndexTypeNames[Magnum::UnsignedInt(value) - 1]; return {}; } -Magnum::MeshIndexType ConfigurationValue::fromString(const std::string& stringValue, ConfigurationValueFlags) { +Magnum::MeshIndexType ConfigurationValue::fromString(Containers::StringView stringValue, ConfigurationValueFlags) { for(std::size_t i = 0; i != Containers::arraySize(Magnum::MeshIndexTypeNames); ++i) if(stringValue == Magnum::MeshIndexTypeNames[i]) return Magnum::MeshIndexType(i + 1); diff --git a/src/Magnum/Mesh.h b/src/Magnum/Mesh.h index 3902ba5c5..331754793 100644 --- a/src/Magnum/Mesh.h +++ b/src/Magnum/Mesh.h @@ -30,7 +30,6 @@ */ #include -#include #include "Magnum/Magnum.h" #include "Magnum/visibility.h" @@ -365,14 +364,14 @@ template<> struct MAGNUM_EXPORT ConfigurationValue { * * If the value is invalid, returns empty string. */ - static std::string toString(Magnum::MeshPrimitive value, ConfigurationValueFlags); + static Containers::String toString(Magnum::MeshPrimitive value, ConfigurationValueFlags); /** * @brief Reads enum value as string * * If the value is invalid, returns a zero (invalid) primitive. */ - static Magnum::MeshPrimitive fromString(const std::string& stringValue, ConfigurationValueFlags); + static Magnum::MeshPrimitive fromString(Containers::StringView stringValue, ConfigurationValueFlags); }; /** @configurationvalue{Magnum::MeshIndexType} */ @@ -384,14 +383,14 @@ template<> struct MAGNUM_EXPORT ConfigurationValue { * * If the value is invalid, returns empty string. */ - static std::string toString(Magnum::MeshIndexType value, ConfigurationValueFlags); + static Containers::String toString(Magnum::MeshIndexType value, ConfigurationValueFlags); /** * @brief Read enum value as string * * If the value is invalid, returns a zero (invalid) type. */ - static Magnum::MeshIndexType fromString(const std::string& stringValue, ConfigurationValueFlags); + static Magnum::MeshIndexType fromString(Containers::StringView stringValue, ConfigurationValueFlags); }; }} diff --git a/src/Magnum/PixelFormat.cpp b/src/Magnum/PixelFormat.cpp index da887735a..40afec253 100644 --- a/src/Magnum/PixelFormat.cpp +++ b/src/Magnum/PixelFormat.cpp @@ -25,7 +25,7 @@ #include "PixelFormat.h" -#include +#include #include #include #include @@ -556,14 +556,14 @@ Debug& operator<<(Debug& debug, const CompressedPixelFormat value) { namespace Corrade { namespace Utility { -std::string ConfigurationValue::toString(Magnum::PixelFormat value, ConfigurationValueFlags) { +Containers::String ConfigurationValue::toString(Magnum::PixelFormat value, ConfigurationValueFlags) { if(Magnum::UnsignedInt(value) - 1 < Containers::arraySize(Magnum::PixelFormatNames)) return Magnum::PixelFormatNames[Magnum::UnsignedInt(value) - 1]; return {}; } -Magnum::PixelFormat ConfigurationValue::fromString(const std::string& stringValue, ConfigurationValueFlags) { +Magnum::PixelFormat ConfigurationValue::fromString(Containers::StringView stringValue, ConfigurationValueFlags) { /** @todo This is extremely slow with >100 values. Do a binary search on a sorted index list instead (extracted into a common utility) */ for(std::size_t i = 0; i != Containers::arraySize(Magnum::PixelFormatNames); ++i) @@ -572,14 +572,14 @@ Magnum::PixelFormat ConfigurationValue::fromString(const st return {}; } -std::string ConfigurationValue::toString(Magnum::CompressedPixelFormat value, ConfigurationValueFlags) { +Containers::String ConfigurationValue::toString(Magnum::CompressedPixelFormat value, ConfigurationValueFlags) { if(Magnum::UnsignedInt(value) - 1 < Containers::arraySize(Magnum::CompressedPixelFormatNames)) return Magnum::CompressedPixelFormatNames[Magnum::UnsignedInt(value) - 1]; return {}; } -Magnum::CompressedPixelFormat ConfigurationValue::fromString(const std::string& stringValue, ConfigurationValueFlags) { +Magnum::CompressedPixelFormat ConfigurationValue::fromString(Containers::StringView stringValue, ConfigurationValueFlags) { /** @todo This is extremely slow with >100 values. Do a binary search on a sorted index list instead (extracted into a common utility) */ for(std::size_t i = 0; i != Containers::arraySize(Magnum::CompressedPixelFormatNames); ++i) diff --git a/src/Magnum/PixelFormat.h b/src/Magnum/PixelFormat.h index 1cf1cd298..290f5aa28 100644 --- a/src/Magnum/PixelFormat.h +++ b/src/Magnum/PixelFormat.h @@ -30,7 +30,6 @@ */ #include -#include #include "Magnum/Magnum.h" #include "Magnum/visibility.h" @@ -2491,14 +2490,14 @@ template<> struct MAGNUM_EXPORT ConfigurationValue { * * If the value is invalid, returns empty string. */ - static std::string toString(Magnum::PixelFormat value, ConfigurationValueFlags); + static Containers::String toString(Magnum::PixelFormat value, ConfigurationValueFlags); /** * @brief Reads enum value as string * * If the value is invalid, returns a zero (invalid) format. */ - static Magnum::PixelFormat fromString(const std::string& stringValue, ConfigurationValueFlags); + static Magnum::PixelFormat fromString(Containers::StringView stringValue, ConfigurationValueFlags); }; /** @@ -2513,14 +2512,14 @@ template<> struct MAGNUM_EXPORT ConfigurationValue +#include #include #include #include @@ -930,14 +930,14 @@ Debug& operator<<(Debug& debug, const VertexFormat value) { namespace Corrade { namespace Utility { -std::string ConfigurationValue::toString(Magnum::VertexFormat value, ConfigurationValueFlags) { +Containers::String ConfigurationValue::toString(Magnum::VertexFormat value, ConfigurationValueFlags) { if(Magnum::UnsignedInt(value) - 1 < Containers::arraySize(Magnum::VertexFormatNames)) return Magnum::VertexFormatNames[Magnum::UnsignedInt(value) - 1]; return {}; } -Magnum::VertexFormat ConfigurationValue::fromString(const std::string& stringValue, ConfigurationValueFlags) { +Magnum::VertexFormat ConfigurationValue::fromString(Containers::StringView stringValue, ConfigurationValueFlags) { for(std::size_t i = 0; i != Containers::arraySize(Magnum::VertexFormatNames); ++i) if(stringValue == Magnum::VertexFormatNames[i]) return Magnum::VertexFormat(i + 1); diff --git a/src/Magnum/VertexFormat.h b/src/Magnum/VertexFormat.h index 9cbcc9108..56dcbc3d2 100644 --- a/src/Magnum/VertexFormat.h +++ b/src/Magnum/VertexFormat.h @@ -30,7 +30,6 @@ */ #include -#include #include "Magnum/Magnum.h" #include "Magnum/visibility.h" @@ -1473,14 +1472,14 @@ template<> struct MAGNUM_EXPORT ConfigurationValue { * * If the value is invalid, returns empty string. */ - static std::string toString(Magnum::VertexFormat value, ConfigurationValueFlags); + static Containers::String toString(Magnum::VertexFormat value, ConfigurationValueFlags); /** * @brief Read enum value as string * * If the value is invalid, returns a zero (invalid) format. */ - static Magnum::VertexFormat fromString(const std::string& stringValue, ConfigurationValueFlags); + static Magnum::VertexFormat fromString(Containers::StringView stringValue, ConfigurationValueFlags); }; }}