Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
L
linphone-desktop
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Administrator
linphone-desktop
Commits
24eb82f6
Commit
24eb82f6
authored
Nov 30, 2016
by
Ronan Abhamon
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
feat(src/app/App): enable Calls view
parent
1149e9ad
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
4 additions
and
9 deletions
+4
-9
App.cpp
tests/src/app/App.cpp
+3
-5
ContactsListModel.cpp
tests/src/components/contacts/ContactsListModel.cpp
+0
-2
ContactsListModel.hpp
tests/src/components/contacts/ContactsListModel.hpp
+1
-1
ContactsListProxyModel.hpp
tests/src/components/contacts/ContactsListProxyModel.hpp
+0
-1
No files found.
tests/src/app/App.cpp
View file @
24eb82f6
...
@@ -5,7 +5,6 @@
...
@@ -5,7 +5,6 @@
#include <QtDebug>
#include <QtDebug>
#include "../components/chat/ChatProxyModel.hpp"
#include "../components/chat/ChatProxyModel.hpp"
#include "../components/contacts/ContactModel.hpp"
#include "../components/contacts/ContactsListModel.hpp"
#include "../components/contacts/ContactsListModel.hpp"
#include "../components/contacts/ContactsListProxyModel.hpp"
#include "../components/contacts/ContactsListProxyModel.hpp"
#include "../components/core/CoreManager.hpp"
#include "../components/core/CoreManager.hpp"
...
@@ -134,11 +133,10 @@ void App::addContextProperties () {
...
@@ -134,11 +133,10 @@ void App::addContextProperties () {
QQmlComponent
component
(
&
m_engine
,
QUrl
(
QML_VIEW_CALL_WINDOW
));
QQmlComponent
component
(
&
m_engine
,
QUrl
(
QML_VIEW_CALL_WINDOW
));
// Windows.
// Windows.
if
(
component
.
isError
())
{
if
(
component
.
isError
())
qWarning
()
<<
component
.
errors
();
qWarning
()
<<
component
.
errors
();
}
else
{
else
//context->setContextProperty("CallsWindow", component.create());
context
->
setContextProperty
(
"CallsWindow"
,
component
.
create
());
}
m_notifier
=
new
Notifier
();
m_notifier
=
new
Notifier
();
context
->
setContextProperty
(
"Notifier"
,
m_notifier
);
context
->
setContextProperty
(
"Notifier"
,
m_notifier
);
...
...
tests/src/components/contacts/ContactsListModel.cpp
View file @
24eb82f6
...
@@ -3,8 +3,6 @@
...
@@ -3,8 +3,6 @@
#include "../../app/App.hpp"
#include "../../app/App.hpp"
#include "../../utils.hpp"
#include "../../utils.hpp"
#include "../core/CoreManager.hpp"
#include "../core/CoreManager.hpp"
#include "ContactModel.hpp"
#include "ContactsListProxyModel.hpp"
#include "ContactsListModel.hpp"
#include "ContactsListModel.hpp"
...
...
tests/src/components/contacts/ContactsListModel.hpp
View file @
24eb82f6
...
@@ -4,7 +4,7 @@
...
@@ -4,7 +4,7 @@
#include <QAbstractListModel>
#include <QAbstractListModel>
#include <linphone++/linphone.hh>
#include <linphone++/linphone.hh>
class
ContactModel
;
#include "ContactModel.hpp"
// ===================================================================
// ===================================================================
...
...
tests/src/components/contacts/ContactsListProxyModel.hpp
View file @
24eb82f6
...
@@ -3,7 +3,6 @@
...
@@ -3,7 +3,6 @@
#include <QSortFilterProxyModel>
#include <QSortFilterProxyModel>
class
ContactModel
;
class
ContactsListModel
;
class
ContactsListModel
;
// ===================================================================
// ===================================================================
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment