AK: Improve smart pointer ergonomics a bit.

3 files changed, 26 insertions, 6 deletions

diff --git a/AK/OwnPtr.h b/AK/OwnPtr.h
index 1988b7169e..828aca3110 100644
--- a/AK/OwnPtr.h
+++ b/AK/OwnPtr.h
@@ -66,9 +66,6 @@ public:
 
     bool operator!() const { return !m_ptr; }
 
-    typedef T* OwnPtr::*UnspecifiedBoolType;
-    operator UnspecifiedBoolType() const { return m_ptr ? &OwnPtr::m_ptr : nullptr; }
-
     T* leak_ptr()
     {
         T* leakedPtr = m_ptr;
@@ -85,6 +82,9 @@ public:
     T& operator*() { return *m_ptr; }
     const T& operator*() const { return *m_ptr; }
 
+    operator const T*() const { return m_ptr; }
+    operator T*() { return m_ptr; }
+
     operator bool() { return !!m_ptr; }
 
 private:
diff --git a/AK/RetainPtr.h b/AK/RetainPtr.h
index be92b181f0..b23d070d2e 100644
--- a/AK/RetainPtr.h
+++ b/AK/RetainPtr.h
@@ -53,6 +53,14 @@ public:
         return *this;
     }
 
+    template<typename U>
+    RetainPtr& operator=(Retained<U>&& other)
+    {
+        release_if_not_null(m_ptr);
+        m_ptr = &other.leak_ref();
+        return *this;
+    }
+
     RetainPtr& operator=(T* ptr)
     {
         if (m_ptr != ptr)
@@ -90,9 +98,6 @@ public:
 
     bool operator!() const { return !m_ptr; }
 
-    typedef T* RetainPtr::*UnspecifiedBoolType;
-    operator UnspecifiedBoolType() const { return m_ptr ? &RetainPtr::m_ptr : nullptr; }
-
     T* leak_ref()
     {
         T* leakedPtr = m_ptr;
@@ -109,8 +114,20 @@ public:
     T& operator*() { return *m_ptr; }
     const T& operator*() const { return *m_ptr; }
 
+    operator const T*() const { return m_ptr; }
+    operator T*() { return m_ptr; }
+
     operator bool() { return !!m_ptr; }
 
+    bool operator==(std::nullptr_t) const { return !m_ptr; }
+    bool operator!=(std::nullptr_t) const { return m_ptr; }
+
+    bool operator==(const RetainPtr& other) const { return m_ptr == other.m_ptr; }
+    bool operator!=(const RetainPtr& other) const { return m_ptr != other.m_ptr; }
+
+    bool operator==(const T* other) const { return m_ptr == other; }
+    bool operator!=(const T* other) const { return m_ptr != other; }
+
     bool is_null() const { return !m_ptr; }
 
 private:
diff --git a/AK/Retained.h b/AK/Retained.h
index ebf61bc468..10756d6440 100644
--- a/AK/Retained.h
+++ b/AK/Retained.h
@@ -107,6 +107,9 @@ public:
     CALLABLE_WHEN(unconsumed) T& operator*() { ASSERT(m_ptr); return *m_ptr; }
     CALLABLE_WHEN(unconsumed) const T& operator*() const { ASSERT(m_ptr); return *m_ptr; }
 
+    CALLABLE_WHEN(unconsumed) operator T*() { ASSERT(m_ptr); return m_ptr; }
+    CALLABLE_WHEN(unconsumed) operator const T*() const { ASSERT(m_ptr); return m_ptr; }
+
 private:
     Retained() { }