[Libreoffice-commits] core.git: vcl/source

[Noel Grandin (via logerrit)]

 vcl/source/control/button.cxx  |   18 +++++++++---------
 vcl/source/control/ctrl.cxx    |    4 ++--
 vcl/source/control/edit.cxx    |    2 +-
 vcl/source/control/listbox.cxx |    2 +-
 vcl/source/control/menubtn.cxx |    2 +-
 5 files changed, 14 insertions(+), 14 deletions(-)

New commits:
commit 75b6b7f66b6ff66f8d9945bccdef71952db2d966
Author:     Noel Grandin <noel.grandin at collabora.co.uk>
AuthorDate: Fri May 28 20:40:22 2021 +0200
Commit:     Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Fri May 28 22:25:25 2021 +0200

    IsDisposed->isDisposed in vcl/../control
    
    Change-Id: Icd5fb88f3827eddb307f5fe6b46667a72062e408
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116358
    Tested-by: Jenkins
    Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>

diff --git a/vcl/source/control/button.cxx b/vcl/source/control/button.cxx
index 1e47b8fbba35..897d55618151 100644
--- a/vcl/source/control/button.cxx
+++ b/vcl/source/control/button.cxx
@@ -1597,7 +1597,7 @@ void PushButton::SetPressed( bool bPressed )
 void PushButton::EndSelection()
 {
     EndTracking( TrackingEventFlags::Cancel );
-    if ( !IsDisposed() &&
+    if ( !isDisposed() &&
          GetButtonState() & DrawButtonFlags::Pressed )
     {
         GetButtonState() &= ~DrawButtonFlags::Pressed;
@@ -2273,7 +2273,7 @@ void RadioButton::ImplUncheckAllOther()
         if ( pWindow->IsChecked() )
         {
             pWindow->SetState( false );
-            if ( pWindow->IsDisposed() )
+            if ( pWindow->isDisposed() )
                 return;
         }
 
@@ -2291,18 +2291,18 @@ void RadioButton::ImplCallClick( bool bGrabFocus, GetFocusFlags nFocusFlags )
     VclPtr<vcl::Window> xWindow = this;
     if ( mbRadioCheck )
         ImplUncheckAllOther();
-    if ( xWindow->IsDisposed() )
+    if ( xWindow->isDisposed() )
         return;
     if ( bGrabFocus )
         ImplGrabFocus( nFocusFlags );
-    if ( xWindow->IsDisposed() )
+    if ( xWindow->isDisposed() )
         return;
     if ( mbStateChanged )
         Toggle();
-    if ( xWindow->IsDisposed() )
+    if ( xWindow->isDisposed() )
         return;
     Click();
-    if ( xWindow->IsDisposed() )
+    if ( xWindow->isDisposed() )
         return;
     mbStateChanged = false;
 }
@@ -2696,11 +2696,11 @@ void RadioButton::Check( bool bCheck )
     mbChecked = bCheck;
     VclPtr<vcl::Window> xWindow = this;
     CompatStateChanged( StateChangedType::State );
-    if ( xWindow->IsDisposed() )
+    if ( xWindow->isDisposed() )
         return;
     if ( bCheck && mbRadioCheck )
         ImplUncheckAllOther();
-    if ( xWindow->IsDisposed() )
+    if ( xWindow->isDisposed() )
         return;
     Toggle();
 }
@@ -3133,7 +3133,7 @@ void CheckBox::ImplCheck()
     VclPtr<vcl::Window> xWindow = this;
     Invalidate();
     Toggle();
-    if ( xWindow->IsDisposed() )
+    if ( xWindow->isDisposed() )
         return;
     Click();
 }
diff --git a/vcl/source/control/ctrl.cxx b/vcl/source/control/ctrl.cxx
index f0c01cdc4b0c..c7dba808975a 100644
--- a/vcl/source/control/ctrl.cxx
+++ b/vcl/source/control/ctrl.cxx
@@ -308,14 +308,14 @@ bool Control::ImplCallEventListenersAndHandler( VclEventId nEvent, std::function
 
     Control::CallEventListeners( nEvent );
 
-    if ( !xThis->IsDisposed() )
+    if ( !xThis->isDisposed() )
     {
         if (callHandler)
         {
             callHandler();
         }
 
-        if ( !xThis->IsDisposed() )
+        if ( !xThis->isDisposed() )
             return false;
     }
     return true;
diff --git a/vcl/source/control/edit.cxx b/vcl/source/control/edit.cxx
index f7ebe26568e6..f5bf3c47b427 100644
--- a/vcl/source/control/edit.cxx
+++ b/vcl/source/control/edit.cxx
@@ -2023,7 +2023,7 @@ void Edit::Command( const CommandEvent& rCEvt )
         else if (sCommand == "specialchar" && pImplFncGetSpecialChars)
         {
             OUString aChars = pImplFncGetSpecialChars(GetFrameWeld(), GetFont());
-            if (!IsDisposed()) // destroyed while the insert special character dialog was still open
+            if (!isDisposed()) // destroyed while the insert special character dialog was still open
             {
                 SetSelection( aSaveSel );
                 if (!aChars.isEmpty())
diff --git a/vcl/source/control/listbox.cxx b/vcl/source/control/listbox.cxx
index 43576679338b..cb3b74672c04 100644
--- a/vcl/source/control/listbox.cxx
+++ b/vcl/source/control/listbox.cxx
@@ -276,7 +276,7 @@ IMPL_LINK_NOARG(ListBox, ImplPopupModeEndHdl, FloatingWindow*, void)
 
             VclPtr<vcl::Window> xWindow = this;
             Select();
-            if ( xWindow->IsDisposed() )
+            if ( xWindow->isDisposed() )
                 return;
 
             mpImplLB->SetTravelSelect( bTravelSelect );
diff --git a/vcl/source/control/menubtn.cxx b/vcl/source/control/menubtn.cxx
index 157175de8337..33401186fc36 100644
--- a/vcl/source/control/menubtn.cxx
+++ b/vcl/source/control/menubtn.cxx
@@ -73,7 +73,7 @@ void MenuButton::ExecuteMenu()
         tools::Rectangle aRect(aPos, aSize );
         mpMenu->Execute(this, aRect, PopupMenuFlags::ExecuteDown);
 
-        if (IsDisposed())
+        if (isDisposed())
             return;
 
         mnCurItemId = mpMenu->GetCurItemId();