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>

2 files changed, 11 insertions, 11 deletions

diff --git a/avmedia/source/opengl/oglwindow.cxx b/avmedia/source/opengl/oglwindow.cxx
index 15ec0f7a52db..88209d55ee5c 100644
--- a/avmedia/source/opengl/oglwindow.cxx
+++ b/avmedia/source/opengl/oglwindow.cxx
@@ -201,7 +201,7 @@ void SAL_CALL OGLWindow::removePaintListener( const uno::Reference< awt::XPaintL
 
 IMPL_LINK(OGLWindow, FocusGrabber, VclWindowEvent&, rEvent, void)
 {
-    if( rEvent.GetId() == VCLEVENT_WINDOW_MOUSEMOVE )
+    if( rEvent.GetId() == VclEventId::WindowMouseMove )
     {
         MouseEvent* pMouseEvt = static_cast<MouseEvent*>(rEvent.GetData());
         if(pMouseEvt)
@@ -227,7 +227,7 @@ IMPL_LINK(OGLWindow, FocusGrabber, VclWindowEvent&, rEvent, void)
 
 IMPL_LINK(OGLWindow, CameraHandler, VclWindowEvent&, rEvent, void)
 {
-    if( rEvent.GetId() == VCLEVENT_WINDOW_KEYINPUT )
+    if( rEvent.GetId() == VclEventId::WindowKeyInput )
     {
         KeyEvent* pKeyEvt = static_cast<KeyEvent*>(rEvent.GetData());
         if(pKeyEvt)
@@ -332,7 +332,7 @@ IMPL_LINK(OGLWindow, CameraHandler, VclWindowEvent&, rEvent, void)
             }
         }
     }
-    else if( rEvent.GetId() == VCLEVENT_WINDOW_MOUSEBUTTONDOWN )
+    else if( rEvent.GetId() == VclEventId::WindowMouseButtonDown )
     {
         MouseEvent* pMouseEvt = static_cast<MouseEvent*>(rEvent.GetData());
         if(pMouseEvt && pMouseEvt->IsLeft() && pMouseEvt->GetClicks() == 1)
@@ -340,7 +340,7 @@ IMPL_LINK(OGLWindow, CameraHandler, VclWindowEvent&, rEvent, void)
             m_aLastMousePos = pMouseEvt->GetPosPixel();
         }
     }
-    else if( rEvent.GetId() == VCLEVENT_WINDOW_MOUSEMOVE )
+    else if( rEvent.GetId() == VclEventId::WindowMouseMove )
     {
         if ( !m_rEventHandler.HasFocus() )
         {
@@ -374,7 +374,7 @@ IMPL_LINK(OGLWindow, CameraHandler, VclWindowEvent&, rEvent, void)
             m_aLastMousePos = aCurPos;
         }
     }
-    else if( rEvent.GetId() == VCLEVENT_WINDOW_MOUSEBUTTONUP )
+    else if( rEvent.GetId() == VclEventId::WindowMouseButtonUp )
     {
         MouseEvent* pMouseEvt = static_cast<MouseEvent*>(rEvent.GetData());
         if(pMouseEvt && pMouseEvt->IsLeft() && pMouseEvt->GetClicks() == 1)
diff --git a/avmedia/source/viewer/mediaevent_impl.cxx b/avmedia/source/viewer/mediaevent_impl.cxx
index 61634bc04b29..87ec80daa2b4 100644
--- a/avmedia/source/viewer/mediaevent_impl.cxx
+++ b/avmedia/source/viewer/mediaevent_impl.cxx
@@ -65,7 +65,7 @@ void SAL_CALL MediaEventListenersImpl::keyPressed( const css::awt::KeyEvent& e )
                                   ( ( e.Modifiers & 4 ) ? KEY_MOD2 : 0 ) );
         KeyEvent aVCLKeyEvt( e.KeyChar, aVCLKeyCode );
 
-        Application::PostKeyEvent( VCLEVENT_WINDOW_KEYINPUT, reinterpret_cast< vcl::Window* >( mpNotifyWindow.get() ), &aVCLKeyEvt );
+        Application::PostKeyEvent( VclEventId::WindowKeyInput, reinterpret_cast< vcl::Window* >( mpNotifyWindow.get() ), &aVCLKeyEvt );
     }
 }
 
