From 6cc36a969a7c3135388e4fe48d179721311525e2 Mon Sep 17 00:00:00 2001 From: tux3 Date: Thu, 21 Jan 2016 03:00:46 +0100 Subject: [PATCH] Fix capitalization of Settings::loadpersonal() My bad, thanks to @antis81 for noticing --- src/nexus.cpp | 2 +- src/persistence/settings.cpp | 6 +++--- src/persistence/settings.h | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/nexus.cpp b/src/nexus.cpp index 237dafbe9..a6e4fb715 100644 --- a/src/nexus.cpp +++ b/src/nexus.cpp @@ -275,7 +275,7 @@ void Nexus::setProfile(Profile* profile) { getInstance().profile = profile; if (profile) - Settings::getInstance().loadpersonal(profile); + Settings::getInstance().loadPersonal(profile); } AndroidGUI* Nexus::getAndroidGUI() diff --git a/src/persistence/settings.cpp b/src/persistence/settings.cpp index 0839e4303..4532f918c 100644 --- a/src/persistence/settings.cpp +++ b/src/persistence/settings.cpp @@ -265,7 +265,7 @@ void Settings::loadGlobal() loaded = true; } -void Settings::loadpersonal() +void Settings::loadPersonal() { Profile* profile = Nexus::getProfile(); if (!profile) @@ -273,10 +273,10 @@ void Settings::loadpersonal() qCritical() << "No active profile, couldn't load personal settings"; return; } - loadpersonal(profile); + loadPersonal(profile); } -void Settings::loadpersonal(Profile* profile) +void Settings::loadPersonal(Profile* profile) { QMutexLocker locker{&bigLock}; diff --git a/src/persistence/settings.h b/src/persistence/settings.h index 59b8cc87b..858c71beb 100644 --- a/src/persistence/settings.h +++ b/src/persistence/settings.h @@ -49,8 +49,8 @@ public: void savePersonal(Profile *profile); ///< Asynchronous void loadGlobal(); - void loadpersonal(); - void loadpersonal(Profile *profile); + void loadPersonal(); + void loadPersonal(Profile *profile); public slots: void saveGlobal(); ///< Asynchronous