RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-05-31 05:48:12 +00:00
Code Issues Activity Actions

LibGUI+Userland: Make SortingProxyModel::create() return ErrorOr

Browse source 
Unfortunately, most of the users are inside constructors, (and two
others are inside callback lambdas) so the error can't propagate, but
that can be improved later.
This commit is contained in:
Sam Atkins 2021-12-24 12:12:04 +00:00 • committed by Brian Gianforcaro
parent c72a996542
commit f6633a1026
11 changed files with 20 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Userland/Applications/FileManager/DirectoryView.cpp
View file

@ -132,7 +132,7 @@ void DirectoryView::handle_activation(GUI::ModelIndex const& index)
DirectoryView::DirectoryView(Mode mode) DirectoryView::DirectoryView(Mode mode)
: m_mode(mode) : m_mode(mode)
, m_model(GUI::FileSystemModel::create({})) , m_model(GUI::FileSystemModel::create({}))
, m_sorting_model(GUI::SortingProxyModel::create(m_model)) , m_sorting_model(MUST(GUI::SortingProxyModel::create(m_model)))
{ {
set_active_widget(nullptr); set_active_widget(nullptr);
set_grabbable_margins(2); set_grabbable_margins(2);

2
Userland/Applications/MouseSettings/ThemeWidget.cpp
View file

@ -107,7 +107,7 @@ ThemeWidget::ThemeWidget()
m_cursors_tableview->set_highlight_key_column(false); m_cursors_tableview->set_highlight_key_column(false);
auto mouse_cursor_model = MouseCursorModel::create(); auto mouse_cursor_model = MouseCursorModel::create();
auto sorting_proxy_model = GUI::SortingProxyModel::create(mouse_cursor_model); auto sorting_proxy_model = MUST(GUI::SortingProxyModel::create(mouse_cursor_model));
sorting_proxy_model->set_sort_role(GUI::ModelRole::Display); sorting_proxy_model->set_sort_role(GUI::ModelRole::Display);
m_cursors_tableview->set_model(sorting_proxy_model); m_cursors_tableview->set_model(sorting_proxy_model);

6
Userland/Applications/SystemMonitor/NetworkStatisticsWidget.cpp
View file

@ -65,7 +65,7 @@ NetworkStatisticsWidget::NetworkStatisticsWidget()
net_adapters_fields.empend("bytes_in", "Bytes In", Gfx::TextAlignment::CenterRight); net_adapters_fields.empend("bytes_in", "Bytes In", Gfx::TextAlignment::CenterRight);
net_adapters_fields.empend("bytes_out", "Bytes Out", Gfx::TextAlignment::CenterRight); net_adapters_fields.empend("bytes_out", "Bytes Out", Gfx::TextAlignment::CenterRight);
m_adapter_model = GUI::JsonArrayModel::create("/proc/net/adapters", move(net_adapters_fields)); m_adapter_model = GUI::JsonArrayModel::create("/proc/net/adapters", move(net_adapters_fields));
m_adapter_table_view->set_model(GUI::SortingProxyModel::create(*m_adapter_model)); m_adapter_table_view->set_model(MUST(GUI::SortingProxyModel::create(*m_adapter_model)));
auto& tcp_sockets_group_box = add<GUI::GroupBox>("TCP Sockets"); auto& tcp_sockets_group_box = add<GUI::GroupBox>("TCP Sockets");
tcp_sockets_group_box.set_layout<GUI::VerticalBoxLayout>(); tcp_sockets_group_box.set_layout<GUI::VerticalBoxLayout>();
@ -86,7 +86,7 @@ NetworkStatisticsWidget::NetworkStatisticsWidget()
net_tcp_fields.empend("bytes_in", "Bytes In", Gfx::TextAlignment::CenterRight); net_tcp_fields.empend("bytes_in", "Bytes In", Gfx::TextAlignment::CenterRight);
net_tcp_fields.empend("bytes_out", "Bytes Out", Gfx::TextAlignment::CenterRight); net_tcp_fields.empend("bytes_out", "Bytes Out", Gfx::TextAlignment::CenterRight);
m_tcp_socket_model = GUI::JsonArrayModel::create("/proc/net/tcp", move(net_tcp_fields)); m_tcp_socket_model = GUI::JsonArrayModel::create("/proc/net/tcp", move(net_tcp_fields));
m_tcp_socket_table_view->set_model(GUI::SortingProxyModel::create(*m_tcp_socket_model)); m_tcp_socket_table_view->set_model(MUST(GUI::SortingProxyModel::create(*m_tcp_socket_model)));
auto& udp_sockets_group_box = add<GUI::GroupBox>("UDP Sockets"); auto& udp_sockets_group_box = add<GUI::GroupBox>("UDP Sockets");
udp_sockets_group_box.set_layout<GUI::VerticalBoxLayout>(); udp_sockets_group_box.set_layout<GUI::VerticalBoxLayout>();
@ -100,7 +100,7 @@ NetworkStatisticsWidget::NetworkStatisticsWidget()
net_udp_fields.empend("local_address", "Local", Gfx::TextAlignment::CenterLeft); net_udp_fields.empend("local_address", "Local", Gfx::TextAlignment::CenterLeft);
net_udp_fields.empend("local_port", "Port", Gfx::TextAlignment::CenterRight); net_udp_fields.empend("local_port", "Port", Gfx::TextAlignment::CenterRight);
m_udp_socket_model = GUI::JsonArrayModel::create("/proc/net/udp", move(net_udp_fields)); m_udp_socket_model = GUI::JsonArrayModel::create("/proc/net/udp", move(net_udp_fields));
m_udp_socket_table_view->set_model(GUI::SortingProxyModel::create(*m_udp_socket_model)); m_udp_socket_table_view->set_model(MUST(GUI::SortingProxyModel::create(*m_udp_socket_model)));
m_update_timer = add<Core::Timer>( m_update_timer = add<Core::Timer>(
1000, [this] { 1000, [this] {

2
Userland/Applications/SystemMonitor/ProcessFileDescriptorMapWidget.cpp
View file

@ -38,7 +38,7 @@ ProcessFileDescriptorMapWidget::ProcessFileDescriptorMapWidget()
}); });
m_model = GUI::JsonArrayModel::create({}, move(pid_fds_fields)); m_model = GUI::JsonArrayModel::create({}, move(pid_fds_fields));
m_table_view->set_model(GUI::SortingProxyModel::create(*m_model)); m_table_view->set_model(MUST(GUI::SortingProxyModel::create(*m_model)));
} }
ProcessFileDescriptorMapWidget::~ProcessFileDescriptorMapWidget() ProcessFileDescriptorMapWidget::~ProcessFileDescriptorMapWidget()

