From 0bb2110cebcae124ccf503de9e4863b6a8cc0982 Mon Sep 17 00:00:00 2001 From: Francois Cartegnie Date: Fri, 2 Mar 2012 00:46:28 +0100 Subject: [PATCH] Qt: Don't bypass (goto error) local variable declarations --- modules/gui/qt4/qt4.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/modules/gui/qt4/qt4.cpp b/modules/gui/qt4/qt4.cpp index 64d75a0eb7..73e84d539f 100644 --- a/modules/gui/qt4/qt4.cpp +++ b/modules/gui/qt4/qt4.cpp @@ -183,6 +183,12 @@ static void ShowDialog ( intf_thread_t *, int, int, intf_dialog_args_t * ); #define ICONCHANGE_LONGTEXT N_( \ "This option allows the interface to change its icon on various occasions.") +static const int i_notification_list[] = + { NOTIFICATION_NEVER, NOTIFICATION_MINIMIZED, NOTIFICATION_ALWAYS }; + +static const char *const psz_notification_list_text[] = + { N_("Never"), N_("When minimized"), N_("Always") }; + /**********************************************************************/ vlc_module_begin () set_shortname( "Qt" ) @@ -205,12 +211,6 @@ vlc_module_begin () #endif SYSTRAY_TEXT, SYSTRAY_LONGTEXT, false) - static const int i_notification_list[] = - { NOTIFICATION_NEVER, NOTIFICATION_MINIMIZED, NOTIFICATION_ALWAYS }; - - static const char *const psz_notification_list_text[] = - { N_("Never"), N_("When minimized"), N_("Always") }; - add_integer( "qt-notification", NOTIFICATION_MINIMIZED, NOTIFICATION_TEXT, NOTIFICATION_LONGTEXT, false ) -- 2.39.2