RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-27 02:47:35 +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

20
Userland/Applications/Spreadsheet/Cell.h
View file

@ -11,7 +11,7 @@
#include "Forward.h"
#include "JSIntegration.h"
#include "Position.h"
#include <AK/String.h>
#include <AK/DeprecatedString.h>
#include <AK/Types.h>
#include <AK/WeakPtr.h>
#include <LibGUI/Command.h>
@ -24,7 +24,7 @@ struct Cell : public Weakable<Cell> {
Formula,
};
Cell(String data, Position position, WeakPtr<Sheet> sheet)
Cell(DeprecatedString data, Position position, WeakPtr<Sheet> sheet)
: m_dirty(false)
, m_data(move(data))
, m_kind(LiteralString)
@ -33,7 +33,7 @@ struct Cell : public Weakable<Cell> {
{
}
Cell(String source, JS::Value&& cell_value, Position position, WeakPtr<Sheet> sheet)
Cell(DeprecatedString source, JS::Value&& cell_value, Position position, WeakPtr<Sheet> sheet)
: m_dirty(false)
, m_data(move(source))
, m_evaluated_data(move(cell_value))
@ -45,7 +45,7 @@ struct Cell : public Weakable<Cell> {
void reference_from(Cell*);
void set_data(String new_data);
void set_data(DeprecatedString new_data);
void set_data(JS::Value new_data);
bool dirty() const { return m_dirty; }
void clear_dirty() { m_dirty = false; }
@ -55,7 +55,7 @@ struct Cell : public Weakable<Cell> {
if (!m_name_for_javascript.is_empty())
return m_name_for_javascript;
m_name_for_javascript = String::formatted("cell {}", m_position.to_cell_identifier(sheet));
m_name_for_javascript = DeprecatedString::formatted("cell {}", m_position.to_cell_identifier(sheet));
return m_name_for_javascript;
}
@ -67,7 +67,7 @@ struct Cell : public Weakable<Cell> {
return m_thrown_value;
}
String const& data() const { return m_data; }
DeprecatedString const& data() const { return m_data; }
const JS::Value& evaluated_data() const { return m_evaluated_data; }
Kind kind() const { return m_kind; }
Vector<WeakPtr<Cell>> const& referencing_cells() const { return m_referencing_cells; }
@ -94,14 +94,14 @@ struct Cell : public Weakable<Cell> {
m_conditional_formats = move(fmts);
}
JS::ThrowCompletionOr<String> typed_display() const;
JS::ThrowCompletionOr<DeprecatedString> typed_display() const;
JS::ThrowCompletionOr<JS::Value> typed_js_data() const;
CellType const& type() const;
CellTypeMetadata const& type_metadata() const { return m_type_metadata; }
CellTypeMetadata& type_metadata() { return m_type_metadata; }
String source() const;
DeprecatedString source() const;
JS::Value js_data();
@ -116,7 +116,7 @@ struct Cell : public Weakable<Cell> {
private:
bool m_dirty { false };
bool m_evaluated_externally { false };
String m_data;
DeprecatedString m_data;
JS::Value m_evaluated_data;
JS::Value m_thrown_value;
Kind m_kind { LiteralString };
@ -125,7 +125,7 @@ private:
CellType const* m_type { nullptr };
CellTypeMetadata m_type_metadata;
Position m_position;
mutable String m_name_for_javascript;
mutable DeprecatedString m_name_for_javascript;
Vector<ConditionalFormat> m_conditional_formats;
Format m_evaluated_formats;