Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Open sidebar
savoirfairelinux
jami-lrc
Commits
08b44fbc
Unverified
Commit
08b44fbc
authored
Mar 11, 2020
by
Sébastien Blin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
misc: fix QString .arg calls
replace %s by %1 Change-Id: I023557d09ec338e226f2244d41655392a7762f1a
parent
28cba9e5
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
5 additions
and
4 deletions
+5
-4
src/contactmodel.cpp
src/contactmodel.cpp
+2
-1
src/newaccountmodel.cpp
src/newaccountmodel.cpp
+2
-2
src/newcallmodel.cpp
src/newcallmodel.cpp
+1
-1
No files found.
src/contactmodel.cpp
View file @
08b44fbc
...
...
@@ -214,6 +214,7 @@ ContactModel::hasPendingRequests() const
int
ContactModel
::
pendingRequestCount
()
const
{
if
(
!
pimpl_
)
return
0
;
std
::
lock_guard
<
std
::
mutex
>
lk
(
pimpl_
->
contactsMtx_
);
int
pendingRequestCount
=
0
;
std
::
for_each
(
pimpl_
->
contacts
.
begin
(),
pimpl_
->
contacts
.
end
(),
...
...
@@ -232,7 +233,7 @@ ContactModel::addContact(contact::Info contactInfo)
// If passed contact is a banned contact, call the daemon to unban it
auto
it
=
std
::
find
(
pimpl_
->
bannedContacts
.
begin
(),
pimpl_
->
bannedContacts
.
end
(),
profile
.
uri
);
if
(
it
!=
pimpl_
->
bannedContacts
.
end
())
{
qDebug
()
<<
QString
(
"Unban-ing contact %
s
"
).
arg
(
profile
.
uri
);
qDebug
()
<<
QString
(
"Unban-ing contact %
1
"
).
arg
(
profile
.
uri
);
ConfigurationManager
::
instance
().
addContact
(
owner
.
id
,
profile
.
uri
);
// bannedContacts will be updated in slotContactAdded
return
;
...
...
src/newaccountmodel.cpp
View file @
08b44fbc
...
...
@@ -398,7 +398,7 @@ NewAccountModelPimpl::updateAccounts()
for
(
auto
&
it
:
accounts
)
{
auto
&
accountInfo
=
it
.
second
.
first
;
if
(
!
accountIds
.
contains
(
accountInfo
.
id
))
{
qDebug
()
<<
QString
(
"detected account removal %
s
"
).
arg
(
accountInfo
.
id
);
qDebug
()
<<
QString
(
"detected account removal %
1
"
).
arg
(
accountInfo
.
id
);
toBeRemoved
.
push_back
(
accountInfo
.
id
);
}
}
...
...
@@ -414,7 +414,7 @@ NewAccountModelPimpl::updateAccounts()
// "Remote peer disconnected", "The name is not activable", etc.
// So avoid to create useless directories.
if
(
account
==
accounts
.
end
()
&&
id
.
indexOf
(
" "
)
==
-
1
)
{
q
Debu
g
()
<<
QString
(
"detected new account %
s
"
).
arg
(
id
);
q
Warnin
g
()
<<
QString
(
"detected new account %
1
"
).
arg
(
id
);
addToAccounts
(
id
);
auto
updatedAccount
=
accounts
.
find
(
id
);
if
(
updatedAccount
==
accounts
.
end
())
{
...
...
src/newcallmodel.cpp
View file @
08b44fbc
...
...
@@ -700,7 +700,7 @@ NewCallModelPimpl::slotCallStateChanged(const QString& callId, const QString& st
return
;
}
qDebug
()
<<
QString
(
"slotCallStateChanged (call: %
s
), from %
s
to %
s
"
)
qDebug
()
<<
QString
(
"slotCallStateChanged (call: %
1
), from %
2
to %
3
"
)
.
arg
(
callId
)
.
arg
(
call
::
to_string
(
previousStatus
))
.
arg
(
call
::
to_string
(
status
));
...
...
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