qt4 - Renaming a function.
authorJean-Baptiste Kempf <jb@videolan.org>
Tue, 17 Jul 2007 17:54:05 +0000 (17:54 +0000)
committerJean-Baptiste Kempf <jb@videolan.org>
Tue, 17 Jul 2007 17:54:05 +0000 (17:54 +0000)
modules/gui/qt4/main_interface.cpp
modules/gui/qt4/main_interface.hpp

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