Remove useless parameter

diff --git a/modules/gui/qt4/components/interface_widgets.cpp b/modules/gui/qt4/components/interface_widgets.cpp
index cddd823c23e053b6552fd9b06510cccd62b8c349..d78ef8c0e426650234492a95940cf1342e826924 100644 (file)
--- a/modules/gui/qt4/components/interface_widgets.cpp
+++ b/modules/gui/qt4/components/interface_widgets.cpp
@@ -144,7 +144,7 @@ void VideoWidget::SetSizing( unsigned int w, unsigned int h )
     updateGeometry(); // Needed for deinterlace
 }
 
-void VideoWidget::release( void *p_win )
+void VideoWidget::release( void )
 {
     msg_Dbg( p_intf, "Video is not needed anymore" );
     p_vout = NULL;

diff --git a/modules/gui/qt4/components/interface_widgets.hpp b/modules/gui/qt4/components/interface_widgets.hpp
index 35aa00740936ef37ae889f9e00792b29fd20e41c..13eecc9b50b1d58012a8bb87eaf63ebcd9cd85e2 100644 (file)
--- a/modules/gui/qt4/components/interface_widgets.hpp
+++ b/modules/gui/qt4/components/interface_widgets.hpp
@@ -60,7 +60,7 @@ public:
 
     void *request( vout_thread_t *, int *, int *,
                    unsigned int *, unsigned int * );
-    void  release( void * );
+    void  release( void );
     int   control( void *, int, va_list );
 
     virtual QSize sizeHint() const;

diff --git a/modules/gui/qt4/main_interface.cpp b/modules/gui/qt4/main_interface.cpp
index 1ce149ec2f4a2962f9d941f57bde41bf8cbdf422..4665e5da2d81d8e65baa3447d8c87f27ef82b72e 100644 (file)
--- a/modules/gui/qt4/main_interface.cpp
+++ b/modules/gui/qt4/main_interface.cpp
@@ -206,8 +206,8 @@ MainInterface::MainInterface( intf_thread_t *_p_intf ) : QVLCMW( _p_intf )
 
 
     /* VideoWidget connects to avoid different threads speaking to each other */
-    CONNECT( this, askReleaseVideo( void * ),
-             this, releaseVideoSlot( void * ) );
+    CONNECT( this, askReleaseVideo( void ),
+             this, releaseVideoSlot( void ) );
     if( videoWidget )
         CONNECT( this, askVideoToResize( unsigned int, unsigned int ),
                  videoWidget, SetSizing( unsigned int, unsigned int ) );
@@ -650,17 +650,16 @@ void *MainInterface::requestVideo( vout_thread_t *p_nvout, int *pi_x,
 }
 
 /* Call from the WindowClose function */
-void MainInterface::releaseVideo( void *p_win )
+void MainInterface::releaseVideo( void )
 {
     if( fullscreenControls ) fullscreenControls->detachVout();
-    if( p_win )
-        emit askReleaseVideo( p_win );
+    emit askReleaseVideo( );
 }
 
 /* Function that is CONNECTED to the previous emit */
-void MainInterface::releaseVideoSlot( void *p_win )
+void MainInterface::releaseVideoSlot( void )
 {
-    videoWidget->release( p_win );
+    videoWidget->release( );
 
     if( bgWasVisible )
     {

diff --git a/modules/gui/qt4/main_interface.hpp b/modules/gui/qt4/main_interface.hpp
index d1c05003e2b5f6383c062d303c13da7ef6028054..cd58719eebc2147caaa62dacbf2f22f1ec383188 100644 (file)
--- a/modules/gui/qt4/main_interface.hpp
+++ b/modules/gui/qt4/main_interface.hpp
@@ -79,7 +79,7 @@ public:
     void *requestVideo( vout_thread_t *p_nvout, int *pi_x,
                         int *pi_y, unsigned int *pi_width,
                         unsigned int *pi_height );
-    void releaseVideo( void * );
+    void releaseVideo( void  );
     int controlVideo( void *p_window, int i_query, va_list args );
 
     /* Getters */
@@ -159,7 +159,7 @@ public slots:
     void toggleFSC();
 
     /* Manage the Video Functions from the vout threads */
-    void releaseVideoSlot( void * );
+    void releaseVideoSlot( void );
 
 private slots:
     void debug();
@@ -177,7 +177,7 @@ private slots:
     void showSpeedMenu( QPoint );
     void updateRecentsMenu();
 signals:
-    void askReleaseVideo( void * );
+    void askReleaseVideo( );
     void askVideoToResize( unsigned int, unsigned int );
     void askVideoToToggle();
     void askBgWidgetToToggle();

diff --git a/modules/gui/qt4/qt4.cpp b/modules/gui/qt4/qt4.cpp
index b52210e6248962785b7d975ad6c21f0655d8a25b..fac61dcfb61f7310ce655c29be5b48ceaa14076e 100644 (file)
--- a/modules/gui/qt4/qt4.cpp
+++ b/modules/gui/qt4/qt4.cpp
@@ -557,5 +557,5 @@ static void WindowClose (vlc_object_t *obj)
     QMutexLocker locker (&iface.lock);
 
     msg_Dbg (obj, "releasing video...");
-    p_mi->releaseVideo (wnd->handle);
+    p_mi->releaseVideo ();
 }