vlc | branch: master | Jean-Baptiste Kempf <[email protected]> | Sat Feb 27 17:08:46 2016 +0100| [b634e6a9c812ac2cdc01635e53e9ab1f82683e56] | committer: Jean-Baptiste Kempf
Fix comments about Qt4 > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=b634e6a9c812ac2cdc01635e53e9ab1f82683e56 --- bin/vlc.c | 2 +- include/vlc/libvlc_media_player.h | 2 +- modules/gui/macosx/ConvertAndSave.m | 2 +- modules/gui/macosx/MainWindow.m | 2 +- modules/gui/skins2/src/dialogs.cpp | 2 +- modules/gui/skins2/src/skin_main.cpp | 2 +- modules/stream_out/stats.c | 2 +- src/input/resource.c | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/bin/vlc.c b/bin/vlc.c index e0deebe..0a33a0f 100644 --- a/bin/vlc.c +++ b/bin/vlc.c @@ -246,7 +246,7 @@ int main( int i_argc, const char *ppsz_argv[] ) libvlc_playlist_play (vlc, -1, 0, NULL); - /* Qt4 insists on catching SIGCHLD via signal handler. To work around that, + /* Qt insists on catching SIGCHLD via signal handler. To work around that, * unblock it after all our child threads are created. */ sigdelset (&set, SIGCHLD); pthread_sigmask (SIG_SETMASK, &set, NULL); diff --git a/include/vlc/libvlc_media_player.h b/include/vlc/libvlc_media_player.h index f384dcb..970bdf1 100644 --- a/include/vlc/libvlc_media_player.h +++ b/include/vlc/libvlc_media_player.h @@ -429,7 +429,7 @@ void libvlc_video_set_format_callbacks( libvlc_media_player_t *mp, * * Or it can be an NSView object. * - * If you want to use it along with Qt4 see the QMacCocoaViewContainer. Then + * If you want to use it along with Qt see the QMacCocoaViewContainer. Then * the following code should work: * @code{.mm} * { diff --git a/modules/gui/macosx/ConvertAndSave.m b/modules/gui/macosx/ConvertAndSave.m index 9b57352..c93ee0a 100644 --- a/modules/gui/macosx/ConvertAndSave.m +++ b/modules/gui/macosx/ConvertAndSave.m @@ -75,7 +75,7 @@ { NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults]; - /* We are using the same format as the Qt4 intf here: + /* We are using the same format as the Qt intf here: * Container(string), transcode video(bool), transcode audio(bool), * use subtitles(bool), video codec(string), video bitrate(integer), * scale(float), fps(float), width(integer, height(integer), diff --git a/modules/gui/macosx/MainWindow.m b/modules/gui/macosx/MainWindow.m index 796274b..4415c34 100644 --- a/modules/gui/macosx/MainWindow.m +++ b/modules/gui/macosx/MainWindow.m @@ -334,7 +334,7 @@ static const float f_min_window_height = 307.; SideBarItem *lanItem = [SideBarItem itemWithTitle:_NS("LOCAL NETWORK") identifier:@"localnetwork"]; SideBarItem *internetItem = [SideBarItem itemWithTitle:_NS("INTERNET") identifier:@"internet"]; - /* SD subnodes, inspired by the Qt4 intf */ + /* SD subnodes, inspired by the Qt intf */ char **ppsz_longnames = NULL; int *p_categories = NULL; char **ppsz_names = vlc_sd_GetNames(pl_Get(getIntf()), &ppsz_longnames, &p_categories); diff --git a/modules/gui/skins2/src/dialogs.cpp b/modules/gui/skins2/src/dialogs.cpp index bdf87cd..31eb526 100644 --- a/modules/gui/skins2/src/dialogs.cpp +++ b/modules/gui/skins2/src/dialogs.cpp @@ -164,7 +164,7 @@ bool Dialogs::init() m_pModule = module_need( m_pProvider, "dialogs provider", NULL, false ); if( m_pModule == NULL ) { - msg_Err( getIntf(), "no suitable dialogs provider found (hint: compile the qt4 plugin, and make sure it is loaded properly)" ); + msg_Err( getIntf(), "no suitable dialogs provider found (hint: compile the qt plugin, and make sure it is loaded properly)" ); vlc_object_release( m_pProvider ); m_pProvider = NULL; return false; diff --git a/modules/gui/skins2/src/skin_main.cpp b/modules/gui/skins2/src/skin_main.cpp index 0d2c2a2..8f3da3c 100644 --- a/modules/gui/skins2/src/skin_main.cpp +++ b/modules/gui/skins2/src/skin_main.cpp @@ -245,7 +245,7 @@ static void *Run( void * p_obj ) } if( Dialogs::instance( p_intf ) == NULL ) { - msg_Err( p_intf, "cannot instantiate qt4 dialogs provider" ); + msg_Err( p_intf, "cannot instantiate qt dialogs provider" ); b_error = true; goto end; } diff --git a/modules/stream_out/stats.c b/modules/stream_out/stats.c index 8d2ac27..51028dd 100644 --- a/modules/stream_out/stats.c +++ b/modules/stream_out/stats.c @@ -225,7 +225,7 @@ static int Send( sout_stream_t *p_stream, sout_stream_id_sys_t *id, char *outputhash = psz_md5_hash( &hash ); /* We could just set p_sys->output to stdout and remove user of msg_Dbg - * if we don't need ability to output info to gui modules (like qt4 messages window + * if we don't need ability to output info to gui modules (like qt messages window */ mtime_t dts_difference = VLC_TS_INVALID; if( likely( id->previous_dts != VLC_TS_INVALID ) ) diff --git a/src/input/resource.c b/src/input/resource.c index 3440288..0021cec 100644 --- a/src/input/resource.c +++ b/src/input/resource.c @@ -61,7 +61,7 @@ struct input_resource_t /* This lock is used to protect vout resources access (for hold) * It is a special case because of embed video (possible deadlock - * between vout window request and vout holds in some(qt4) interface) + * between vout window request and vout holds in some(qt) interface) */ vlc_mutex_t lock_hold; _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
