whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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>
bb10
Thiago Macieira 2012-08-08 14:57:39 +02:00 committed by Qt by Nokia
parent 9f71ff69f2
commit 9e96717746
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/corelib/tools/qlinkedlist.h
View File

@ -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();