소스 검색

LibUnicode: Return a String from Unicode normalization

Timothy Flynn 2 년 전
부모
커밋
58bc831750
2개의 변경된 파일4개의 추가작업 그리고 4개의 파일을 삭제
  1. 2 2
      Userland/Libraries/LibUnicode/Normalize.cpp
  2. 2 2
      Userland/Libraries/LibUnicode/Normalize.h

+ 2 - 2
Userland/Libraries/LibUnicode/Normalize.cpp

@@ -302,7 +302,7 @@ static ErrorOr<Vector<u32>> normalize_implementation(Utf8View string, Normalizat
     VERIFY_NOT_REACHED();
 }
 
-ErrorOr<DeprecatedString> normalize(StringView string, NormalizationForm form)
+ErrorOr<String> normalize(StringView string, NormalizationForm form)
 {
     auto const code_points = TRY(normalize_implementation(Utf8View { string }, form));
 
@@ -310,7 +310,7 @@ ErrorOr<DeprecatedString> normalize(StringView string, NormalizationForm form)
     for (auto code_point : code_points)
         TRY(builder.try_append_code_point(code_point));
 
-    return builder.to_deprecated_string();
+    return builder.to_string();
 }
 
 }

+ 2 - 2
Userland/Libraries/LibUnicode/Normalize.h

@@ -6,11 +6,11 @@
 
 #pragma once
 
-#include <AK/DeprecatedString.h>
 #include <AK/Error.h>
 #include <AK/Forward.h>
 #include <AK/Optional.h>
 #include <AK/Span.h>
+#include <AK/String.h>
 #include <AK/StringView.h>
 #include <LibUnicode/Forward.h>
 
@@ -29,6 +29,6 @@ enum class NormalizationForm {
 NormalizationForm normalization_form_from_string(StringView form);
 StringView normalization_form_to_string(NormalizationForm form);
 
-ErrorOr<DeprecatedString> normalize(StringView string, NormalizationForm form);
+ErrorOr<String> normalize(StringView string, NormalizationForm form);
 
 }