Replace deprecated boost::optional::reset(val) with operator =

Change-Id: I7340a561e0df0c781fd834388deb4b9f83800f9b
Reviewed-on: https://gerrit.libreoffice.org/63221
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>

3 files changed, 9 insertions, 9 deletions

diff --git a/vcl/source/app/settings.cxx b/vcl/source/app/settings.cxx
index 267a58262229..42f4f57a2a74 100644
--- a/vcl/source/app/settings.cxx
+++ b/vcl/source/app/settings.cxx
@@ -2115,7 +2115,7 @@ static void setupPersonaHeaderFooter( WhichPersona eWhich, OUString& rHeaderFoot
 
     rHeaderFooter = aOldValue;
     rHeaderFooterBitmap = BitmapEx();
-    rMenuBarTextColor = boost::none;
+    rMenuBarTextColor.reset();
 
     // now read the new values and setup bitmaps
     OUString aHeader, aFooter;
diff --git a/vcl/source/control/quickselectionengine.cxx b/vcl/source/control/quickselectionengine.cxx
index 2e04cf68e164..3773a3afd039 100644
--- a/vcl/source/control/quickselectionengine.cxx
+++ b/vcl/source/control/quickselectionengine.cxx
@@ -124,7 +124,7 @@ namespace vcl
 
                 if ( m_pData->sCurrentSearchString.getLength() == 1 )
                 {   // first character in the search -> remember
-                    m_pData->aSingleSearchChar.reset( c );
+                    m_pData->aSingleSearchChar = c;
                 }
                 else if ( m_pData->sCurrentSearchString.getLength() > 1 )
                 {
diff --git a/vcl/unx/generic/window/screensaverinhibitor.cxx b/vcl/unx/generic/window/screensaverinhibitor.cxx
index 675b79269627..4b9253d6869e 100644
--- a/vcl/unx/generic/window/screensaverinhibitor.cxx
+++ b/vcl/unx/generic/window/screensaverinhibitor.cxx
@@ -50,14 +50,14 @@ void ScreenSaverInhibitor::inhibit( bool bInhibit, const OUString& sReason,
 
     if ( bIsX11 )
     {
-        if ( pDisplay != boost::none )
+        if (pDisplay)
         {
             inhibitXScreenSaver( bInhibit, pDisplay.get() );
             inhibitXAutoLock( bInhibit, pDisplay.get() );
             inhibitDPMS( bInhibit, pDisplay.get() );
         }
 
-        if ( xid != boost::none )
+        if (xid)
         {
             inhibitGSM( bInhibit, appname, aReason.getStr(), xid.get() );
             inhibitMSM( bInhibit, appname, aReason.getStr(), xid.get() );
@@ -72,8 +72,8 @@ static void dbusInhibit( bool bInhibit,
                   const std::function<GVariant*( GDBusProxy*, const guint, GError*& )>& fUnInhibit,
                   boost::optional<guint>& rCookie )
 {
-    if ( ( !bInhibit && ( rCookie == boost::none ) ) ||
-         ( bInhibit && ( rCookie != boost::none ) ) )
+    if ( ( !bInhibit && !rCookie ) ||
+         (  bInhibit &&  rCookie ) )
     {
         return;
     }
@@ -130,7 +130,7 @@ static void dbusInhibit( bool bInhibit,
     else
     {
         res = fUnInhibit( proxy, rCookie.get(), error );
-        rCookie = boost::none;
+        rCookie.reset();
 
         if (res != nullptr)
         {
@@ -281,12 +281,12 @@ void ScreenSaverInhibitor::inhibitXScreenSaver( bool bInhibit, Display* pDisplay
         XSetScreenSaver( pDisplay, 0, nInterval,
                          bPreferBlanking, bAllowExposures );
     }
-    else if ( !bInhibit && ( mnXScreenSaverTimeout != boost::none ) )
+    else if ( !bInhibit && mnXScreenSaverTimeout )
     {
         XSetScreenSaver( pDisplay, mnXScreenSaverTimeout.get(),
                          nInterval, bPreferBlanking,
                          bAllowExposures );
-        mnXScreenSaverTimeout = boost::none;
+        mnXScreenSaverTimeout.reset();
     }
 }