Browse Source

Clean up unnecessary usage of std::string and Utility::String.

And for the remaining <Corrade/Utility/String.h> document what they're
for.
pull/168/head
Vladimír Vondruš 3 years ago
parent
commit
93990413a7
  1. 14
      doc/generated/easings.cpp
  2. 2
      src/Magnum/DebugTools/Test/CompareImageTest.cpp
  3. 3
      src/Magnum/Platform/WindowlessEglApplication.cpp
  4. 2
      src/Magnum/Trade/Implementation/converterUtilities.h
  5. 3
      src/Magnum/Trade/Test/MaterialDataTest.cpp
  6. 2
      src/MagnumPlugins/AnyAudioImporter/AnyImporter.cpp
  7. 2
      src/MagnumPlugins/AnyImageConverter/AnyImageConverter.cpp
  8. 2
      src/MagnumPlugins/AnyImageImporter/AnyImageImporter.cpp
  9. 2
      src/MagnumPlugins/AnySceneConverter/AnySceneConverter.cpp
  10. 2
      src/MagnumPlugins/AnySceneImporter/AnySceneImporter.cpp
  11. 2
      src/MagnumPlugins/AnyShaderConverter/AnyConverter.cpp

14
doc/generated/easings.cpp

@ -40,10 +40,11 @@
attribute to the <svg> element if you'd ever need that.
*/
#include <Corrade/Containers/ArrayView.h>
#include <Corrade/Containers/StringStl.h>
#include <Corrade/Utility/FormatStl.h>
#include <Corrade/Utility/Path.h>
#include <Corrade/Utility/String.h>
#include <Corrade/Utility/String.h> /* 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)) {
</svg>
)");
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<Float(*)(Float)> 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<Float(*)(Float)> 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},

2
src/Magnum/DebugTools/Test/CompareImageTest.cpp

@ -37,7 +37,7 @@
#include <Corrade/Utility/DebugStl.h>
#include <Corrade/Utility/FormatStl.h>
#include <Corrade/Utility/Path.h>
#include <Corrade/Utility/String.h>
#include <Corrade/Utility/String.h> /* replaceFirst() */
#include "Magnum/ImageView.h"
#include "Magnum/PixelFormat.h"

3
src/Magnum/Platform/WindowlessEglApplication.cpp

@ -32,7 +32,6 @@
#include <Corrade/Utility/Assert.h>
#include <Corrade/Utility/Debug.h>
#include <Corrade/Utility/DebugStl.h>
#include <Corrade/Utility/String.h>
#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);
}

2
src/Magnum/Trade/Implementation/converterUtilities.h

@ -36,7 +36,7 @@
#include <Corrade/PluginManager/PluginMetadata.h>
#include <Corrade/Utility/Format.h>
#include <Corrade/Utility/FormatStl.h> /** @todo drop once String::replaceAll() has a StringView overload */
#include <Corrade/Utility/String.h>
#include <Corrade/Utility/String.h> /* replaceAll() */
#include <Corrade/Utility/ConfigurationGroup.h>
#include "Magnum/PixelFormat.h"

3
src/Magnum/Trade/Test/MaterialDataTest.cpp

@ -31,7 +31,6 @@
#include <Corrade/TestSuite/Compare/Container.h>
#include <Corrade/TestSuite/Compare/Numeric.h>
#include <Corrade/Utility/DebugStl.h>
#include <Corrade/Utility/String.h>
#include "Magnum/Math/Color.h"
#include "Magnum/Math/Matrix3.h"
@ -1147,7 +1146,7 @@ void MaterialDataTest::constructDuplicateAttribute() {
MaterialData data{{}, Utility::move(attributes), Containers::array<UnsignedInt>({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() {

2
src/MagnumPlugins/AnyAudioImporter/AnyImporter.cpp

@ -31,7 +31,7 @@
#include <Corrade/Utility/Assert.h>
#include <Corrade/Utility/DebugStl.h>
#include <Corrade/Utility/Path.h>
#include <Corrade/Utility/String.h>
#include <Corrade/Utility/String.h> /* lowercase() */
#include "MagnumPlugins/Implementation/propagateConfiguration.h"

2
src/MagnumPlugins/AnyImageConverter/AnyImageConverter.cpp

@ -31,7 +31,7 @@
#include <Corrade/Utility/Assert.h>
#include <Corrade/Utility/DebugStl.h> /* for PluginMetadata::name() */
#include <Corrade/Utility/Path.h>
#include <Corrade/Utility/String.h>
#include <Corrade/Utility/String.h> /* lowercase() */
#include "Magnum/Trade/ImageData.h"
#include "MagnumPlugins/Implementation/propagateConfiguration.h"

2
src/MagnumPlugins/AnyImageImporter/AnyImageImporter.cpp

@ -34,7 +34,7 @@
#include <Corrade/Utility/DebugStl.h> /* for PluginMetadata::name() */
#include <Corrade/Utility/Format.h>
#include <Corrade/Utility/Path.h>
#include <Corrade/Utility/String.h>
#include <Corrade/Utility/String.h> /* lowercase() */
#include "Magnum/Trade/ImageData.h"
#include "MagnumPlugins/Implementation/propagateConfiguration.h"

2
src/MagnumPlugins/AnySceneConverter/AnySceneConverter.cpp

@ -34,7 +34,7 @@
#include <Corrade/Utility/DebugStl.h> /* for PluginMetadata::name() */
#include <Corrade/Utility/Macros.h> /* CORRADE_UNUSED */
#include <Corrade/Utility/Path.h>
#include <Corrade/Utility/String.h>
#include <Corrade/Utility/String.h> /* lowercase() */
#include "Magnum/Trade/MeshData.h"
#include "Magnum/Trade/SceneData.h"

2
src/MagnumPlugins/AnySceneImporter/AnySceneImporter.cpp

@ -31,7 +31,7 @@
#include <Corrade/Utility/Assert.h>
#include <Corrade/Utility/DebugStl.h> /* for PluginMetadata::name() */
#include <Corrade/Utility/Path.h>
#include <Corrade/Utility/String.h>
#include <Corrade/Utility/String.h> /* lowercase() */
#include "Magnum/Trade/AnimationData.h"
#include "Magnum/Trade/CameraData.h"

2
src/MagnumPlugins/AnyShaderConverter/AnyConverter.cpp

@ -34,7 +34,7 @@
#include <Corrade/Utility/DebugStl.h> /* for PluginMetadata::name() */
#include <Corrade/Utility/Format.h>
#include <Corrade/Utility/Path.h>
#include <Corrade/Utility/String.h>
#include <Corrade/Utility/String.h> /* lowercase() */
#include "MagnumPlugins/Implementation/propagateConfiguration.h"

Loading…
Cancel
Save