Katana_mirror/katie
1
0
Fork 0
mirror of https://bitbucket.org/smil3y/katie.git synced 2025-02-24 10:52:56 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

rename QLinkedList::free to freeData for consistency

Browse source 
upstream commits:
9e96717746

Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
This commit is contained in:
Ivailo Monev 2016-05-03 14:21:03 +00:00
parent a34c3f8f9f
commit 289f291000
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/core/tools/qlinkedlist.h
View file

@ -236,7 +236,7 @@ public:
private:
void detach_helper();
void free(QLinkedListData*);
void freeData(QLinkedListData*);
};
template <typename T>
@ -245,7 +245,7 @@ inline QLinkedList<T>::~QLinkedList()
if (!d)
return;
if (!d->ref.deref())
free(d);
freeData(d);
}
template <typename T>
@ -266,19 +266,19 @@ void QLinkedList<T>::detach_helper()
copy = copy->n;
} QT_CATCH(...) {
copy->n = x.e;
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;
@ -305,7 +305,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();