mirror of
https://github.com/RGBCube/serenity
synced 2025-07-25 15:37:46 +00:00
Everywhere: Rename {Deprecated => Byte}String
This commit un-deprecates DeprecatedString, and repurposes it as a byte string. As the null state has already been removed, there are no other particularly hairy blockers in repurposing this type as a byte string (what it _really_ is). This commit is auto-generated: $ xs=$(ack -l \bDeprecatedString\b\|deprecated_string AK Userland \ Meta Ports Ladybird Tests Kernel) $ perl -pie 's/\bDeprecatedString\b/ByteString/g; s/deprecated_string/byte_string/g' $xs $ clang-format --style=file -i \ $(git diff --name-only | grep \.cpp\|\.h) $ gn format $(git ls-files '*.gn' '*.gni')
This commit is contained in:
parent
38d62563b3
commit
5e1499d104
1615 changed files with 10257 additions and 10257 deletions
|
@ -6,7 +6,7 @@
|
|||
|
||||
#pragma once
|
||||
|
||||
#include <AK/DeprecatedString.h>
|
||||
#include <AK/ByteString.h>
|
||||
#include <AK/NonnullRefPtr.h>
|
||||
#include <AK/Optional.h>
|
||||
#include <AK/RefPtr.h>
|
||||
|
@ -35,7 +35,7 @@ public:
|
|||
: public RefCounted<Node>
|
||||
, public Weakable<Node> {
|
||||
public:
|
||||
Node(DeprecatedString text, Optional<Icon> icon, Node* parent_node = nullptr)
|
||||
Node(ByteString text, Optional<Icon> icon, Node* parent_node = nullptr)
|
||||
: m_text(move(text))
|
||||
, m_icon(move(icon))
|
||||
, m_parent_node(parent_node)
|
||||
|
@ -45,7 +45,7 @@ public:
|
|||
virtual ~Node() = default;
|
||||
|
||||
template<typename NodeType = Node, typename... Args>
|
||||
NonnullRefPtr<NodeType> add_node(DeprecatedString text, Optional<Icon> icon, Args&&... args)
|
||||
NonnullRefPtr<NodeType> add_node(ByteString text, Optional<Icon> icon, Args&&... args)
|
||||
requires(IsBaseOf<Node, NodeType>)
|
||||
{
|
||||
auto node = adopt_ref(*new NodeType(move(text), move(icon), this, forward<Args>(args)...));
|
||||
|
@ -53,7 +53,7 @@ public:
|
|||
return node;
|
||||
}
|
||||
|
||||
DeprecatedString const& text() const { return m_text; }
|
||||
ByteString const& text() const { return m_text; }
|
||||
Optional<Icon> const& icon() const { return m_icon; }
|
||||
|
||||
Node const* parent_node() const { return m_parent_node; }
|
||||
|
@ -63,7 +63,7 @@ public:
|
|||
Vector<NonnullRefPtr<Node>>& child_nodes() { return m_child_nodes; }
|
||||
|
||||
private:
|
||||
DeprecatedString m_text;
|
||||
ByteString m_text;
|
||||
Optional<Icon> m_icon;
|
||||
WeakPtr<Node> m_parent_node;
|
||||
Vector<NonnullRefPtr<Node>> m_child_nodes;
|
||||
|
@ -73,7 +73,7 @@ public:
|
|||
Vector<NonnullRefPtr<Node>>& nodes() { return m_nodes; }
|
||||
|
||||
template<typename NodeType = Node, typename... Args>
|
||||
NonnullRefPtr<NodeType> add_node(DeprecatedString text, Optional<Icon> icon, Args&&... args)
|
||||
NonnullRefPtr<NodeType> add_node(ByteString text, Optional<Icon> icon, Args&&... args)
|
||||
requires(IsBaseOf<Node, NodeType>)
|
||||
{
|
||||
auto node = adopt_ref(*new NodeType(move(text), move(icon), nullptr, forward<Args>(args)...));
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue