From d09f5c3e8ddf35c7b45a00e3acc71382d85cdc08 Mon Sep 17 00:00:00 2001 From: Ronan Abhamon Date: Tue, 9 May 2017 10:37:29 +0200 Subject: [PATCH] feat(src/components/contact/ContactModel): add assert and update linphone --- linphone-desktop/src/components/contact/ContactModel.cpp | 2 ++ linphone-desktop/src/components/contacts/ContactsListModel.cpp | 2 +- submodules/linphone | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/linphone-desktop/src/components/contact/ContactModel.cpp b/linphone-desktop/src/components/contact/ContactModel.cpp index f1e64f130..c3782dca7 100644 --- a/linphone-desktop/src/components/contact/ContactModel.cpp +++ b/linphone-desktop/src/components/contact/ContactModel.cpp @@ -100,6 +100,8 @@ void ContactModel::setVcardModelInternal (VcardModel *vcardModel) { } void ContactModel::updateSipAddresses (VcardModel *oldVcardModel) { + Q_ASSERT(oldVcardModel != nullptr); + QVariantList oldSipAddresses = oldVcardModel->getSipAddresses(); QVariantList sipAddresses = mVcardModel->getSipAddresses(); QSet done; diff --git a/linphone-desktop/src/components/contacts/ContactsListModel.cpp b/linphone-desktop/src/components/contacts/ContactsListModel.cpp index cc6342cb6..7679e7f82 100644 --- a/linphone-desktop/src/components/contacts/ContactsListModel.cpp +++ b/linphone-desktop/src/components/contacts/ContactsListModel.cpp @@ -135,7 +135,7 @@ ContactModel *ContactsListModel::addContact (VcardModel *vcard) { return nullptr; } - qInfo() << QStringLiteral("Add contact on vcard:") << vcard << contact; + qInfo() << QStringLiteral("Add contact from vcard:") << contact << vcard; int row = mList.count(); diff --git a/submodules/linphone b/submodules/linphone index 57114440b..5fb392bcc 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit 57114440b1e573cebd4104623b6ad16df40ac800 +Subproject commit 5fb392bccf5a317c1c9192cbc659699d8004ffae