squidy/qBittorrent
1
0
Fork 0
mirror of https://github.com/qbittorrent/qBittorrent.git synced 2025-12-19 06:57:24 -06:00
Code Issues Packages Projects Releases Wiki Activity

Unify singleton pattern in Profile class

Browse Source 
1. Use unified function names `initInstance()` and `freeInstance()` and
make them public.
2. Add `freeInstance()` to avoid noise from memory leak detectors.
3. Let `instance()`return a pointer directly to avoid unnecessary
indirections when invoking functions.
This commit is contained in:
Chocobo1
2020-02-11 10:56:04 +08:00
parent 8b330e3ac0
commit 5de75eff05
9 changed files with 39 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
src/base/profile.cpp
View File

@@ -42,25 +42,30 @@ Profile::Profile(Private::Profile *impl, Private::PathConverter *pathConverter)
ensureDirectoryExists(SpecialFolder::Data);
}
// to generate correct call to ProfilePrivate::~ProfileImpl()
Profile::~Profile() = default;
void Profile::initialize(const QString &rootProfilePath, const QString &configurationName,
bool convertPathsToProfileRelative)
void Profile::initInstance(const QString &rootProfilePath, const QString &configurationName,
const bool convertPathsToProfileRelative)
{
std::unique_ptr<Private::Profile> profile(rootProfilePath.isEmpty()
? static_cast<Private::Profile *>(new Private::DefaultProfile(configurationName))
: static_cast<Private::Profile *>(new Private::CustomProfile(rootProfilePath, configurationName)));
if (m_instance)
return;
std::unique_ptr<Private::Profile> profile(rootProfilePath.isEmpty()
? static_cast<Private::Profile *>(new Private::DefaultProfile(configurationName))
: static_cast<Private::Profile *>(new Private::CustomProfile(rootProfilePath, configurationName)));
std::unique_ptr<Private::PathConverter> converter(convertPathsToProfileRelative
? static_cast<Private::PathConverter *>(new Private::Converter(profile->baseDirectory()))
: static_cast<Private::PathConverter *>(new Private::NoConvertConverter()));
? static_cast<Private::PathConverter *>(new Private::Converter(profile->baseDirectory()))
: static_cast<Private::PathConverter *>(new Private::NoConvertConverter()));
m_instance = new Profile(profile.release(), converter.release());
}
const Profile &Profile::instance()
void Profile::freeInstance()
{
return *m_instance;
delete m_instance;
m_instance = nullptr;
}
const Profile *Profile::instance()
{
return m_instance;
}
QString Profile::location(const SpecialFolder folder) const
@@ -96,7 +101,7 @@ SettingsPtr Profile::applicationSettings(const QString &name) const
return m_profileImpl->applicationSettings(name);
}
void Profile::ensureDirectoryExists(const SpecialFolder folder)
void Profile::ensureDirectoryExists(const SpecialFolder folder) const
{
const QString locationPath = location(folder);
if (!locationPath.isEmpty() && !QDir().mkpath(locationPath))
@@ -115,5 +120,5 @@ QString Profile::fromPortablePath(const QString &portablePath) const
QString specialFolderLocation(const SpecialFolder folder)
{
return Profile::instance().location(folder);
return Profile::instance()->location(folder);
}