diff --git a/doc/generated/easings.cpp b/doc/generated/easings.cpp index 11f3bab48..8c201f317 100644 --- a/doc/generated/easings.cpp +++ b/doc/generated/easings.cpp @@ -40,10 +40,11 @@ attribute to the element if you'd ever need that. */ +#include #include #include #include -#include +#include /* lowercase() */ #include "Magnum/Magnum.h" #include "Magnum/Math/Bezier.h" @@ -53,6 +54,7 @@ using namespace Magnum; using namespace Magnum::Math::Literals; +using namespace Corrade::Containers::Literals; namespace { @@ -69,7 +71,7 @@ constexpr Int ThumbEndMarkerSize = 8; constexpr Vector2 ThumbSize{128, 128}; constexpr Vector2 ThumbBorder{0, 32}; -void generateThumb(const std::string& file, Float(*function)(Float)) { +void generateThumb(const Containers::StringView file, Float(*function)(Float)) { std::string out; Range2D viewBox{{}, ThumbSize}; @@ -95,15 +97,15 @@ void generateThumb(const std::string& file, Float(*function)(Float)) { )"); - Utility::Path::write("easings-" + file + "-thumb.svg", Containers::StringView{out}); + Utility::Path::write(Utility::format("easings-{}-thumb.svg", file), Containers::StringView{out}); } -void generate(const std::string& file, Float(*function)(Float), std::initializer_list related = {}, const CubicBezier2D& bezier = {}, const Color3& colorBefore = 0xcd3431_srgbf, const Color3 colorAfter = 0xcd3431_srgbf, bool extraMargin = false) { +void generate(Containers::StringView file, Float(*function)(Float), std::initializer_list related = {}, const CubicBezier2D& bezier = {}, const Color3& colorBefore = 0xcd3431_srgbf, const Color3& colorAfter = 0xcd3431_srgbf, bool extraMargin = false) { std::string out; Vector2 size = Size; Vector2 border = Border; - std::string extraStyle; + Containers::StringView extraStyle; if(extraMargin) { size.y() += 2*ExtraMargin; border.y() += ExtraMargin; @@ -202,7 +204,7 @@ const Color3 success = 0x3bd267_srgbf; /** @todo better bezier approximations for more complex curves, easings.net has it awful */ int main() { - #define _c(name) Utility::String::lowercase(std::string{#name}), Animation::Easing::name + #define _c(name) Utility::String::lowercase(#name ## _s), Animation::Easing::name generate(_c(linear), {}, /* [linear] */ CubicBezier2D{Vector2{0.0f}, Vector2{1.0f/3.0f}, diff --git a/src/Magnum/DebugTools/Test/CompareImageTest.cpp b/src/Magnum/DebugTools/Test/CompareImageTest.cpp index d322f8c13..0cb4c318d 100644 --- a/src/Magnum/DebugTools/Test/CompareImageTest.cpp +++ b/src/Magnum/DebugTools/Test/CompareImageTest.cpp @@ -37,7 +37,7 @@ #include #include #include -#include +#include /* replaceFirst() */ #include "Magnum/ImageView.h" #include "Magnum/PixelFormat.h" diff --git a/src/Magnum/Platform/WindowlessEglApplication.cpp b/src/Magnum/Platform/WindowlessEglApplication.cpp index a95fbaa6e..17b391b1d 100644 --- a/src/Magnum/Platform/WindowlessEglApplication.cpp +++ b/src/Magnum/Platform/WindowlessEglApplication.cpp @@ -32,7 +32,6 @@ #include #include #include -#include #include "Magnum/GL/Version.h" @@ -161,7 +160,7 @@ WindowlessEglContext::WindowlessEglContext(const Configuration& configuration, G EGL_NONE }; CORRADE_INTERNAL_ASSERT_OUTPUT(eglDebugMessageControl([](EGLenum, const char* const command, EGLint, EGLLabelKHR, EGLLabelKHR, const char* message) { - Debug{} << command << Debug::nospace << "():" << Utility::String::rtrim(message); + Debug{} << command << Debug::nospace << "():" << Containers::StringView{message}.trimmedSuffix(); }, debugAttribs) == EGL_SUCCESS); } diff --git a/src/Magnum/Trade/Implementation/converterUtilities.h b/src/Magnum/Trade/Implementation/converterUtilities.h index ed93fdc37..a975db57b 100644 --- a/src/Magnum/Trade/Implementation/converterUtilities.h +++ b/src/Magnum/Trade/Implementation/converterUtilities.h @@ -36,7 +36,7 @@ #include #include #include /** @todo drop once String::replaceAll() has a StringView overload */ -#include +#include /* replaceAll() */ #include #include "Magnum/PixelFormat.h" diff --git a/src/Magnum/Trade/Test/MaterialDataTest.cpp b/src/Magnum/Trade/Test/MaterialDataTest.cpp index ad802c5de..a8e34e81e 100644 --- a/src/Magnum/Trade/Test/MaterialDataTest.cpp +++ b/src/Magnum/Trade/Test/MaterialDataTest.cpp @@ -31,7 +31,6 @@ #include #include #include -#include #include "Magnum/Math/Color.h" #include "Magnum/Math/Matrix3.h" @@ -1147,7 +1146,7 @@ void MaterialDataTest::constructDuplicateAttribute() { MaterialData data{{}, Utility::move(attributes), Containers::array({1, 1, 6})}; /* Because with graceful asserts it doesn't exit on error, the assertion might get printed multiple times */ - CORRADE_COMPARE(Utility::String::partition(out.str(), '\n')[0], "Trade::MaterialData: duplicate attribute DiffuseTextureCoordinates in layer 2"); + CORRADE_COMPARE(Containers::StringView{out.str()}.partition('\n')[0], "Trade::MaterialData: duplicate attribute DiffuseTextureCoordinates in layer 2"); } void MaterialDataTest::constructFromImmutableSortedArray() { diff --git a/src/MagnumPlugins/AnyAudioImporter/AnyImporter.cpp b/src/MagnumPlugins/AnyAudioImporter/AnyImporter.cpp index 6992932ee..d38f60901 100644 --- a/src/MagnumPlugins/AnyAudioImporter/AnyImporter.cpp +++ b/src/MagnumPlugins/AnyAudioImporter/AnyImporter.cpp @@ -31,7 +31,7 @@ #include #include #include -#include +#include /* lowercase() */ #include "MagnumPlugins/Implementation/propagateConfiguration.h" diff --git a/src/MagnumPlugins/AnyImageConverter/AnyImageConverter.cpp b/src/MagnumPlugins/AnyImageConverter/AnyImageConverter.cpp index 76d380940..9a94a614d 100644 --- a/src/MagnumPlugins/AnyImageConverter/AnyImageConverter.cpp +++ b/src/MagnumPlugins/AnyImageConverter/AnyImageConverter.cpp @@ -31,7 +31,7 @@ #include #include /* for PluginMetadata::name() */ #include -#include +#include /* lowercase() */ #include "Magnum/Trade/ImageData.h" #include "MagnumPlugins/Implementation/propagateConfiguration.h" diff --git a/src/MagnumPlugins/AnyImageImporter/AnyImageImporter.cpp b/src/MagnumPlugins/AnyImageImporter/AnyImageImporter.cpp index 2de47a941..81b356527 100644 --- a/src/MagnumPlugins/AnyImageImporter/AnyImageImporter.cpp +++ b/src/MagnumPlugins/AnyImageImporter/AnyImageImporter.cpp @@ -34,7 +34,7 @@ #include /* for PluginMetadata::name() */ #include #include -#include +#include /* lowercase() */ #include "Magnum/Trade/ImageData.h" #include "MagnumPlugins/Implementation/propagateConfiguration.h" diff --git a/src/MagnumPlugins/AnySceneConverter/AnySceneConverter.cpp b/src/MagnumPlugins/AnySceneConverter/AnySceneConverter.cpp index 129160ffd..ccdd64ab4 100644 --- a/src/MagnumPlugins/AnySceneConverter/AnySceneConverter.cpp +++ b/src/MagnumPlugins/AnySceneConverter/AnySceneConverter.cpp @@ -34,7 +34,7 @@ #include /* for PluginMetadata::name() */ #include /* CORRADE_UNUSED */ #include -#include +#include /* lowercase() */ #include "Magnum/Trade/MeshData.h" #include "Magnum/Trade/SceneData.h" diff --git a/src/MagnumPlugins/AnySceneImporter/AnySceneImporter.cpp b/src/MagnumPlugins/AnySceneImporter/AnySceneImporter.cpp index b2ec6b543..179a97584 100644 --- a/src/MagnumPlugins/AnySceneImporter/AnySceneImporter.cpp +++ b/src/MagnumPlugins/AnySceneImporter/AnySceneImporter.cpp @@ -31,7 +31,7 @@ #include #include /* for PluginMetadata::name() */ #include -#include +#include /* lowercase() */ #include "Magnum/Trade/AnimationData.h" #include "Magnum/Trade/CameraData.h" diff --git a/src/MagnumPlugins/AnyShaderConverter/AnyConverter.cpp b/src/MagnumPlugins/AnyShaderConverter/AnyConverter.cpp index c1925bc93..3d167fb60 100644 --- a/src/MagnumPlugins/AnyShaderConverter/AnyConverter.cpp +++ b/src/MagnumPlugins/AnyShaderConverter/AnyConverter.cpp @@ -34,7 +34,7 @@ #include /* for PluginMetadata::name() */ #include #include -#include +#include /* lowercase() */ #include "MagnumPlugins/Implementation/propagateConfiguration.h"