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
7bcc90c3
Commit
7bcc90c3
authored
Dec 01, 2016
by
Ronan Abhamon
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
feat(app): force the usage of `override` keyword
parent
989bbc4e
Changes
7
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
18 additions
and
15 deletions
+18
-15
CMakeLists.txt
tests/CMakeLists.txt
+2
-0
ChatModel.hpp
tests/src/components/chat/ChatModel.hpp
+4
-4
ChatProxyModel.hpp
tests/src/components/chat/ChatProxyModel.hpp
+2
-2
ContactsListModel.hpp
tests/src/components/contacts/ContactsListModel.hpp
+4
-4
ContactsListProxyModel.hpp
tests/src/components/contacts/ContactsListProxyModel.hpp
+2
-2
TimelineModel.hpp
tests/src/components/timeline/TimelineModel.hpp
+3
-3
Calls.qml
tests/ui/views/App/Calls/Calls.qml
+1
-0
No files found.
tests/CMakeLists.txt
View file @
7bcc90c3
...
...
@@ -25,6 +25,8 @@ set(CUSTOM_FLAGS "\
-Wpointer-arith \
-Wuninitialized \
-Wunused \
-Wsuggest-override \
-Werror=suggest-override \
"
)
set
(
CMAKE_CXX_FLAGS
"
${
CMAKE_CXX_FLAGS
}
${
CUSTOM_FLAGS
}
"
)
...
...
tests/src/components/chat/ChatModel.hpp
View file @
7bcc90c3
...
...
@@ -47,13 +47,13 @@ public:
ChatModel
(
QObject
*
parent
=
Q_NULLPTR
)
:
QAbstractListModel
(
parent
)
{}
int
rowCount
(
const
QModelIndex
&
index
=
QModelIndex
())
const
;
int
rowCount
(
const
QModelIndex
&
index
=
QModelIndex
())
const
override
;
QHash
<
int
,
QByteArray
>
roleNames
()
const
;
QVariant
data
(
const
QModelIndex
&
index
,
int
role
)
const
;
QHash
<
int
,
QByteArray
>
roleNames
()
const
override
;
QVariant
data
(
const
QModelIndex
&
index
,
int
role
)
const
override
;
bool
removeRow
(
int
row
,
const
QModelIndex
&
parent
=
QModelIndex
());
bool
removeRows
(
int
row
,
int
count
,
const
QModelIndex
&
parent
=
QModelIndex
());
bool
removeRows
(
int
row
,
int
count
,
const
QModelIndex
&
parent
=
QModelIndex
())
override
;
public
slots
:
void
removeEntry
(
int
id
);
...
...
tests/src/components/chat/ChatProxyModel.hpp
View file @
7bcc90c3
...
...
@@ -19,7 +19,7 @@ public:
ChatModelFilter
(
QObject
*
parent
=
Q_NULLPTR
);
protected:
bool
filterAcceptsRow
(
int
source_row
,
const
QModelIndex
&
parent
)
const
;
bool
filterAcceptsRow
(
int
source_row
,
const
QModelIndex
&
parent
)
const
override
;
private:
void
setEntryTypeFilter
(
ChatModel
::
EntryType
type
);
...
...
@@ -60,7 +60,7 @@ public slots:
}
protected:
bool
filterAcceptsRow
(
int
source_row
,
const
QModelIndex
&
source_parent
)
const
;
bool
filterAcceptsRow
(
int
source_row
,
const
QModelIndex
&
source_parent
)
const
override
;
private:
QString
getSipAddress
()
const
{
...
...
tests/src/components/contacts/ContactsListModel.hpp
View file @
7bcc90c3
...
...
@@ -16,13 +16,13 @@ class ContactsListModel : public QAbstractListModel {
public:
ContactsListModel
(
QObject
*
parent
=
Q_NULLPTR
);
int
rowCount
(
const
QModelIndex
&
index
=
QModelIndex
())
const
;
int
rowCount
(
const
QModelIndex
&
index
=
QModelIndex
())
const
override
;
QHash
<
int
,
QByteArray
>
roleNames
()
const
;
QVariant
data
(
const
QModelIndex
&
index
,
int
role
)
const
;
QHash
<
int
,
QByteArray
>
roleNames
()
const
override
;
QVariant
data
(
const
QModelIndex
&
index
,
int
role
)
const
override
;
bool
removeRow
(
int
row
,
const
QModelIndex
&
parent
=
QModelIndex
());
bool
removeRows
(
int
row
,
int
count
,
const
QModelIndex
&
parent
=
QModelIndex
());
bool
removeRows
(
int
row
,
int
count
,
const
QModelIndex
&
parent
=
QModelIndex
())
override
;
public
slots
:
// See: http://doc.qt.io/qt-5/qtqml-cppintegration-data.html#data-ownership
...
...
tests/src/components/contacts/ContactsListProxyModel.hpp
View file @
7bcc90c3
...
...
@@ -30,8 +30,8 @@ public slots:
}
protected:
bool
filterAcceptsRow
(
int
source_row
,
const
QModelIndex
&
source_parent
)
const
;
bool
lessThan
(
const
QModelIndex
&
left
,
const
QModelIndex
&
right
)
const
;
bool
filterAcceptsRow
(
int
source_row
,
const
QModelIndex
&
source_parent
)
const
override
;
bool
lessThan
(
const
QModelIndex
&
left
,
const
QModelIndex
&
right
)
const
override
;
private:
float
computeStringWeight
(
const
QString
&
string
,
float
percentage
)
const
;
...
...
tests/src/components/timeline/TimelineModel.hpp
View file @
7bcc90c3
...
...
@@ -13,9 +13,9 @@ class TimelineModel : public QAbstractListModel {
public:
TimelineModel
(
const
ContactsListModel
*
contacts_list
);
int
rowCount
(
const
QModelIndex
&
)
const
;
QHash
<
int
,
QByteArray
>
roleNames
()
const
;
QVariant
data
(
const
QModelIndex
&
index
,
int
role
)
const
;
int
rowCount
(
const
QModelIndex
&
)
const
override
;
QHash
<
int
,
QByteArray
>
roleNames
()
const
override
;
QVariant
data
(
const
QModelIndex
&
index
,
int
role
)
const
override
;
private:
void
init_entries
();
...
...
tests/ui/views/App/Calls/Calls.qml
View file @
7bcc90c3
...
...
@@ -86,6 +86,7 @@ Window {
childA
:
AbstractCall
{
anchors.fill
:
parent
callTypeLabel
:
'
INCOMING VIDEO CALL
'
sipAddress
:
'
sip:erwan.croze@sip.linphone.org
'
}
childB
:
Rectangle
{
...
...
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