Restore QList backward compatibility

Add detach3 and append2, leaving the old functions as they were.
This ensures that new code will use the optimized version of QList,
and old code will just continue calling the old functions.

Reviewed-by: Thiago

1 files changed, 5 insertions, 3 deletions

diff --git a/src/corelib/tools/qlist.h b/src/corelib/tools/qlist.h
index ab6f7bd..331f448 100644
--- a/src/corelib/tools/qlist.h
+++ b/src/corelib/tools/qlist.h
@@ -72,13 +72,15 @@ struct Q_CORE_EXPORT QListData {
     enum { DataHeaderSize = sizeof(Data) - sizeof(void *) };
 
     Data *detach(); // remove in 5.0
-    Data *detach2();
+    Data *detach2(); // remove in 5.0
+    Data *detach3();
     void realloc(int alloc);
     static Data shared_null;
     Data *d;
     void **erase(void **xi);
     void **append();
     void **append(const QListData &l);
+    void **append2(const QListData &l); // remove in 5.0
     void **prepend();
     void **insert(int i);
     void remove(int i);
@@ -593,7 +595,7 @@ template <typename T>
 Q_OUTOFLINE_TEMPLATE void QList<T>::detach_helper()
 {
     Node *n = reinterpret_cast<Node *>(p.begin());
-    QListData::Data *x = p.detach2();
+    QListData::Data *x = p.detach3();
     QT_TRY {
         node_copy(reinterpret_cast<Node *>(p.begin()), reinterpret_cast<Node *>(p.end()), n);
     } QT_CATCH(...) {
@@ -693,7 +695,7 @@ template <typename T>
 Q_OUTOFLINE_TEMPLATE QList<T> &QList<T>::operator+=(const QList<T> &l)
 {
     detach();
-    Node *n = reinterpret_cast<Node *>(p.append(l.p));
+    Node *n = reinterpret_cast<Node *>(p.append2(l.p));
     QT_TRY{
         node_copy(n, reinterpret_cast<Node *>(p.end()), reinterpret_cast<Node *>(l.p.begin()));
     } QT_CATCH(...) {