From f74942f67a61fea0b04fecfc053480bd5972629f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= <mosra@centrum.cz>
Date: Mon, 19 Apr 2021 09:15:40 +0200
Subject: [PATCH] Shaders: make the string building slightly less crazy.

---
 src/Magnum/Shaders/PhongGL.cpp | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/Magnum/Shaders/PhongGL.cpp b/src/Magnum/Shaders/PhongGL.cpp
index de4494706..ba0d0b308 100644
--- a/src/Magnum/Shaders/PhongGL.cpp
+++ b/src/Magnum/Shaders/PhongGL.cpp
@@ -31,6 +31,7 @@
 #include <Corrade/Containers/EnumSet.hpp>
 #include <Corrade/Containers/Reference.h>
 #include <Corrade/Containers/StringView.h>
+#include <Corrade/Containers/StringStl.h>
 #include <Corrade/Utility/FormatStl.h>
 #include <Corrade/Utility/Resource.h>
 
@@ -94,9 +95,9 @@ PhongGL::PhongGL(const Flags flags, const UnsignedInt lightCount): _flags{flags}
             lightPositionInitializerPreamble.size() +
             lightCount*(lightPositionInitializerItem.size()));
 
-        lightInitializerVertex.append(lightPositionInitializerPreamble.data(), lightPositionInitializerPreamble.size());
+        lightInitializerVertex.append(lightPositionInitializerPreamble);
         for(std::size_t i = 0; i != lightCount; ++i)
-            lightInitializerVertex.append(lightPositionInitializerItem.data(), lightPositionInitializerItem.size());
+            lightInitializerVertex.append(lightPositionInitializerItem);
 
         /* Drop the last comma and add a newline at the end */
         lightInitializerVertex[lightInitializerVertex.size() - 2] = '\n';
@@ -108,17 +109,17 @@ PhongGL::PhongGL(const Flags flags, const UnsignedInt lightCount): _flags{flags}
             lightCount*(lightColorInitializerItem.size() +
                         lightRangeInitializerItem.size()));
 
-        lightInitializerFragment.append(lightColorInitializerPreamble.data(), lightColorInitializerPreamble.size());
+        lightInitializerFragment.append(lightColorInitializerPreamble);
         for(std::size_t i = 0; i != lightCount; ++i)
-            lightInitializerFragment.append(lightColorInitializerItem.data(), lightColorInitializerItem.size());
+            lightInitializerFragment.append(lightColorInitializerItem);
 
         /* Drop the last comma and add a newline at the end */
         lightInitializerFragment[lightInitializerFragment.size() - 2] = '\n';
         lightInitializerFragment.resize(lightInitializerFragment.size() - 1);
 
-        lightInitializerFragment.append(lightRangeInitializerPreamble.data(), lightRangeInitializerPreamble.size());
+        lightInitializerFragment.append(lightRangeInitializerPreamble);
         for(std::size_t i = 0; i != lightCount; ++i)
-            lightInitializerFragment.append(lightRangeInitializerItem.data(), lightRangeInitializerItem.size());
+            lightInitializerFragment.append(lightRangeInitializerItem);
 
         /* Drop the last comma and add a newline at the end */
         lightInitializerFragment[lightInitializerFragment.size() - 2] = '\n';