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

apply upstream commit

Browse source 
upstream commit:
113e921684

Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
This commit is contained in:
Ivailo Monev 2019-06-26 13:32:03 +00:00
parent 3709c00891
commit 4575b97b6b
3 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/core/tools/qlinkedlist.h
View file

@ -230,8 +230,6 @@ private:
template <typename T> template <typename T>
inline QLinkedList<T>::~QLinkedList() inline QLinkedList<T>::~QLinkedList()
{ {
if (!d)
return;
if (!d->ref.deref()) if (!d->ref.deref())
freeData(d); freeData(d);
} }

2
src/core/tools/qmap.h
View file

@ -159,7 +159,7 @@ public:
inline QMap() : d(&QMapData::shared_null) { d->ref.ref(); } inline QMap() : d(&QMapData::shared_null) { d->ref.ref(); }
inline QMap(const QMap<Key, T> &other) : d(other.d) inline QMap(const QMap<Key, T> &other) : d(other.d)
{ d->ref.ref(); if (!d->sharable) detach(); } { d->ref.ref(); if (!d->sharable) detach(); }
inline ~QMap() { if (!d) return; if (!d->ref.deref()) freeData(d); } inline ~QMap() { if (!d->ref.deref()) freeData(d); }
QMap<Key, T> &operator=(const QMap<Key, T> &other); QMap<Key, T> &operator=(const QMap<Key, T> &other);
#ifdef Q_COMPILER_RVALUE_REFS #ifdef Q_COMPILER_RVALUE_REFS

2
src/core/tools/qvector.h
View file

@ -84,7 +84,7 @@ public:
explicit QVector(int size); explicit QVector(int size);
QVector(int size, const T &t); QVector(int size, const T &t);
inline QVector(const QVector<T> &v) : d(v.d) { d->ref.ref(); if (!d->sharable) detach_helper(); } inline QVector(const QVector<T> &v) : d(v.d) { d->ref.ref(); if (!d->sharable) detach_helper(); }
inline ~QVector() { if (!d) return; if (!d->ref.deref()) free(p); } inline ~QVector() { if (!d->ref.deref()) free(p); }
QVector<T> &operator=(const QVector<T> &v); QVector<T> &operator=(const QVector<T> &v);
#ifdef Q_COMPILER_RVALUE_REFS #ifdef Q_COMPILER_RVALUE_REFS
inline QVector<T> operator=(QVector<T> &&other) inline QVector<T> operator=(QVector<T> &&other)