From 2209f2992dc3eda6a55a3f07e2f22f2caf772ac2 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Felix=20Paul=20K=C3=BChne?= Date: Wed, 27 Feb 2008 21:34:27 +0000 Subject: [PATCH] * coding style fixes (please don't do [NSString string], but use an empty constant. It's faster and nicer) --- modules/gui/macosx/update.h | 5 +---- modules/gui/macosx/update.m | 11 +++-------- 2 files changed, 4 insertions(+), 12 deletions(-) diff --git a/modules/gui/macosx/update.h b/modules/gui/macosx/update.h index e87f0298be..b3cf1654a6 100644 --- a/modules/gui/macosx/update.h +++ b/modules/gui/macosx/update.h @@ -22,12 +22,9 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. *****************************************************************************/ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif - #ifdef UPDATE_CHECK #import +#import "intf.h" #import @interface VLCUpdate : NSObject diff --git a/modules/gui/macosx/update.m b/modules/gui/macosx/update.m index 679784307f..920a991d6a 100644 --- a/modules/gui/macosx/update.m +++ b/modules/gui/macosx/update.m @@ -22,17 +22,12 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. *****************************************************************************/ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif - #ifdef UPDATE_CHECK /***************************************************************************** * Preamble *****************************************************************************/ #import "update.h" -#import "intf.h" static NSString * kPrefUpdateOnStartup = @"UpdateOnStartup"; static NSString * kPrefUpdateLastTimeChecked = @"UpdateLastTimeChecked"; @@ -173,8 +168,8 @@ static VLCUpdate *_o_sharedInstance = nil; if( uptodate ) { - [o_fld_releaseNote setString: [NSString string]]; - [o_fld_currentVersion setStringValue: [NSString string]]; + [o_fld_releaseNote setString: @""]; + [o_fld_currentVersion setStringValue: @""]; [o_fld_status setStringValue: _NS("This version of VLC is the latest available.")]; [o_btn_DownloadNow setEnabled: NO]; } @@ -212,7 +207,7 @@ static void updateCallback( void * p_data, vlc_bool_t b_success ) - (void)performDownload:(NSString *)path { - update_Download( p_u, (char*)[path UTF8String] ); + update_Download( p_u, [path UTF8String] ); [o_btn_DownloadNow setEnabled: NO]; [o_update_window orderOut: self]; update_Delete( p_u ); -- 2.39.2