Reimplement qSwap and Q_DECLARE_SHARED differently.

This enables the use of Q_DECLARE_SHARED with d-pointers that are
QExplicitlySharedDataPointer<PrivateClass>.

Also, this enables swapping atomically QSharedPointers.

Reviewed-by: Harald Fernengel

1 files changed, 20 insertions, 0 deletions

diff --git a/tests/auto/qexplicitlyshareddatapointer/tst_qexplicitlyshareddatapointer.cpp b/tests/auto/qexplicitlyshareddatapointer/tst_qexplicitlyshareddatapointer.cpp
index 4cdeb5c..97e57f1 100644
--- a/tests/auto/qexplicitlyshareddatapointer/tst_qexplicitlyshareddatapointer.cpp
+++ b/tests/auto/qexplicitlyshareddatapointer/tst_qexplicitlyshareddatapointer.cpp
@@ -61,6 +61,7 @@ private Q_SLOTS:
     void clone() const;
     void data() const;
     void reset() const;
+    void swap() const;
 };
 
 class MyClass : public QSharedData
@@ -233,6 +234,25 @@ void tst_QExplicitlySharedDataPointer::reset() const
     }
 }
 
+void tst_QExplicitlySharedDataPointer::swap() const
+{
+    QExplicitlySharedDataPointer<MyClass> p1(0), p2(new MyClass());
+    QVERIFY(!p1.data());
+    QVERIFY(p2.data());
+
+    p1.swap(p2);
+    QVERIFY(p1.data());
+    QVERIFY(!p2.data());
+
+    p1.swap(p2);
+    QVERIFY(!p1.data());
+    QVERIFY(p2.data());
+
+    qSwap(p1, p2);
+    QVERIFY(p1.data());
+    QVERIFY(!p2.data());
+}
+
 QTEST_MAIN(tst_QExplicitlySharedDataPointer)
 
 #include "tst_qexplicitlyshareddatapointer.moc"