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
cfcd0456
Commit
cfcd0456
authored
Jun 14, 2017
by
Ronan Abhamon
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
feat(app): explicit usage of global namespace on static functions
parent
06c97e4c
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
13 additions
and
13 deletions
+13
-13
Cli.cpp
linphone-desktop/src/app/cli/Cli.cpp
+2
-2
Logger.cpp
linphone-desktop/src/app/logger/Logger.cpp
+1
-1
Paths.cpp
linphone-desktop/src/app/paths/Paths.cpp
+5
-5
VcardModel.cpp
linphone-desktop/src/components/contact/VcardModel.cpp
+5
-5
No files found.
linphone-desktop/src/app/cli/Cli.cpp
View file @
cfcd0456
...
...
@@ -71,8 +71,8 @@ QRegExp Cli::mRegExpArgs("(?:(?:(\\w+)\\s*)=\\s*(?:\"([^\"\\\\]*(?:\\\\.[^\"\\\\
QRegExp
Cli
::
mRegExpFunctionName
(
"^
\\
s*(
\\
w+)
\\
s*"
);
Cli
::
Cli
(
QObject
*
parent
)
:
QObject
(
parent
)
{
addCommand
(
"show"
,
tr
(
"showFunctionDescription"
),
cliShow
);
addCommand
(
"call"
,
tr
(
"showFunctionCall"
),
cliCall
,
{
addCommand
(
"show"
,
tr
(
"showFunctionDescription"
),
::
cliShow
);
addCommand
(
"call"
,
tr
(
"showFunctionCall"
),
::
cliCall
,
{
{
"sip-address"
,
{}
}
});
}
...
...
linphone-desktop/src/app/logger/Logger.cpp
View file @
cfcd0456
...
...
@@ -165,7 +165,7 @@ void Logger::init () {
linphone_core_set_log_level
(
ORTP_MESSAGE
);
linphone_core_set_log_handler
([](
const
char
*
domain
,
OrtpLogLevel
type
,
const
char
*
fmt
,
va_list
args
)
{
if
(
mInstance
->
isVerbose
())
linphoneLog
(
domain
,
type
,
fmt
,
args
);
::
linphoneLog
(
domain
,
type
,
fmt
,
args
);
});
linphone_core_set_log_collection_path
(
Paths
::
getLogsDirPath
().
c_str
());
...
...
linphone-desktop/src/app/paths/Paths.cpp
View file @
cfcd0456
...
...
@@ -275,26 +275,26 @@ void Paths::migrate () {
QString
oldPath
=
oldBaseDir
+
"/.linphonerc"
;
if
(
!::
filePathExists
(
newPath
)
&&
::
filePathExists
(
oldPath
))
{
migrateConfigurationFile
(
oldPath
,
newPath
);
::
migrateConfigurationFile
(
oldPath
,
newPath
);
/* Define RLS uri so that presence switches from peer-to-peer mode to list mode. */
setRlsUri
(
newPath
);
::
setRlsUri
(
newPath
);
}
newPath
=
::
getAppCallHistoryFilePath
();
oldPath
=
oldBaseDir
+
"/.linphone-call-history.db"
;
if
(
!::
filePathExists
(
newPath
)
&&
::
filePathExists
(
oldPath
))
migrateFile
(
oldPath
,
newPath
);
::
migrateFile
(
oldPath
,
newPath
);
newPath
=
::
getAppFriendsFilePath
();
oldPath
=
oldBaseDir
+
"/.linphone-friends.db"
;
if
(
!::
filePathExists
(
newPath
)
&&
::
filePathExists
(
oldPath
))
migrateFile
(
oldPath
,
newPath
);
::
migrateFile
(
oldPath
,
newPath
);
newPath
=
::
getAppMessageHistoryFilePath
();
oldPath
=
oldBaseDir
+
"/.linphone-history.db"
;
if
(
!::
filePathExists
(
newPath
)
&&
::
filePathExists
(
oldPath
))
migrateFile
(
oldPath
,
newPath
);
::
migrateFile
(
oldPath
,
newPath
);
}
linphone-desktop/src/components/contact/VcardModel.cpp
View file @
cfcd0456
...
...
@@ -121,7 +121,7 @@ VcardModel::~VcardModel () {
if
(
!
mIsReadOnly
)
{
qInfo
()
<<
QStringLiteral
(
"Destroy detached vcard:"
)
<<
this
;
if
(
!
mAvatarIsReadOnly
)
removeBelcardPhoto
(
mVcard
->
getVcard
());
::
removeBelcardPhoto
(
mVcard
->
getVcard
());
}
else
qInfo
()
<<
QStringLiteral
(
"Destroy attached vcard:"
)
<<
this
;
}
...
...
@@ -130,7 +130,7 @@ VcardModel::~VcardModel () {
QString
VcardModel
::
getAvatar
()
const
{
// Find desktop avatar.
shared_ptr
<
belcard
::
BelCardPhoto
>
photo
=
findBelcardPhoto
(
mVcard
->
getVcard
());
shared_ptr
<
belcard
::
BelCardPhoto
>
photo
=
::
findBelcardPhoto
(
mVcard
->
getVcard
());
// No path found.
if
(
!
photo
)
...
...
@@ -181,7 +181,7 @@ bool VcardModel::setAvatar (const QString &path) {
}
// 2. Remove oldest photo.
removeBelcardPhoto
(
belcard
,
mAvatarIsReadOnly
);
::
removeBelcardPhoto
(
belcard
,
mAvatarIsReadOnly
);
mAvatarIsReadOnly
=
false
;
// 3. Update new photo.
...
...
@@ -303,7 +303,7 @@ QVariantList VcardModel::getSipAddresses () const {
bool
VcardModel
::
addSipAddress
(
const
QString
&
sipAddress
)
{
CHECK_VCARD_IS_WRITABLE
(
this
);
string
interpretedSipAddress
=
interpretSipAddress
(
sipAddress
);
string
interpretedSipAddress
=
::
interpretSipAddress
(
sipAddress
);
if
(
interpretedSipAddress
.
empty
())
return
false
;
...
...
@@ -332,7 +332,7 @@ void VcardModel::removeSipAddress (const QString &sipAddress) {
shared_ptr
<
belcard
::
BelCard
>
belcard
=
mVcard
->
getVcard
();
list
<
shared_ptr
<
belcard
::
BelCardImpp
>
>
addresses
=
belcard
->
getImpp
();
shared_ptr
<
belcard
::
BelCardImpp
>
value
=
::
findBelCardValue
(
addresses
,
::
Utils
::
coreStringToAppString
(
interpretSipAddress
(
sipAddress
))
addresses
,
::
Utils
::
coreStringToAppString
(
::
interpretSipAddress
(
sipAddress
))
);
if
(
!
value
)
{
...
...
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