Use int for better compatibility (open-eid#1177)

IB-7700 Signed-off-by: Raul Metsma <[email protected]>
metsma · Mar 29, 2023 · 5bd100f · 5bd100f
1 parent 72d7f61
commit 5bd100f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/client/Settings.cpp b/client/Settings.cpp
@@ -54,7 +54,7 @@ const Option<bool, bool (*)()> Settings::SID_UUID_CUSTOM
 const Option<bool> Settings::SMARTID_REMEMBER { QStringLiteral("SmartIDSettings"), true };
 const Option<QString> Settings::SMARTID_CODE { QStringLiteral("SmartID") };
 const Option<QString> Settings::SMARTID_COUNTRY { QStringLiteral("SmartIDCountry"), QStringLiteral("EE") };
-const QStringList Settings::SMARTID_COUNTRY_LIST = {
+const QStringList Settings::SMARTID_COUNTRY_LIST {
 	QStringLiteral("EE"),
 	QStringLiteral("LT"),
 	QStringLiteral("LV"),
@@ -78,7 +78,7 @@ const Option<bool> Settings::SHOW_INTRO { QStringLiteral("showIntro"), true };
 const Option<bool> Settings::SHOW_PRINT_SUMMARY { QStringLiteral("ShowPrintSummary"), false };
 const Option<bool> Settings::SHOW_ROLE_ADDRESS_INFO { QStringLiteral("RoleAddressInfo"), false };
 
-const Option<Settings::ProxyConfig> Settings::PROXY_CONFIG { QStringLiteral("ProxyConfig"), Settings::ProxyNone };
+const Option<int> Settings::PROXY_CONFIG { QStringLiteral("ProxyConfig"), Settings::ProxyNone };
 const Option<QString> Settings::PROXY_HOST { QStringLiteral("ProxyHost") };
 const Option<QString> Settings::PROXY_PORT { QStringLiteral("ProxyPort") };
 const Option<QString> Settings::PROXY_USER { QStringLiteral("ProxyUser") };

diff --git a/client/Settings.h b/client/Settings.h
@@ -116,7 +116,7 @@ struct Settings
 		ProxySystem,
 		ProxyManual,
 	};
-	static const Option<ProxyConfig> PROXY_CONFIG;
+	static const Option<int> PROXY_CONFIG;
 	static const Option<QString> PROXY_HOST;
 	static const Option<QString> PROXY_PORT;
 	static const Option<QString> PROXY_USER;
@@ -128,4 +128,3 @@ struct Settings
 	static const Option<bool> TSL_ONLINE_DIGEST;
 #endif
 };
-Q_DECLARE_METATYPE(Settings::ProxyConfig)