Changed string to llutils native string

Author: Randall Flagg

FreeTypeWrapper/External/LLUtils

@@ -1,6 +1,10 @@
 #pragma once
+#include <LLUtils/StringDefs.h>
+
 namespace FreeType
 {
+    using string_type = LLUtils::native_string_type;
+
     enum class RenderMode
     {
         Default

FreeTypeWrapper/Include/FreeTypeWrapper/FreeTypeCommon.h

@@ -44,8 +44,8 @@ namespace FreeType
 
     struct TextCreateParams
     {
-        std::wstring fontPath;
-        std::wstring text;
+        string_type fontPath;
+        string_type text;
         uint16_t fontSize{};
         LLUtils::Color textColor;
         LLUtils::Color backgroundColor;
@@ -107,7 +107,7 @@ namespace FreeType
      //private member methods
 
 
-        FreeTypeFont* GetOrCreateFont(const std::wstring& fontPath);
+        FreeTypeFont* GetOrCreateFont(const string_type& fontPath);
         FT_Stroker GetStroker();
         static std::string GenerateFreeTypeErrorString(std::string userMessage, FT_Error error);
 
@@ -119,7 +119,7 @@ namespace FreeType
         FT_Library fLibrary;
         FT_Stroker fStroker = nullptr;
 
-        std::map<std::wstring, FreeTypeFontUniquePtr> fFontNameToFont;
+        std::map<string_type, FreeTypeFontUniquePtr> fFontNameToFont;
 
     };
 }

FreeTypeWrapper/Include/FreeTypeWrapper/FreeTypeConnector.h

@@ -107,8 +107,8 @@ namespace FreeType
         const bool lineEndFixedWidth = createFlags.test(TextCreateFlags::LineEndFixedWidth);
         const bool usebidiText = createFlags.test(TextCreateFlags::Bidirectional);
 
-        const std::wstring text = textCreateParams.text;
-        const std::wstring& fontPath = textCreateParams.fontPath;
+        const string_type text = textCreateParams.text;
+        const string_type& fontPath = textCreateParams.fontPath;
         const uint16_t fontSize = textCreateParams.fontSize;
         const uint32_t OutlineWidth = textCreateParams.outlineWidth;
         FT_Render_Mode textRenderMOde = FreeTypeRenderer::GetRenderMode(textCreateParams.renderMode);
@@ -241,7 +241,7 @@ namespace FreeType
         }
     }
 
-    FreeTypeFont* FreeTypeConnector::GetOrCreateFont(const std::wstring& fontPath)
+    FreeTypeFont* FreeTypeConnector::GetOrCreateFont(const string_type& fontPath)
     {
         FreeTypeFont* font = nullptr;
 
@@ -288,8 +288,8 @@ namespace FreeType
             )
     {
         using namespace std;
-        const std::wstring text = textCreateParams.text;
-        const std::wstring& fontPath = textCreateParams.fontPath;
+        const string_type text = textCreateParams.text;
+        const string_type& fontPath = textCreateParams.fontPath;
         const uint16_t fontSize = textCreateParams.fontSize;
         const uint32_t OutlineWidth = textCreateParams.outlineWidth;
         const LLUtils::Color outlineColor = textCreateParams.outlineColor;

FreeTypeWrapper/Source/FreeTypeConnector.cpp

@@ -7,7 +7,7 @@ namespace FreeType
     class FreeTypeFont
     {
     public:
-        FreeTypeFont(FT_Library ftLibrary, const std::wstring& fileName)
+        FreeTypeFont(FT_Library ftLibrary, const string_type& fileName)
         {
             fName = fileName;
             fLibrary = ftLibrary;
@@ -53,7 +53,7 @@ namespace FreeType
 
 
     private:
-        std::wstring fName;
+        string_type fName;
         FT_Face fFace = nullptr;
         FT_Library fLibrary = nullptr;
         uint16_t fFontSize = 0;

FreeTypeWrapper/Source/FreeTypeFont.h

@@ -2,34 +2,32 @@
 #include <LLUtils/StringUtility.h>
 namespace FreeType
 {
-    FormattedTextEntry FormattedTextEntry::Parse(const std::wstring& format, const std::wstring& text)
+    FormattedTextEntry FormattedTextEntry::Parse(const string_type& format, const string_type& text)
     {
         using namespace std;
         using namespace LLUtils;
 
         using string_type = std::remove_const_t<std::remove_reference_t<decltype(text)>>;
         FormattedTextEntry result {};
 
-        wstring trimmed = StringUtility::ToLower(format);
-        trimmed.erase(trimmed.find_last_not_of(L" >") + 1);
-        trimmed.erase(0, trimmed.find_first_not_of(L" <"));
-
-        
+        string_type trimmed = StringUtility::ToLower(format);
+        trimmed.erase(trimmed.find_last_not_of(LLUTILS_TEXT(" >")) + 1);
+        trimmed.erase(0, trimmed.find_first_not_of(LLUTILS_TEXT(" <")));
 
         using stringList = ListString<string_type>;
 
         bool isValid = false;
-        stringList properties = StringUtility::split(trimmed, L';');
+        stringList properties = StringUtility::split(trimmed, LLUTILS_TEXT(';'));
         stringstream ss;
         for (const string_type& prop : properties)
         {
-            stringList trimmedList = StringUtility::split(prop, L'=');
+            stringList trimmedList = StringUtility::split(prop, LLUTILS_TEXT('='));
 
             if (trimmedList.size() == 2)
             {
                 const string_type key = StringUtility::ToLower(trimmedList[0]);
                 const string_type& value = trimmedList[1];
-                if (key == L"textcolor")
+                if (key == LLUTILS_TEXT("textcolor"))
                 {
                     result.textColor = Color::FromString(StringUtility::ToAString(value));
                 }
@@ -64,7 +62,7 @@ namespace FreeType
 
 
 
-    VecFormattedTextEntry MetaText::GetFormattedText(std::wstring text)
+    VecFormattedTextEntry MetaText::GetFormattedText(string_type text)
     {
         using namespace std;
         using string_type = decltype(text);

FreeTypeWrapper/Source/MetaTextParser.cpp

@@ -2,6 +2,7 @@
 #include <vector>
 #include <string>
 #include <LLUtils/Color.h>
+#include "../Include/FreeTypeWrapper/FreeTypeCommon.h"
 
 namespace FreeType
 {
@@ -13,15 +14,15 @@ namespace FreeType
         //uint32_t outlineWidth;
         //uint32_t outlineColor;
 
-        std::wstring text;
-        static FormattedTextEntry Parse(const std::wstring& format, const std::wstring& text);
+        string_type text;
+        static FormattedTextEntry Parse(const string_type& format, const string_type& text);
     };
 
     using VecFormattedTextEntry = std::vector<FormattedTextEntry>;
 
     class MetaText
     {
     public:
-        static VecFormattedTextEntry GetFormattedText(std::wstring text);
+        static VecFormattedTextEntry GetFormattedText(string_type text);
     };
 }