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

LibGUI: Move Icon and FontDatabase into the GUI namespace

Browse source 
We also clean up some old references to the old G prefixed GUI classes

This also fixes a potential bug with using: C_OBJECT_ABSTRACT(GAbstractButton)
instead of C_OBJECT_ABSTRACT(AbstractButton)
This commit is contained in:
Shannon Booth 2020-03-07 12:02:21 +13:00 • committed by Andreas Kling
parent 57f1c919df
commit 6a3b12664a
24 changed files with 120 additions and 104 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Libraries/LibGUI/Variant.cpp
View file

@ -190,10 +190,10 @@ Variant::Variant(const Gfx::Bitmap& value)
AK::ref_if_not_null(m_value.as_bitmap);
}
Variant::Variant(const GIcon& value)
Variant::Variant(const GUI::Icon& value)
: m_type(Type::Icon)
{
m_value.as_icon = &const_cast<GIconImpl&>(value.impl());
m_value.as_icon = &const_cast<GUI::IconImpl&>(value.impl());
AK::ref_if_not_null(m_value.as_icon);
}
@ -398,7 +398,7 @@ String Variant::to_string() const
case Type::Bitmap:
return "[Gfx::Bitmap]";
case Type::Icon:
return "[GIcon]";
return "[GUI::Icon]";
case Type::Color:
return as_color().to_string();
case Type::Point: