RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-27 16:47:44 +00:00
Code Issues Activity Actions

AK+Everywhere: Rename String to DeprecatedString

Browse source 
We have a new, improved string type coming up in AK (OOM aware, no null
state), and while it's going to use UTF-8, the name UTF8String is a
mouthful - so let's free up the String name by renaming the existing
class.
Making the old one have an annoying name will hopefully also help with
quick adoption :^)
This commit is contained in:
Linus Groh 2022-12-04 18:02:33 +00:00 • committed by Andreas Kling
parent f74251606d
commit 6e19ab2bbc
2006 changed files with 11635 additions and 11636 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Userland/Libraries/LibDiff/Format.cpp
View file

@ -5,12 +5,12 @@
*/
#include "Format.h"
#include <AK/String.h>
#include <AK/DeprecatedString.h>
#include <AK/StringBuilder.h>
#include <AK/Vector.h>
namespace Diff {
String generate_only_additions(String const& text)
DeprecatedString generate_only_additions(DeprecatedString const& text)
{
auto lines = text.split('\n', SplitBehavior::KeepEmpty);
StringBuilder builder;

4
Userland/Libraries/LibDiff/Format.h
View file

@ -6,8 +6,8 @@
#pragma once
#include <AK/String.h>
#include <AK/DeprecatedString.h>
namespace Diff {
String generate_only_additions(String const&);
DeprecatedString generate_only_additions(DeprecatedString const&);
};

8
Userland/Libraries/LibDiff/Hunks.cpp
View file

@ -8,9 +8,9 @@
#include <AK/Debug.h>
namespace Diff {
Vector<Hunk> parse_hunks(String const& diff)
Vector<Hunk> parse_hunks(DeprecatedString const& diff)
{
Vector<String> diff_lines = diff.split('\n');
Vector<DeprecatedString> diff_lines = diff.split('\n');
if (diff_lines.is_empty())
return {};
@ -74,14 +74,14 @@ Vector<Hunk> parse_hunks(String const& diff)
return hunks;
}
HunkLocation parse_hunk_location(String const& location_line)
HunkLocation parse_hunk_location(DeprecatedString const& location_line)
{
size_t char_index = 0;
struct StartAndLength {
size_t start { 0 };
size_t length { 0 };
};
auto parse_start_and_length_pair = [](String const& raw) {
auto parse_start_and_length_pair = [](DeprecatedString const& raw) {
auto index_of_separator = raw.find(',').value();
auto start = raw.substring(0, index_of_separator).to_uint().value();
auto length = raw.substring(index_of_separator + 1, raw.length() - index_of_separator - 1).to_uint().value();

10
Userland/Libraries/LibDiff/Hunks.h
View file

@ -6,7 +6,7 @@
#pragma once
#include <AK/String.h>
#include <AK/DeprecatedString.h>
#include <AK/Vector.h>
namespace Diff {
@ -28,10 +28,10 @@ struct HunkLocation {
struct Hunk {
size_t original_start_line { 0 };
size_t target_start_line { 0 };
Vector<String> removed_lines;
Vector<String> added_lines;
Vector<DeprecatedString> removed_lines;
Vector<DeprecatedString> added_lines;
};
Vector<Hunk> parse_hunks(String const& diff);
HunkLocation parse_hunk_location(String const& location_line);
Vector<Hunk> parse_hunks(DeprecatedString const& diff);
HunkLocation parse_hunk_location(DeprecatedString const& location_line);
};