[vlc-devel] commit: Qt: avoid slots duplication. Remove one connects too. ( Jean-Baptiste Kempf )

[git version control]

vlc | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Mon Dec 29 20:05:45 2008 +0100| [212ac2d4bbf05dda77d26b6d380b3f92b6a76216] | committer: Jean-Baptiste Kempf 

Qt: avoid slots duplication. Remove one connects too.

Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>

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

 modules/gui/qt4/main_interface.cpp |   15 +++------------
 modules/gui/qt4/main_interface.hpp |    1 -
 2 files changed, 3 insertions(+), 13 deletions(-)

diff --git a/modules/gui/qt4/main_interface.cpp b/modules/gui/qt4/main_interface.cpp
index 6de7b03..88c0ef5 100644
--- a/modules/gui/qt4/main_interface.cpp
+++ b/modules/gui/qt4/main_interface.cpp
@@ -176,9 +176,7 @@ MainInterface::MainInterface( intf_thread_t *_p_intf ) : QVLCMW( _p_intf )
     /**
      * CONNECTS on PLAY_STATUS
      **/
-    /* Status on the main controller */
-    CONNECT( THEMIM->getIM(), statusChanged( int ), this, setStatus( int ) );
-    /* and in the systray */
+    /* Status on the systray */
     if( sysTray )
     {
         CONNECT( THEMIM->getIM(), statusChanged( int ), this,
@@ -828,15 +826,6 @@ void MainInterface::setName( QString name )
     nameLabel->setToolTip( " " + name +" " );
 }
 
-void MainInterface::setStatus( int status )
-{
-    msg_Dbg( p_intf, "Updating the stream status: %i", status );
-
-    /* And in the systray for the menu */
-    if( sysTray )
-        QVLCMenu::updateSystrayMenu( this, p_intf );
-}
-
 /*****************************************************************************
  * Systray Icon and Systray Menu
  *****************************************************************************/
@@ -948,6 +937,8 @@ void MainInterface::updateSystrayTooltipName( QString name )
                     QSystemTrayIcon::NoIcon, 3000 );
         }
     }
+
+    QVLCMenu::updateSystrayMenu( this, p_intf );
 }
 
 /**
diff --git a/modules/gui/qt4/main_interface.hpp b/modules/gui/qt4/main_interface.hpp
index f5b4ed3..061ce9c 100644
--- a/modules/gui/qt4/main_interface.hpp
+++ b/modules/gui/qt4/main_interface.hpp
@@ -161,7 +161,6 @@ public slots:
 private slots:
     void debug();
     void doComponentsUpdate();
-    void setStatus( int );
     void setName( QString );
     void setVLCWindowsTitle( QString title = "" );
 #if 0