rayelliott
/
barrier
mirror of https://github.com/debauchee/barrier.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

#4978 Renamed conflicting 'Unknown' EditionType

This commit is contained in:
Andrew Nelless 2016-06-08 17:03:33 +01:00 committed by Jerry (Xinyu Hou)
parent 25d8c5c32a
commit 1bb1b21f77
6 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/gui/src/AppConfig.cpp
View File

@ -135,7 +135,7 @@ void AppConfig::loadSettings()
} }
m_ElevateMode = static_cast<ElevateMode>(elevateMode.toInt()); m_ElevateMode = static_cast<ElevateMode>(elevateMode.toInt());
m_AutoConfigPrompted = settings().value("autoConfigPrompted", false).toBool(); 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_ActivateEmail = settings().value("activateEmail", "").toString();
m_CryptoEnabled = settings().value("cryptoEnabled", false).toBool(); m_CryptoEnabled = settings().value("cryptoEnabled", false).toBool();
m_AutoHide = settings().value("autoHide", false).toBool(); m_AutoHide = settings().value("autoHide", false).toBool();

2
src/gui/src/EditionType.h
View File

@ -22,7 +22,7 @@ enum qEditionType {
Basic, Basic,
Pro, Pro,
Trial, Trial,
Unknown UnknownEdition
}; };
#endif // EDITIONTYPE_H #endif // EDITIONTYPE_H

2
src/gui/src/PluginWizardPage.cpp
View File

@ -30,7 +30,7 @@
PluginWizardPage::PluginWizardPage(MainWindow& mainWindow, QWidget *parent) : PluginWizardPage::PluginWizardPage(MainWindow& mainWindow, QWidget *parent) :
QWizardPage(parent), QWizardPage(parent),
m_Finished(false), m_Finished(false),
m_Edition(Unknown), m_Edition(UnknownEdition),
m_pSslCertificate(NULL), m_pSslCertificate(NULL),
m_mainWindow(mainWindow) m_mainWindow(mainWindow)
{ {

4
src/gui/src/SetupWizard.cpp
View File

@ -29,7 +29,7 @@
SetupWizard::SetupWizard(MainWindow& mainWindow, bool startMain) : SetupWizard::SetupWizard(MainWindow& mainWindow, bool startMain) :
m_MainWindow(mainWindow), m_MainWindow(mainWindow),
m_StartMain(startMain), m_StartMain(startMain),
m_Edition(Unknown), m_Edition(UnknownEdition),
m_LoginAttemps(0) m_LoginAttemps(0)
{ {
setupUi(this); setupUi(this);
@ -95,7 +95,7 @@ bool SetupWizard::validateCurrentPage()
message, message,
this); this);
if (m_Edition == Unknown) { if (m_Edition == UnknownEdition) {
m_LoginAttemps++; m_LoginAttemps++;
if (m_LoginAttemps == kMaximiumLoginAttemps) { if (m_LoginAttemps == kMaximiumLoginAttemps) {
m_LoginAttemps = 0; m_LoginAttemps = 0;

4
src/gui/src/SubscriptionManager.cpp
View File

@ -39,7 +39,7 @@ SubscriptionManager::SubscriptionManager(QWidget* parent, AppConfig& appConfig,
bool SubscriptionManager::activateSerial(const QString& serial) bool SubscriptionManager::activateSerial(const QString& serial)
{ {
m_Edition = Unknown; m_Edition = UnknownEdition;
persistDirectory(); persistDirectory();
CoreInterface coreInterface; CoreInterface coreInterface;
QString output; QString output;
@ -62,7 +62,7 @@ bool SubscriptionManager::activateSerial(const QString& serial)
bool SubscriptionManager::checkSubscription() bool SubscriptionManager::checkSubscription()
{ {
m_Edition = Unknown; m_Edition = UnknownEdition;
persistDirectory(); persistDirectory();
CoreInterface coreInterface; CoreInterface coreInterface;
QString output; QString output;

2
src/gui/src/WebClient.cpp
View File

@ -32,7 +32,7 @@ int WebClient::getEdition(
QWidget* w) QWidget* w)
{ {
QString responseJson; QString responseJson;
int edition = Unknown; int edition = UnknownEdition;
try { try {
responseJson = request(email, password); responseJson = request(email, password);
} }