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

Applets/Network: Propagate errors using custom try_create

Browse source 
We now move-construct the bitmaps into the NetworkWidget.
This commit is contained in:
creator1creeper1 2021-12-25 13:50:43 +01:00 • committed by Andreas Kling
parent f125d52622
commit e46f08ff33
1 changed files with 14 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

18
Userland/Applets/Network/main.cpp
View file

@ -20,10 +20,20 @@
#include <stdio.h>
class NetworkWidget final : public GUI::ImageWidget {
C_OBJECT(NetworkWidget);
C_OBJECT_ABSTRACT(NetworkWidget)
public:
static ErrorOr<NonnullRefPtr<NetworkWidget>> try_create(bool notifications)
{
NonnullRefPtr<Gfx::Bitmap> connected_icon = TRY(Gfx::Bitmap::try_load_from_file("/res/icons/16x16/network.png"));
NonnullRefPtr<Gfx::Bitmap> disconnected_icon = TRY(Gfx::Bitmap::try_load_from_file("/res/icons/16x16/network-disconnected.png"));
return adopt_nonnull_ref_or_enomem(new (nothrow) NetworkWidget(notifications, move(connected_icon), move(disconnected_icon)));
}
private:
NetworkWidget(bool notifications)
NetworkWidget(bool notifications, NonnullRefPtr<Gfx::Bitmap> connected_icon, NonnullRefPtr<Gfx::Bitmap> disconnected_icon)
: m_connected_icon(move(connected_icon))
, m_disconnected_icon(move(disconnected_icon))
{
m_notifications = notifications;
update_widget();
@ -153,8 +163,8 @@ private:
String m_adapter_info;
bool m_connected = false;
bool m_notifications = true;
RefPtr<Gfx::Bitmap> m_connected_icon = Gfx::Bitmap::try_load_from_file("/res/icons/16x16/network.png").release_value_but_fixme_should_propagate_errors();
RefPtr<Gfx::Bitmap> m_disconnected_icon = Gfx::Bitmap::try_load_from_file("/res/icons/16x16/network-disconnected.png").release_value_but_fixme_should_propagate_errors();
NonnullRefPtr<Gfx::Bitmap> m_connected_icon;
NonnullRefPtr<Gfx::Bitmap> m_disconnected_icon;
};
ErrorOr<int> serenity_main(Main::Arguments arguments)