QWeakPointer: purge deprecated API

Since 5.0: assignment/construction from QObject pointer
Since 5.14: data() to recover the packaged pointer

Change-Id: I5d6ab561ce39bc0d9d3e5035eb2ca38139cd76b6
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>

1 files changed, 0 insertions, 196 deletions

diff --git a/tests/auto/corelib/tools/qsharedpointer/tst_qsharedpointer.cpp b/tests/auto/corelib/tools/qsharedpointer/tst_qsharedpointer.cpp
index 95c2c2bb70..4ca7940556 100644
--- a/tests/auto/corelib/tools/qsharedpointer/tst_qsharedpointer.cpp
+++ b/tests/auto/corelib/tools/qsharedpointer/tst_qsharedpointer.cpp
@@ -77,10 +77,6 @@ private slots:
     void functionCallDownCast();
     void upCast();
     void qobjectWeakManagement();
-#if QT_DEPRECATED_SINCE(5, 0)
-    void noSharedPointerFromWeakQObject();
-    void sharedPointerFromQObjectWithWeak();
-#endif
     void weakQObjectFromSharedPointer();
     void objectCast();
     void objectCastStdSharedPtr();
@@ -956,156 +952,10 @@ void tst_QSharedPointer::qobjectWeakManagement()
         QVERIFY(weak.isNull());
     }
     safetyCheck();
-
-#if QT_DEPRECATED_SINCE(5, 0)
-    {
-        QWeakPointer<QObject> weak;
-        weak = QWeakPointer<QObject>();
-        QVERIFY(weak.isNull());
-        QVERIFY(!weak.data());
-    }
-
-    {
-        QObject *obj = new QObject;
-        QWeakPointer<QObject> weak(obj);
-        QVERIFY(!weak.isNull());
-        QVERIFY(weak.data() == obj);
-
-        // now delete
-        delete obj;
-        QVERIFY(weak.isNull());
-    }
-    safetyCheck();
-
-    {
-        // same, bit with operator=
-        QObject *obj = new QObject;
-        QWeakPointer<QObject> weak;
-        weak = obj;
-        QVERIFY(!weak.isNull());
-        QVERIFY(weak.data() == obj);
-
-        // now delete
-        delete obj;
-        QVERIFY(weak.isNull());
-    }
-    safetyCheck();
-
-    {
-        // delete triggered by parent
-        QObject *obj, *parent;
-        parent = new QObject;
-        obj = new QObject(parent);
-        QWeakPointer<QObject> weak(obj);
-
-        // now delete the parent
-        delete parent;
-        QVERIFY(weak.isNull());
-    }
-    safetyCheck();
-
-    {
-        // same as above, but set the parent after QWeakPointer is created
-        QObject *obj, *parent;
-        obj = new QObject;
-        QWeakPointer<QObject> weak(obj);
-
-        parent = new QObject;
-        obj->setParent(parent);
-
-        // now delete the parent
-        delete parent;
-        QVERIFY(weak.isNull());
-    }
-    safetyCheck();
-
-    {
-        // with two QWeakPointers
-        QObject *obj = new QObject;
-        QWeakPointer<QObject> weak(obj);
-
-        {
-            QWeakPointer<QObject> weak2(obj);
-            QVERIFY(!weak2.isNull());
-            QVERIFY(weak == weak2);
-        }
-        QVERIFY(!weak.isNull());
-
-        delete obj;
-        QVERIFY(weak.isNull());
-    }
-    safetyCheck();
-
-    {
-        // same, but delete the pointer while two QWeakPointers exist
-        QObject *obj = new QObject;
-        QWeakPointer<QObject> weak(obj);
-
-        {
-            QWeakPointer<QObject> weak2(obj);
-            QVERIFY(!weak2.isNull());
-
-            delete obj;
-            QVERIFY(weak.isNull());
-            QVERIFY(weak2.isNull());
-        }
-        QVERIFY(weak.isNull());
-    }
-    safetyCheck();
-#endif
-}
-
-#if QT_DEPRECATED_SINCE(5, 0)
-void tst_QSharedPointer::noSharedPointerFromWeakQObject()
-{
-    // you're not allowed to create a QSharedPointer from an unmanaged QObject
-    QObject obj;
-    QWeakPointer<QObject> weak(&obj);
-
-    {
-        QTest::ignoreMessage(QtWarningMsg ,  "QSharedPointer: cannot create a QSharedPointer from a QObject-tracking QWeakPointer");
-        QSharedPointer<QObject> strong = weak.toStrongRef();
-        QVERIFY(strong.isNull());
-    }
-    {
-        QTest::ignoreMessage(QtWarningMsg ,  "QSharedPointer: cannot create a QSharedPointer from a QObject-tracking QWeakPointer");
-        QSharedPointer<QObject> strong = weak;
-        QVERIFY(strong.isNull());
-    }
-
-    QCOMPARE(weak.data(), &obj);
-    // if something went wrong, we'll probably crash here
 }
 
