RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-25 22:47:47 +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

8
Libraries/LibGUI/Variant.h
View file

@ -44,7 +44,7 @@ public:
Variant(const char*);
Variant(const String&);
Variant(const Gfx::Bitmap&);
Variant(const GIcon&);
Variant(const GUI::Icon&);
Variant(const Gfx::Point&);
Variant(const Gfx::Size&);
Variant(const Gfx::Rect&);
@ -207,10 +207,10 @@ public:
return *m_value.as_bitmap;
}
GIcon as_icon() const
GUI::Icon as_icon() const
{
ASSERT(type() == Type::Icon);
return GIcon(*m_value.as_icon);
return GUI::Icon(*m_value.as_icon);
}
Color as_color() const
@ -263,7 +263,7 @@ private:
union {
StringImpl* as_string;
Gfx::Bitmap* as_bitmap;
GIconImpl* as_icon;
GUI::IconImpl* as_icon;
Gfx::Font* as_font;
bool as_bool;
i32 as_i32;