diff --git a/Userland/Applications/Spreadsheet/SpreadsheetModel.cpp b/Userland/Applications/Spreadsheet/SpreadsheetModel.cpp index 21478f9392..b7e330cdcb 100644 --- a/Userland/Applications/Spreadsheet/SpreadsheetModel.cpp +++ b/Userland/Applications/Spreadsheet/SpreadsheetModel.cpp @@ -157,7 +157,7 @@ RefPtr SheetModel::mime_data(const GUI::ModelSelection& selectio auto new_data = DeprecatedString::formatted("{}\n{}", cursor_position.to_url(m_sheet).to_deprecated_string(), StringView(mime_data_buffer)); - mime_data->set_data("text/x-spreadsheet-data", new_data.to_byte_buffer()); + mime_data->set_data("text/x-spreadsheet-data"_string, new_data.to_byte_buffer()); return mime_data; } diff --git a/Userland/Libraries/LibCore/MimeData.cpp b/Userland/Libraries/LibCore/MimeData.cpp index 6dbe2d9908..b296ffa32e 100644 --- a/Userland/Libraries/LibCore/MimeData.cpp +++ b/Userland/Libraries/LibCore/MimeData.cpp @@ -16,13 +16,13 @@ Vector MimeData::formats() const Vector mime_types; mime_types.ensure_capacity(m_data.size()); for (auto& it : m_data) - mime_types.unchecked_append(it.key); + mime_types.unchecked_append(it.key.to_deprecated_string()); return mime_types; } Vector MimeData::urls() const { - auto it = m_data.find("text/uri-list"); + auto it = m_data.find("text/uri-list"sv); if (it == m_data.end()) return {}; Vector urls; @@ -39,19 +39,19 @@ ErrorOr MimeData::set_urls(Vector const& urls) TRY(builder.try_append(url.to_deprecated_string())); TRY(builder.try_append('\n')); } - set_data("text/uri-list", TRY(builder.to_byte_buffer())); + set_data("text/uri-list"_string, TRY(builder.to_byte_buffer())); return {}; } DeprecatedString MimeData::text() const { - return DeprecatedString::copy(m_data.get("text/plain").value_or({})); + return DeprecatedString::copy(m_data.get("text/plain"sv).value_or({})); } void MimeData::set_text(DeprecatedString const& text) { - set_data("text/plain", text.to_byte_buffer()); + set_data("text/plain"_string, text.to_byte_buffer()); } // FIXME: Share this, TextEditor and HackStudio language detection somehow. diff --git a/Userland/Libraries/LibCore/MimeData.h b/Userland/Libraries/LibCore/MimeData.h index d2f07a5617..36c190002b 100644 --- a/Userland/Libraries/LibCore/MimeData.h +++ b/Userland/Libraries/LibCore/MimeData.h @@ -21,7 +21,7 @@ public: virtual ~MimeData() = default; ByteBuffer data(StringView mime_type) const { return m_data.get(mime_type).value_or({}); } - void set_data(DeprecatedString const& mime_type, ByteBuffer&& data) { m_data.set(mime_type, move(data)); } + void set_data(String const& mime_type, ByteBuffer&& data) { m_data.set(mime_type, move(data)); } bool has_format(StringView mime_type) const { return m_data.contains(mime_type); } Vector formats() const; @@ -36,16 +36,16 @@ public: Vector urls() const; ErrorOr set_urls(Vector const&); - HashMap const& all_data() const { return m_data; } + HashMap const& all_data() const { return m_data; } private: MimeData() = default; - explicit MimeData(HashMap const& data) + explicit MimeData(HashMap const& data) : m_data(data.clone().release_value_but_fixme_should_propagate_errors()) { } - HashMap m_data; + HashMap m_data; }; StringView guess_mime_type_based_on_filename(StringView); diff --git a/Userland/Libraries/LibGUI/ConnectionToWindowServer.cpp b/Userland/Libraries/LibGUI/ConnectionToWindowServer.cpp index 738f4c0d91..601184ccb4 100644 --- a/Userland/Libraries/LibGUI/ConnectionToWindowServer.cpp +++ b/Userland/Libraries/LibGUI/ConnectionToWindowServer.cpp @@ -349,7 +349,7 @@ void ConnectionToWindowServer::applet_area_rect_changed(Gfx::IntRect const& rect }); } -void ConnectionToWindowServer::drag_dropped(i32 window_id, Gfx::IntPoint mouse_position, DeprecatedString const& text, HashMap const& mime_data) +void ConnectionToWindowServer::drag_dropped(i32 window_id, Gfx::IntPoint mouse_position, DeprecatedString const& text, HashMap const& mime_data) { if (auto* window = Window::from_window_id(window_id)) { auto mime_data_obj = Core::MimeData::construct(mime_data); diff --git a/Userland/Libraries/LibGUI/ConnectionToWindowServer.h b/Userland/Libraries/LibGUI/ConnectionToWindowServer.h index 5999afc28a..b5930a95b7 100644 --- a/Userland/Libraries/LibGUI/ConnectionToWindowServer.h +++ b/Userland/Libraries/LibGUI/ConnectionToWindowServer.h @@ -48,7 +48,7 @@ private: virtual void menu_visibility_did_change(i32, bool) override; virtual void screen_rects_changed(Vector const&, u32, u32, u32) override; virtual void applet_area_rect_changed(Gfx::IntRect const&) override; - virtual void drag_dropped(i32, Gfx::IntPoint, DeprecatedString const&, HashMap const&) override; + virtual void drag_dropped(i32, Gfx::IntPoint, DeprecatedString const&, HashMap const&) override; virtual void drag_accepted() override; virtual void drag_cancelled() override; virtual void update_system_theme(Core::AnonymousBuffer const&) override; diff --git a/Userland/Libraries/LibGUI/DragOperation.cpp b/Userland/Libraries/LibGUI/DragOperation.cpp index 5d1506f292..4ce9b1045e 100644 --- a/Userland/Libraries/LibGUI/DragOperation.cpp +++ b/Userland/Libraries/LibGUI/DragOperation.cpp @@ -84,9 +84,9 @@ void DragOperation::set_bitmap(Gfx::Bitmap const* bitmap) if (!m_mime_data) m_mime_data = Core::MimeData::construct(); if (bitmap) - m_mime_data->set_data("image/x-raw-bitmap", bitmap->serialize_to_byte_buffer().release_value_but_fixme_should_propagate_errors()); + m_mime_data->set_data("image/x-raw-bitmap"_string, bitmap->serialize_to_byte_buffer().release_value_but_fixme_should_propagate_errors()); } -void DragOperation::set_data(DeprecatedString const& data_type, DeprecatedString const& data) +void DragOperation::set_data(String const& data_type, DeprecatedString const& data) { if (!m_mime_data) m_mime_data = Core::MimeData::construct(); diff --git a/Userland/Libraries/LibGUI/DragOperation.h b/Userland/Libraries/LibGUI/DragOperation.h index d3eac406f0..160f25ecb3 100644 --- a/Userland/Libraries/LibGUI/DragOperation.h +++ b/Userland/Libraries/LibGUI/DragOperation.h @@ -29,7 +29,7 @@ public: void set_mime_data(RefPtr mime_data) { m_mime_data = move(mime_data); } void set_text(DeprecatedString const& text); void set_bitmap(Gfx::Bitmap const* bitmap); - void set_data(DeprecatedString const& data_type, DeprecatedString const& data); + void set_data(String const& data_type, DeprecatedString const& data); Outcome exec(); Outcome outcome() const { return m_outcome; } diff --git a/Userland/Libraries/LibGUI/Model.cpp b/Userland/Libraries/LibGUI/Model.cpp index 87ea46ea59..fa31bc91d1 100644 --- a/Userland/Libraries/LibGUI/Model.cpp +++ b/Userland/Libraries/LibGUI/Model.cpp @@ -125,10 +125,10 @@ RefPtr Model::mime_data(ModelSelection const& selection) const } }); - mime_data->set_data(drag_data_type(), data_builder.to_byte_buffer().release_value_but_fixme_should_propagate_errors()); + mime_data->set_data(MUST(String::from_utf8(drag_data_type())), data_builder.to_byte_buffer().release_value_but_fixme_should_propagate_errors()); mime_data->set_text(text_builder.to_deprecated_string()); if (bitmap) - mime_data->set_data("image/x-raw-bitmap", bitmap->serialize_to_byte_buffer().release_value_but_fixme_should_propagate_errors()); + mime_data->set_data("image/x-raw-bitmap"_string, bitmap->serialize_to_byte_buffer().release_value_but_fixme_should_propagate_errors()); return mime_data; } diff --git a/Userland/Libraries/LibVT/TerminalWidget.cpp b/Userland/Libraries/LibVT/TerminalWidget.cpp index 24d5a054eb..149e27f03d 100644 --- a/Userland/Libraries/LibVT/TerminalWidget.cpp +++ b/Userland/Libraries/LibVT/TerminalWidget.cpp @@ -912,7 +912,7 @@ void TerminalWidget::mousemove_event(GUI::MouseEvent& event) auto drag_operation = GUI::DragOperation::construct(); drag_operation->set_text(m_active_href); - drag_operation->set_data("text/uri-list", m_active_href); + drag_operation->set_data("text/uri-list"_string, m_active_href); m_active_href = {}; m_active_href_id = {}; diff --git a/Userland/Services/WindowServer/ConnectionFromClient.cpp b/Userland/Services/WindowServer/ConnectionFromClient.cpp index 82b74a97c0..46cc91860a 100644 --- a/Userland/Services/WindowServer/ConnectionFromClient.cpp +++ b/Userland/Services/WindowServer/ConnectionFromClient.cpp @@ -872,7 +872,7 @@ void ConnectionFromClient::start_window_resize(i32 window_id, i32 resize_directi WindowManager::the().start_window_resize(window, ScreenInput::the().cursor_location(), MouseButton::Primary, (ResizeDirection)resize_direction); } -Messages::WindowServer::StartDragResponse ConnectionFromClient::start_drag(DeprecatedString const& text, HashMap const& mime_data, Gfx::ShareableBitmap const& drag_bitmap) +Messages::WindowServer::StartDragResponse ConnectionFromClient::start_drag(DeprecatedString const& text, HashMap const& mime_data, Gfx::ShareableBitmap const& drag_bitmap) { auto& wm = WindowManager::the(); if (wm.dnd_client() || !(wm.last_processed_buttons() & MouseButton::Primary)) diff --git a/Userland/Services/WindowServer/ConnectionFromClient.h b/Userland/Services/WindowServer/ConnectionFromClient.h index 641ff9e30a..f993be454d 100644 --- a/Userland/Services/WindowServer/ConnectionFromClient.h +++ b/Userland/Services/WindowServer/ConnectionFromClient.h @@ -144,7 +144,7 @@ private: virtual void popup_menu(i32, Gfx::IntPoint, Gfx::IntRect const&) override; virtual void dismiss_menu(i32) override; virtual void set_window_icon_bitmap(i32, Gfx::ShareableBitmap const&) override; - virtual Messages::WindowServer::StartDragResponse start_drag(DeprecatedString const&, HashMap const&, Gfx::ShareableBitmap const&) override; + virtual Messages::WindowServer::StartDragResponse start_drag(DeprecatedString const&, HashMap const&, Gfx::ShareableBitmap const&) override; virtual void set_accepts_drag(bool) override; virtual Messages::WindowServer::SetSystemThemeResponse set_system_theme(DeprecatedString const&, DeprecatedString const&, bool keep_desktop_background, Optional const& color_scheme_path) override; virtual Messages::WindowServer::GetSystemThemeResponse get_system_theme() override; diff --git a/Userland/Services/WindowServer/WindowClient.ipc b/Userland/Services/WindowServer/WindowClient.ipc index 06c880c91b..225248f679 100644 --- a/Userland/Services/WindowServer/WindowClient.ipc +++ b/Userland/Services/WindowServer/WindowClient.ipc @@ -36,7 +36,7 @@ endpoint WindowClient drag_accepted() =| drag_cancelled() =| - drag_dropped(i32 window_id, Gfx::IntPoint mouse_position, [UTF8] DeprecatedString text, HashMap mime_data) =| + drag_dropped(i32 window_id, Gfx::IntPoint mouse_position, [UTF8] DeprecatedString text, HashMap mime_data) =| update_system_theme(Core::AnonymousBuffer theme_buffer) =| update_system_fonts(DeprecatedString default_font_query, DeprecatedString fixed_width_font_query, DeprecatedString window_title_font_query) =| diff --git a/Userland/Services/WindowServer/WindowServer.ipc b/Userland/Services/WindowServer/WindowServer.ipc index 4354fcc398..1945ee80bc 100644 --- a/Userland/Services/WindowServer/WindowServer.ipc +++ b/Userland/Services/WindowServer/WindowServer.ipc @@ -128,7 +128,7 @@ endpoint WindowServer set_window_cursor(i32 window_id, i32 cursor_type) =| set_window_custom_cursor(i32 window_id, Gfx::ShareableBitmap cursor) =| - start_drag([UTF8] DeprecatedString text, HashMap mime_data, Gfx::ShareableBitmap drag_bitmap) => (bool started) + start_drag([UTF8] DeprecatedString text, HashMap mime_data, Gfx::ShareableBitmap drag_bitmap) => (bool started) set_accepts_drag(bool accepts) =| set_system_theme(DeprecatedString theme_path, [UTF8] DeprecatedString theme_name, bool keep_desktop_background, Optional color_scheme_path) => (bool success)