fix: use qobject parent
This commit is contained in:
parent
edf6184c81
commit
8f51502f91
2 changed files with 2 additions and 6 deletions
|
|
@ -73,8 +73,6 @@ GlobalConfig::GlobalConfig(GlobalConfig* fallback, const QString& filePath, QObj
|
||||||
}
|
}
|
||||||
|
|
||||||
GlobalConfig::~GlobalConfig() {
|
GlobalConfig::~GlobalConfig() {
|
||||||
if (m_defaults)
|
|
||||||
m_defaults->deleteLater();
|
|
||||||
if (s_instance == this)
|
if (s_instance == this)
|
||||||
s_instance = nullptr;
|
s_instance = nullptr;
|
||||||
}
|
}
|
||||||
|
|
@ -85,7 +83,7 @@ GlobalConfig* GlobalConfig::instance() {
|
||||||
|
|
||||||
GlobalConfig* GlobalConfig::defaults() {
|
GlobalConfig* GlobalConfig::defaults() {
|
||||||
if (!m_defaults)
|
if (!m_defaults)
|
||||||
m_defaults = new GlobalConfig(nullptr, QString()); // Non-singleton constructor
|
m_defaults = new GlobalConfig(nullptr, QString(), this); // Non-singleton constructor
|
||||||
return m_defaults;
|
return m_defaults;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -62,8 +62,6 @@ TokenConfig::TokenConfig(TokenConfig* fallback, const QString& filePath, QObject
|
||||||
}
|
}
|
||||||
|
|
||||||
TokenConfig::~TokenConfig() {
|
TokenConfig::~TokenConfig() {
|
||||||
if (m_defaults)
|
|
||||||
m_defaults->deleteLater();
|
|
||||||
if (s_instance == this)
|
if (s_instance == this)
|
||||||
s_instance = nullptr;
|
s_instance = nullptr;
|
||||||
}
|
}
|
||||||
|
|
@ -74,7 +72,7 @@ TokenConfig* TokenConfig::instance() {
|
||||||
|
|
||||||
TokenConfig* TokenConfig::defaults() {
|
TokenConfig* TokenConfig::defaults() {
|
||||||
if (!m_defaults)
|
if (!m_defaults)
|
||||||
m_defaults = new TokenConfig(nullptr, QString()); // Non-singleton constructor
|
m_defaults = new TokenConfig(nullptr, QString(), this); // Non-singleton constructor
|
||||||
return m_defaults;
|
return m_defaults;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue