#4978 Renamed conflicting 'Unknown' EditionType
This commit is contained in:
parent
25d8c5c32a
commit
1bb1b21f77
|
@ -135,7 +135,7 @@ void AppConfig::loadSettings()
|
|||
}
|
||||
m_ElevateMode = static_cast<ElevateMode>(elevateMode.toInt());
|
||||
m_AutoConfigPrompted = settings().value("autoConfigPrompted", false).toBool();
|
||||
m_Edition = settings().value("edition", Unknown).toInt();
|
||||
m_Edition = settings().value("edition", UnknownEdition).toInt();
|
||||
m_ActivateEmail = settings().value("activateEmail", "").toString();
|
||||
m_CryptoEnabled = settings().value("cryptoEnabled", false).toBool();
|
||||
m_AutoHide = settings().value("autoHide", false).toBool();
|
||||
|
|
|
@ -22,7 +22,7 @@ enum qEditionType {
|
|||
Basic,
|
||||
Pro,
|
||||
Trial,
|
||||
Unknown
|
||||
UnknownEdition
|
||||
};
|
||||
|
||||
#endif // EDITIONTYPE_H
|
||||
|
|
|
@ -30,7 +30,7 @@
|
|||
PluginWizardPage::PluginWizardPage(MainWindow& mainWindow, QWidget *parent) :
|
||||
QWizardPage(parent),
|
||||
m_Finished(false),
|
||||
m_Edition(Unknown),
|
||||
m_Edition(UnknownEdition),
|
||||
m_pSslCertificate(NULL),
|
||||
m_mainWindow(mainWindow)
|
||||
{
|
||||
|
|
|
@ -29,7 +29,7 @@
|
|||
SetupWizard::SetupWizard(MainWindow& mainWindow, bool startMain) :
|
||||
m_MainWindow(mainWindow),
|
||||
m_StartMain(startMain),
|
||||
m_Edition(Unknown),
|
||||
m_Edition(UnknownEdition),
|
||||
m_LoginAttemps(0)
|
||||
{
|
||||
setupUi(this);
|
||||
|
@ -95,7 +95,7 @@ bool SetupWizard::validateCurrentPage()
|
|||
message,
|
||||
this);
|
||||
|
||||
if (m_Edition == Unknown) {
|
||||
if (m_Edition == UnknownEdition) {
|
||||
m_LoginAttemps++;
|
||||
if (m_LoginAttemps == kMaximiumLoginAttemps) {
|
||||
m_LoginAttemps = 0;
|
||||
|
|
|
@ -39,7 +39,7 @@ SubscriptionManager::SubscriptionManager(QWidget* parent, AppConfig& appConfig,
|
|||
|
||||
bool SubscriptionManager::activateSerial(const QString& serial)
|
||||
{
|
||||
m_Edition = Unknown;
|
||||
m_Edition = UnknownEdition;
|
||||
persistDirectory();
|
||||
CoreInterface coreInterface;
|
||||
QString output;
|
||||
|
@ -62,7 +62,7 @@ bool SubscriptionManager::activateSerial(const QString& serial)
|
|||
|
||||
bool SubscriptionManager::checkSubscription()
|
||||
{
|
||||
m_Edition = Unknown;
|
||||
m_Edition = UnknownEdition;
|
||||
persistDirectory();
|
||||
CoreInterface coreInterface;
|
||||
QString output;
|
||||
|
|
|
@ -32,7 +32,7 @@ int WebClient::getEdition(
|
|||
QWidget* w)
|
||||
{
|
||||
QString responseJson;
|
||||
int edition = Unknown;
|
||||
int edition = UnknownEdition;
|
||||
try {
|
||||
responseJson = request(email, password);
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue