Commit 5a10a6bd authored by Ronan's avatar Ronan
Browse files

fix(CoreManager): rename database paths functions

parent 01d06c2d
...@@ -210,7 +210,7 @@ void CoreManager::cleanLogs () const { ...@@ -210,7 +210,7 @@ void CoreManager::cleanLogs () const {
mCore->set ## DATABASE ## DatabasePath(PATH); \ mCore->set ## DATABASE ## DatabasePath(PATH); \
} while (0); } while (0);
void CoreManager::setDatabasesPaths () { void CoreManager::setDatabasePaths () {
SET_DATABASE_PATH(Friends, Paths::getFriendsListFilePath()); SET_DATABASE_PATH(Friends, Paths::getFriendsListFilePath());
SET_DATABASE_PATH(CallLogs, Paths::getCallHistoryFilePath()); SET_DATABASE_PATH(CallLogs, Paths::getCallHistoryFilePath());
SET_DATABASE_PATH(Chat, Paths::getMessageHistoryFilePath()); SET_DATABASE_PATH(Chat, Paths::getMessageHistoryFilePath());
...@@ -229,7 +229,7 @@ void CoreManager::setOtherPaths () { ...@@ -229,7 +229,7 @@ void CoreManager::setOtherPaths () {
mCore->setRootCa(Paths::getRootCaFilePath()); mCore->setRootCa(Paths::getRootCaFilePath());
} }
void CoreManager::setResourcesPaths () { void CoreManager::setResourcePaths () {
shared_ptr<linphone::Factory> factory = linphone::Factory::get(); shared_ptr<linphone::Factory> factory = linphone::Factory::get();
factory->setMspluginsDir(Paths::getPackageMsPluginsDirPath()); factory->setMspluginsDir(Paths::getPackageMsPluginsDirPath());
factory->setTopResourcesDir(Paths::getPackageDataDirPath()); factory->setTopResourcesDir(Paths::getPackageDataDirPath());
...@@ -243,7 +243,7 @@ void CoreManager::createLinphoneCore (const QString &configPath) { ...@@ -243,7 +243,7 @@ void CoreManager::createLinphoneCore (const QString &configPath) {
// Migration of configuration and database files from GTK version of Linphone. // Migration of configuration and database files from GTK version of Linphone.
Paths::migrate(); Paths::migrate();
setResourcesPaths(); setResourcePaths();
mCore = linphone::Factory::get()->createCore( mCore = linphone::Factory::get()->createCore(
Paths::getConfigFilePath(configPath), Paths::getConfigFilePath(configPath),
...@@ -270,7 +270,7 @@ void CoreManager::createLinphoneCore (const QString &configPath) { ...@@ -270,7 +270,7 @@ void CoreManager::createLinphoneCore (const QString &configPath) {
mCore->start(); mCore->start();
setDatabasesPaths(); setDatabasePaths();
setOtherPaths(); setOtherPaths();
} }
......
...@@ -142,9 +142,9 @@ signals: ...@@ -142,9 +142,9 @@ signals:
private: private:
CoreManager (QObject *parent, const QString &configPath); CoreManager (QObject *parent, const QString &configPath);
void setDatabasesPaths (); void setDatabasePaths ();
void setOtherPaths (); void setOtherPaths ();
void setResourcesPaths (); void setResourcePaths ();
void createLinphoneCore (const QString &configPath); void createLinphoneCore (const QString &configPath);
void migrate (); void migrate ();
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment