From 24eb82f6bd391f7fef047f333a96d5128257c751 Mon Sep 17 00:00:00 2001 From: Ronan Abhamon Date: Wed, 30 Nov 2016 15:42:47 +0100 Subject: [PATCH] feat(src/app/App): enable Calls view --- tests/src/app/App.cpp | 8 +++----- tests/src/components/contacts/ContactsListModel.cpp | 2 -- tests/src/components/contacts/ContactsListModel.hpp | 2 +- tests/src/components/contacts/ContactsListProxyModel.hpp | 1 - 4 files changed, 4 insertions(+), 9 deletions(-) diff --git a/tests/src/app/App.cpp b/tests/src/app/App.cpp index 2afc8d5b7..79790f180 100644 --- a/tests/src/app/App.cpp +++ b/tests/src/app/App.cpp @@ -5,7 +5,6 @@ #include #include "../components/chat/ChatProxyModel.hpp" -#include "../components/contacts/ContactModel.hpp" #include "../components/contacts/ContactsListModel.hpp" #include "../components/contacts/ContactsListProxyModel.hpp" #include "../components/core/CoreManager.hpp" @@ -134,11 +133,10 @@ void App::addContextProperties () { QQmlComponent component(&m_engine, QUrl(QML_VIEW_CALL_WINDOW)); // Windows. - if (component.isError()) { + if (component.isError()) qWarning() << component.errors(); - } else { - //context->setContextProperty("CallsWindow", component.create()); - } + else + context->setContextProperty("CallsWindow", component.create()); m_notifier = new Notifier(); context->setContextProperty("Notifier", m_notifier); diff --git a/tests/src/components/contacts/ContactsListModel.cpp b/tests/src/components/contacts/ContactsListModel.cpp index ee38519ad..b67063627 100644 --- a/tests/src/components/contacts/ContactsListModel.cpp +++ b/tests/src/components/contacts/ContactsListModel.cpp @@ -3,8 +3,6 @@ #include "../../app/App.hpp" #include "../../utils.hpp" #include "../core/CoreManager.hpp" -#include "ContactModel.hpp" -#include "ContactsListProxyModel.hpp" #include "ContactsListModel.hpp" diff --git a/tests/src/components/contacts/ContactsListModel.hpp b/tests/src/components/contacts/ContactsListModel.hpp index e9cb110da..9c34b1d94 100644 --- a/tests/src/components/contacts/ContactsListModel.hpp +++ b/tests/src/components/contacts/ContactsListModel.hpp @@ -4,7 +4,7 @@ #include #include -class ContactModel; +#include "ContactModel.hpp" // =================================================================== diff --git a/tests/src/components/contacts/ContactsListProxyModel.hpp b/tests/src/components/contacts/ContactsListProxyModel.hpp index 7734ef92f..9b9414bf1 100644 --- a/tests/src/components/contacts/ContactsListProxyModel.hpp +++ b/tests/src/components/contacts/ContactsListProxyModel.hpp @@ -3,7 +3,6 @@ #include -class ContactModel; class ContactsListModel; // ===================================================================