Make QThreadStorage supports value type and not only pointers.

Handling value type is much more natural than handling pointer.
It was not possible to use normal type in QThreadStorage previously
(probably because some compiler would not support it?)

This should ease a lot the use of QThreadStorage and make it more
intuitive.

The only problem was the QThreadStorage::deleteData() that would
not compile for nonn-pointer. This is now fixed

Also updated the documentation.

Reviewed-by: Joao
Reviewed-by: Brad
Task-number: QTBUG-15033

1 files changed, 74 insertions, 0 deletions

diff --git a/tests/auto/qthreadstorage/tst_qthreadstorage.cpp b/tests/auto/qthreadstorage/tst_qthreadstorage.cpp
index 54f8bd9..90e0311 100644
--- a/tests/auto/qthreadstorage/tst_qthreadstorage.cpp
+++ b/tests/auto/qthreadstorage/tst_qthreadstorage.cpp
@@ -78,6 +78,7 @@ private slots:
     void ensureCleanupOrder();
     void QTBUG13877_crashOnExit();
     void QTBUG14579_leakInDestructor();
+    void valueBased();
 };
 
 class Pointer
@@ -318,6 +319,7 @@ public:
     static QBasicAtomicInt count;
     inline SPointer() { count.ref(); }
     inline ~SPointer() { count.deref(); }
+    inline SPointer(const SPointer &other) { count.ref(); }
 };
 QBasicAtomicInt SPointer::count = Q_BASIC_ATOMIC_INITIALIZER(0);
 
@@ -382,5 +384,77 @@ void tst_QThreadStorage::QTBUG14579_leakInDestructor()
     QCOMPARE(int(SPointer::count), c);
 }
 
+void tst_QThreadStorage::valueBased()
+{
+    struct Thread : QThread {
+        QThreadStorage<SPointer> &tlsSPointer;
+        QThreadStorage<QString> &tlsString;
+        QThreadStorage<int> &tlsInt;
+
+        int someNumber;
+        QString someString;
+        Thread(QThreadStorage<SPointer> &t1, QThreadStorage<QString> &t2, QThreadStorage<int> &t3)
+        : tlsSPointer(t1), tlsString(t2), tlsInt(t3) { }
+
+        void run() {
+            /*QVERIFY(!tlsSPointer.hasLocalData());
+            QVERIFY(!tlsString.hasLocalData());
+            QVERIFY(!tlsInt.hasLocalData());*/
+            SPointer pointercopy = tlsSPointer.localData();
+
+            //Default constructed values
+            QVERIFY(tlsString.localData().isNull());
+            QCOMPARE(tlsInt.localData(), 0);
+
+            //setting
+            tlsString.setLocalData(someString);
+            tlsInt.setLocalData(someNumber);
+
+            QCOMPARE(tlsString.localData(), someString);
+            QCOMPARE(tlsInt.localData(), someNumber);
+
+            //changing
+            tlsSPointer.setLocalData(SPointer());
+            tlsInt.localData() += 42;
+            tlsString.localData().append(QLatin1String(" world"));
+
+            QCOMPARE(tlsString.localData(), (someString + QLatin1String(" world")));
+            QCOMPARE(tlsInt.localData(), (someNumber + 42));
+
+            // operator=
+            tlsString.localData() = QString::number(someNumber);
+            QCOMPARE(tlsString.localData().toInt(), someNumber);
+        }
+    };
+
+    QThreadStorage<SPointer> tlsSPointer;
+    QThreadStorage<QString> tlsString;
+    QThreadStorage<int> tlsInt;
+
+    int c = SPointer::count;
+
+    Thread t1(tlsSPointer, tlsString, tlsInt);
+    Thread t2(tlsSPointer, tlsString, tlsInt);
+    Thread t3(tlsSPointer, tlsString, tlsInt);
+    t1.someNumber = 42;
+    t2.someNumber = -128;
+    t3.someNumber = 78;
+    t1.someString = "hello";
+    t2.someString = "trolltech";
+    t3.someString = "nokia";
+
+    t1.start();
+    t2.start();
+    t3.start();
+
+    QVERIFY(t1.wait());
+    QVERIFY(t2.wait());
+    QVERIFY(t3.wait());
+
+    QCOMPARE(c, int(SPointer::count));
+
+}
+
+
 QTEST_MAIN(tst_QThreadStorage)
 #include "tst_qthreadstorage.moc"