🔥 Remove deprecated StringUtils::format (#2613)

Author: halx99

3rdparty/yasio/yasio/bindings/yasio_axlua.cpp

@@ -37,8 +37,10 @@ SOFTWARE.
 #  if !__has_attribute(format)
 #    undef __has_attribute
 #  endif
-#include "cocos2d.h"
-using namespace cocos2d;
+#include "base/Director.h"
+#include "base/Scheduler.h"
+
+using namespace ax;
 
 namespace lyasio
 {
@@ -72,7 +74,7 @@ static TIMER_ID loop(unsigned int n, float interval, vcallback_t callback)
 
     auto timerId = reinterpret_cast<TIMER_ID>(++TimerObject::s_timerId);
 
-    std::string key = StringUtils::format("LSTMR#%p", timerId);
+    std::string key = fmt::format("LSTMR#{}", fmt::ptr(timerId));
 
     Director::getInstance()->getScheduler()->schedule(
         [timerObj](
@@ -93,7 +95,7 @@ static TIMER_ID delay(float delay, vcallback_t callback)
     yasio::ref_ptr<TimerObject> timerObj(new TimerObject(std::move(callback)));
     auto timerId = reinterpret_cast<TIMER_ID>(++TimerObject::s_timerId);
 
-    std::string key = StringUtils::format("LSTMR#%p", timerId);
+    std::string key = fmt::format("LSTMR#{}", fmt::ptr(timerId));
     Director::getInstance()->getScheduler()->schedule(
         [timerObj](
             float /*dt*/) { // lambda expression hold the reference of timerObj automatically.
@@ -108,7 +110,7 @@ static TIMER_ID delay(float delay, vcallback_t callback)
 
 static void kill(TIMER_ID timerId)
 {
-  std::string key = StringUtils::format("LSTMR#%p", timerId);
+  std::string key = fmt::format("LSTMR#{}", fmt::ptr(timerId));
   Director::getInstance()->getScheduler()->unschedule(key, STIMER_TARGET_VALUE);
 }
 YASIO_LUA_API void clear()

CHANGELOG.md

@@ -573,7 +573,7 @@
   - Rename all AXLOG/printf to AXLOGD (without .\core, .\3rdparty) by @aismann in https://github.com/axmolengine/axmol/pull/2020
   - Set several log messages to verbose level by @rh101 in https://github.com/axmolengine/axmol/pull/2021
   - Change AXLOGI to more appropriate AXLOGD for several log calls by @rh101 in https://github.com/axmolengine/axmol/pull/2028
-- `StringUtils::format`, use `fmt::format` instead.
+- `text_utils::format`, use `fmt::format` instead.
 
 ## Bug Fixes
 

core/2d/Action.cpp

@@ -31,7 +31,7 @@ THE SOFTWARE.
 #include "2d/ActionInterval.h"
 #include "2d/Node.h"
 #include "base/Director.h"
-#include "base/UTF8.h"
+#include "base/text_utils.h"
 
 namespace ax
 {

core/2d/FastTMXLayer.cpp

@@ -48,7 +48,7 @@ THE SOFTWARE.
 #include "renderer/backend/DriverBase.h"
 #include "renderer/backend/Buffer.h"
 #include "base/Director.h"
-#include "base/UTF8.h"
+#include "base/text_utils.h"
 #include "renderer/backend/ProgramState.h"
 
 namespace ax

core/2d/FastTMXTiledMap.cpp

@@ -28,7 +28,7 @@ THE SOFTWARE.
 ****************************************************************************/
 #include "2d/FastTMXTiledMap.h"
 #include "2d/FastTMXLayer.h"
-#include "base/UTF8.h"
+#include "base/text_utils.h"
 
 namespace ax
 {

core/2d/Font.h

@@ -31,7 +31,7 @@
 
 #include <string>
 #include "base/Types.h"
-#include "base/UTF8.h"
+#include "base/text_utils.h"
 
 namespace ax
 {

core/2d/FontAtlas.cpp

@@ -32,7 +32,7 @@
 #endif
 #include <algorithm>
 #include "2d/FontFreeType.h"
-#include "base/UTF8.h"
+#include "base/text_utils.h"
 #include "base/Director.h"
 #include "base/EventListenerCustom.h"
 #include "base/EventDispatcher.h"

core/2d/FontFNT.cpp

@@ -32,7 +32,7 @@
 #include "base/Configuration.h"
 #include "base/Director.h"
 #include "base/Map.h"
-#include "base/UTF8.h"
+#include "base/text_utils.h"
 #include "renderer/TextureCache.h"
 
 #include <cmath>

core/2d/FontFreeType.cpp

@@ -28,7 +28,7 @@ THE SOFTWARE.
 #include "2d/FontFreeType.h"
 #include "2d/FontAtlas.h"
 #include "base/Director.h"
-#include "base/UTF8.h"
+#include "base/text_utils.h"
 #include "base/filesystem.h"
 #include "freetype/ftmodapi.h"
 #include "platform/FileUtils.h"
@@ -351,7 +351,7 @@ FontAtlas* FontFreeType::newFontAtlas()
     if (_usedGlyphs != GlyphCollection::DYNAMIC)
     {
         std::u32string utf32;
-        if (StringUtils::UTF8ToUTF32(getGlyphCollection(), utf32))
+        if (text_utils::UTF8ToUTF32(getGlyphCollection(), utf32))
         {
             fontAtlas->prepareLetterDefinitions(utf32);
         }
@@ -436,7 +436,7 @@ unsigned char* FontFreeType::getGlyphBitmap(char32_t charCode,
         char32_t ntcs[2] = {charCode, (char32_t)0};
         std::u32string_view charUTF32(ntcs, 1);
         std::string charUTF8;
-        ax::StringUtils::UTF32ToUTF8(charUTF32, charUTF8);
+        ax::text_utils::UTF32ToUTF8(charUTF32, charUTF8);
 
         if (charUTF8 == "\n")
             charUTF8 = "\\n";

core/2d/Label.cpp

@@ -36,7 +36,7 @@
 #include "2d/SpriteBatchNode.h"
 #include "2d/DrawNode.h"
 #include "2d/Camera.h"
-#include "base/UTF8.h"
+#include "base/text_utils.h"
 #include "base/Macros.h"
 #include "platform/FileUtils.h"
 #include "renderer/Renderer.h"
@@ -925,7 +925,7 @@ void Label::setString(std::string_view text)
         _contentDirty = true;
 
         std::u32string utf32String;
-        if (StringUtils::UTF8ToUTF32(_utf8Text, utf32String))
+        if (text_utils::UTF8ToUTF32(_utf8Text, utf32String))
         {
             _utf32Text = utf32String;
         }
@@ -1701,7 +1701,7 @@ void Label::clearTextures()
     if (_fontAtlas)
     {
         std::u32string utf32String;
-        if (StringUtils::UTF8ToUTF32(_utf8Text, utf32String))
+        if (text_utils::UTF8ToUTF32(_utf8Text, utf32String))
         {
             _utf32Text = utf32String;
         }
@@ -2347,7 +2347,7 @@ void Label::computeStringNumLines()
     size_t stringLen = _utf32Text.length();
     for (size_t i = 0; i < stringLen - 1; ++i)
     {
-        if (_utf32Text[i] == StringUtils::UnicodeCharacters::NewLine)
+        if (_utf32Text[i] == text_utils::UnicodeCharacters::NewLine)
         {
             quantityOfLines++;
         }
@@ -2765,9 +2765,9 @@ int Label::getFirstWordLen(const std::u32string& utf32Text, int startIndex, int
     {
         char32_t character = utf32Text[index];
 
-        if (character == StringUtils::UnicodeCharacters::NewLine ||
-            (!StringUtils::isUnicodeNonBreaking(character) &&
-             (StringUtils::isUnicodeSpace(character) || StringUtils::isCJKUnicode(character))))
+        if (character == text_utils::UnicodeCharacters::NewLine ||
+            (!text_utils::isUnicodeNonBreaking(character) &&
+             (text_utils::isUnicodeSpace(character) || text_utils::isCJKUnicode(character))))
         {
             break;
         }
@@ -2798,13 +2798,13 @@ int Label::getFirstWordLen(const std::u32string& utf32Text, int startIndex, int
 
 bool Label::getFontLetterDef(char32_t character, FontLetterDefinition& letterDef) const
 {
-    if (character == StringUtils::UnicodeCharacters::NoBreakSpace)
+    if (character == text_utils::UnicodeCharacters::NoBreakSpace)
     {
         // change no-break space to regular space
         // reason: some fonts have issue with no-break space:
         //   * no letter definition
         //   * not normal big width
-        character = StringUtils::UnicodeCharacters::Space;
+        character = text_utils::UnicodeCharacters::Space;
     }
 
     return _fontAtlas->getLetterDefinitionForChar(character, letterDef);
@@ -2859,7 +2859,7 @@ bool Label::multilineTextWrap(bool breakOnChar, bool ignoreOverflow)
     for (int index = 0; index < textLen;)
     {
         char32_t character = _utf32Text[index];
-        if (character == StringUtils::UnicodeCharacters::NewLine)
+        if (character == text_utils::UnicodeCharacters::NewLine)
         {
             _linesWidth.emplace_back(letterRight);
             letterRight = 0.f;
@@ -2883,11 +2883,11 @@ bool Label::multilineTextWrap(bool breakOnChar, bool ignoreOverflow)
                 (index + tokenLen) < textLen)
             {
                 auto tokenLastChar = _utf32Text[index + tokenLen - 1];
-                if (!StringUtils::isCJKUnicode(tokenLastChar) && !StringUtils::isUnicodeSpace(tokenLastChar))
+                if (!text_utils::isCJKUnicode(tokenLastChar) && !text_utils::isUnicodeSpace(tokenLastChar))
                 {
                     // Work out if this token is valid based on the desired output
                     auto nextChar = _utf32Text[index + tokenLen];
-                    if (!StringUtils::isUnicodeSpace(nextChar) && !StringUtils::isCJKUnicode(nextChar))
+                    if (!text_utils::isUnicodeSpace(nextChar) && !text_utils::isCJKUnicode(nextChar))
                     {
                         // No point continuing here
                         return false;
@@ -2906,14 +2906,14 @@ bool Label::multilineTextWrap(bool breakOnChar, bool ignoreOverflow)
         {
             int letterIndex = index + tmp;
             character       = _utf32Text[letterIndex];
-            if (character == StringUtils::UnicodeCharacters::CarriageReturn)
+            if (character == text_utils::UnicodeCharacters::CarriageReturn)
             {
                 recordPlaceholderInfo(letterIndex, character);
                 continue;
             }
 
             // \b - Next char not change x position
-            if (character == StringUtils::UnicodeCharacters::NextCharNoChangeX)
+            if (character == text_utils::UnicodeCharacters::NextCharNoChangeX)
             {
                 nextChangeSize = false;
                 recordPlaceholderInfo(letterIndex, character);
@@ -2930,7 +2930,7 @@ bool Label::multilineTextWrap(bool breakOnChar, bool ignoreOverflow)
 
             auto letterX = (nextLetterX + letterDef.offsetX * _fontScale) / contentScaleFactor;
             if (_enableWrap && _maxLineWidth > 0.f && nextTokenX > 0.f &&
-                letterX + letterDef.width * _fontScale > _maxLineWidth && !StringUtils::isUnicodeSpace(character) &&
+                letterX + letterDef.width * _fontScale > _maxLineWidth && !text_utils::isUnicodeSpace(character) &&
                 nextChangeSize)
             {
                 _linesWidth.emplace_back(letterRight - whitespaceWidth);
@@ -2959,7 +2959,7 @@ bool Label::multilineTextWrap(bool breakOnChar, bool ignoreOverflow)
                 nextLetterX += newLetterWidth;
                 tokenRight = nextLetterX / contentScaleFactor;
 
-                if (StringUtils::isUnicodeSpace(character))
+                if (text_utils::isUnicodeSpace(character))
                 {
                     nextWhitespaceWidth += newLetterWidth / contentScaleFactor;
                 }