From fe6019189672cdfa356a78734ad6b44b6c418e0f Mon Sep 17 00:00:00 2001 From: Wescoeur Date: Tue, 13 Jun 2017 21:22:59 +0200 Subject: [PATCH] fix(app): coding style --- linphone-desktop/src/app/paths/Paths.cpp | 2 +- linphone-desktop/src/components/calls/CallsListModel.cpp | 2 +- linphone-desktop/src/components/chat/ChatModel.cpp | 2 +- linphone-desktop/src/components/core/CoreManager.cpp | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/linphone-desktop/src/app/paths/Paths.cpp b/linphone-desktop/src/app/paths/Paths.cpp index 73afe1830..df85c7f4b 100644 --- a/linphone-desktop/src/app/paths/Paths.cpp +++ b/linphone-desktop/src/app/paths/Paths.cpp @@ -191,7 +191,7 @@ string Paths::getFriendsListFilePath () { return getWritableFilePath(getAppFriendsFilePath()); } -std::string Paths::getDownloadDirPath () { +string Paths::getDownloadDirPath () { return getWritableDirPath(QStandardPaths::writableLocation(QStandardPaths::DownloadLocation)); } diff --git a/linphone-desktop/src/components/calls/CallsListModel.cpp b/linphone-desktop/src/components/calls/CallsListModel.cpp index 76ef8765d..ee6a2b04f 100644 --- a/linphone-desktop/src/components/calls/CallsListModel.cpp +++ b/linphone-desktop/src/components/calls/CallsListModel.cpp @@ -137,7 +137,7 @@ void CallsListModel::terminateAllCalls () const { // ----------------------------------------------------------------------------- -void CallsListModel::handleCallStateChanged (const std::shared_ptr &call, linphone::CallState state) { +void CallsListModel::handleCallStateChanged (const shared_ptr &call, linphone::CallState state) { switch (state) { case linphone::CallStateIncomingReceived: case linphone::CallStateOutgoingInit: diff --git a/linphone-desktop/src/components/chat/ChatModel.cpp b/linphone-desktop/src/components/chat/ChatModel.cpp index 1a7fb56dd..73d046bd0 100644 --- a/linphone-desktop/src/components/chat/ChatModel.cpp +++ b/linphone-desktop/src/components/chat/ChatModel.cpp @@ -57,7 +57,7 @@ inline QString getDownloadPath (const shared_ptr &message return ::Utils::coreStringToAppString(message->getAppdata()).section(':', 1); } -inline bool fileWasDownloaded (const std::shared_ptr &message) { +inline bool fileWasDownloaded (const shared_ptr &message) { const QString &path = getDownloadPath(message); return !path.isEmpty() && QFileInfo(path).isFile(); } diff --git a/linphone-desktop/src/components/core/CoreManager.cpp b/linphone-desktop/src/components/core/CoreManager.cpp index 73114dd11..17fdf4989 100644 --- a/linphone-desktop/src/components/core/CoreManager.cpp +++ b/linphone-desktop/src/components/core/CoreManager.cpp @@ -127,7 +127,7 @@ void CoreManager::setResourcesPaths () { void CoreManager::createLinphoneCore (const QString &configPath) { qInfo() << QStringLiteral("Launch async linphone core creation."); - // Migration of configuration and database files from GTK version of Linphone + // Migration of configuration and database files from GTK version of Linphone. Paths::migrate(); setResourcesPaths();