From 49393daf011944ee8ef2a5a5736780de5c9f6509 Mon Sep 17 00:00:00 2001
From: Charles Kerr <charles@charleskerr.com>
Date: Sun, 27 Nov 2022 14:56:34 -0600
Subject: [PATCH] refactor: use std::optional.value_or() (#4255)

---
 libtransmission/torrent.cc      | 2 +-
 libtransmission/utils.cc        | 7 +------
 libtransmission/variant-json.cc | 3 +--
 qt/FreeSpaceLabel.cc            | 2 +-
 4 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/libtransmission/torrent.cc b/libtransmission/torrent.cc
index 4429d6651..4f8578da8 100644
--- a/libtransmission/torrent.cc
+++ b/libtransmission/torrent.cc
@@ -968,7 +968,7 @@ tr_stat const* tr_torrentStat(tr_torrent* tor)
     s->sizeWhenDone = tor->completion.sizeWhenDone();
 
     auto const verify_progress = tor->verifyProgress();
-    s->recheckProgress = verify_progress ? *verify_progress : 0.0F;
+    s->recheckProgress = verify_progress.value_or(0.0);
     s->activityDate = tor->activityDate;
     s->addedDate = tor->addedDate;
     s->doneDate = tor->doneDate;
diff --git a/libtransmission/utils.cc b/libtransmission/utils.cc
index 84087f1d2..7a8ade7ee 100644
--- a/libtransmission/utils.cc
+++ b/libtransmission/utils.cc
@@ -616,12 +616,7 @@ double tr_truncd(double x, int decimal_places)
         pt[decimal_places != 0 ? decimal_places + 1 : 0] = '\0';
     }
 
-    if (auto parsed = tr_parseNum<double>(std::data(buf)); parsed)
-    {
-        return *parsed;
-    }
-
-    return {};
+    return tr_parseNum<double>(std::data(buf)).value_or(0.0);
 }
 
 std::string tr_strpercent(double x)
diff --git a/libtransmission/variant-json.cc b/libtransmission/variant-json.cc
index 642b93dd9..a8d6f67cf 100644
--- a/libtransmission/variant-json.cc
+++ b/libtransmission/variant-json.cc
@@ -329,8 +329,7 @@ static void action_callback_POP(
         if ((state->special_flags & JSONSL_SPECIALf_NUMNOINT) != 0)
         {
             auto sv = std::string_view{ jsn->base + state->pos_begin, jsn->pos - state->pos_begin };
-            auto const val = tr_parseNum<double>(sv);
-            tr_variantInitReal(get_node(jsn), val ? *val : double{});
+            tr_variantInitReal(get_node(jsn), tr_parseNum<double>(sv).value_or(0.0));
         }
         else if ((state->special_flags & JSONSL_SPECIALf_NUMERIC) != 0)
         {
diff --git a/qt/FreeSpaceLabel.cc b/qt/FreeSpaceLabel.cc
index 116c1f879..f476931a7 100644
--- a/qt/FreeSpaceLabel.cc
+++ b/qt/FreeSpaceLabel.cc
@@ -87,7 +87,7 @@ void FreeSpaceLabel::onTimer()
 
             // update the tooltip
             auto const path = dictFind<QString>(r.args.get(), TR_KEY_path);
-            setToolTip(QDir::toNativeSeparators(path ? *path : QString()));
+            setToolTip(QDir::toNativeSeparators(path.value_or(QString{})));
 
             timer_.start();
         });