renamed getInstance() -> instance() for singletons

This commit is contained in:
fourtf
2019-10-07 22:42:34 +02:00
parent aeab038bc8
commit 6f710823ed
37 changed files with 77 additions and 77 deletions
+5 -5
View File
@@ -9,12 +9,12 @@
namespace chatterino {
Settings *Settings::instance = nullptr;
Settings *Settings::instance_ = nullptr;
Settings::Settings(const QString &settingsDirectory)
: ABSettings(settingsDirectory)
{
instance = this;
instance_ = this;
#ifdef USEWINSDK
this->autorun = isRegisteredForStartup();
@@ -23,14 +23,14 @@ Settings::Settings(const QString &settingsDirectory)
#endif
}
Settings &Settings::getInstance()
Settings &Settings::instance()
{
return *instance;
return *instance_;
}
Settings *getSettings()
{
return &Settings::getInstance();
return &Settings::instance();
}
} // namespace chatterino