From e75d6949743e5a334f7a287a832ecbf4fc1d3b05 Mon Sep 17 00:00:00 2001 From: Karol Kosek Date: Thu, 21 Sep 2023 19:02:52 +0200 Subject: [PATCH] Userland: Compare event MIME type list with a StringView The following commit will port MIME types to String. Traits - used in Vector::contains_slow - can't compare String type with char*, so we need to use StringView instead. --- Userland/Applications/3DFileViewer/main.cpp | 2 +- Userland/Applications/FontEditor/MainWidget.cpp | 2 +- Userland/Applications/HexEditor/HexEditorWidget.cpp | 2 +- Userland/Applications/ImageViewer/ViewWidget.cpp | 2 +- Userland/Applications/PixelPaint/MainWidget.cpp | 2 +- Userland/Applications/Presenter/PresenterWidget.cpp | 2 +- Userland/Applications/SoundPlayer/SoundPlayerWidget.cpp | 2 +- Userland/Applications/TextEditor/MainWidget.cpp | 2 +- Userland/Applications/ThemeEditor/MainWidget.cpp | 2 +- Userland/DevTools/GMLPlayground/MainWidget.cpp | 2 +- Userland/DevTools/HackStudio/Editor.cpp | 2 +- Userland/DevTools/SQLStudio/MainWidget.cpp | 2 +- Userland/Libraries/LibGUI/FileSystemModel.cpp | 2 +- Userland/Libraries/LibGUI/PathBreadcrumbbar.cpp | 2 +- Userland/Libraries/LibVT/TerminalWidget.cpp | 2 +- Userland/Services/Taskbar/QuickLaunchWidget.cpp | 2 +- 16 files changed, 16 insertions(+), 16 deletions(-) diff --git a/Userland/Applications/3DFileViewer/main.cpp b/Userland/Applications/3DFileViewer/main.cpp index d7ab5ead86..d9157b97a8 100644 --- a/Userland/Applications/3DFileViewer/main.cpp +++ b/Userland/Applications/3DFileViewer/main.cpp @@ -128,7 +128,7 @@ private: void GLContextWidget::drag_enter_event(GUI::DragEvent& event) { auto const& mime_types = event.mime_types(); - if (mime_types.contains_slow("text/uri-list")) + if (mime_types.contains_slow("text/uri-list"sv)) event.accept(); } diff --git a/Userland/Applications/FontEditor/MainWidget.cpp b/Userland/Applications/FontEditor/MainWidget.cpp index 56b016fb34..60015035bc 100644 --- a/Userland/Applications/FontEditor/MainWidget.cpp +++ b/Userland/Applications/FontEditor/MainWidget.cpp @@ -987,7 +987,7 @@ void MainWidget::update_preview() void MainWidget::drag_enter_event(GUI::DragEvent& event) { auto const& mime_types = event.mime_types(); - if (mime_types.contains_slow("text/uri-list")) + if (mime_types.contains_slow("text/uri-list"sv)) event.accept(); } diff --git a/Userland/Applications/HexEditor/HexEditorWidget.cpp b/Userland/Applications/HexEditor/HexEditorWidget.cpp index bf95e8e623..aaf35ec8fd 100644 --- a/Userland/Applications/HexEditor/HexEditorWidget.cpp +++ b/Userland/Applications/HexEditor/HexEditorWidget.cpp @@ -624,7 +624,7 @@ void HexEditorWidget::set_value_inspector_visible(bool visible) void HexEditorWidget::drag_enter_event(GUI::DragEvent& event) { auto const& mime_types = event.mime_types(); - if (mime_types.contains_slow("text/uri-list")) + if (mime_types.contains_slow("text/uri-list"sv)) event.accept(); } diff --git a/Userland/Applications/ImageViewer/ViewWidget.cpp b/Userland/Applications/ImageViewer/ViewWidget.cpp index 05e18ba7ba..f0f301e846 100644 --- a/Userland/Applications/ImageViewer/ViewWidget.cpp +++ b/Userland/Applications/ImageViewer/ViewWidget.cpp @@ -283,7 +283,7 @@ ErrorOr ViewWidget::try_open_file(String const& path, Core::File& file) void ViewWidget::drag_enter_event(GUI::DragEvent& event) { auto const& mime_types = event.mime_types(); - if (mime_types.contains_slow("text/uri-list")) + if (mime_types.contains_slow("text/uri-list"sv)) event.accept(); } diff --git a/Userland/Applications/PixelPaint/MainWidget.cpp b/Userland/Applications/PixelPaint/MainWidget.cpp index 2b03ab271c..29b35bc4d7 100644 --- a/Userland/Applications/PixelPaint/MainWidget.cpp +++ b/Userland/Applications/PixelPaint/MainWidget.cpp @@ -1473,7 +1473,7 @@ ImageEditor& MainWidget::create_new_editor(NonnullRefPtr image) void MainWidget::drag_enter_event(GUI::DragEvent& event) { auto const& mime_types = event.mime_types(); - if (mime_types.contains_slow("text/uri-list")) + if (mime_types.contains_slow("text/uri-list"sv)) event.accept(); } diff --git a/Userland/Applications/Presenter/PresenterWidget.cpp b/Userland/Applications/Presenter/PresenterWidget.cpp index 97003e1a90..acffb9a7b9 100644 --- a/Userland/Applications/Presenter/PresenterWidget.cpp +++ b/Userland/Applications/Presenter/PresenterWidget.cpp @@ -203,7 +203,7 @@ void PresenterWidget::second_paint_event(GUI::PaintEvent& event) void PresenterWidget::drag_enter_event(GUI::DragEvent& event) { auto const& mime_types = event.mime_types(); - if (mime_types.contains_slow("text/uri-list")) + if (mime_types.contains_slow("text/uri-list"sv)) event.accept(); } diff --git a/Userland/Applications/SoundPlayer/SoundPlayerWidget.cpp b/Userland/Applications/SoundPlayer/SoundPlayerWidget.cpp index 06da8c3583..1ead9c70d4 100644 --- a/Userland/Applications/SoundPlayer/SoundPlayerWidget.cpp +++ b/Userland/Applications/SoundPlayer/SoundPlayerWidget.cpp @@ -148,7 +148,7 @@ void SoundPlayerWidget::set_nonlinear_volume_slider(bool nonlinear) void SoundPlayerWidget::drag_enter_event(GUI::DragEvent& event) { auto const& mime_types = event.mime_types(); - if (mime_types.contains_slow("text/uri-list")) + if (mime_types.contains_slow("text/uri-list"sv)) event.accept(); } diff --git a/Userland/Applications/TextEditor/MainWidget.cpp b/Userland/Applications/TextEditor/MainWidget.cpp index 8fe943ee6d..a186297d27 100644 --- a/Userland/Applications/TextEditor/MainWidget.cpp +++ b/Userland/Applications/TextEditor/MainWidget.cpp @@ -832,7 +832,7 @@ bool MainWidget::request_close() void MainWidget::drag_enter_event(GUI::DragEvent& event) { auto const& mime_types = event.mime_types(); - if (mime_types.contains_slow("text/uri-list")) + if (mime_types.contains_slow("text/uri-list"sv)) event.accept(); } diff --git a/Userland/Applications/ThemeEditor/MainWidget.cpp b/Userland/Applications/ThemeEditor/MainWidget.cpp index 39d83641bb..3743fa8484 100644 --- a/Userland/Applications/ThemeEditor/MainWidget.cpp +++ b/Userland/Applications/ThemeEditor/MainWidget.cpp @@ -678,7 +678,7 @@ ErrorOr MainWidget::load_from_file(String const& filename, NonnullOwnPtr FileSystemModel::column_name(int column) const bool FileSystemModel::accepts_drag(ModelIndex const& index, Vector const& mime_types) const { - if (!mime_types.contains_slow("text/uri-list")) + if (!mime_types.contains_slow("text/uri-list"sv)) return false; if (!index.is_valid()) diff --git a/Userland/Libraries/LibGUI/PathBreadcrumbbar.cpp b/Userland/Libraries/LibGUI/PathBreadcrumbbar.cpp index 371f49bf1c..a61cc1f28e 100644 --- a/Userland/Libraries/LibGUI/PathBreadcrumbbar.cpp +++ b/Userland/Libraries/LibGUI/PathBreadcrumbbar.cpp @@ -69,7 +69,7 @@ PathBreadcrumbbar::PathBreadcrumbbar(NonnullRefPtr location_text_b }; m_breadcrumbbar->on_segment_drag_enter = [&](size_t, GUI::DragEvent& event) { - if (event.mime_types().contains_slow("text/uri-list")) + if (event.mime_types().contains_slow("text/uri-list"sv)) event.accept(); }; diff --git a/Userland/Libraries/LibVT/TerminalWidget.cpp b/Userland/Libraries/LibVT/TerminalWidget.cpp index 149e27f03d..e527f0ca04 100644 --- a/Userland/Libraries/LibVT/TerminalWidget.cpp +++ b/Userland/Libraries/LibVT/TerminalWidget.cpp @@ -1164,7 +1164,7 @@ void TerminalWidget::context_menu_event(GUI::ContextMenuEvent& event) void TerminalWidget::drag_enter_event(GUI::DragEvent& event) { auto const& mime_types = event.mime_types(); - if (mime_types.contains_slow("text/plain") || mime_types.contains_slow("text/uri-list")) + if (mime_types.contains_slow("text/plain"sv) || mime_types.contains_slow("text/uri-list"sv)) event.accept(); } diff --git a/Userland/Services/Taskbar/QuickLaunchWidget.cpp b/Userland/Services/Taskbar/QuickLaunchWidget.cpp index ddec98deae..654ca156dd 100644 --- a/Userland/Services/Taskbar/QuickLaunchWidget.cpp +++ b/Userland/Services/Taskbar/QuickLaunchWidget.cpp @@ -232,7 +232,7 @@ void QuickLaunchWidget::config_string_did_change(StringView domain, StringView g void QuickLaunchWidget::drag_enter_event(GUI::DragEvent& event) { auto const& mime_types = event.mime_types(); - if (mime_types.contains_slow("text/uri-list")) + if (mime_types.contains_slow("text/uri-list"sv)) event.accept(); }