diff --git a/Libraries/LibCore/Object.cpp b/Libraries/LibCore/Object.cpp index dc9028a533..6860510167 100644 --- a/Libraries/LibCore/Object.cpp +++ b/Libraries/LibCore/Object.cpp @@ -40,9 +40,8 @@ IntrusiveList& Object::all_objects() return objects; } -Object::Object(Object* parent, bool is_widget) +Object::Object(Object* parent) : m_parent(parent) - , m_widget(is_widget) { all_objects().append(*this); if (m_parent) diff --git a/Libraries/LibCore/Object.h b/Libraries/LibCore/Object.h index 972895ebb8..c7fb49741d 100644 --- a/Libraries/LibCore/Object.h +++ b/Libraries/LibCore/Object.h @@ -117,8 +117,6 @@ public: void deferred_invoke(Function); - bool is_widget() const { return m_widget; } - void save_to(AK::JsonObject&); bool set_property(const StringView& name, const JsonValue& value); @@ -151,7 +149,7 @@ public: void decrement_inspector_count(Badge); protected: - explicit Object(Object* parent = nullptr, bool is_widget = false); + explicit Object(Object* parent = nullptr); void register_property(const String& name, Function getter, Function setter = nullptr); @@ -169,7 +167,6 @@ private: String m_name; int m_timer_id { 0 }; unsigned m_inspector_count { 0 }; - bool m_widget { false }; HashMap> m_properties; NonnullRefPtrVector m_children; }; diff --git a/Libraries/LibGUI/ToolBarContainer.cpp b/Libraries/LibGUI/ToolBarContainer.cpp index 8cbca228e2..717bfb34d4 100644 --- a/Libraries/LibGUI/ToolBarContainer.cpp +++ b/Libraries/LibGUI/ToolBarContainer.cpp @@ -37,10 +37,10 @@ void ToolBarContainer::child_event(Core::ChildEvent& event) Frame::child_event(event); if (event.type() == Core::Event::ChildAdded) { - if (event.child() && event.child()->is_widget()) + if (event.child() && is(event.child())) did_add_toolbar((Widget&)*event.child()); } else if (event.type() == Core::Event::ChildRemoved) { - if (event.child() && event.child()->is_widget()) { + if (event.child() && is(event.child())) { did_remove_toolbar((Widget&)*event.child()); } } diff --git a/Libraries/LibGUI/Widget.cpp b/Libraries/LibGUI/Widget.cpp index 32edb2bd79..e35fc36536 100644 --- a/Libraries/LibGUI/Widget.cpp +++ b/Libraries/LibGUI/Widget.cpp @@ -130,7 +130,7 @@ const WidgetClassRegistration* WidgetClassRegistration::find(const String& class } Widget::Widget() - : Core::Object(nullptr, true) + : Core::Object(nullptr) , m_background_role(Gfx::ColorRole::Window) , m_foreground_role(Gfx::ColorRole::WindowText) , m_font(Gfx::FontDatabase::default_font()) @@ -197,7 +197,7 @@ void Widget::child_event(Core::ChildEvent& event) { if (event.type() == Event::ChildAdded) { if (event.child() && is(*event.child()) && layout()) { - if (event.insertion_before_child() && event.insertion_before_child()->is_widget()) + if (event.insertion_before_child() && is(event.insertion_before_child())) layout()->insert_widget_before(downcast(*event.child()), downcast(*event.insertion_before_child())); else layout()->add_widget(downcast(*event.child())); @@ -853,7 +853,7 @@ Vector Widget::child_widgets() const Vector widgets; widgets.ensure_capacity(children().size()); for (auto& child : const_cast(this)->children()) { - if (child.is_widget()) + if (is(child)) widgets.append(static_cast(&child)); } return widgets;