Remove QScopedCustomPointer

Use QScopedPointer with a custom deleter instead, so we can remove
the awful QScopedCustomPointer once and for all :)

Reviewed-by: Thiago

1 files changed, 9 insertions, 0 deletions

diff --git a/src/corelib/tools/qscopedpointer.h b/src/corelib/tools/qscopedpointer.h
index 7a3ee14..f801366 100644
--- a/src/corelib/tools/qscopedpointer.h
+++ b/src/corelib/tools/qscopedpointer.h
@@ -166,6 +166,11 @@ public:
         return oldD;
     }
 
+    inline void swap(QScopedPointer<T, Cleanup> &other)
+    {
+        qSwap(d, other.d);
+    }
+
     typedef T *pointer;
 
 protected:
@@ -175,6 +180,10 @@ private:
     Q_DISABLE_COPY(QScopedPointer)
 };
 
+template <class T, class Cleanup>
+Q_INLINE_TEMPLATE void qSwap(QScopedPointer<T, Cleanup> &p1, QScopedPointer<T, Cleanup> &p2)
+{ p1.swap(p2); }
+
 template <typename T, typename Cleanup = QScopedPointerArrayDeleter<T> >
 class QScopedArrayPointer : public QScopedPointer<T, Cleanup>
 {