Changeset 7cd22823b1e7e4b6a3f23e8f6624ded298459b73

Show
Ignore:
Timestamp:
06/28/08 11:49:56 (2 months ago)
Author:
Rémi Denis-Courmont <rdenis@simphalempin.com>
git-committer:
Rémi Denis-Courmont <rdenis@simphalempin.com> 1214646596 +0300
git-parent:

[264f09b66b24ea7d11e875d255c11f7e90947410]

git-author:
Rémi Denis-Courmont <rdenis@simphalempin.com> 1214646596 +0300
Message:

Fix function name clash

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • modules/gui/qt4/qt4.cpp

    r12b1883 r7cd2282  
    5555static void Close        ( vlc_object_t * ); 
    5656static int  OpenDialogs  ( vlc_object_t * ); 
    57 static int  OpenWindow   ( vlc_object_t * ); 
    58 static void CloseWindow  ( vlc_object_t * ); 
     57static int  WindowOpen   ( vlc_object_t * ); 
     58static void WindowClose  ( vlc_object_t * ); 
    5959static void Run          ( intf_thread_t * ); 
    6060static void Init         ( intf_thread_t * ); 
    …… 
    211211    add_submodule(); 
    212212        set_capability( "vout window", 50 ); 
    213         set_callbacks( OpenWindow, CloseWindow ); 
     213        set_callbacks( WindowOpen, WindowClose ); 
    214214vlc_module_end(); 
    215215 
    …… 
    462462#include <vlc_window.h> 
    463463 
    464 static int ControlWindow (vout_window_t *, int, va_list); 
    465  
    466 static int OpenWindow (vlc_object_t *obj) 
     464static int WindowControl (vout_window_t *, int, va_list); 
     465 
     466static int WindowOpen (vlc_object_t *obj) 
    467467{ 
    468468    vout_window_t *wnd = (vout_window_t *)obj; 
    …… 
    505505                                        &wnd->width, &wnd->height); 
    506506    windowLock.unlock (); 
    507     wnd->control = ControlWindow; 
     507    wnd->control = WindowControl; 
    508508    wnd->p_private = miP; 
    509509    return VLC_SUCCESS; 
    510510} 
    511511 
    512 static int ControlWindow (vout_window_t *wnd, int query, va_list args) 
     512static int WindowControl (vout_window_t *wnd, int query, va_list args) 
    513513{ 
    514514    QPointer<MainInterface> *miP = (QPointer<MainInterface> *)wnd->p_private; 
    …… 
    520520} 
    521521 
    522 static void CloseWindow (vlc_object_t *obj) 
     522static void WindowClose (vlc_object_t *obj) 
    523523{ 
    524524    vout_window_t *wnd = (vout_window_t *)obj;