diff options
| author | louiz’ <louiz@louiz.org> | 2018-03-17 17:28:47 +0100 |
|---|---|---|
| committer | louiz’ <louiz@louiz.org> | 2018-03-17 17:28:47 +0100 |
| commit | 03714c6cebf90dc7db8e3997a18cdd19e039c667 (patch) | |
| tree | c7f32136db1a40492f18cbd635a1bab761d14ced /src/xmpp | |
| parent | d0e3c71b91f1a1c1780158789fd42b8ac7209495 (diff) | |
| download | biboumi-03714c6cebf90dc7db8e3997a18cdd19e039c667.tar.gz biboumi-03714c6cebf90dc7db8e3997a18cdd19e039c667.tar.bz2 biboumi-03714c6cebf90dc7db8e3997a18cdd19e039c667.tar.xz biboumi-03714c6cebf90dc7db8e3997a18cdd19e039c667.zip | |
Revert "Use std::optional<bool> instead of OptionalBool"
This reverts commit ba879a882e031d7b8503f78fe41d1210000c96ca.
Diffstat (limited to 'src/xmpp')
| -rw-r--r-- | src/xmpp/biboumi_adhoc_commands.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/xmpp/biboumi_adhoc_commands.cpp b/src/xmpp/biboumi_adhoc_commands.cpp index 53ec98b..38b6165 100644 --- a/src/xmpp/biboumi_adhoc_commands.cpp +++ b/src/xmpp/biboumi_adhoc_commands.cpp @@ -493,7 +493,7 @@ void insert_irc_channel_configuration_form(XmlNode& node, const Jid& requester, { // Value selected by default XmlSubNode value(record_history, "value"); - value.set_inner(std::to_string(options.col<Database::RecordHistoryOptional>())); + value.set_inner(options.col<Database::RecordHistoryOptional>().to_string()); } // All three possible values for (const auto& val: {"unset", "true", "false"}) @@ -594,19 +594,19 @@ bool handle_irc_channel_configuration_form(XmppComponent& xmpp_component, const else if (field->get_tag("var") == "record_history" && value && !value->get_inner().empty()) { - std::optional<bool>& database_value = options.col<Database::RecordHistoryOptional>(); + OptionalBool& database_value = options.col<Database::RecordHistoryOptional>(); if (value->get_inner() == "true") - database_value = true; + database_value.set_value(true); else if (value->get_inner() == "false") - database_value = false; + database_value.set_value(false); else - database_value.reset(); + database_value.unset(); auto& biboumi_component = dynamic_cast<BiboumiComponent&>(xmpp_component); Bridge* bridge = biboumi_component.find_user_bridge(requester.bare()); if (bridge) { - if (database_value) - bridge->set_record_history(*database_value); + if (database_value.is_set) + bridge->set_record_history(database_value.value); else { // It is unset, we need to fetch the Global option, to // know if it’s enabled or not |