mirror of
https://github.com/RGBCube/serenity
synced 2025-07-27 15:27:35 +00:00
Big, possibly complete sweep of naming changes.
This commit is contained in:
parent
27fa09aee4
commit
ffab6897aa
93 changed files with 830 additions and 885 deletions
10
AK/WeakPtr.h
10
AK/WeakPtr.h
|
@ -13,14 +13,14 @@ public:
|
|||
|
||||
template<typename U>
|
||||
WeakPtr(WeakPtr<U>&& other)
|
||||
: m_link(reinterpret_cast<WeakLink<T>*>(other.leakLink()))
|
||||
: m_link(reinterpret_cast<WeakLink<T>*>(other.leak_link()))
|
||||
{
|
||||
}
|
||||
|
||||
template<typename U>
|
||||
WeakPtr& operator=(WeakPtr<U>&& other)
|
||||
{
|
||||
m_link = reinterpret_cast<WeakLink<T>*>(other.leakLink());
|
||||
m_link = reinterpret_cast<WeakLink<T>*>(other.leak_link());
|
||||
return *this;
|
||||
}
|
||||
|
||||
|
@ -38,7 +38,7 @@ public:
|
|||
bool is_null() const { return !m_link || !m_link->ptr(); }
|
||||
void clear() { m_link = nullptr; }
|
||||
|
||||
WeakLink<T>* leakLink() { return m_link.leakRef(); }
|
||||
WeakLink<T>* leak_link() { return m_link.leak_ref(); }
|
||||
|
||||
private:
|
||||
WeakPtr(RetainPtr<WeakLink<T>>&& link) : m_link(move(link)) { }
|
||||
|
@ -47,11 +47,11 @@ private:
|
|||
};
|
||||
|
||||
template<typename T>
|
||||
inline WeakPtr<T> Weakable<T>::makeWeakPtr()
|
||||
inline WeakPtr<T> Weakable<T>::make_weak_ptr()
|
||||
{
|
||||
if (!m_link)
|
||||
m_link = adopt(*new WeakLink<T>(static_cast<T&>(*this)));
|
||||
return WeakPtr<T>(m_link.copyRef());
|
||||
return WeakPtr<T>(m_link.copy_ref());
|
||||
}
|
||||
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue