From 7e13551cab445214d5b5fb74d74645d52b08dd2b Mon Sep 17 00:00:00 2001 From: Ronan Abhamon Date: Fri, 23 Dec 2016 14:37:05 +0100 Subject: [PATCH] feat(app): little fixes --- tests/src/components/contacts/ContactsListModel.cpp | 2 +- tests/src/components/contacts/ContactsListModel.hpp | 1 - tests/src/components/contacts/ContactsListProxyModel.cpp | 8 +------- tests/src/components/contacts/ContactsListProxyModel.hpp | 1 - tests/src/components/sip-addresses/SipAddressesModel.cpp | 2 +- 5 files changed, 3 insertions(+), 11 deletions(-) diff --git a/tests/src/components/contacts/ContactsListModel.cpp b/tests/src/components/contacts/ContactsListModel.cpp index 66a43c4e1..d95753259 100644 --- a/tests/src/components/contacts/ContactsListModel.cpp +++ b/tests/src/components/contacts/ContactsListModel.cpp @@ -40,7 +40,7 @@ QHash ContactsListModel::roleNames () const { QVariant ContactsListModel::data (const QModelIndex &index, int role) const { int row = index.row(); - if (row < 0 || row >= m_list.count()) + if (!index.isValid() || row < 0 || row >= m_list.count()) return QVariant(); if (role == Qt::DisplayRole) diff --git a/tests/src/components/contacts/ContactsListModel.hpp b/tests/src/components/contacts/ContactsListModel.hpp index 159edca4e..bd53abb86 100644 --- a/tests/src/components/contacts/ContactsListModel.hpp +++ b/tests/src/components/contacts/ContactsListModel.hpp @@ -9,7 +9,6 @@ // ============================================================================= class ContactsListModel : public QAbstractListModel { - friend class ContactsListProxyModel; friend class SipAddressesModel; Q_OBJECT; diff --git a/tests/src/components/contacts/ContactsListProxyModel.cpp b/tests/src/components/contacts/ContactsListProxyModel.cpp index 187a9207b..99a6c5fee 100644 --- a/tests/src/components/contacts/ContactsListProxyModel.cpp +++ b/tests/src/components/contacts/ContactsListProxyModel.cpp @@ -32,13 +32,7 @@ const QRegExp ContactsListProxyModel::m_search_separators("^[^_.-;@ ][_.-;@ ]"); // ----------------------------------------------------------------------------- ContactsListProxyModel::ContactsListProxyModel (QObject *parent) : QSortFilterProxyModel(parent) { - m_list = CoreManager::getInstance()->getContactsListModel(); - - setSourceModel(m_list); - - for (const ContactModel *contact : m_list->m_list) - m_weights[contact] = 0; - + setSourceModel(CoreManager::getInstance()->getContactsListModel()); sort(0); } diff --git a/tests/src/components/contacts/ContactsListProxyModel.hpp b/tests/src/components/contacts/ContactsListProxyModel.hpp index b2e4e2706..de8e078f4 100644 --- a/tests/src/components/contacts/ContactsListProxyModel.hpp +++ b/tests/src/components/contacts/ContactsListProxyModel.hpp @@ -39,7 +39,6 @@ private: void setConnectedFilter (bool use_connected_filter); - ContactsListModel *m_list; QString m_filter; bool m_use_connected_filter = false; diff --git a/tests/src/components/sip-addresses/SipAddressesModel.cpp b/tests/src/components/sip-addresses/SipAddressesModel.cpp index 2bac46ab0..17fc5d48a 100644 --- a/tests/src/components/sip-addresses/SipAddressesModel.cpp +++ b/tests/src/components/sip-addresses/SipAddressesModel.cpp @@ -82,7 +82,7 @@ QHash SipAddressesModel::roleNames () const { QVariant SipAddressesModel::data (const QModelIndex &index, int role) const { int row = index.row(); - if (row < 0 || row >= m_refs.count()) + if (!index.isValid() || row < 0 || row >= m_refs.count()) return QVariant(); if (role == Qt::DisplayRole)