2
Userland/Applications/SystemMonitor/ProcessMemoryMapWidget.cpp
View file

@ -99,7 +99,7 @@ ProcessMemoryMapWidget::ProcessMemoryMapWidget()
pid_vm_fields.empend("cow_pages", "# CoW", Gfx::TextAlignment::CenterRight); pid_vm_fields.empend("cow_pages", "# CoW", Gfx::TextAlignment::CenterRight);
pid_vm_fields.empend("name", "Name", Gfx::TextAlignment::CenterLeft); pid_vm_fields.empend("name", "Name", Gfx::TextAlignment::CenterLeft);
m_json_model = GUI::JsonArrayModel::create({}, move(pid_vm_fields)); m_json_model = GUI::JsonArrayModel::create({}, move(pid_vm_fields));
m_table_view->set_model(GUI::SortingProxyModel::create(*m_json_model)); m_table_view->set_model(MUST(GUI::SortingProxyModel::create(*m_json_model)));
m_table_view->set_column_painting_delegate(7, make<PagemapPaintingDelegate>()); m_table_view->set_column_painting_delegate(7, make<PagemapPaintingDelegate>());

2
Userland/Applications/SystemMonitor/ProcessUnveiledPathsWidget.cpp
View file

@ -21,7 +21,7 @@ ProcessUnveiledPathsWidget::ProcessUnveiledPathsWidget()
pid_unveil_fields.empend("permissions", "Permissions", Gfx::TextAlignment::CenterLeft); pid_unveil_fields.empend("permissions", "Permissions", Gfx::TextAlignment::CenterLeft);
m_model = GUI::JsonArrayModel::create({}, move(pid_unveil_fields)); m_model = GUI::JsonArrayModel::create({}, move(pid_unveil_fields));
m_table_view->set_model(GUI::SortingProxyModel::create(*m_model)); m_table_view->set_model(MUST(GUI::SortingProxyModel::create(*m_model)));
} }
ProcessUnveiledPathsWidget::~ProcessUnveiledPathsWidget() ProcessUnveiledPathsWidget::~ProcessUnveiledPathsWidget()

