From 6b3efff7cce6d5a8a62d8bea968e5a4e8b433a7e Mon Sep 17 00:00:00 2001
From: Andreas Traczyk <andreas.traczyk@savoirfairelinux.com>
Date: Thu, 15 Feb 2024 13:51:44 -0500
Subject: [PATCH] misc: use logical `or` instead of bitwise
No impact on logic. Just clarifies intention and allows short-circuiting.
Change-Id: If18f9d28cf4f4ead58a4f94b0ba0e4514ac9eea1
---
src/libclient/accountmodel.cpp | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/libclient/accountmodel.cpp b/src/libclient/accountmodel.cpp
index e4655a8ec..b1e681123 100644
--- a/src/libclient/accountmodel.cpp
+++ b/src/libclient/accountmodel.cpp
@@ -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]);
--
GitLab