From 1bb1b21f7779d186a9b09d2cba62e8b13b48fa88 Mon Sep 17 00:00:00 2001
From: Andrew Nelless <Andrew Nelless>
Date: Wed, 8 Jun 2016 17:03:33 +0100
Subject: [PATCH] #4978 Renamed conflicting 'Unknown' EditionType

---
 src/gui/src/AppConfig.cpp           | 2 +-
 src/gui/src/EditionType.h           | 2 +-
 src/gui/src/PluginWizardPage.cpp    | 2 +-
 src/gui/src/SetupWizard.cpp         | 4 ++--
 src/gui/src/SubscriptionManager.cpp | 4 ++--
 src/gui/src/WebClient.cpp           | 2 +-
 6 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/gui/src/AppConfig.cpp b/src/gui/src/AppConfig.cpp
index f96c6633..e5bcc868 100644
--- a/src/gui/src/AppConfig.cpp
+++ b/src/gui/src/AppConfig.cpp
@@ -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();
diff --git a/src/gui/src/EditionType.h b/src/gui/src/EditionType.h
index 2229cd23..381e949c 100644
--- a/src/gui/src/EditionType.h
+++ b/src/gui/src/EditionType.h
@@ -22,7 +22,7 @@ enum qEditionType {
 	Basic,
 	Pro,
 	Trial,
-	Unknown
+	UnknownEdition
 };
 
 #endif // EDITIONTYPE_H
diff --git a/src/gui/src/PluginWizardPage.cpp b/src/gui/src/PluginWizardPage.cpp
index ace607da..9172f190 100644
--- a/src/gui/src/PluginWizardPage.cpp
+++ b/src/gui/src/PluginWizardPage.cpp
@@ -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)
 {
diff --git a/src/gui/src/SetupWizard.cpp b/src/gui/src/SetupWizard.cpp
index f5a40b6c..4e03bd89 100644
--- a/src/gui/src/SetupWizard.cpp
+++ b/src/gui/src/SetupWizard.cpp
@@ -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;
diff --git a/src/gui/src/SubscriptionManager.cpp b/src/gui/src/SubscriptionManager.cpp
index f3f55611..88a921b7 100644
--- a/src/gui/src/SubscriptionManager.cpp
+++ b/src/gui/src/SubscriptionManager.cpp
@@ -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;
diff --git a/src/gui/src/WebClient.cpp b/src/gui/src/WebClient.cpp
index 451bf47f..c3b3b4ef 100644
--- a/src/gui/src/WebClient.cpp
+++ b/src/gui/src/WebClient.cpp
@@ -32,7 +32,7 @@ int WebClient::getEdition(
 		QWidget* w)
 {
 	QString responseJson;
-	int edition = Unknown;
+	int edition = UnknownEdition;
 	try {
 		responseJson = request(email, password);
 	}