diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2016-12-06 13:26:09 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2016-12-07 07:10:39 +0000 |
| commit | 2d48f5fc0a4f7b5b8c9d3a4f4cc85d5f3a7e5053 (patch) | |
| tree | c2e18df7dd44255e98c91f242194fd9bb66f3f3e /extensions/source | |
| parent | ed80d28d9f019a1afa2edd66e115eae26ea19963 (diff) | |
convert VCLEVENT constants to scoped enum
Change-Id: Ic8ccb0a9715ec05182dacddab2c015b0de6a0fba
Reviewed-on: https://gerrit.libreoffice.org/31675
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'extensions/source')
| -rw-r--r-- | extensions/source/update/ui/updatecheckui.cxx | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/extensions/source/update/ui/updatecheckui.cxx b/extensions/source/update/ui/updatecheckui.cxx index ab3b54c592fc..d1297893d403 100644 --- a/extensions/source/update/ui/updatecheckui.cxx +++ b/extensions/source/update/ui/updatecheckui.cxx @@ -656,9 +656,9 @@ IMPL_LINK_NOARG(UpdateCheckUI, UserEventHdl, void*, void) IMPL_LINK( UpdateCheckUI, WindowEventHdl, VclWindowEvent&, rEvent, void ) { - sal_uLong nEventID = rEvent.GetId(); + VclEventId nEventID = rEvent.GetId(); - if ( VCLEVENT_OBJECT_DYING == nEventID ) + if ( VclEventId::ObjectDying == nEventID ) { SolarMutexGuard aGuard; if ( mpIconSysWin == rEvent.GetWindow() ) @@ -667,7 +667,7 @@ IMPL_LINK( UpdateCheckUI, WindowEventHdl, VclWindowEvent&, rEvent, void ) RemoveBubbleWindow( true ); } } - else if ( VCLEVENT_WINDOW_MENUBARADDED == nEventID ) + else if ( VclEventId::WindowMenubarAdded == nEventID ) { SolarMutexGuard aGuard; vcl::Window *pWindow = rEvent.GetWindow(); @@ -680,15 +680,15 @@ IMPL_LINK( UpdateCheckUI, WindowEventHdl, VclWindowEvent&, rEvent, void ) } } } - else if ( VCLEVENT_WINDOW_MENUBARREMOVED == nEventID ) + else if ( VclEventId::WindowMenubarRemoved == nEventID ) { SolarMutexGuard aGuard; MenuBar *pMBar = static_cast<MenuBar*>(rEvent.GetData()); if ( pMBar && ( pMBar == mpIconMBar ) ) RemoveBubbleWindow( true ); } - else if ( ( nEventID == VCLEVENT_WINDOW_MOVE ) || - ( nEventID == VCLEVENT_WINDOW_RESIZE ) ) + else if ( ( nEventID == VclEventId::WindowMove ) || + ( nEventID == VclEventId::WindowResize ) ) { SolarMutexGuard aGuard; if ( ( mpIconSysWin == rEvent.GetWindow() ) && @@ -708,9 +708,9 @@ IMPL_LINK( UpdateCheckUI, ApplicationEventHdl, VclSimpleEvent&, rEvent, void) { switch (rEvent.GetId()) { - case VCLEVENT_WINDOW_SHOW: - case VCLEVENT_WINDOW_ACTIVATE: - case VCLEVENT_WINDOW_GETFOCUS: { + case VclEventId::WindowShow: + case VclEventId::WindowActivate: + case VclEventId::WindowGetFocus: { SolarMutexGuard aGuard; vcl::Window *pWindow = static_cast< VclWindowEvent * >(&rEvent)->GetWindow(); @@ -725,6 +725,7 @@ IMPL_LINK( UpdateCheckUI, ApplicationEventHdl, VclSimpleEvent&, rEvent, void) } break; } + default: break; } } |