RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-26 06:17:34 +00:00
Code Issues Activity Actions

AK: Rename Retainable => RefCounted.

Browse source 
(And various related renames that go along with it.)
This commit is contained in:
Andreas Kling 2019-06-21 15:29:31 +02:00
parent ef1bfcb9d8
commit 77b9fa89dd
45 changed files with 118 additions and 118 deletions
Download patch file Download diff file Expand all files Collapse all files

2
LibGUI/GAction.h
View file

@ -15,7 +15,7 @@ class GButton;
class GMenuItem;
class GWidget;
class GAction : public Retainable<GAction>
class GAction : public RefCounted<GAction>
, public Weakable<GAction> {
public:
enum class ShortcutScope {

2
LibGUI/GIcon.h
View file

@ -3,7 +3,7 @@
#include <AK/HashMap.h>
#include <SharedGraphics/GraphicsBitmap.h>
class GIconImpl : public Retainable<GIconImpl> {
class GIconImpl : public RefCounted<GIconImpl> {
public:
static Retained<GIconImpl> create() { return adopt(*new GIconImpl); }
~GIconImpl() {}

2
LibGUI/GModel.h
View file

@ -39,7 +39,7 @@ private:
GModelIndex m_index;
};
class GModel : public Retainable<GModel> {
class GModel : public RefCounted<GModel> {
public:
struct ColumnMetadata {
int preferred_width { 0 };

18
LibGUI/GVariant.cpp
View file

@ -14,13 +14,13 @@ void GVariant::clear()
{
switch (m_type) {
case Type::String:
AK::release_if_not_null(m_value.as_string);
AK::deref_if_not_null(m_value.as_string);
break;
case Type::Bitmap:
AK::release_if_not_null(m_value.as_bitmap);
AK::deref_if_not_null(m_value.as_bitmap);
break;
case Type::Icon:
AK::release_if_not_null(m_value.as_icon);
AK::deref_if_not_null(m_value.as_icon);
break;
default:
break;
@ -51,21 +51,21 @@ GVariant::GVariant(const String& value)
: m_type(Type::String)
{
m_value.as_string = const_cast<StringImpl*>(value.impl());
AK::retain_if_not_null(m_value.as_string);
AK::ref_if_not_null(m_value.as_string);
}
GVariant::GVariant(const GraphicsBitmap& value)
: m_type(Type::Bitmap)
{
m_value.as_bitmap = const_cast<GraphicsBitmap*>(&value);
AK::retain_if_not_null(m_value.as_bitmap);
AK::ref_if_not_null(m_value.as_bitmap);
}
GVariant::GVariant(const GIcon& value)
: m_type(Type::Icon)
{
m_value.as_icon = &const_cast<GIconImpl&>(value.impl());
AK::retain_if_not_null(m_value.as_icon);
AK::ref_if_not_null(m_value.as_icon);
}
GVariant::GVariant(Color color)
@ -133,15 +133,15 @@ void GVariant::copy_from(const GVariant& other)
break;
case Type::String:
m_value.as_string = other.m_value.as_string;
AK::retain_if_not_null(m_value.as_bitmap);
AK::ref_if_not_null(m_value.as_bitmap);
break;
case Type::Bitmap:
m_value.as_bitmap = other.m_value.as_bitmap;
AK::retain_if_not_null(m_value.as_bitmap);
AK::ref_if_not_null(m_value.as_bitmap);
break;
case Type::Icon:
m_value.as_icon = other.m_value.as_icon;
AK::retain_if_not_null(m_value.as_icon);
AK::ref_if_not_null(m_value.as_icon);
break;
case Type::Color:
m_value.as_color = other.m_value.as_color;