diff --git a/linphone-desktop/src/app/cli/Cli.cpp b/linphone-desktop/src/app/cli/Cli.cpp index 9dcd1cc67..8eedc32a0 100644 --- a/linphone-desktop/src/app/cli/Cli.cpp +++ b/linphone-desktop/src/app/cli/Cli.cpp @@ -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", {} } }); } diff --git a/linphone-desktop/src/app/logger/Logger.cpp b/linphone-desktop/src/app/logger/Logger.cpp index 250b81867..b25fc3046 100644 --- a/linphone-desktop/src/app/logger/Logger.cpp +++ b/linphone-desktop/src/app/logger/Logger.cpp @@ -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()); diff --git a/linphone-desktop/src/app/paths/Paths.cpp b/linphone-desktop/src/app/paths/Paths.cpp index 92aa03be5..403758ae7 100644 --- a/linphone-desktop/src/app/paths/Paths.cpp +++ b/linphone-desktop/src/app/paths/Paths.cpp @@ -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); } diff --git a/linphone-desktop/src/components/contact/VcardModel.cpp b/linphone-desktop/src/components/contact/VcardModel.cpp index 0642cc353..eecd2ea98 100644 --- a/linphone-desktop/src/components/contact/VcardModel.cpp +++ b/linphone-desktop/src/components/contact/VcardModel.cpp @@ -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 photo = findBelcardPhoto(mVcard->getVcard()); + shared_ptr 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 = mVcard->getVcard(); list > addresses = belcard->getImpp(); shared_ptr value = ::findBelCardValue( - addresses, ::Utils::coreStringToAppString(interpretSipAddress(sipAddress)) + addresses, ::Utils::coreStringToAppString(::interpretSipAddress(sipAddress)) ); if (!value) {