Rewrite uses of boost::optional

...to only use functions that are also available for std::optional (in
preparation for changing from boost::optional to std::optional):

* uses of get are replaced with operator * or operator ->
* uses of is_initialized are replaced with operator bool
* uses of reset with an argument are replace with operator =

(All of the replacements are also available for boost::optional "since forever",
so this change should not break builds against old --with-system-boost.  An
alternative replacement for is_initialized would have been has_value, but that
is only available since Boost 1.68.)

Change-Id: I532687b6a5ee37dab28befb8e0eb05c22cbecf0f
Reviewed-on: https://gerrit.libreoffice.org/84124
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>

2 files changed, 13 insertions, 13 deletions

diff --git a/vcl/source/fontsubset/sft.cxx b/vcl/source/fontsubset/sft.cxx
index d359e48b0f80..c0c0c709e8a2 100644
--- a/vcl/source/fontsubset/sft.cxx
+++ b/vcl/source/fontsubset/sft.cxx
@@ -2610,16 +2610,16 @@ bool getTTCoverage(
     if (nLength >= OS2_Legacy_length)
     {
         rUnicodeRange = std::bitset<UnicodeCoverage::MAX_UC_ENUM>();
-        append(rUnicodeRange.get(),  0, GetUInt32(pTable, OS2_ulUnicodeRange1_offset));
-        append(rUnicodeRange.get(), 32, GetUInt32(pTable, OS2_ulUnicodeRange2_offset));
-        append(rUnicodeRange.get(), 64, GetUInt32(pTable, OS2_ulUnicodeRange3_offset));
-        append(rUnicodeRange.get(), 96, GetUInt32(pTable, OS2_ulUnicodeRange4_offset));
+        append(*rUnicodeRange,  0, GetUInt32(pTable, OS2_ulUnicodeRange1_offset));
+        append(*rUnicodeRange, 32, GetUInt32(pTable, OS2_ulUnicodeRange2_offset));
+        append(*rUnicodeRange, 64, GetUInt32(pTable, OS2_ulUnicodeRange3_offset));
+        append(*rUnicodeRange, 96, GetUInt32(pTable, OS2_ulUnicodeRange4_offset));
         bRet = true;
         if (nLength >= OS2_V1_length)
         {
             rCodePageRange = std::bitset<CodePageCoverage::MAX_CP_ENUM>();
-            append(rCodePageRange.get(),  0, GetUInt32(pTable, OS2_ulCodePageRange1_offset));
-            append(rCodePageRange.get(), 32, GetUInt32(pTable, OS2_ulCodePageRange2_offset));
+            append(*rCodePageRange,  0, GetUInt32(pTable, OS2_ulCodePageRange1_offset));
+            append(*rCodePageRange, 32, GetUInt32(pTable, OS2_ulCodePageRange2_offset));
         }
     }
     return bRet;
diff --git a/vcl/unx/generic/window/screensaverinhibitor.cxx b/vcl/unx/generic/window/screensaverinhibitor.cxx
index cc291c5e725b..b79069d08d12 100644
--- a/vcl/unx/generic/window/screensaverinhibitor.cxx
+++ b/vcl/unx/generic/window/screensaverinhibitor.cxx
@@ -55,15 +55,15 @@ void ScreenSaverInhibitor::inhibit( bool bInhibit, const OUString& sReason,
     {
         if (pDisplay)
         {
-            inhibitXScreenSaver( bInhibit, pDisplay.get() );
-            inhibitXAutoLock( bInhibit, pDisplay.get() );
-            inhibitDPMS( bInhibit, pDisplay.get() );
+            inhibitXScreenSaver( bInhibit, *pDisplay );
+            inhibitXAutoLock( bInhibit, *pDisplay );
+            inhibitDPMS( bInhibit, *pDisplay );
         }
 
         if (xid)
         {
-            inhibitGSM( bInhibit, appname, aReason.getStr(), xid.get() );
-            inhibitMSM( bInhibit, appname, aReason.getStr(), xid.get() );
+            inhibitGSM( bInhibit, appname, aReason.getStr(), *xid );
+            inhibitMSM( bInhibit, appname, aReason.getStr(), *xid );
         }
     }
 }
@@ -132,7 +132,7 @@ static void dbusInhibit( bool bInhibit,
     }
     else
     {
-        res = fUnInhibit( proxy, rCookie.get(), error );
+        res = fUnInhibit( proxy, *rCookie, error );
         rCookie.reset();
 
         if (res != nullptr)
@@ -286,7 +286,7 @@ void ScreenSaverInhibitor::inhibitXScreenSaver( bool bInhibit, Display* pDisplay
     }
     else if ( !bInhibit && mnXScreenSaverTimeout )
     {
-        XSetScreenSaver( pDisplay, mnXScreenSaverTimeout.get(),
+        XSetScreenSaver( pDisplay, *mnXScreenSaverTimeout,
                          nInterval, bPreferBlanking,
                          bAllowExposures );
         mnXScreenSaverTimeout.reset();