6
Userland/Applications/SystemMonitor/main.cpp
View file

@ -180,7 +180,7 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
auto& process_table_view = process_table_container.add<GUI::TableView>(); auto& process_table_view = process_table_container.add<GUI::TableView>();
process_table_view.set_column_headers_visible(true); process_table_view.set_column_headers_visible(true);
process_table_view.set_model(GUI::SortingProxyModel::create(process_model)); process_table_view.set_model(TRY(GUI::SortingProxyModel::create(process_model)));
for (auto column = 0; column < ProcessModel::Column::__Count; ++column) for (auto column = 0; column < ProcessModel::Column::__Count; ++column)
process_table_view.set_column_visible(column, false); process_table_view.set_column_visible(column, false);
process_table_view.set_column_visible(ProcessModel::Column::Icon, true); process_table_view.set_column_visible(ProcessModel::Column::Icon, true);
@ -549,7 +549,7 @@ NonnullRefPtr<GUI::Widget> build_storage_widget()
df_fields.empend("total_inode_count", "Total inodes", Gfx::TextAlignment::CenterRight); df_fields.empend("total_inode_count", "Total inodes", Gfx::TextAlignment::CenterRight);
df_fields.empend("block_size", "Block size", Gfx::TextAlignment::CenterRight); df_fields.empend("block_size", "Block size", Gfx::TextAlignment::CenterRight);
fs_table_view.set_model(GUI::SortingProxyModel::create(GUI::JsonArrayModel::create("/proc/df", move(df_fields)))); fs_table_view.set_model(MUST(GUI::SortingProxyModel::create(GUI::JsonArrayModel::create("/proc/df", move(df_fields)))));
fs_table_view.set_column_painting_delegate(3, make<ProgressbarPaintingDelegate>()); fs_table_view.set_column_painting_delegate(3, make<ProgressbarPaintingDelegate>());
@ -647,7 +647,7 @@ NonnullRefPtr<GUI::Widget> build_hardware_tab()
return String::formatted("{:02x}", revision_id); return String::formatted("{:02x}", revision_id);
}); });
pci_table_view.set_model(GUI::SortingProxyModel::create(GUI::JsonArrayModel::create("/proc/pci", move(pci_fields)))); pci_table_view.set_model(MUST(GUI::SortingProxyModel::create(GUI::JsonArrayModel::create("/proc/pci", move(pci_fields)))));
pci_table_view.model()->invalidate(); pci_table_view.model()->invalidate();
} }
}; };

4
Userland/Demos/WidgetGallery/GalleryWidget.cpp
View file

