mirror of
https://github.com/RGBCube/serenity
synced 2025-07-28 08:07:44 +00:00
AK+Everywhere: Rename String to DeprecatedString
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:
parent
f74251606d
commit
6e19ab2bbc
2006 changed files with 11635 additions and 11636 deletions
|
@ -2,5 +2,5 @@
|
|||
|
||||
endpoint ClipboardClient
|
||||
{
|
||||
clipboard_data_changed([UTF8] String mime_type) =|
|
||||
clipboard_data_changed([UTF8] DeprecatedString mime_type) =|
|
||||
}
|
||||
|
|
|
@ -2,6 +2,6 @@
|
|||
|
||||
endpoint ClipboardServer
|
||||
{
|
||||
get_clipboard_data() => (Core::AnonymousBuffer data, [UTF8] String mime_type, IPC::Dictionary metadata)
|
||||
set_clipboard_data(Core::AnonymousBuffer data, [UTF8] String mime_type, IPC::Dictionary metadata) =|
|
||||
get_clipboard_data() => (Core::AnonymousBuffer data, [UTF8] DeprecatedString mime_type, IPC::Dictionary metadata)
|
||||
set_clipboard_data(Core::AnonymousBuffer data, [UTF8] DeprecatedString mime_type, IPC::Dictionary metadata) =|
|
||||
}
|
||||
|
|
|
@ -30,7 +30,7 @@ void ConnectionFromClient::die()
|
|||
s_connections.remove(client_id());
|
||||
}
|
||||
|
||||
void ConnectionFromClient::set_clipboard_data(Core::AnonymousBuffer const& data, String const& mime_type, IPC::Dictionary const& metadata)
|
||||
void ConnectionFromClient::set_clipboard_data(Core::AnonymousBuffer const& data, DeprecatedString const& mime_type, IPC::Dictionary const& metadata)
|
||||
{
|
||||
Storage::the().set_data(data, mime_type, metadata.entries());
|
||||
}
|
||||
|
|
|
@ -30,7 +30,7 @@ private:
|
|||
explicit ConnectionFromClient(NonnullOwnPtr<Core::Stream::LocalSocket>, int client_id);
|
||||
|
||||
virtual Messages::ClipboardServer::GetClipboardDataResponse get_clipboard_data() override;
|
||||
virtual void set_clipboard_data(Core::AnonymousBuffer const&, String const&, IPC::Dictionary const&) override;
|
||||
virtual void set_clipboard_data(Core::AnonymousBuffer const&, DeprecatedString const&, IPC::Dictionary const&) override;
|
||||
};
|
||||
|
||||
}
|
||||
|
|
|
@ -14,7 +14,7 @@ Storage& Storage::the()
|
|||
return s_the;
|
||||
}
|
||||
|
||||
void Storage::set_data(Core::AnonymousBuffer data, String const& mime_type, HashMap<String, String> const& metadata)
|
||||
void Storage::set_data(Core::AnonymousBuffer data, DeprecatedString const& mime_type, HashMap<DeprecatedString, DeprecatedString> const& metadata)
|
||||
{
|
||||
m_buffer = move(data);
|
||||
m_data_size = data.size();
|
||||
|
|
|
@ -6,9 +6,9 @@
|
|||
|
||||
#pragma once
|
||||
|
||||
#include <AK/DeprecatedString.h>
|
||||
#include <AK/Function.h>
|
||||
#include <AK/HashMap.h>
|
||||
#include <AK/String.h>
|
||||
#include <LibCore/AnonymousBuffer.h>
|
||||
|
||||
namespace Clipboard {
|
||||
|
@ -20,8 +20,8 @@ public:
|
|||
|
||||
bool has_data() const { return m_buffer.is_valid(); }
|
||||
|
||||
String const& mime_type() const { return m_mime_type; }
|
||||
HashMap<String, String> const& metadata() const { return m_metadata; }
|
||||
DeprecatedString const& mime_type() const { return m_mime_type; }
|
||||
HashMap<DeprecatedString, DeprecatedString> const& metadata() const { return m_metadata; }
|
||||
|
||||
u8 const* data() const
|
||||
{
|
||||
|
@ -37,7 +37,7 @@ public:
|
|||
return 0;
|
||||
}
|
||||
|
||||
void set_data(Core::AnonymousBuffer, String const& mime_type, HashMap<String, String> const& metadata);
|
||||
void set_data(Core::AnonymousBuffer, DeprecatedString const& mime_type, HashMap<DeprecatedString, DeprecatedString> const& metadata);
|
||||
|
||||
Function<void()> on_content_change;
|
||||
|
||||
|
@ -46,10 +46,10 @@ public:
|
|||
private:
|
||||
Storage() = default;
|
||||
|
||||
String m_mime_type;
|
||||
DeprecatedString m_mime_type;
|
||||
Core::AnonymousBuffer m_buffer;
|
||||
size_t m_data_size { 0 };
|
||||
HashMap<String, String> m_metadata;
|
||||
HashMap<DeprecatedString, DeprecatedString> m_metadata;
|
||||
};
|
||||
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue