mirror of
				https://github.com/RGBCube/serenity
				synced 2025-10-31 11:52:44 +00:00 
			
		
		
		
	 1a97382305
			
		
	
	
		1a97382305
		
	
	
	
	
		
			
			The pattern to construct `Application` was to use the `try_create` method from the `C_OBJECT` macro. While being safe from an OOM perspective, this method doesn't propagate errors from the constructor. This patch make `Application` use the `C_OBJECT_ABSTRACT` and manually define a `create` method that can bubble up errors from the construction stage. This commit also removes the ability to use `argc` and `argv` to create an `Application`, only `Main`'s `Arguments` can be used. From a user point of view, the patch renames `try_create` => `create`, hence the huge number of modified files.
		
			
				
	
	
		
			34 lines
		
	
	
	
		
			1.1 KiB
		
	
	
	
		
			C++
		
	
	
	
	
	
			
		
		
	
	
			34 lines
		
	
	
	
		
			1.1 KiB
		
	
	
	
		
			C++
		
	
	
	
	
	
| /*
 | |
|  * Copyright (c) 2018-2021, Andreas Kling <kling@serenityos.org>
 | |
|  * Copyright (c) 2020, Linus Groh <linusg@serenityos.org>
 | |
|  *
 | |
|  * SPDX-License-Identifier: BSD-2-Clause
 | |
|  */
 | |
| 
 | |
| #include "GalleryWidget.h"
 | |
| #include <LibCore/System.h>
 | |
| #include <LibGUI/Application.h>
 | |
| #include <LibGUI/Icon.h>
 | |
| #include <LibGUI/Window.h>
 | |
| #include <LibMain/Main.h>
 | |
| 
 | |
| ErrorOr<int> serenity_main(Main::Arguments arguments)
 | |
| {
 | |
|     TRY(Core::System::pledge("stdio recvfd sendfd rpath unix thread"));
 | |
|     auto app = TRY(GUI::Application::create(arguments));
 | |
| 
 | |
|     TRY(Core::System::unveil("/tmp/session/%sid/portal/filesystemaccess", "rw"));
 | |
|     TRY(Core::System::unveil("/res", "r"));
 | |
|     TRY(Core::System::unveil("/etc/FileIconProvider.ini", "r"));
 | |
|     TRY(Core::System::unveil(nullptr, nullptr));
 | |
|     auto app_icon = TRY(GUI::Icon::try_create_default_icon("app-widget-gallery"sv));
 | |
| 
 | |
|     auto window = TRY(GUI::Window::try_create());
 | |
|     window->resize(430, 480);
 | |
|     window->set_title("Widget Gallery");
 | |
|     window->set_icon(app_icon.bitmap_for_size(16));
 | |
|     (void)TRY(window->set_main_widget<GalleryWidget>());
 | |
|     window->show();
 | |
| 
 | |
|     return app->exec();
 | |
| }
 |