diff --git a/Userland/Libraries/LibGUI/Clipboard.cpp b/Userland/Libraries/LibGUI/Clipboard.cpp index 348287620f..25cd6c07f1 100644 --- a/Userland/Libraries/LibGUI/Clipboard.cpp +++ b/Userland/Libraries/LibGUI/Clipboard.cpp @@ -150,7 +150,7 @@ ErrorOr Clipboard::DataAndType::to_json() const void Clipboard::set_data(ReadonlyBytes data, DeprecatedString const& type, HashMap const& metadata) { if (data.is_empty()) { - connection().async_set_clipboard_data({}, type, metadata); + connection().async_set_clipboard_data({}, type, metadata.clone().release_value_but_fixme_should_propagate_errors()); return; } @@ -161,18 +161,18 @@ void Clipboard::set_data(ReadonlyBytes data, DeprecatedString const& type, HashM } auto buffer = buffer_or_error.release_value(); memcpy(buffer.data(), data.data(), data.size()); - connection().async_set_clipboard_data(move(buffer), type, metadata); + connection().async_set_clipboard_data(move(buffer), type, metadata.clone().release_value_but_fixme_should_propagate_errors()); } void Clipboard::set_bitmap(Gfx::Bitmap const& bitmap, HashMap const& additional_metadata) { - HashMap metadata(additional_metadata); + HashMap metadata = additional_metadata.clone().release_value_but_fixme_should_propagate_errors(); metadata.set("width", DeprecatedString::number(bitmap.width())); metadata.set("height", DeprecatedString::number(bitmap.height())); metadata.set("scale", DeprecatedString::number(bitmap.scale())); metadata.set("format", DeprecatedString::number((int)bitmap.format())); metadata.set("pitch", DeprecatedString::number(bitmap.pitch())); - set_data({ bitmap.scanline(0), bitmap.size_in_bytes() }, "image/x-serenityos", metadata); + set_data({ bitmap.scanline(0), bitmap.size_in_bytes() }, "image/x-serenityos", move(metadata)); } void Clipboard::clear() diff --git a/Userland/Libraries/LibIPC/Dictionary.h b/Userland/Libraries/LibIPC/Dictionary.h index 9a83c03d2c..c653c56dbb 100644 --- a/Userland/Libraries/LibIPC/Dictionary.h +++ b/Userland/Libraries/LibIPC/Dictionary.h @@ -17,8 +17,8 @@ class Dictionary { public: Dictionary() = default; - Dictionary(HashMap const& initial_entries) - : m_entries(initial_entries) + Dictionary(HashMap&& initial_entries) + : m_entries(move(initial_entries)) { } diff --git a/Userland/Services/Clipboard/ConnectionFromClient.cpp b/Userland/Services/Clipboard/ConnectionFromClient.cpp index f83f55ac02..a58892e447 100644 --- a/Userland/Services/Clipboard/ConnectionFromClient.cpp +++ b/Userland/Services/Clipboard/ConnectionFromClient.cpp @@ -38,7 +38,7 @@ void ConnectionFromClient::set_clipboard_data(Core::AnonymousBuffer const& data, Messages::ClipboardServer::GetClipboardDataResponse ConnectionFromClient::get_clipboard_data() { auto& storage = Storage::the(); - return { storage.buffer(), storage.mime_type(), storage.metadata() }; + return { storage.buffer(), storage.mime_type(), storage.metadata().clone().release_value_but_fixme_should_propagate_errors() }; } void ConnectionFromClient::notify_about_clipboard_change() diff --git a/Userland/Services/SpiceAgent/ConnectionToClipboardServer.cpp b/Userland/Services/SpiceAgent/ConnectionToClipboardServer.cpp index 0f3569ce7b..ef945af77e 100644 --- a/Userland/Services/SpiceAgent/ConnectionToClipboardServer.cpp +++ b/Userland/Services/SpiceAgent/ConnectionToClipboardServer.cpp @@ -71,5 +71,5 @@ void ConnectionToClipboardServer::set_bitmap(Gfx::Bitmap const& bitmap) VERIFY(!buffer_or_error.is_error()); auto buffer = buffer_or_error.release_value(); memcpy(buffer.data(), data.data(), data.size()); - this->async_set_clipboard_data(buffer, "image/x-serenityos", metadata); + this->async_set_clipboard_data(buffer, "image/x-serenityos", move(metadata)); }