@@ -83,7 +83,7 @@ void SAL_CALL MediaEventListenersImpl::keyReleased( const css::awt::KeyEvent& e
                                   ( ( e.Modifiers & 2 ) ? KEY_MOD1 : 0 ) |
                                   ( ( e.Modifiers & 4 ) ? KEY_MOD2 : 0 ) );
         KeyEvent aVCLKeyEvt( e.KeyChar, aVCLKeyCode );
-        Application::PostKeyEvent( VCLEVENT_WINDOW_KEYUP, reinterpret_cast< vcl::Window* >( mpNotifyWindow.get() ), &aVCLKeyEvt );
+        Application::PostKeyEvent( VclEventId::WindowKeyUp, reinterpret_cast< vcl::Window* >( mpNotifyWindow.get() ), &aVCLKeyEvt );
     }
 }
 
@@ -103,7 +103,7 @@ void SAL_CALL MediaEventListenersImpl::mousePressed( const css::awt::MouseEvent&
                                 ( ( e.Buttons & 2 ) ? MOUSE_RIGHT : 0 ) |
                                 ( ( e.Buttons & 4 ) ? MOUSE_MIDDLE : 0 ),
                                 e.Modifiers );
-        Application::PostMouseEvent( VCLEVENT_WINDOW_MOUSEBUTTONDOWN, reinterpret_cast< vcl::Window* >( mpNotifyWindow.get() ), &aVCLMouseEvt );
+        Application::PostMouseEvent( VclEventId::WindowMouseButtonDown, reinterpret_cast< vcl::Window* >( mpNotifyWindow.get() ), &aVCLMouseEvt );
     }
 }
 
@@ -123,7 +123,7 @@ void SAL_CALL MediaEventListenersImpl::mouseReleased( const css::awt::MouseEvent
                                 ( ( e.Buttons & 2 ) ? MOUSE_RIGHT : 0 ) |
                                 ( ( e.Buttons & 4 ) ? MOUSE_MIDDLE : 0 ),
                                 e.Modifiers );
-        Application::PostMouseEvent( VCLEVENT_WINDOW_MOUSEBUTTONUP, reinterpret_cast< vcl::Window* >( mpNotifyWindow.get() ), &aVCLMouseEvt );
+        Application::PostMouseEvent( VclEventId::WindowMouseButtonUp, reinterpret_cast< vcl::Window* >( mpNotifyWindow.get() ), &aVCLMouseEvt );
     }
 }
 
@@ -161,7 +161,7 @@ void SAL_CALL MediaEventListenersImpl::mouseDragged( const css::awt::MouseEvent&
     if( mpNotifyWindow )
     {
         MouseEvent aVCLMouseEvt( Point( e.X, e.Y ), 0, MouseEventModifiers::NONE, e.Buttons, e.Modifiers );
-        Application::PostMouseEvent( VCLEVENT_WINDOW_MOUSEMOVE, reinterpret_cast< vcl::Window* >( mpNotifyWindow.get() ), &aVCLMouseEvt );
+        Application::PostMouseEvent( VclEventId::WindowMouseMove, reinterpret_cast< vcl::Window* >( mpNotifyWindow.get() ), &aVCLMouseEvt );
     }
 }
 
@@ -175,7 +175,7 @@ void SAL_CALL MediaEventListenersImpl::mouseMoved( const css::awt::MouseEvent& e
     if( mpNotifyWindow )
     {
         MouseEvent aVCLMouseEvt( Point( e.X, e.Y ), 0, MouseEventModifiers::NONE, e.Buttons, e.Modifiers );
-        Application::PostMouseEvent( VCLEVENT_WINDOW_MOUSEMOVE, reinterpret_cast< vcl::Window* >( mpNotifyWindow.get() ), &aVCLMouseEvt );
+        Application::PostMouseEvent( VclEventId::WindowMouseMove, reinterpret_cast< vcl::Window* >( mpNotifyWindow.get() ), &aVCLMouseEvt );
     }
 }