mirror of
https://github.com/RGBCube/serenity
synced 2025-07-28 07:37:35 +00:00
Userland: Port to automatic GML initializer where possible
This commit is contained in:
parent
dec066fa5c
commit
adc845e0cb
41 changed files with 148 additions and 245 deletions
|
@ -29,14 +29,7 @@ static int netmask_to_cidr(IPv4Address const& address)
|
|||
return 32 - count_trailing_zeroes_safe(address_in_host_representation);
|
||||
}
|
||||
|
||||
ErrorOr<NonnullRefPtr<NetworkSettingsWidget>> NetworkSettingsWidget::create()
|
||||
{
|
||||
auto widget = TRY(try_create());
|
||||
TRY(widget->setup());
|
||||
return widget;
|
||||
}
|
||||
|
||||
ErrorOr<void> NetworkSettingsWidget::setup()
|
||||
ErrorOr<void> NetworkSettingsWidget::initialize()
|
||||
{
|
||||
m_adapters_combobox = *find_descendant_of_type_named<GUI::ComboBox>("adapters_combobox");
|
||||
m_enabled_checkbox = *find_descendant_of_type_named<GUI::CheckBox>("enabled_checkbox");
|
||||
|
|
|
@ -16,17 +16,14 @@ class NetworkSettingsWidget : public GUI::SettingsWindow::Tab {
|
|||
C_OBJECT_ABSTRACT(NetworkSettingsWidget)
|
||||
|
||||
public:
|
||||
static ErrorOr<NonnullRefPtr<NetworkSettingsWidget>> create();
|
||||
static ErrorOr<NonnullRefPtr<NetworkSettingsWidget>> try_create();
|
||||
ErrorOr<void> initialize();
|
||||
|
||||
virtual void apply_settings() override;
|
||||
void switch_adapter(ByteString const& adapter);
|
||||
|
||||
protected:
|
||||
static ErrorOr<NonnullRefPtr<NetworkSettingsWidget>> try_create();
|
||||
|
||||
private:
|
||||
NetworkSettingsWidget() = default;
|
||||
ErrorOr<void> setup();
|
||||
|
||||
struct NetworkAdapterData {
|
||||
bool enabled = false;
|
||||
|
|
|
@ -37,7 +37,7 @@ ErrorOr<int> serenity_main(Main::Arguments args)
|
|||
auto app_icon = GUI::Icon::default_icon("network"sv);
|
||||
auto window = TRY(GUI::SettingsWindow::create("Network Settings", GUI::SettingsWindow::ShowDefaultsButton::No));
|
||||
|
||||
auto network_settings_widget = TRY(NetworkSettings::NetworkSettingsWidget::create());
|
||||
auto network_settings_widget = TRY(NetworkSettings::NetworkSettingsWidget::try_create());
|
||||
TRY(window->add_tab(network_settings_widget, "Network"_string, "network"sv));
|
||||
if (!adapter.is_null()) {
|
||||
network_settings_widget->switch_adapter(adapter);
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue