mirrors/linphone-desktop
1
0
Fork 0
mirror of https://gitlab.linphone.org/BC/public/linphone-desktop.git synced 2026-01-31 19:09:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

feat(components/contacts/ContactsListModel): mapSipAddressToContact working

Browse source
This commit is contained in:
Ronan Abhamon 2016-11-22 11:22:28 +01:00
parent e6c4550305
commit 6317473442
6 changed files with 26 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
submodules/linphone

@ -1 +1 @@
Subproject commit 8544d5033e56d755c4acedc402983d1c89d8e53f
Subproject commit 797eea2a56bc4bfaa0df76884b7f4e5228e80de8

20
tests/src/app/Logger.cpp
View file

@ -18,33 +18,39 @@
// ===================================================================
void qmlLogger (QtMsgType type, const QMessageLogContext &context, const QString &msg) {
void logger (QtMsgType type, const QMessageLogContext &context, const QString &msg) {
QByteArray local_msg = msg.toLocal8Bit();
QByteArray date_time = QDateTime::currentDateTime()
.toString("HH:mm:ss").toLocal8Bit();
const char *context_file = context.file ?: "cpp";
const char *context_file = "cpp";
int context_line = 0;
if (context.file && !context.function) {
context_file = context.file;
context_line = context.line;
}
switch (type) {
case QtDebugMsg:
fprintf(stderr, GREEN "[%s][Debug]" PURPLE "%s:%u: " RESET "%s\n",
date_time.constData(), context_file, context.line, local_msg.constData());
date_time.constData(), context_file, context_line, local_msg.constData());
break;
case QtInfoMsg:
fprintf(stderr, BLUE "[%s][Info]" PURPLE "%s:%u: " RESET "%s\n",
date_time.constData(), context_file, context.line, local_msg.constData());
date_time.constData(), context_file, context_line, local_msg.constData());
break;
case QtWarningMsg:
fprintf(stderr, RED "[%s][Warning]" PURPLE "%s:%u: " RESET "%s\n",
date_time.constData(), context_file, context.line, local_msg.constData());
date_time.constData(), context_file, context_line, local_msg.constData());
break;
case QtCriticalMsg:
fprintf(stderr, RED "[%s][Critical]" PURPLE "%s:%u: " RESET "%s\n",
date_time.constData(), context_file, context.line, local_msg.constData());
date_time.constData(), context_file, context_line, local_msg.constData());
break;
case QtFatalMsg:
fprintf(stderr, RED "[%s][Fatal]" PURPLE "%s:%u: " RESET "%s\n",
date_time.constData(), context_file, context.line, local_msg.constData());
date_time.constData(), context_file, context_line, local_msg.constData());
abort();
}
}

2
tests/src/app/Logger.hpp
View file

@ -3,6 +3,6 @@
#include <QtGlobal>
void qmlLogger (QtMsgType type, const QMessageLogContext &context, const QString &msg);
void logger (QtMsgType type, const QMessageLogContext &context, const QString &msg);
#endif // LOGGER_H_

10
tests/src/components/contacts/ContactsListModel.cpp
View file

@ -1,3 +1,5 @@
#include <QtDebug>
#include "../core/CoreManager.hpp"
#include "ContactsListProxyModel.hpp"
@ -38,10 +40,14 @@ QVariant ContactsListModel::data (const QModelIndex &index, int role) const {
// -------------------------------------------------------------------
ContactModel *ContactsListModel::mapSipAddressToContact (const QString &sipAddress) {
return m_friend_to_contact[
ContactModel *ContactsListModel::mapSipAddressToContact (const QString &sipAddress) const {
ContactModel *contact = m_friend_to_contact[
CoreManager::getInstance()->getCore()->getFriendsLists().front()->findFriendByUri(
sipAddress.toStdString()
).get()
];
qInfo() << "Map sip address to contact:" << sipAddress << "->" << contact;
return contact;
}

4
tests/src/components/contacts/ContactsListModel.hpp
View file

@ -23,11 +23,11 @@ public:
QVariant data (const QModelIndex &index, int role) const;
public slots:
ContactModel *mapSipAddressToContact (const QString &sipAddress);
ContactModel *mapSipAddressToContact (const QString &sipAddress) const;
private:
QList<ContactModel *> m_list;
QHash<linphone::Friend *, ContactModel* > m_friend_to_contact;
QHash<const linphone::Friend *, ContactModel* > m_friend_to_contact;
};
#endif // CONTACTS_LIST_MODEL_H

2
tests/src/main.cpp
View file

@ -4,7 +4,7 @@
// ===================================================================
int main (int argc, char *argv[]) {
qInstallMessageHandler(qmlLogger);
qInstallMessageHandler(logger);
QGuiApplication::setAttribute(Qt::AA_EnableHighDpiScaling);
App::init(argc, argv);