Add get() and operator bool() to QObjectUniquePointer

qgis · Jun 10, 2019 · 590f654 · 590f654
1 parent 8197e00
commit 590f654
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 0 deletions.
diff --git a/src/core/qobjectuniqueptr.h b/src/core/qobjectuniqueptr.h
@@ -91,6 +91,14 @@ class QObjectUniquePtr
       return static_cast<T *>( mPtr.data() );
     }
 
+    /**
+     * Returns the raw pointer to the managed QObject.
+     */
+    inline T *get() const
+    {
+      return static_cast<T *>( mPtr.data() );
+    }
+
     /**
      * Returns a raw pointer to the managed QObject.
      */
@@ -123,6 +131,11 @@ class QObjectUniquePtr
       return mPtr.isNull();
     }
 
+    inline bool operator bool() const
+    {
+      return !mPtr.isNull();
+    }
+
     inline void clear()
     {
       mPtr.clear();

diff --git a/tests/src/core/testqobjectuniqueptr.cpp b/tests/src/core/testqobjectuniqueptr.cpp
@@ -43,9 +43,13 @@ void TestQObjectUniquePtr::testParentDeletedFirst()
 
   QObjectUniquePtr<QObject> obj( child );
   QVERIFY( !obj.isNull() );
+  QVERIFY( obj );
+  QCOMPARE( child, obj.get() );
+  QCOMPARE( child, obj.data() );
 
   delete parent;
   QVERIFY( obj.isNull() );
+  QVERIFY( !obj );
 }
 
 void TestQObjectUniquePtr::testParentDeletedAfter()