clang-tidy readability-redundant-smartptr-get

redundant get() call on smart pointer

Change-Id: Icb5a03bbc15e79a30d3d135a507d22914d15c2bd
Reviewed-on: https://gerrit.libreoffice.org/61837
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>

5 files changed, 27 insertions, 25 deletions

diff --git a/svtools/source/contnr/fileview.cxx b/svtools/source/contnr/fileview.cxx
index 518775457a99..d769a2321714 100644
--- a/svtools/source/contnr/fileview.cxx
+++ b/svtools/source/contnr/fileview.cxx
@@ -1562,7 +1562,8 @@ FileViewResult SvtFileView_Impl::GetFolderContent_Impl(
     if ( ::osl::Condition::result_timeout == eResult )
     {
         // maximum time to wait
-        OSL_ENSURE( !m_xCancelAsyncTimer.get(), "SvtFileView_Impl::GetFolderContent_Impl: there's still a previous timer!" );
+        OSL_ENSURE(!m_xCancelAsyncTimer,
+                   "SvtFileView_Impl::GetFolderContent_Impl: there's still a previous timer!");
         m_xCancelAsyncTimer.set(new CallbackTimer(this));
         sal_Int32 nMaxTimeout = pAsyncDescriptor->nMaxTimeout;
         OSL_ENSURE( nMaxTimeout > nMinTimeout,
diff --git a/svtools/source/control/ruler.cxx b/svtools/source/control/ruler.cxx
index d343532e40a0..1cb397edd890 100644
--- a/svtools/source/control/ruler.cxx
+++ b/svtools/source/control/ruler.cxx
@@ -803,7 +803,7 @@ void Ruler::ImplDrawIndents(vcl::RenderContext& rRenderContext, long nMin, long
                 }
             }
             bool bIsHit = false;
-            if(mxCurrentHitTest.get() != nullptr && mxCurrentHitTest->eType == RulerType::Indent)
+            if (mxCurrentHitTest != nullptr && mxCurrentHitTest->eType == RulerType::Indent)
             {
                 bIsHit = mxCurrentHitTest->nAryPos == j;
             }
@@ -1996,7 +1996,7 @@ void Ruler::MouseMove( const MouseEvent& rMEvt )
 
     if (ImplHitTest( rMEvt.GetPosPixel(), mxCurrentHitTest.get() ))
     {
-        maHoverSelection = *mxCurrentHitTest.get();
+        maHoverSelection = *mxCurrentHitTest;
 
         if (mxCurrentHitTest->bSize)
         {
@@ -2028,7 +2028,7 @@ void Ruler::MouseMove( const MouseEvent& rMEvt )
         }
     }
 
-    if (mxPreviousHitTest.get() != nullptr && mxPreviousHitTest->eType != mxCurrentHitTest->eType)
+    if (mxPreviousHitTest != nullptr && mxPreviousHitTest->eType != mxCurrentHitTest->eType)
     {
         mbFormat = true;
     }
diff --git a/svtools/source/control/valueset.cxx b/svtools/source/control/valueset.cxx
index 963fc1bb8249..275ac4dcc550 100644
--- a/svtools/source/control/valueset.cxx
+++ b/svtools/source/control/valueset.cxx
@@ -400,7 +400,7 @@ void ValueSet::Format(vcl::RenderContext const & rRenderContext)
         nNoneHeight = 0;
         nNoneSpace = 0;
 
-        if (mpNoneItem.get())
+        if (mpNoneItem)
             mpNoneItem.reset(nullptr);
     }
 
@@ -502,7 +502,7 @@ void ValueSet::Format(vcl::RenderContext const & rRenderContext)
 
         if (nStyle & WB_NONEFIELD)
         {
-            if (mpNoneItem.get())
+            if (mpNoneItem)
             {
                 mpNoneItem->mbVisible = false;
                 mpNoneItem->maText = GetText();
@@ -578,7 +578,7 @@ void ValueSet::Format(vcl::RenderContext const & rRenderContext)
         // create NoSelection field and show it
         if (nStyle & WB_NONEFIELD)
         {
-            if (mpNoneItem.get() == nullptr)
+            if (mpNoneItem == nullptr)
                 mpNoneItem.reset(new ValueSetItem(*this));
 
             mpNoneItem->mnId = 0;
@@ -739,7 +739,7 @@ void ValueSet::ImplDrawSelect(vcl::RenderContext& rRenderContext, sal_uInt16 nIt
         pItem = mItemList[ nPos ].get();
         aRect = ImplGetItemRect( nPos );
     }
-    else if (mpNoneItem.get())
+    else if (mpNoneItem)
     {
         pItem = mpNoneItem.get();
         aRect = maNoneItemRect;
@@ -866,7 +866,7 @@ void ValueSet::ImplHideSelect( sal_uInt16 nItemId )
     }
     else
     {
-        if (mpNoneItem.get() == nullptr)
+        if (mpNoneItem == nullptr)
         {
             return;
         }
@@ -1219,15 +1219,15 @@ void ValueSet::KeyInput( const KeyEvent& rKeyEvent )
 
     --nLastItem;
 
-    const size_t nCurPos = mnSelItemId ? GetItemPos(mnSelItemId)
-                                       : (mpNoneItem.get() ? VALUESET_ITEM_NONEITEM : 0);
+    const size_t nCurPos
+        = mnSelItemId ? GetItemPos(mnSelItemId) : (mpNoneItem ? VALUESET_ITEM_NONEITEM : 0);
     size_t nItemPos = VALUESET_ITEM_NOTFOUND;
     size_t nVStep = mnCols;
 
     switch (rKeyEvent.GetKeyCode().GetCode())
     {
         case KEY_HOME:
-            nItemPos = mpNoneItem.get() ? VALUESET_ITEM_NONEITEM : 0;
+            nItemPos = mpNoneItem ? VALUESET_ITEM_NONEITEM : 0;
             break;
 
         case KEY_END:
@@ -1241,7 +1241,7 @@ void ValueSet::KeyInput( const KeyEvent& rKeyEvent )
                 {
                     nItemPos = nCurPos-1;
                 }
-                else if (mpNoneItem.get())
+                else if (mpNoneItem)
                 {
                     nItemPos = VALUESET_ITEM_NONEITEM;
                 }
@@ -1287,7 +1287,7 @@ void ValueSet::KeyInput( const KeyEvent& rKeyEvent )
                     // Go up of a whole page
                     nItemPos = nCurPos-nVStep;
                 }
-                else if (mpNoneItem.get())
+                else if (mpNoneItem)
                 {
                     nItemPos = VALUESET_ITEM_NONEITEM;
                 }
@@ -2505,15 +2505,15 @@ bool SvtValueSet::KeyInput( const KeyEvent& rKeyEvent )
 
     --nLastItem;
 
-    const size_t nCurPos = mnSelItemId ? GetItemPos(mnSelItemId)
-                                       : (mpNoneItem.get() ? VALUESET_ITEM_NONEITEM : 0);
+    const size_t nCurPos
+        = mnSelItemId ? GetItemPos(mnSelItemId) : (mpNoneItem ? VALUESET_ITEM_NONEITEM : 0);
     size_t nItemPos = VALUESET_ITEM_NOTFOUND;
     size_t nVStep = mnCols;
 
     switch (rKeyEvent.GetKeyCode().GetCode())
     {
         case KEY_HOME:
-            nItemPos = mpNoneItem.get() ? VALUESET_ITEM_NONEITEM : 0;
+            nItemPos = mpNoneItem ? VALUESET_ITEM_NONEITEM : 0;
             break;
 
         case KEY_END:
@@ -2527,7 +2527,7 @@ bool SvtValueSet::KeyInput( const KeyEvent& rKeyEvent )
                 {
                     nItemPos = nCurPos-1;
                 }
-                else if (mpNoneItem.get())
+                else if (mpNoneItem)
                 {
                     nItemPos = VALUESET_ITEM_NONEITEM;
                 }
@@ -2572,7 +2572,7 @@ bool SvtValueSet::KeyInput( const KeyEvent& rKeyEvent )
                     // Go up of a whole page
                     nItemPos = nCurPos-nVStep;
                 }
-                else if (mpNoneItem.get())
+                else if (mpNoneItem)
                 {
                     nItemPos = VALUESET_ITEM_NONEITEM;
                 }
@@ -3019,7 +3019,7 @@ void SvtValueSet::Format(vcl::RenderContext const & rRenderContext)
         nNoneHeight = 0;
         nNoneSpace = 0;
 
-        if (mpNoneItem.get())
+        if (mpNoneItem)
             mpNoneItem.reset(nullptr);
     }
 
@@ -3115,7 +3115,7 @@ void SvtValueSet::Format(vcl::RenderContext const & rRenderContext)
 
         if (nStyle & WB_NONEFIELD)
         {
-            if (mpNoneItem.get())
+            if (mpNoneItem)
             {
                 mpNoneItem->mbVisible = false;
                 mpNoneItem->maText = GetText();
@@ -3319,7 +3319,7 @@ void SvtValueSet::ImplDrawSelect(vcl::RenderContext& rRenderContext, sal_uInt16
         pItem = mItemList[ nPos ].get();
         aRect = ImplGetItemRect( nPos );
     }
-    else if (mpNoneItem.get())
+    else if (mpNoneItem)
     {
         pItem = mpNoneItem.get();
         aRect = maNoneItemRect;
diff --git a/svtools/source/misc/dialogcontrolling.cxx b/svtools/source/misc/dialogcontrolling.cxx
index fbfa4613c6dc..0e2836fed295 100644
--- a/svtools/source/misc/dialogcontrolling.cxx
+++ b/svtools/source/misc/dialogcontrolling.cxx
@@ -159,7 +159,8 @@ namespace svt
 
     void ControlDependencyManager::addController( const std::shared_ptr<DialogController>& _pController )
     {
-        OSL_ENSURE( _pController.get() != nullptr, "ControlDependencyManager::addController: invalid controller, this will crash, sooner or later!" );
+        OSL_ENSURE(_pController != nullptr, "ControlDependencyManager::addController: invalid "
+                                            "controller, this will crash, sooner or later!");
         m_pImpl->aControllers.push_back( _pController );
     }
 
diff --git a/svtools/source/misc/svtaccessiblefactory.cxx b/svtools/source/misc/svtaccessiblefactory.cxx
index b97384d29866..08bb8710a555 100644
--- a/svtools/source/misc/svtaccessiblefactory.cxx
+++ b/svtools/source/misc/svtaccessiblefactory.cxx
@@ -219,7 +219,7 @@ namespace svt
 
 #if HAVE_FEATURE_DESKTOP
         // load the library implementing the factory
-        if ( !s_pFactory.get() )
+        if (!s_pFactory)
         {
 #ifndef DISABLE_DYNLOADING
             const OUString sModuleName( SVLIBRARY( "acc" ));
@@ -249,7 +249,7 @@ namespace svt
         }
 #endif // HAVE_FEATURE_DESKTOP
 
-        if ( !s_pFactory.get() )
+        if (!s_pFactory)
             // the attempt to load the lib, or to create the factory, failed
             // -> fall back to a dummy factory
             s_pFactory = new AccessibleDummyFactory;