mirrors/linphone-desktop
1
0
Fork 0
mirror of https://gitlab.linphone.org/BC/public/linphone-desktop.git synced 2026-05-07 14:44:01 +00:00
Code Issues Projects Releases Packages Wiki Activity

feat(app): explicit usage of global namespace on static functions

Browse source
This commit is contained in:
Ronan Abhamon 2017-06-14 14:28:56 +02:00
parent 06c97e4c90
commit cfcd045602
4 changed files with 13 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
linphone-desktop/src/app/cli/Cli.cpp
View file

@ -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", {} }
});
}

2
linphone-desktop/src/app/logger/Logger.cpp
View file

@ -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());

10
linphone-desktop/src/app/paths/Paths.cpp
View file

@ -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);
}

10
linphone-desktop/src/components/contact/VcardModel.cpp
View file

@ -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) {