GUIFont: Switch remaining APIs to std::span

Author: neo1973

xbmc/guilib/GUIFont.cpp

@@ -87,9 +87,9 @@ std::string& CGUIFont::GetFontName()
 
 void CGUIFont::DrawText(float x,
                         float y,
-                        const std::vector<KODI::UTILS::COLOR::Color>& colors,
+                        std::span<const KODI::UTILS::COLOR::Color> colors,
                         KODI::UTILS::COLOR::Color shadowColor,
-                        const vecText& text,
+                        std::span<const character_t> text,
                         uint32_t alignment,
                         float maxPixelWidth)
 {
@@ -179,9 +179,9 @@ bool CGUIFont::UpdateScrollInfo(std::span<const character_t> text, CScrollInfo&
 
 void CGUIFont::DrawScrollingText(float x,
                                  float y,
-                                 const std::vector<KODI::UTILS::COLOR::Color>& colors,
+                                 std::span<const KODI::UTILS::COLOR::Color> colors,
                                  KODI::UTILS::COLOR::Color shadowColor,
-                                 const vecText& text,
+                                 std::span<const character_t> text,
                                  uint32_t alignment,
                                  float maxWidth,
                                  const CScrollInfo& scrollInfo)

xbmc/guilib/GUIFont.h

@@ -126,28 +126,26 @@ class CGUIFont
                 float y,
                 KODI::UTILS::COLOR::Color color,
                 KODI::UTILS::COLOR::Color shadowColor,
-                const vecText& text,
+                std::span<const character_t> text,
                 uint32_t alignment,
                 float maxPixelWidth)
   {
-    std::vector<KODI::UTILS::COLOR::Color> colors;
-    colors.push_back(color);
-    DrawText(x, y, colors, shadowColor, text, alignment, maxPixelWidth);
+    DrawText(x, y, std::span(&color, 1), shadowColor, text, alignment, maxPixelWidth);
   };
 
   void DrawText(float x,
                 float y,
-                const std::vector<KODI::UTILS::COLOR::Color>& colors,
+                std::span<const KODI::UTILS::COLOR::Color> colors,
                 KODI::UTILS::COLOR::Color shadowColor,
-                const vecText& text,
+                std::span<const character_t> text,
                 uint32_t alignment,
                 float maxPixelWidth);
 
   void DrawScrollingText(float x,
                          float y,
-                         const std::vector<KODI::UTILS::COLOR::Color>& colors,
+                         std::span<const KODI::UTILS::COLOR::Color> colors,
                          KODI::UTILS::COLOR::Color shadowColor,
-                         const vecText& text,
+                         std::span<const character_t> text,
                          uint32_t alignment,
                          float maxPixelWidth,
                          const CScrollInfo& scrollInfo);

xbmc/guilib/GUIFontTTF.cpp

@@ -365,8 +365,8 @@ void CGUIFontTTF::End()
 void CGUIFontTTF::DrawTextInternal(CGraphicContext& context,
                                    float x,
                                    float y,
-                                   const std::vector<KODI::UTILS::COLOR::Color>& colors,
-                                   const vecText& text,
+                                   std::span<const KODI::UTILS::COLOR::Color> colors,
+                                   std::span<const character_t> text,
                                    uint32_t alignment,
                                    float maxPixelWidth,
                                    bool scrolling,

xbmc/guilib/GUIFontTTF.h

@@ -160,8 +160,8 @@ class CGUIFontTTF
   void DrawTextInternal(CGraphicContext& context,
                         float x,
                         float y,
-                        const std::vector<KODI::UTILS::COLOR::Color>& colors,
-                        const vecText& text,
+                        std::span<const KODI::UTILS::COLOR::Color> colors,
+                        std::span<const character_t> text,
                         uint32_t alignment,
                         float maxPixelWidth,
                         bool scrolling,