-void tst_QSharedPointer::sharedPointerFromQObjectWithWeak()
-{
-    QObject *ptr = new QObject;
-    QWeakPointer<QObject> weak = ptr;
-    {
-        QSharedPointer<QObject> shared(ptr);
-        QVERIFY(!weak.isNull());
-        QCOMPARE(shared.data(), ptr);
-        QCOMPARE(weak.data(), ptr);
-    }
-    QVERIFY(weak.isNull());
-}
-#endif
-
 void tst_QSharedPointer::weakQObjectFromSharedPointer()
 {
-#if QT_DEPRECATED_SINCE(5, 0)
-    {
-        // this is the inverse of the above: you're allowed to create a QWeakPointer
-        // from a managed QObject
-        QSharedPointer<QObject> shared(new QObject);
-        QWeakPointer<QObject> weak = shared.data();
-        QVERIFY(!weak.isNull());
-
-        // delete:
-        shared.clear();
-        QVERIFY(weak.isNull());
-    }
-#endif
     {
         QSharedPointer<QObject> shared(new QObject);
         QWeakPointer<QObject> weak = shared;
@@ -2507,52 +2357,6 @@ void tst_QSharedPointer::qvariantCast()
     }
     // Intentionally does not compile.
 //     QSharedPointer<int> sop = qSharedPointerFromVariant<int>(v);
-
-#if QT_DEPRECATED_SINCE(5, 0)
-    v = QVariant::fromValue(sp.toWeakRef());
-
-    {
-        QWeakPointer<QObject> other = qWeakPointerFromVariant<QObject>(v);
-        QCOMPARE(other.data()->objectName(), QString::fromLatin1("A test name"));
-    }
-    {
-        QWeakPointer<QIODevice> other = qWeakPointerFromVariant<QIODevice>(v);
-        QCOMPARE(other.data()->objectName(), QString::fromLatin1("A test name"));
-    }
-    {
-        QWeakPointer<QFile> other = qWeakPointerFromVariant<QFile>(v);
-        QCOMPARE(other.data()->objectName(), QString::fromLatin1("A test name"));
-    }
-    {
-        QWeakPointer<QThread> other = qWeakPointerFromVariant<QThread>(v);
-        QVERIFY(!other);
-    }
-
-    // Intentionally does not compile.
-//     QWeakPointer<int> sop = qWeakPointerFromVariant<int>(v);
-
-    QFile file;
-    QWeakPointer<QFile> tracking = &file;
-    tracking.data()->setObjectName("A test name");
-    v = QVariant::fromValue(tracking);
-
-    {
-        QWeakPointer<QObject> other = qWeakPointerFromVariant<QObject>(v);
-        QCOMPARE(other.data()->objectName(), QString::fromLatin1("A test name"));
-    }
-    {
-        QWeakPointer<QIODevice> other = qWeakPointerFromVariant<QIODevice>(v);
-        QCOMPARE(other.data()->objectName(), QString::fromLatin1("A test name"));
-    }
-    {
-        QWeakPointer<QFile> other = qWeakPointerFromVariant<QFile>(v);
-        QCOMPARE(other.data()->objectName(), QString::fromLatin1("A test name"));
-    }
-    {
-        QWeakPointer<QThread> other = qWeakPointerFromVariant<QThread>(v);
-        QVERIFY(!other);
-    }
-#endif
 }
 
 class SomeClass : public QEnableSharedFromThis<SomeClass>