Commit b6a2c4a4 authored by Jean-Baptiste Kempf's avatar Jean-Baptiste Kempf

Use Qt instead of Qt4

parent 6ef3c715
......@@ -1065,7 +1065,7 @@ static int FullscreenControllerWidgetFullscreenChanged( vlc_object_t *vlc_object
vout_thread_t *p_vout = (vout_thread_t *) vlc_object;
msg_Dbg( p_vout, "Qt4: Fullscreen state changed" );
msg_Dbg( p_vout, "Qt: Fullscreen state changed" );
FullscreenControllerWidget *p_fs = (FullscreenControllerWidget *)data;
p_fs->fullscreenChanged( p_vout, new_val.b_bool, var_GetInteger( p_vout, "mouse-hide-timeout" ) );
......
......@@ -114,7 +114,7 @@ AboutDialog::AboutDialog( intf_thread_t *_p_intf)
+ qfu( VLC_CompileBy() )+ " on " + qfu( VLC_CompileHost() ) +
+ " ("__DATE__" "__TIME__").\n"
+ qtr( "Compiler: " ) + qfu( VLC_Compiler() ) + ".\n"
+ qtr( "You are using the Qt4 Interface.\n\n" )
+ qtr( "You are using the Qt Interface.\n\n" )
+ qtr( "Copyright (C) " ) + COPYRIGHT_YEARS
+ qtr( " by the VideoLAN Team.\n" )
+ "http://www.videolan.org" );
......
/*****************************************************************************
* qt4.cpp : QT4 interface
* qt4.cpp : Qt interface
****************************************************************************
* Copyright © 2006-2009 the VideoLAN team
* $Id$
......@@ -311,7 +311,7 @@ vlc_module_end ()
/*****************************************/
/* Ugly, but the Qt4 interface assumes single instance anyway */
/* Ugly, but the Qt interface assumes single instance anyway */
static vlc_sem_t ready;
static QMutex lock;
static bool busy = false;
......@@ -360,7 +360,7 @@ static int Open( vlc_object_t *p_this, bool isDialogProvider )
QMutexLocker locker (&lock);
if (busy)
{
msg_Err (p_this, "cannot start Qt4 multiple times");
msg_Err (p_this, "cannot start Qt multiple times");
return VLC_EGENERIC;
}
......@@ -401,7 +401,7 @@ static int Open( vlc_object_t *p_this, bool isDialogProvider )
return VLC_SUCCESS;
}
/* Open qt4 interface */
/* Open Qt interface */
static int OpenIntf( vlc_object_t *p_this )
{
return Open( p_this, false );
......@@ -607,7 +607,7 @@ static int WindowOpen( vout_window_t *p_wnd, const vout_window_cfg_t *cfg )
(intf_thread_t *)var_InheritAddress( p_wnd, "qt4-iface" );
if( !p_intf )
{ /* If another interface is used, this plugin cannot work */
msg_Dbg( p_wnd, "Qt4 interface not found" );
msg_Dbg( p_wnd, "Qt interface not found" );
return VLC_EGENERIC;
}
......
/*****************************************************************************
* qt4.hpp : QT4 interface
* qt4.hpp : Qt interface
****************************************************************************
* Copyright (C) 2006-2009 the VideoLAN team
* $Id$
......
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