[vlc-commits] gui: qt: Fix build with Qt4

[Hugo Beauzée-Luyssen]

vlc/vlc-2.2 | branch: master | Hugo Beauzée-Luyssen <hugo at beauzee.fr> | Thu Dec 29 16:30:38 2016 +0100| [3d79a0e6f1f037f0085c9221508333c3dd7c877b] | committer: Hugo Beauzée-Luyssen

gui: qt: Fix build with Qt4

(cherry picked from commit d9961de0126a54ee549107e21f0a9bb5f1a532b3)
Signed-off-by: Hugo Beauzée-Luyssen <hugo at beauzee.fr>

> http://git.videolan.org/gitweb.cgi/vlc/vlc-2.2.git/?a=commit;h=3d79a0e6f1f037f0085c9221508333c3dd7c877b
---

 modules/gui/qt4/components/controller.cpp | 6 +++---
 modules/gui/qt4/components/controller.hpp | 4 ++++
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/modules/gui/qt4/components/controller.cpp b/modules/gui/qt4/components/controller.cpp
index 8468482..59f348a 100644
--- a/modules/gui/qt4/components/controller.cpp
+++ b/modules/gui/qt4/components/controller.cpp
@@ -1093,7 +1093,7 @@ void FullscreenControllerWidget::keyPressEvent( QKeyEvent *event )
 }
 
 /* */
-static int FullscreenControllerWidgetFullscreenChanged( vlc_object_t *vlc_object,
+int FullscreenControllerWidget::FullscreenChanged( vlc_object_t *vlc_object,
                 const char *variable, vlc_value_t old_val,
                 vlc_value_t new_val,  void *data )
 {
@@ -1151,7 +1151,7 @@ void FullscreenControllerWidget::setVoutList( vout_thread_t **pp_vout, int i_vou
     foreach( vout_thread_t *p_vout, del )
     {
         var_DelCallback( p_vout, "fullscreen",
-                         FullscreenControllerWidgetFullscreenChanged, this );
+                         FullscreenControllerWidget::FullscreenChanged, this );
         vlc_mutex_lock( &lock );
         fullscreenChanged( p_vout, false, 0 );
         vout.removeAll( p_vout );
@@ -1176,7 +1176,7 @@ void FullscreenControllerWidget::setVoutList( vout_thread_t **pp_vout, int i_vou
         vlc_mutex_lock( &lock );
         vout.append( p_vout );
         var_AddCallback( p_vout, "fullscreen",
-                         FullscreenControllerWidgetFullscreenChanged, this );
+                         FullscreenControllerWidget::FullscreenChanged, this );
         /* I miss a add and fire */
         fullscreenChanged( p_vout, var_GetBool( THEPL, "fullscreen" ),
                            var_GetInteger( p_vout, "mouse-hide-timeout" ) );
diff --git a/modules/gui/qt4/components/controller.hpp b/modules/gui/qt4/components/controller.hpp
index 2a65e19..20865a2 100644
--- a/modules/gui/qt4/components/controller.hpp
+++ b/modules/gui/qt4/components/controller.hpp
@@ -266,6 +266,10 @@ public:
     void updateFullwidthGeometry( int number );
     int targetScreen();
 
+private:
+    static int FullscreenChanged( vlc_object_t *obj,
+                    const char *, vlc_value_t, vlc_value_t new_val, void *data );
+
 signals:
     void keyPressed( QKeyEvent * );
     void fullscreenChanged( bool );