diff options
author | Stephen Kelly <stephen.kelly@kdab.com> | 2012-05-30 19:26:24 +0200 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-05-31 11:09:27 +0200 |
commit | 8c19724eab7cd5c9f4f50093e5d71af7768f977c (patch) | |
tree | 8383037656572148a00687caa7b8f389f0a3af7f /src/contacts/qcontactmanager_p.cpp | |
parent | 3983f789c1071da79d2cd31b7378e366e41c240f (diff) |
Use QPointer instead of QWeakPointer for tracking QObjects.
Change-Id: Ia79fd891946a93f47a76fb97bfe07d9cc37da27e
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Cristiano di Flora <cristiano.di-flora@nokia.com>
Diffstat (limited to 'src/contacts/qcontactmanager_p.cpp')
-rw-r--r-- | src/contacts/qcontactmanager_p.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/contacts/qcontactmanager_p.cpp b/src/contacts/qcontactmanager_p.cpp index 6badd4cf6..bf7df5652 100644 --- a/src/contacts/qcontactmanager_p.cpp +++ b/src/contacts/qcontactmanager_p.cpp @@ -52,7 +52,7 @@ #include <QSharedData> #include <QtPlugin> #include <QPluginLoader> -#include <QWeakPointer> +#include <QPointer> #include <QDebug> #include <QDir> @@ -85,12 +85,12 @@ static void qContactsCleanEngines() { // This is complicated by needing to remove any engines before we unload factories // guard pointers as one engine could be parent of another manager and cause doubledelete - QList<QWeakPointer<QContactManager> > aliveManagers; + QList<QPointer<QContactManager> > aliveManagers; foreach(QContactManager* manager, QContactManagerData::m_aliveEngines) { - aliveManagers << QWeakPointer<QContactManager>(manager); + aliveManagers << QPointer<QContactManager>(manager); } - foreach(QWeakPointer<QContactManager> manager, aliveManagers) { + foreach(QPointer<QContactManager> manager, aliveManagers) { if (!manager) { // deleting engine of one manager, could cause deleting next manager in list (aggregation case) continue; |