@ -296,7 +296,7 @@ GalleryWidget::GalleryWidget()
m_cursors_tableview->set_column_headers_visible(false); m_cursors_tableview->set_column_headers_visible(false);
m_cursors_tableview->set_highlight_key_column(false); m_cursors_tableview->set_highlight_key_column(false);
auto sorting_proxy_model = GUI::SortingProxyModel::create(MouseCursorModel::create()); auto sorting_proxy_model = MUST(GUI::SortingProxyModel::create(MouseCursorModel::create()));
sorting_proxy_model->set_sort_role(GUI::ModelRole::Display); sorting_proxy_model->set_sort_role(GUI::ModelRole::Display);
m_cursors_tableview->set_model(sorting_proxy_model); m_cursors_tableview->set_model(sorting_proxy_model);
@ -319,7 +319,7 @@ GalleryWidget::GalleryWidget()
m_icons_tableview->set_column_headers_visible(false); m_icons_tableview->set_column_headers_visible(false);
m_icons_tableview->set_highlight_key_column(false); m_icons_tableview->set_highlight_key_column(false);
auto sorting_proxy_icons_model = GUI::SortingProxyModel::create(FileIconsModel::create()); auto sorting_proxy_icons_model = MUST(GUI::SortingProxyModel::create(FileIconsModel::create()));
sorting_proxy_icons_model->set_sort_role(GUI::ModelRole::Display); sorting_proxy_icons_model->set_sort_role(GUI::ModelRole::Display);
m_icons_tableview->set_model(sorting_proxy_icons_model); m_icons_tableview->set_model(sorting_proxy_icons_model);

2
Userland/Libraries/LibGUI/FilePicker.cpp
View file

@ -96,7 +96,7 @@ FilePicker::FilePicker(Window* parent_window, Mode mode, StringView filename, St
m_view = *widget.find_descendant_of_type_named<GUI::MultiView>("view"); m_view = *widget.find_descendant_of_type_named<GUI::MultiView>("view");
m_view->set_selection_mode(m_mode == Mode::OpenMultiple ? GUI::AbstractView::SelectionMode::MultiSelection : GUI::AbstractView::SelectionMode::SingleSelection); m_view->set_selection_mode(m_mode == Mode::OpenMultiple ? GUI::AbstractView::SelectionMode::MultiSelection : GUI::AbstractView::SelectionMode::SingleSelection);
m_view->set_model(SortingProxyModel::create(*m_model)); m_view->set_model(MUST(SortingProxyModel::create(*m_model)));
m_view->set_model_column(FileSystemModel::Column::Name); m_view->set_model_column(FileSystemModel::Column::Name);
m_view->set_key_column_and_sort_order(GUI::FileSystemModel::Column::Name, GUI::SortOrder::Ascending); m_view->set_key_column_and_sort_order(GUI::FileSystemModel::Column::Name, GUI::SortOrder::Ascending);
m_view->set_column_visible(FileSystemModel::Column::User, true); m_view->set_column_visible(FileSystemModel::Column::User, true);

2
Userland/Libraries/LibGUI/ProcessChooser.cpp
View file

@ -36,7 +36,7 @@ ProcessChooser::ProcessChooser(StringView window_title, StringView button_label,
m_table_view = widget.add<GUI::TableView>(); m_table_view = widget.add<GUI::TableView>();
auto process_model = RunningProcessesModel::create(); auto process_model = RunningProcessesModel::create();
auto sorting_model = GUI::SortingProxyModel::create(process_model); auto sorting_model = MUST(GUI::SortingProxyModel::create(process_model));
sorting_model->set_sort_role(GUI::ModelRole::Display); sorting_model->set_sort_role(GUI::ModelRole::Display);
m_table_view->set_model(sorting_model); m_table_view->set_model(sorting_model);
m_table_view->set_key_column_and_sort_order(RunningProcessesModel::Column::PID, GUI::SortOrder::Descending); m_table_view->set_key_column_and_sort_order(RunningProcessesModel::Column::PID, GUI::SortOrder::Descending);

6
Userland/Libraries/LibGUI/SortingProxyModel.h
View file

@ -14,7 +14,11 @@ class SortingProxyModel
: public Model : public Model
, private ModelClient { , private ModelClient {
public: public:
static NonnullRefPtr<SortingProxyModel> create(NonnullRefPtr<Model> source) { return adopt_ref(*new SortingProxyModel(move(source))); } static ErrorOr<NonnullRefPtr<SortingProxyModel>> create(NonnullRefPtr<Model> source)
{
return adopt_nonnull_ref_or_enomem(new (nothrow) SortingProxyModel(move(source)));
}
virtual ~SortingProxyModel() override; virtual ~SortingProxyModel() override;
virtual int row_count(ModelIndex const& = ModelIndex()) const override; virtual int row_count(ModelIndex const& = ModelIndex()) const override;