[vlc-commits] skins2: remove dead code

[Erwan Tulou]

vlc | branch: master | Erwan Tulou <erwan10 at videolan.org> | Wed Feb  7 20:12:10 2018 +0100| [1bd9a6206f8dc2bd3ca97d854b9a6707aea4466a] | committer: Erwan Tulou

skins2: remove dead code

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=1bd9a6206f8dc2bd3ca97d854b9a6707aea4466a
---

 modules/gui/skins2/src/top_window.cpp | 7 ++-----
 modules/gui/skins2/src/top_window.hpp | 2 --
 2 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/modules/gui/skins2/src/top_window.cpp b/modules/gui/skins2/src/top_window.cpp
index 77842a32e2..56eb998ac9 100644
--- a/modules/gui/skins2/src/top_window.cpp
+++ b/modules/gui/skins2/src/top_window.cpp
@@ -62,7 +62,7 @@ TopWindow::TopWindow( intf_thread_t *pIntf, int left, int top,
     m_rWindowManager( rWindowManager ),
     m_pActiveLayout( NULL ), m_pLastHitControl( NULL ),
     m_pCapturingControl( NULL ), m_pFocusControl( NULL ),
-    m_pDragControl( NULL ), m_currModifier( 0 )
+    m_pDragControl( NULL )
 {
     // Register as a moving window
     m_rWindowManager.registerWindow( *this );
@@ -209,9 +209,6 @@ void TopWindow::processEvent( EvtKey &rEvtKey )
     {
         getIntf()->p_sys->p_dialogs->sendKey( rEvtKey.getModKey() );
     }
-
-    // Always store the modifier, which can be needed for scroll events.
-    m_currModifier = rEvtKey.getMod();
 }
 
 void TopWindow::processEvent( EvtScroll &rEvtScroll )
@@ -237,7 +234,7 @@ void TopWindow::processEvent( EvtScroll &rEvtScroll )
     {
         // Treat the scroll event as a hotkey plus current modifiers
         int i = (rEvtScroll.getDirection() == EvtScroll::kUp ?
-                 KEY_MOUSEWHEELUP : KEY_MOUSEWHEELDOWN) | m_currModifier;
+                 KEY_MOUSEWHEELUP : KEY_MOUSEWHEELDOWN) | rEvtScroll.getMod();
 
         getIntf()->p_sys->p_dialogs->sendKey( i );
     }
diff --git a/modules/gui/skins2/src/top_window.hpp b/modules/gui/skins2/src/top_window.hpp
index a64dd49d59..8979ba326b 100644
--- a/modules/gui/skins2/src/top_window.hpp
+++ b/modules/gui/skins2/src/top_window.hpp
@@ -119,8 +119,6 @@ private:
     CtrlGeneric *m_pFocusControl;
     /// Control over which drag&drop is hovering
     CtrlGeneric *m_pDragControl;
-    /// Current key modifier (also used for mouse)
-    int m_currModifier;
 
     /// Variable for the visibility of the window
     VarBoolImpl *m_pVarMaximized;