diff options
author | Konstantin Ritt <ritt.ks@gmail.com> | 2013-12-25 23:55:53 +0200 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-12-28 04:47:14 +0100 |
commit | d5221e614cad9485eb6ba549099e887122f8ae88 (patch) | |
tree | f4b9125d1e3746749d4badff721028b71f8fedc8 /src/plugins/organizer/memory/qorganizeritemmemorybackend.cpp | |
parent | bc97f51c4d62944eb57e9d98cb411993ebb5e5cd (diff) |
[QOrganizerItemMemoryEngineData] Get rid of extra ref counter
QOrganizerItemMemoryEngineData is a QSharedData successor
and thus already ref-counted; simply use existing counter.
Change-Id: I2c6f34215dd1149d33cbccfd8e85288f5e5ec241
Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
Diffstat (limited to 'src/plugins/organizer/memory/qorganizeritemmemorybackend.cpp')
-rw-r--r-- | src/plugins/organizer/memory/qorganizeritemmemorybackend.cpp | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/src/plugins/organizer/memory/qorganizeritemmemorybackend.cpp b/src/plugins/organizer/memory/qorganizeritemmemorybackend.cpp index 177f6bfae..838ce23c9 100644 --- a/src/plugins/organizer/memory/qorganizeritemmemorybackend.cpp +++ b/src/plugins/organizer/memory/qorganizeritemmemorybackend.cpp @@ -291,7 +291,6 @@ uint QOrganizerCollectionMemoryEngineId::hash() const */ QOrganizerItemMemoryEngineData::QOrganizerItemMemoryEngineData() : QSharedData(), - m_refCount(QAtomicInt(1)), m_nextOrganizerItemId(1), m_nextOrganizerCollectionId(2), m_anonymous(false) @@ -317,14 +316,13 @@ QOrganizerItemMemoryEngine* QOrganizerItemMemoryEngine::createMemoryEngine(const } QOrganizerItemMemoryEngineData* data = engineDatas.value(idValue); - if (data) { - data->m_refCount.ref(); - } else { + if (!data) { data = new QOrganizerItemMemoryEngineData(); data->m_id = idValue; data->m_anonymous = anonymous; engineDatas.insert(idValue, data); } + data->ref.ref(); return new QOrganizerItemMemoryEngine(data); } @@ -354,7 +352,7 @@ QOrganizerItemMemoryEngine::QOrganizerItemMemoryEngine(QOrganizerItemMemoryEngin QOrganizerItemMemoryEngine::~QOrganizerItemMemoryEngine() { d->m_sharedEngines.removeAll(this); - if (!d->m_refCount.deref()) { + if (!d->ref.deref()) { engineDatas.remove(d->m_id); delete d; } |