mirrors/linphone-desktop
1
0
Fork 0
mirror of https://gitlab.linphone.org/BC/public/linphone-desktop.git synced 2026-01-23 14:48:15 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix(app): little fixes & coding style

Browse source
This commit is contained in:
Ronan Abhamon 2016-12-29 16:51:39 +01:00
parent a7f626e321
commit 25b6925977
5 changed files with 10 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
tests/src/components/chat/ChatProxyModel.hpp
View file

@ -45,9 +45,7 @@ public:
public slots:
void loadMoreEntries ();
void setEntryTypeFilter (ChatModel::EntryType type);
void removeEntry (int id);
void removeAllEntries () {

2
tests/src/components/contact/ContactModel.cpp
View file

@ -17,7 +17,7 @@ ContactModel::ContactModel (shared_ptr<linphone::Friend> linphone_friend) {
ContactModel::ContactModel (VcardModel *vcard) {
QQmlEngine *engine = App::getInstance()->getEngine();
if (engine->objectOwnership(vcard) == QQmlEngine::CppOwnership)
throw std::invalid_argument("A contact is already linked to this vcard.");
throw invalid_argument("A contact is already linked to this vcard.");
m_linphone_friend = linphone::Friend::newFromVcard(vcard->m_vcard);
m_vcard.reset(vcard);

1
tests/src/components/core/CoreManager.hpp
View file

@ -1,7 +1,6 @@
#ifndef CORE_MANAGER_H_
#define CORE_MANAGER_H_
#include "../contact/VcardModel.hpp"
#include "../contacts/ContactsListModel.hpp"
#include "../sip-addresses/SipAddressesModel.hpp"

14
tests/src/components/smart-search-bar/SmartSearchBarModel.cpp
View file

@ -35,18 +35,16 @@ void SmartSearchBarModel::setFilter (const QString &pattern) {
// -----------------------------------------------------------------------------
bool SmartSearchBarModel::filterAcceptsRow (int source_row, const QModelIndex &source_parent) const {
const QModelIndex index = sourceModel()->index(source_row, 0, source_parent);
const QVariantMap map = index.data().toMap();
return computeStringWeight(map["sipAddress"].toString()) > 0;
const QModelIndex &index = sourceModel()->index(source_row, 0, source_parent);
return computeStringWeight(index.data().toMap()["sipAddress"].toString()) > 0;
}
bool SmartSearchBarModel::lessThan (const QModelIndex &left, const QModelIndex &right) const {
const QVariantMap map_a = sourceModel()->data(left).toMap();
const QVariantMap map_b = sourceModel()->data(right).toMap();
const QVariantMap &map_a = sourceModel()->data(left).toMap();
const QVariantMap &map_b = sourceModel()->data(right).toMap();
const QString sip_address_a = map_a["sipAddress"].toString();
const QString sip_address_b = map_b["sipAddress"].toString();
const QString &sip_address_a = map_a["sipAddress"].toString();
const QString &sip_address_b = map_b["sipAddress"].toString();
int weight_a = computeStringWeight(sip_address_a);
int weight_b = computeStringWeight(sip_address_b);

11
tests/src/components/timeline/TimelineModel.cpp
View file

@ -18,15 +18,10 @@ QHash<int, QByteArray> TimelineModel::roleNames () const {
// -----------------------------------------------------------------------------
bool TimelineModel::filterAcceptsRow (int source_row, const QModelIndex &source_parent) const {
const QModelIndex index = sourceModel()->index(source_row, 0, source_parent);
const QVariantMap map = index.data().toMap();
return map.contains("timestamp");
const QModelIndex &index = sourceModel()->index(source_row, 0, source_parent);
return index.data().toMap().contains("timestamp");
}
bool TimelineModel::lessThan (const QModelIndex &left, const QModelIndex &right) const {
const QVariantMap sip_address_a = sourceModel()->data(left).toMap();
const QVariantMap sip_address_b = sourceModel()->data(right).toMap();
return sip_address_a["timestamp"] > sip_address_b["timestamp"];
return sourceModel()->data(left).toMap()["timestamp"] > sourceModel()->data(right).toMap()["timestamp"];
}