chore: remove obsolete runWizard setting
This commit is contained in:
parent
bd674f546b
commit
5d310be807
2 changed files with 2 additions and 18 deletions
|
|
@ -39,7 +39,7 @@ const char *const AppConfig::m_SettingsName[] = {
|
||||||
"logLevel2",
|
"logLevel2",
|
||||||
"logToFile",
|
"logToFile",
|
||||||
"logFilename",
|
"logFilename",
|
||||||
"wizardLastRun",
|
"", // 6 wizardLastRun, obsolete
|
||||||
"startedBefore",
|
"startedBefore",
|
||||||
"elevateMode",
|
"elevateMode",
|
||||||
"elevateModeEnum",
|
"elevateModeEnum",
|
||||||
|
|
@ -105,8 +105,6 @@ void AppConfig::recall()
|
||||||
void AppConfig::recallFromAllScopes()
|
void AppConfig::recallFromAllScopes()
|
||||||
{
|
{
|
||||||
using enum Setting;
|
using enum Setting;
|
||||||
|
|
||||||
m_WizardLastRun = findInAllScopes(kWizardLastRun, m_WizardLastRun).toInt();
|
|
||||||
m_LoadFromSystemScope = findInAllScopes(kLoadSystemSettings, m_LoadFromSystemScope).toBool();
|
m_LoadFromSystemScope = findInAllScopes(kLoadSystemSettings, m_LoadFromSystemScope).toBool();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -172,7 +170,6 @@ void AppConfig::commit()
|
||||||
|
|
||||||
qDebug("committing app config");
|
qDebug("committing app config");
|
||||||
|
|
||||||
saveToAllScopes(kWizardLastRun, m_WizardLastRun);
|
|
||||||
saveToAllScopes(kLoadSystemSettings, m_LoadFromSystemScope);
|
saveToAllScopes(kLoadSystemSettings, m_LoadFromSystemScope);
|
||||||
saveToAllScopes(kClientGroupChecked, m_ClientGroupChecked);
|
saveToAllScopes(kClientGroupChecked, m_ClientGroupChecked);
|
||||||
saveToAllScopes(kServerGroupChecked, m_ServerGroupChecked);
|
saveToAllScopes(kServerGroupChecked, m_ServerGroupChecked);
|
||||||
|
|
@ -444,11 +441,6 @@ ProcessMode AppConfig::processMode() const
|
||||||
return m_EnableService ? ProcessMode::kService : ProcessMode::kDesktop;
|
return m_EnableService ? ProcessMode::kService : ProcessMode::kDesktop;
|
||||||
}
|
}
|
||||||
|
|
||||||
bool AppConfig::wizardShouldRun() const
|
|
||||||
{
|
|
||||||
return m_WizardLastRun < kWizardVersion;
|
|
||||||
}
|
|
||||||
|
|
||||||
bool AppConfig::startedBefore() const
|
bool AppConfig::startedBefore() const
|
||||||
{
|
{
|
||||||
return m_StartedBefore;
|
return m_StartedBefore;
|
||||||
|
|
@ -697,11 +689,6 @@ void AppConfig::setLogFilename(const QString &s)
|
||||||
m_LogFilename = s;
|
m_LogFilename = s;
|
||||||
}
|
}
|
||||||
|
|
||||||
void AppConfig::setWizardHasRun()
|
|
||||||
{
|
|
||||||
m_WizardLastRun = kWizardVersion;
|
|
||||||
}
|
|
||||||
|
|
||||||
void AppConfig::setStartedBefore(bool b)
|
void AppConfig::setStartedBefore(bool b)
|
||||||
{
|
{
|
||||||
m_StartedBefore = b;
|
m_StartedBefore = b;
|
||||||
|
|
|
||||||
|
|
@ -61,7 +61,7 @@ private:
|
||||||
kLogLevel = 3,
|
kLogLevel = 3,
|
||||||
kLogToFile = 4,
|
kLogToFile = 4,
|
||||||
kLogFilename = 5,
|
kLogFilename = 5,
|
||||||
kWizardLastRun = 6,
|
// 6 = show first run wizard, obsolete
|
||||||
kStartedBefore = 7,
|
kStartedBefore = 7,
|
||||||
kElevateModeLegacy = 8,
|
kElevateModeLegacy = 8,
|
||||||
kElevateMode = 9,
|
kElevateMode = 9,
|
||||||
|
|
@ -166,7 +166,6 @@ public:
|
||||||
// Getters (new methods)
|
// Getters (new methods)
|
||||||
//
|
//
|
||||||
|
|
||||||
bool wizardShouldRun() const;
|
|
||||||
bool startedBefore() const;
|
bool startedBefore() const;
|
||||||
QString logDir() const;
|
QString logDir() const;
|
||||||
bool serverGroupChecked() const;
|
bool serverGroupChecked() const;
|
||||||
|
|
@ -206,7 +205,6 @@ public:
|
||||||
//
|
//
|
||||||
|
|
||||||
void setStartedBefore(bool b);
|
void setStartedBefore(bool b);
|
||||||
void setWizardHasRun();
|
|
||||||
void setServerGroupChecked(bool);
|
void setServerGroupChecked(bool);
|
||||||
void setUseExternalConfig(bool);
|
void setUseExternalConfig(bool);
|
||||||
void setConfigFile(const QString &);
|
void setConfigFile(const QString &);
|
||||||
|
|
@ -301,7 +299,6 @@ private:
|
||||||
int m_LogLevel = 0;
|
int m_LogLevel = 0;
|
||||||
bool m_LogToFile = false;
|
bool m_LogToFile = false;
|
||||||
QString m_LogFilename = logDir() + deskflow::gui::kDefaultLogFile;
|
QString m_LogFilename = logDir() + deskflow::gui::kDefaultLogFile;
|
||||||
int m_WizardLastRun = 0;
|
|
||||||
bool m_StartedBefore = false;
|
bool m_StartedBefore = false;
|
||||||
ElevateMode m_ElevateMode = deskflow::gui::kDefaultElevateMode;
|
ElevateMode m_ElevateMode = deskflow::gui::kDefaultElevateMode;
|
||||||
bool m_TlsEnabled = true;
|
bool m_TlsEnabled = true;
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue