Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
savoirfairelinux
jami-client-windows
Commits
5d637b7a
Commit
5d637b7a
authored
Jun 11, 2020
by
Albert Babí Oller
Browse files
misc: minor changes for GNU/Linux compilation
Gitlab: #558 Change-Id: I7060e4a2e862d1a771fbf8a6b71fce2910b59c30
parent
12d68527
Changes
2
Hide whitespace changes
Inline
Side-by-side
src/mainapplication.h
View file @
5d637b7a
...
...
@@ -22,6 +22,7 @@
#include "splashscreen.h"
#include <memory>
#include <QApplication>
#include <QFile>
...
...
src/webchathelpers.cpp
View file @
5d637b7a
...
...
@@ -38,7 +38,7 @@ buildInteractionJson(lrc::api::ConversationModel& conversationModel,
interactionObject
.
insert
(
"sender_contact_method"
,
QJsonValue
(
sender
));
interactionObject
.
insert
(
"timestamp"
,
QJsonValue
(
timestamp
));
interactionObject
.
insert
(
"direction"
,
QJsonValue
(
direction
));
interactionObject
.
insert
(
"duration"
,
QJsonValue
(
interaction
.
duration
));
interactionObject
.
insert
(
"duration"
,
QJsonValue
(
static_cast
<
int
>
(
interaction
.
duration
))
)
;
switch
(
interaction
.
type
)
{
...
...
@@ -140,4 +140,4 @@ interactionsToJsonArrayObject(lrc::api::ConversationModel& conversationModel,
}
}
return
QString
(
QJsonDocument
(
array
).
toJson
(
QJsonDocument
::
Compact
));
}
\ No newline at end of file
}
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