RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-28 10:07: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

2
Userland/Applications/Mail/AccountHolder.cpp
View file

@ -12,7 +12,7 @@ AccountHolder::AccountHolder()
m_mailbox_tree_model = MailboxTreeModel::create(*this);
}
void AccountHolder::add_account_with_name_and_mailboxes(String name, Vector<IMAP::ListItem> const& mailboxes)
void AccountHolder::add_account_with_name_and_mailboxes(DeprecatedString name, Vector<IMAP::ListItem> const& mailboxes)
{
auto account = AccountNode::create(move(name));

22
Userland/Applications/Mail/AccountHolder.h
View file

@ -8,9 +8,9 @@
#pragma once
#include "MailboxTreeModel.h"
#include <AK/DeprecatedString.h>
#include <AK/NonnullRefPtrVector.h>
#include <AK/RefCounted.h>
#include <AK/String.h>
#include <LibIMAP/Objects.h>
class BaseNode : public RefCounted<BaseNode> {
@ -22,7 +22,7 @@ class MailboxNode;
class AccountNode final : public BaseNode {
public:
static NonnullRefPtr<AccountNode> create(String name)
static NonnullRefPtr<AccountNode> create(DeprecatedString name)
{
return adopt_ref(*new AccountNode(move(name)));
}
@ -35,21 +35,21 @@ public:
}
NonnullRefPtrVector<MailboxNode> const& mailboxes() const { return m_mailboxes; }
String const& name() const { return m_name; }
DeprecatedString const& name() const { return m_name; }
private:
explicit AccountNode(String name)
explicit AccountNode(DeprecatedString name)
: m_name(move(name))
{
}
String m_name;
DeprecatedString m_name;
NonnullRefPtrVector<MailboxNode> m_mailboxes;
};
class MailboxNode final : public BaseNode {
public:
static NonnullRefPtr<MailboxNode> create(AccountNode const& associated_account, IMAP::ListItem const& mailbox, String display_name)
static NonnullRefPtr<MailboxNode> create(AccountNode const& associated_account, IMAP::ListItem const& mailbox, DeprecatedString display_name)
{
return adopt_ref(*new MailboxNode(associated_account, mailbox, move(display_name)));
}
@ -57,8 +57,8 @@ public:
virtual ~MailboxNode() override = default;
AccountNode const& associated_account() const { return m_associated_account; }
String const& select_name() const { return m_mailbox.name; }
String const& display_name() const { return m_display_name; }
DeprecatedString const& select_name() const { return m_mailbox.name; }
DeprecatedString const& display_name() const { return m_display_name; }
IMAP::ListItem const& mailbox() const { return m_mailbox; }
bool has_parent() const { return m_parent; }
@ -70,7 +70,7 @@ public:
void add_child(NonnullRefPtr<MailboxNode> child) { m_children.append(child); }
private:
MailboxNode(AccountNode const& associated_account, IMAP::ListItem const& mailbox, String display_name)
MailboxNode(AccountNode const& associated_account, IMAP::ListItem const& mailbox, DeprecatedString display_name)
: m_associated_account(associated_account)
, m_mailbox(mailbox)
, m_display_name(move(display_name))
@ -79,7 +79,7 @@ private:
AccountNode const& m_associated_account;
IMAP::ListItem m_mailbox;
String m_display_name;
DeprecatedString m_display_name;
NonnullRefPtrVector<MailboxNode> m_children;
RefPtr<MailboxNode> m_parent;
@ -94,7 +94,7 @@ public:
return adopt_own(*new AccountHolder());
}
void add_account_with_name_and_mailboxes(String, Vector<IMAP::ListItem> const&);
void add_account_with_name_and_mailboxes(DeprecatedString, Vector<IMAP::ListItem> const&);
NonnullRefPtrVector<AccountNode> const& accounts() const { return m_accounts; }
MailboxTreeModel& mailbox_tree_model() { return *m_mailbox_tree_model; }

2
Userland/Applications/Mail/InboxModel.cpp
View file

@ -17,7 +17,7 @@ int InboxModel::row_count(GUI::ModelIndex const&) const
return m_entries.size();
}
String InboxModel::column_name(int column_index) const
DeprecatedString InboxModel::column_name(int column_index) const
{
switch (column_index) {
case Column::From:

6
Userland/Applications/Mail/InboxModel.h
View file

@ -11,8 +11,8 @@
#include <LibIMAP/Objects.h>
struct InboxEntry {
String from;
String subject;
DeprecatedString from;
DeprecatedString subject;
};
class InboxModel final : public GUI::Model {
@ -32,7 +32,7 @@ public:
virtual int row_count(const GUI::ModelIndex& = GUI::ModelIndex()) const override;
virtual int column_count(const GUI::ModelIndex& = GUI::ModelIndex()) const override { return Column::__Count; }
virtual String column_name(int) const override;
virtual DeprecatedString column_name(int) const override;
virtual GUI::Variant data(const GUI::ModelIndex&, GUI::ModelRole) const override;
private:

34
Userland/Applications/Mail/MailWidget.cpp
View file

@ -43,7 +43,7 @@ MailWidget::MailWidget()
if (!Desktop::Launcher::open(url)) {
GUI::MessageBox::show(
window(),
String::formatted("The link to '{}' could not be opened.", url),
DeprecatedString::formatted("The link to '{}' could not be opened.", url),
"Failed to open link"sv,
GUI::MessageBox::Type::Error);
}
@ -125,7 +125,7 @@ bool MailWidget::connect_and_login()
auto maybe_imap_client = tls ? IMAP::Client::connect_tls(server, port) : IMAP::Client::connect_plaintext(server, port);
if (maybe_imap_client.is_error()) {
GUI::MessageBox::show_error(window(), String::formatted("Failed to connect to '{}:{}' over {}: {}", server, port, tls ? "TLS" : "Plaintext", maybe_imap_client.error()));
GUI::MessageBox::show_error(window(), DeprecatedString::formatted("Failed to connect to '{}:{}' over {}: {}", server, port, tls ? "TLS" : "Plaintext", maybe_imap_client.error()));
return false;
}
m_imap_client = maybe_imap_client.release_value();
@ -138,7 +138,7 @@ bool MailWidget::connect_and_login()
if (response.status() != IMAP::ResponseStatus::OK) {
dbgln("Failed to login. The server says: '{}'", response.response_text());
GUI::MessageBox::show_error(window(), String::formatted("Failed to login. The server says: '{}'", response.response_text()));
GUI::MessageBox::show_error(window(), DeprecatedString::formatted("Failed to login. The server says: '{}'", response.response_text()));
return false;
}
@ -146,7 +146,7 @@ bool MailWidget::connect_and_login()
if (response.status() != IMAP::ResponseStatus::OK) {
dbgln("Failed to retrieve mailboxes. The server says: '{}'", response.response_text());
GUI::MessageBox::show_error(window(), String::formatted("Failed to retrieve mailboxes. The server says: '{}'", response.response_text()));
GUI::MessageBox::show_error(window(), DeprecatedString::formatted("Failed to retrieve mailboxes. The server says: '{}'", response.response_text()));
return false;
}
@ -257,7 +257,7 @@ void MailWidget::selected_mailbox()
if (response.status() != IMAP::ResponseStatus::OK) {
dbgln("Failed to select mailbox. The server says: '{}'", response.response_text());
GUI::MessageBox::show_error(window(), String::formatted("Failed to select mailbox. The server says: '{}'", response.response_text()));
GUI::MessageBox::show_error(window(), DeprecatedString::formatted("Failed to select mailbox. The server says: '{}'", response.response_text()));
return;
}
@ -284,7 +284,7 @@ void MailWidget::selected_mailbox()
if (response.status() != IMAP::ResponseStatus::OK) {
dbgln("Failed to retrieve subject/from for e-mails. The server says: '{}'", response.response_text());
GUI::MessageBox::show_error(window(), String::formatted("Failed to retrieve e-mails. The server says: '{}'", response.response_text()));
GUI::MessageBox::show_error(window(), DeprecatedString::formatted("Failed to retrieve e-mails. The server says: '{}'", response.response_text()));
return;
}
@ -294,7 +294,7 @@ void MailWidget::selected_mailbox()
auto& response_data = fetch_data.get<IMAP::FetchResponseData>();
auto& body_data = response_data.body_data();
auto data_item_has_header = [](IMAP::FetchCommand::DataItem const& data_item, String const& search_header) {
auto data_item_has_header = [](IMAP::FetchCommand::DataItem const& data_item, DeprecatedString const& search_header) {
if (!data_item.section.has_value())
return false;
if (data_item.section->type != IMAP::FetchCommand::DataItem::SectionType::HeaderFields)
@ -307,14 +307,14 @@ void MailWidget::selected_mailbox()
return header_iterator != data_item.section->headers->end();
};
auto subject_iterator = body_data.find_if([&data_item_has_header](Tuple<IMAP::FetchCommand::DataItem, Optional<String>>& data) {
auto subject_iterator = body_data.find_if([&data_item_has_header](Tuple<IMAP::FetchCommand::DataItem, Optional<DeprecatedString>>& data) {
auto const data_item = data.get<0>();
return data_item_has_header(data_item, "Subject");
});
VERIFY(subject_iterator != body_data.end());
auto from_iterator = body_data.find_if([&data_item_has_header](Tuple<IMAP::FetchCommand::DataItem, Optional<String>>& data) {
auto from_iterator = body_data.find_if([&data_item_has_header](Tuple<IMAP::FetchCommand::DataItem, Optional<DeprecatedString>>& data) {
auto const data_item = data.get<0>();
return data_item_has_header(data_item, "From");
});
@ -323,7 +323,7 @@ void MailWidget::selected_mailbox()
// FIXME: All of the following doesn't really follow RFC 2822: https://datatracker.ietf.org/doc/html/rfc2822
auto parse_and_unfold = [](String const& value) {
auto parse_and_unfold = [](DeprecatedString const& value) {
GenericLexer lexer(value);
StringBuilder builder;
@ -352,7 +352,7 @@ void MailWidget::selected_mailbox()
auto& subject_iterator_value = subject_iterator->get<1>().value();
auto subject_index = subject_iterator_value.find("Subject:"sv);
String subject;
DeprecatedString subject;
if (subject_index.has_value()) {
auto potential_subject = subject_iterator_value.substring(subject_index.value());
auto subject_parts = potential_subject.split_limit(':', 2);
@ -400,12 +400,12 @@ void MailWidget::selected_email_to_load()
if (fetch_response.status() != IMAP::ResponseStatus::OK) {
dbgln("Failed to retrieve the body structure of the selected e-mail. The server says: '{}'", fetch_response.response_text());
GUI::MessageBox::show_error(window(), String::formatted("Failed to retrieve the selected e-mail. The server says: '{}'", fetch_response.response_text()));
GUI::MessageBox::show_error(window(), DeprecatedString::formatted("Failed to retrieve the selected e-mail. The server says: '{}'", fetch_response.response_text()));
return;
}
Vector<u32> selected_alternative_position;
String selected_alternative_encoding;
DeprecatedString selected_alternative_encoding;
auto& response_data = fetch_response.data().fetch_data().last().get<IMAP::FetchResponseData>();
@ -461,7 +461,7 @@ void MailWidget::selected_email_to_load()
if (fetch_response.status() != IMAP::ResponseStatus::OK) {
dbgln("Failed to retrieve the body of the selected e-mail. The server says: '{}'", fetch_response.response_text());
GUI::MessageBox::show_error(window(), String::formatted("Failed to retrieve the selected e-mail. The server says: '{}'", fetch_response.response_text()));
GUI::MessageBox::show_error(window(), DeprecatedString::formatted("Failed to retrieve the selected e-mail. The server says: '{}'", fetch_response.response_text()));
return;
}
@ -481,7 +481,7 @@ void MailWidget::selected_email_to_load()
}
auto& body_data = fetch_response_data.body_data();
auto body_text_part_iterator = body_data.find_if([](Tuple<IMAP::FetchCommand::DataItem, Optional<String>>& data) {
auto body_text_part_iterator = body_data.find_if([](Tuple<IMAP::FetchCommand::DataItem, Optional<DeprecatedString>>& data) {
const auto data_item = data.get<0>();
return data_item.section.has_value() && data_item.section->type == IMAP::FetchCommand::DataItem::SectionType::Parts;
});
@ -489,7 +489,7 @@ void MailWidget::selected_email_to_load()
auto& encoded_data = body_text_part_iterator->get<1>().value();
String decoded_data;
DeprecatedString decoded_data;
// FIXME: String uses char internally, so 8bit shouldn't be stored in it.
// However, it works for now.
@ -503,7 +503,7 @@ void MailWidget::selected_email_to_load()
decoded_data = IMAP::decode_quoted_printable(encoded_data);
} else {
dbgln("Mail: Unimplemented decoder for encoding: {}", selected_alternative_encoding);
GUI::MessageBox::show(window(), String::formatted("The e-mail encoding '{}' is currently unsupported.", selected_alternative_encoding), "Unsupported"sv, GUI::MessageBox::Type::Information);
GUI::MessageBox::show(window(), DeprecatedString::formatted("The e-mail encoding '{}' is currently unsupported.", selected_alternative_encoding), "Unsupported"sv, GUI::MessageBox::Type::Information);
return;
}