Commit 212ac2d4 authored by Jean-Baptiste Kempf's avatar Jean-Baptiste Kempf

Qt: avoid slots duplication. Remove one connects too.

Signed-off-by: default avatarJean-Baptiste Kempf <jb@videolan.org>
parent f7a97201
...@@ -176,9 +176,7 @@ MainInterface::MainInterface( intf_thread_t *_p_intf ) : QVLCMW( _p_intf ) ...@@ -176,9 +176,7 @@ MainInterface::MainInterface( intf_thread_t *_p_intf ) : QVLCMW( _p_intf )
/** /**
* CONNECTS on PLAY_STATUS * CONNECTS on PLAY_STATUS
**/ **/
/* Status on the main controller */ /* Status on the systray */
CONNECT( THEMIM->getIM(), statusChanged( int ), this, setStatus( int ) );
/* and in the systray */
if( sysTray ) if( sysTray )
{ {
CONNECT( THEMIM->getIM(), statusChanged( int ), this, CONNECT( THEMIM->getIM(), statusChanged( int ), this,
...@@ -828,15 +826,6 @@ void MainInterface::setName( QString name ) ...@@ -828,15 +826,6 @@ void MainInterface::setName( QString name )
nameLabel->setToolTip( " " + 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 * Systray Icon and Systray Menu
*****************************************************************************/ *****************************************************************************/
...@@ -948,6 +937,8 @@ void MainInterface::updateSystrayTooltipName( QString name ) ...@@ -948,6 +937,8 @@ void MainInterface::updateSystrayTooltipName( QString name )
QSystemTrayIcon::NoIcon, 3000 ); QSystemTrayIcon::NoIcon, 3000 );
} }
} }
QVLCMenu::updateSystrayMenu( this, p_intf );
} }
/** /**
......
...@@ -161,7 +161,6 @@ public slots: ...@@ -161,7 +161,6 @@ public slots:
private slots: private slots:
void debug(); void debug();
void doComponentsUpdate(); void doComponentsUpdate();
void setStatus( int );
void setName( QString ); void setName( QString );
void setVLCWindowsTitle( QString title = "" ); void setVLCWindowsTitle( QString title = "" );
#if 0 #if 0
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment