Skip to content
Snippets Groups Projects
Commit 6b3efff7 authored by Andreas Traczyk's avatar Andreas Traczyk Committed by Sébastien Blin
Browse files

misc: use logical `or` instead of bitwise

No impact on logic. Just clarifies intention and allows short-circuiting.

Change-Id: If18f9d28cf4f4ead58a4f94b0ba0e4514ac9eea1
parent 3531b8b3
Branches
Tags
No related merge requests found
......@@ -839,8 +839,8 @@ account::Info::fromDetails(const MapStringString& details)
confProperties.upnpEnabled = toBool(details[ConfProperties::UPNP_ENABLED]);
confProperties.hasCustomUserAgent = toBool(details[ConfProperties::HAS_CUSTOM_USER_AGENT]);
confProperties.allowIncoming = toBool(details[ConfProperties::ALLOW_CERT_FROM_HISTORY])
| toBool(details[ConfProperties::ALLOW_CERT_FROM_CONTACT])
| toBool(details[ConfProperties::ALLOW_CERT_FROM_TRUSTED]);
|| toBool(details[ConfProperties::ALLOW_CERT_FROM_CONTACT])
|| toBool(details[ConfProperties::ALLOW_CERT_FROM_TRUSTED]);
confProperties.allowIPAutoRewrite = toBool(details[ConfProperties::ACCOUNT_IP_AUTO_REWRITE]);
confProperties.archivePassword = details[ConfProperties::ARCHIVE_PASSWORD];
confProperties.archiveHasPassword = toBool(details[ConfProperties::ARCHIVE_HAS_PASSWORD]);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment