From 5a10a6bd72d46e349f7e1a010ea7374f7204304d Mon Sep 17 00:00:00 2001 From: Ronan Abhamon Date: Wed, 10 Oct 2018 15:49:43 +0200 Subject: [PATCH] fix(CoreManager): rename database paths functions --- src/components/core/CoreManager.cpp | 8 ++++---- src/components/core/CoreManager.hpp | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/components/core/CoreManager.cpp b/src/components/core/CoreManager.cpp index 845664f33..5703c4b5a 100644 --- a/src/components/core/CoreManager.cpp +++ b/src/components/core/CoreManager.cpp @@ -210,7 +210,7 @@ void CoreManager::cleanLogs () const { mCore->set ## DATABASE ## DatabasePath(PATH); \ } while (0); -void CoreManager::setDatabasesPaths () { +void CoreManager::setDatabasePaths () { SET_DATABASE_PATH(Friends, Paths::getFriendsListFilePath()); SET_DATABASE_PATH(CallLogs, Paths::getCallHistoryFilePath()); SET_DATABASE_PATH(Chat, Paths::getMessageHistoryFilePath()); @@ -229,7 +229,7 @@ void CoreManager::setOtherPaths () { mCore->setRootCa(Paths::getRootCaFilePath()); } -void CoreManager::setResourcesPaths () { +void CoreManager::setResourcePaths () { shared_ptr factory = linphone::Factory::get(); factory->setMspluginsDir(Paths::getPackageMsPluginsDirPath()); factory->setTopResourcesDir(Paths::getPackageDataDirPath()); @@ -243,7 +243,7 @@ void CoreManager::createLinphoneCore (const QString &configPath) { // Migration of configuration and database files from GTK version of Linphone. Paths::migrate(); - setResourcesPaths(); + setResourcePaths(); mCore = linphone::Factory::get()->createCore( Paths::getConfigFilePath(configPath), @@ -270,7 +270,7 @@ void CoreManager::createLinphoneCore (const QString &configPath) { mCore->start(); - setDatabasesPaths(); + setDatabasePaths(); setOtherPaths(); } diff --git a/src/components/core/CoreManager.hpp b/src/components/core/CoreManager.hpp index 114a452ea..42075c34a 100644 --- a/src/components/core/CoreManager.hpp +++ b/src/components/core/CoreManager.hpp @@ -142,9 +142,9 @@ signals: private: CoreManager (QObject *parent, const QString &configPath); - void setDatabasesPaths (); + void setDatabasePaths (); void setOtherPaths (); - void setResourcesPaths (); + void setResourcePaths (); void createLinphoneCore (const QString &configPath); void migrate ();