RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-25 03:57:43 +00:00
Code Issues Activity Actions

Userland+LibCore: Remove legacy SERENITY_VERSION from Core::Version

Browse source 
This was being used as a default version argument in a couple of APIs,
so those need to change signature and the caller always needs to provide
a version.
This commit is contained in:
kleines Filmröllchen 2022-08-30 12:49:08 +02:00 • committed by Linus Groh
parent 38bb189772
commit cb0b82ec46
7 changed files with 10 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -17,7 +17,7 @@
namespace GUI {
AboutDialog::AboutDialog(StringView name, Gfx::Bitmap const* icon, Window* parent_window, StringView version)
AboutDialog::AboutDialog(StringView name, StringView version, Gfx::Bitmap const* icon, Window* parent_window)
: Dialog(parent_window)
, m_name(name)
, m_icon(icon)

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

@ -17,16 +17,16 @@ class AboutDialog final : public Dialog {
public:
virtual ~AboutDialog() override = default;
static void show(StringView name, Gfx::Bitmap const* icon = nullptr, Window* parent_window = nullptr, Gfx::Bitmap const* window_icon = nullptr, StringView version = Core::Version::SERENITY_VERSION)
static void show(StringView name, StringView version, Gfx::Bitmap const* icon = nullptr, Window* parent_window = nullptr, Gfx::Bitmap const* window_icon = nullptr)
{
auto dialog = AboutDialog::construct(name, icon, parent_window, version);
auto dialog = AboutDialog::construct(name, version, icon, parent_window);
if (window_icon)
dialog->set_icon(window_icon);
dialog->exec();
}
private:
AboutDialog(StringView name, Gfx::Bitmap const* icon = nullptr, Window* parent_window = nullptr, StringView version = Core::Version::SERENITY_VERSION);
AboutDialog(StringView name, StringView version, Gfx::Bitmap const* icon = nullptr, Window* parent_window = nullptr);
String m_name;
RefPtr<Gfx::Bitmap> m_icon;

3
Userland/Libraries/LibGUI/CommonActions.cpp
View file

@ -7,6 +7,7 @@
#include <AK/Function.h>
#include <AK/String.h>
#include <AK/WeakPtr.h>
#include <LibCore/Version.h>
#include <LibGUI/AboutDialog.h>
#include <LibGUI/Action.h>
#include <LibGUI/Icon.h>
@ -19,7 +20,7 @@ NonnullRefPtr<Action> make_about_action(String const& app_name, Icon const& app_
{
auto weak_parent = AK::make_weak_ptr_if_nonnull<Window>(parent);
auto action = Action::create(String::formatted("&About {}", app_name), app_icon.bitmap_for_size(16), [=](auto&) {
AboutDialog::show(app_name, app_icon.bitmap_for_size(32), weak_parent.ptr());
AboutDialog::show(app_name, Core::Version::read_long_version_string(), app_icon.bitmap_for_size(32), weak_parent.ptr());
});
action->set_status_tip("Show application about box");
return action;