RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-26 21:27:34 +00:00
Code Issues Activity Actions

DisplaySettings: Migrate to Core::Directory::for_each_entry()

Browse source
This commit is contained in:
Sam Atkins 2023-05-25 15:34:38 +01:00 • committed by Andrew Kaster
parent fb445fc523
commit 28a4adba3d
1 changed files with 6 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

13
Userland/Applications/DisplaySettings/ThemesSettingsWidget.cpp
View file

@ -6,10 +6,9 @@
*/ */
#include "ThemesSettingsWidget.h" #include "ThemesSettingsWidget.h"
#include <AK/LexicalPath.h>
#include <AK/QuickSort.h> #include <AK/QuickSort.h>
#include <Applications/DisplaySettings/ThemesSettingsGML.h> #include <Applications/DisplaySettings/ThemesSettingsGML.h>
#include <LibCore/DirIterator.h> #include <LibCore/Directory.h>
#include <LibGUI/Application.h> #include <LibGUI/Application.h>
#include <LibGUI/CheckBox.h> #include <LibGUI/CheckBox.h>
#include <LibGUI/ConnectionToWindowServer.h> #include <LibGUI/ConnectionToWindowServer.h>
@ -73,11 +72,11 @@ ErrorOr<void> ThemesSettingsWidget::setup_interface()
auto mouse_settings_icon = TRY(Gfx::Bitmap::load_from_file("/res/icons/16x16/app-mouse.png"sv)); auto mouse_settings_icon = TRY(Gfx::Bitmap::load_from_file("/res/icons/16x16/app-mouse.png"sv));
m_color_scheme_names.clear(); m_color_scheme_names.clear();
Core::DirIterator iterator("/res/color-schemes", Core::DirIterator::SkipParentAndBaseDir); TRY(Core::Directory::for_each_entry("/res/color-schemes"sv, Core::DirIterator::SkipParentAndBaseDir, [&](auto& entry, auto&) -> ErrorOr<IterationDecision> {
while (iterator.has_next()) { LexicalPath path { entry.name };
auto path = iterator.next_path(); TRY(m_color_scheme_names.try_append(TRY(String::from_utf8(path.title()))));
TRY(m_color_scheme_names.try_append(TRY(String::from_deprecated_string(path.replace(".ini"sv, ""sv, ReplaceMode::FirstOnly))))); return IterationDecision::Continue;
} }));
quick_sort(m_color_scheme_names); quick_sort(m_color_scheme_names);
auto& color_scheme_combo = *find_descendant_of_type_named<GUI::ComboBox>("color_scheme_combo"); auto& color_scheme_combo = *find_descendant_of_type_named<GUI::ComboBox>("color_scheme_combo");
color_scheme_combo.set_only_allow_values_from_model(true); color_scheme_combo.set_only_allow_values_from_model(true);