RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-27 09:27:35 +00:00
Code Issues Activity Actions

LibCore: Make CObject reference-counted

Browse source 
Okay, I've spent a whole day on this now, and it finally kinda works!
With this patch, CObject and all of its derived classes are reference
counted instead of tree-owned.

The previous, Qt-like model was nice and familiar, but ultimately also
outdated and difficult to reason about.

CObject-derived types should now be stored in RefPtr/NonnullRefPtr and
each class can be constructed using the forwarding construct() helper:

    auto widget = GWidget::construct(parent_widget);

Note that construct() simply forwards all arguments to an existing
constructor. It is inserted into each class by the C_OBJECT macro,
see CObject.h to understand how that works.

CObject::delete_later() disappears in this patch, as there is no longer
a single logical owner of a CObject.
This commit is contained in:
Andreas Kling 2019-09-22 00:17:53 +02:00
parent 0c72e0c09f
commit bc319d9e88
45 changed files with 174 additions and 233 deletions
Download patch file Download diff file Expand all files Collapse all files

5
Applications/Taskbar/WindowList.h
View file

@ -15,7 +15,6 @@ public:
~Window()
{
delete m_button;
}
WindowIdentifier identifier() const { return m_identifier; }
@ -41,7 +40,7 @@ private:
WindowIdentifier m_identifier;
String m_title;
Rect m_rect;
GButton* m_button { nullptr };
RefPtr<GButton> m_button;
RefPtr<GraphicsBitmap> m_icon;
bool m_active { false };
bool m_minimized { false };
@ -62,7 +61,7 @@ public:
Window& ensure_window(const WindowIdentifier&);
void remove_window(const WindowIdentifier&);
Function<GButton*(const WindowIdentifier&)> aid_create_button;
Function<NonnullRefPtr<GButton>(const WindowIdentifier&)> aid_create_button;
private:
HashMap<WindowIdentifier, NonnullOwnPtr<Window>> m_windows;