Skip to content

Commit 5bd100f

Browse files
authored
Use int for better compatibility (#1177)
IB-7700 Signed-off-by: Raul Metsma <raul@metsma.ee>
1 parent 72d7f61 commit 5bd100f

File tree

2 files changed

+3
-4
lines changed

2 files changed

+3
-4
lines changed

client/Settings.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ const Option<bool, bool (*)()> Settings::SID_UUID_CUSTOM
5454
const Option<bool> Settings::SMARTID_REMEMBER { QStringLiteral("SmartIDSettings"), true };
5555
const Option<QString> Settings::SMARTID_CODE { QStringLiteral("SmartID") };
5656
const Option<QString> Settings::SMARTID_COUNTRY { QStringLiteral("SmartIDCountry"), QStringLiteral("EE") };
57-
const QStringList Settings::SMARTID_COUNTRY_LIST = {
57+
const QStringList Settings::SMARTID_COUNTRY_LIST {
5858
QStringLiteral("EE"),
5959
QStringLiteral("LT"),
6060
QStringLiteral("LV"),
@@ -78,7 +78,7 @@ const Option<bool> Settings::SHOW_INTRO { QStringLiteral("showIntro"), true };
7878
const Option<bool> Settings::SHOW_PRINT_SUMMARY { QStringLiteral("ShowPrintSummary"), false };
7979
const Option<bool> Settings::SHOW_ROLE_ADDRESS_INFO { QStringLiteral("RoleAddressInfo"), false };
8080

81-
const Option<Settings::ProxyConfig> Settings::PROXY_CONFIG { QStringLiteral("ProxyConfig"), Settings::ProxyNone };
81+
const Option<int> Settings::PROXY_CONFIG { QStringLiteral("ProxyConfig"), Settings::ProxyNone };
8282
const Option<QString> Settings::PROXY_HOST { QStringLiteral("ProxyHost") };
8383
const Option<QString> Settings::PROXY_PORT { QStringLiteral("ProxyPort") };
8484
const Option<QString> Settings::PROXY_USER { QStringLiteral("ProxyUser") };

client/Settings.h

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ struct Settings
116116
ProxySystem,
117117
ProxyManual,
118118
};
119-
static const Option<ProxyConfig> PROXY_CONFIG;
119+
static const Option<int> PROXY_CONFIG;
120120
static const Option<QString> PROXY_HOST;
121121
static const Option<QString> PROXY_PORT;
122122
static const Option<QString> PROXY_USER;
@@ -128,4 +128,3 @@ struct Settings
128128
static const Option<bool> TSL_ONLINE_DIGEST;
129129
#endif
130130
};
131-
Q_DECLARE_METATYPE(Settings::ProxyConfig)

0 commit comments

Comments
 (0)