Commit 322448e4 authored by Jean-Baptiste Kempf's avatar Jean-Baptiste Kempf

qt4 - Renaming a function.

parent 4af342f9
...@@ -123,16 +123,16 @@ MainInterface::MainInterface( intf_thread_t *_p_intf ) : QVLCMW( _p_intf ) ...@@ -123,16 +123,16 @@ MainInterface::MainInterface( intf_thread_t *_p_intf ) : QVLCMW( _p_intf )
setAcceptDrops(true); setAcceptDrops(true);
/* Systray */ /* Systray */
systray = NULL; sysTray = NULL;
if( QSystemTrayIcon::isSystemTrayAvailable() && if( QSystemTrayIcon::isSystemTrayAvailable() &&
( config_GetInt( p_intf, "qt-start-mininimized") == 1) ) ( config_GetInt( p_intf, "qt-start-mininimized") == 1) )
{ {
hide(); hide();
createSystrayMenu(); createSystray();
} }
if( QSystemTrayIcon::isSystemTrayAvailable() && if( QSystemTrayIcon::isSystemTrayAvailable() &&
( config_GetInt( p_intf, "qt-system-tray") == 1) ) ( config_GetInt( p_intf, "qt-system-tray") == 1) )
createSystrayMenu(); createSystray();
/* Init input manager */ /* Init input manager */
MainInputManager::getInstance( p_intf ); MainInputManager::getInstance( p_intf );
...@@ -150,7 +150,7 @@ MainInterface::MainInterface( intf_thread_t *_p_intf ) : QVLCMW( _p_intf ) ...@@ -150,7 +150,7 @@ MainInterface::MainInterface( intf_thread_t *_p_intf ) : QVLCMW( _p_intf )
/* Naming in the controller */ /* Naming in the controller */
CONNECT( THEMIM->getIM(), nameChanged( QString ), this, CONNECT( THEMIM->getIM(), nameChanged( QString ), this,
setName( QString ) ); setName( QString ) );
if( config_GetInt( p_intf, "qt-system-tray" ) && systray ) if( config_GetInt( p_intf, "qt-system-tray" ) && sysTray )
{ {
CONNECT( THEMIM->getIM(), nameChanged( QString ), this, CONNECT( THEMIM->getIM(), nameChanged( QString ), this,
updateSystrayTooltipName( QString ) ); updateSystrayTooltipName( QString ) );
...@@ -165,7 +165,7 @@ MainInterface::MainInterface( intf_thread_t *_p_intf ) : QVLCMW( _p_intf ) ...@@ -165,7 +165,7 @@ MainInterface::MainInterface( intf_thread_t *_p_intf ) : QVLCMW( _p_intf )
CONNECT( THEMIM->getIM(), statusChanged( int ), this, setStatus( int ) ); CONNECT( THEMIM->getIM(), statusChanged( int ), this, setStatus( int ) );
CONNECT( THEMIM->getIM(), navigationChanged( int ), CONNECT( THEMIM->getIM(), navigationChanged( int ),
this, setNavigation(int) ); this, setNavigation(int) );
if( config_GetInt( p_intf, "qt-system-tray" ) && systray ) if( config_GetInt( p_intf, "qt-system-tray" ) && sysTray )
{ {
CONNECT( THEMIM->getIM(), statusChanged( int ), this, CONNECT( THEMIM->getIM(), statusChanged( int ), this,
updateSystrayTooltipStatus( int ) ); updateSystrayTooltipStatus( int ) );
......
...@@ -84,7 +84,7 @@ private: ...@@ -84,7 +84,7 @@ private:
void handleMainUi( QSettings* ); void handleMainUi( QSettings* );
void handleSystray(); void handleSystray();
void doComponentsUpdate(); void doComponentsUpdate();
void createSystrayMenu(); void createSystray();
/* Video */ /* Video */
VideoWidget *videoWidget; VideoWidget *videoWidget;
......
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