diff options
author | Friedemann Kleint <Friedemann.Kleint@nokia.com> | 2011-09-29 14:23:10 +0200 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2011-09-29 14:52:49 +0200 |
commit | 5db4aeea7721e368086a91552a7dd9072f6a9571 (patch) | |
tree | dd893cd346f662dacbfd74369bb18d451756c049 /src/contacts/qcontactmanager_p.cpp | |
parent | 654cf55e1da7ae1dd6351213008c0f39798ce224 (diff) |
QtPim: Fix compilation on Windows/Warnings.
- Fix export of VersitOrganizer
- Fix ASCII string conversion warnings
- Fix crash-prone (QString == 0) comparisons
- Fix setting of participant to have an effect
Change-Id: Icac4266e7857b9b0b93c9a2722e308c7ac823d94
Reviewed-on: http://codereview.qt-project.org/5796
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Xizhi Zhu <xizhi.zhu@nokia.com>
Diffstat (limited to 'src/contacts/qcontactmanager_p.cpp')
-rw-r--r-- | src/contacts/qcontactmanager_p.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/contacts/qcontactmanager_p.cpp b/src/contacts/qcontactmanager_p.cpp index dd873f84c..5694a7cb8 100644 --- a/src/contacts/qcontactmanager_p.cpp +++ b/src/contacts/qcontactmanager_p.cpp @@ -351,7 +351,7 @@ void QContactManagerData::unregisterObserver(QContactManager* manager, QContactO QContactManagerData* d = QContactManagerData::get(manager); QContactLocalId key = d->m_observerForContact.key(observer); - if (key != 0) { + if (!key.isEmpty()) { d->m_observerForContact.remove(key, observer); // If there are now no more observers, disconnect from the engine |