From 9e96717746850205eba7d4957ddb4d0322875fff Mon Sep 17 00:00:00 2001
From: Thiago Macieira <thiago.macieira@intel.com>
Date: Wed, 8 Aug 2012 14:57:39 +0200
Subject: Rename QLinkedList::free to freeData for consistency

QLinkedList does use allocations in the .h, by way of operator new and
operator delete. But for consistency with other classes, don't call our
function free().

Change-Id: I9295f5945619ad4ea82fd1f7f55b34700c54e06a
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
---
 src/corelib/tools/qlinkedlist.h | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'src/corelib/tools')

diff --git a/src/corelib/tools/qlinkedlist.h b/src/corelib/tools/qlinkedlist.h
index 1caf21f456..f91580f550 100644
--- a/src/corelib/tools/qlinkedlist.h
+++ b/src/corelib/tools/qlinkedlist.h
@@ -234,14 +234,14 @@ public:
 
 private:
     void detach_helper();
-    void free(QLinkedListData*);
+    void freeData(QLinkedListData*);
 };
 
 template <typename T>
 inline QLinkedList<T>::~QLinkedList()
 {
     if (!d->ref.deref())
-        free(d);
+        freeData(d);
 }
 
 template <typename T>
@@ -263,19 +263,19 @@ void QLinkedList<T>::detach_helper()
         } QT_CATCH(...) {
             copy->n = x.e;
             Q_ASSERT(!x.d->ref.deref()); // Don't trigger assert in free
-            free(x.d);
+            freeData(x.d);
             QT_RETHROW;
         }
     }
     copy->n = x.e;
     x.e->p = copy;
     if (!d->ref.deref())
-        free(d);
+        freeData(d);
     d = x.d;
 }
 
 template <typename T>
-void QLinkedList<T>::free(QLinkedListData *x)
+void QLinkedList<T>::freeData(QLinkedListData *x)
 {
     Node *y = reinterpret_cast<Node*>(x);
     Node *i = y->n;
@@ -301,7 +301,7 @@ QLinkedList<T> &QLinkedList<T>::operator=(const QLinkedList<T> &l)
         QLinkedListData *o = l.d;
         o->ref.ref();
         if (!d->ref.deref())
-            free(d);
+            freeData(d);
         d = o;
         if (!d->sharable)
             detach_helper();
-- 
cgit v1.2.3