macosx: fixed a bunch of compilation warnings, which popped up using newer Xcode release

no functional changes
(cherry picked from commit f7986362337e1af1b181b8cd0244894de6070db4)

modules/gui/macosx/MainMenu.m

@@ -506,7 +506,7 @@ static VLCMainMenu *_o_sharedInstance = nil;
     for (NSUInteger i = 0; i < count; i++)
     {
         s_rect = [[o_screens objectAtIndex: i] frame];
-        [o_submenu addItemWithTitle: [NSString stringWithFormat: @"%@ %i (%ix%i)", _NS("Screen"), i+1,
+        [o_submenu addItemWithTitle: [NSString stringWithFormat: @"%@ %li (%ix%i)", _NS("Screen"), i+1,
                                       (int)s_rect.size.width, (int)s_rect.size.height] action:@selector(toggleFullscreenDevice:) keyEquivalent:@""];
         o_mitem = [o_submenu itemAtIndex:i+1];
         [o_mitem setTag: (int)[[o_screens objectAtIndex: i] displayID]];

modules/gui/macosx/PXSourceList.m

@@ -344,7 +344,7 @@ NSString * const PXSLDeleteKeyPressedOnRowsNotification = @"PXSourceListDeleteKe
         return NSZeroSize;
     }
 
-    NSAttributedString *badgeAttrString = [[NSAttributedString alloc] initWithString:[NSString stringWithFormat:@"%d", [self badgeValueForItem:rowItem]] attributes:[NSDictionary dictionaryWithObjectsAndKeys:BADGE_FONT, NSFontAttributeName, nil]];
+    NSAttributedString *badgeAttrString = [[NSAttributedString alloc] initWithString:[NSString stringWithFormat:@"%ld", [self badgeValueForItem:rowItem]] attributes:[NSDictionary dictionaryWithObjectsAndKeys:BADGE_FONT, NSFontAttributeName, nil]];
     NSSize stringSize = [badgeAttrString size];
 
     //Calculate the width needed to display the text or the minimum width if it's smaller
@@ -492,7 +492,7 @@ NSString * const PXSLDeleteKeyPressedOnRowsNotification = @"PXSourceListDeleteKe
     [badgePath fill];
 
     //Draw the badge text
-    NSAttributedString *badgeAttrString = [[NSAttributedString alloc] initWithString:[NSString stringWithFormat:@"%d", [self badgeValueForItem:rowItem]] attributes:attributes];
+    NSAttributedString *badgeAttrString = [[NSAttributedString alloc] initWithString:[NSString stringWithFormat:@"%ld", [self badgeValueForItem:rowItem]] attributes:attributes];
 
     NSSize stringSize = [badgeAttrString size];
     NSPoint badgeTextPoint = NSMakePoint(NSMidX(badgeFrame)-(stringSize.width/2.0), //Center in the badge frame

modules/gui/macosx/VideoEffects.m

@@ -239,7 +239,7 @@ static VLCVideoEffects *_o_sharedInstance = nil;
     [o_adjust_brightness_sld setToolTip: [NSString stringWithFormat:@"%0.3f", config_GetFloat( p_intf, "brightness" )]];
     [o_adjust_contrast_sld setToolTip: [NSString stringWithFormat:@"%0.3f", config_GetFloat( p_intf, "contrast" )]];
     [o_adjust_gamma_sld setToolTip: [NSString stringWithFormat:@"%0.3f", config_GetFloat( p_intf, "gamma" )]];
-    [o_adjust_hue_sld setToolTip: [NSString stringWithFormat:@"%i", config_GetInt( p_intf, "hue" )]];
+    [o_adjust_hue_sld setToolTip: [NSString stringWithFormat:@"%lli", config_GetInt( p_intf, "hue" )]];
     [o_adjust_saturation_sld setToolTip: [NSString stringWithFormat:@"%0.3f", config_GetFloat( p_intf, "saturation" )]];
     b_state = [o_adjust_ckb state];
     [o_adjust_brightness_sld setEnabled: b_state];
@@ -259,7 +259,7 @@ static VLCVideoEffects *_o_sharedInstance = nil;
     [o_sharpen_sld setEnabled: [o_sharpen_ckb state]];
     [o_sharpen_lbl setEnabled: [o_sharpen_ckb state]];
     [o_banding_sld setIntValue: config_GetInt( p_intf, "gradfun-radius" )];
-    [o_banding_sld setToolTip: [NSString stringWithFormat:@"%i", config_GetInt( p_intf, "gradfun-radius" )]];
+    [o_banding_sld setToolTip: [NSString stringWithFormat:@"%lli", config_GetInt( p_intf, "gradfun-radius" )]];
     [o_banding_sld setEnabled: [o_banding_ckb state]];
     [o_banding_lbl setEnabled: [o_banding_ckb state]];
     [o_grain_sld setFloatValue: config_GetFloat( p_intf, "grain-variance" )];
@@ -294,11 +294,11 @@ static VLCVideoEffects *_o_sharedInstance = nil;
     [o_puzzle_columns_lbl setEnabled: b_state];
     [o_puzzle_blackslot_ckb setEnabled: b_state];
 
-    [o_threshold_color_fld setStringValue: [[NSString stringWithFormat:@"%x", config_GetInt( p_intf, "colorthres-color" )] uppercaseString]];
+    [o_threshold_color_fld setStringValue: [[NSString stringWithFormat:@"%llx", config_GetInt( p_intf, "colorthres-color" )] uppercaseString]];
     [o_threshold_saturation_sld setIntValue: config_GetInt( p_intf, "colorthres-saturationthres" )];
-    [o_threshold_saturation_sld setToolTip: [NSString stringWithFormat:@"%i", config_GetInt( p_intf, "colorthres-saturationthres" )]];
+    [o_threshold_saturation_sld setToolTip: [NSString stringWithFormat:@"%lli", config_GetInt( p_intf, "colorthres-saturationthres" )]];
     [o_threshold_similarity_sld setIntValue: config_GetInt( p_intf, "colorthres-similaritythres" )];
-    [o_threshold_similarity_sld setToolTip: [NSString stringWithFormat:@"%i", config_GetInt( p_intf, "colorthres-similaritythres" )]];
+    [o_threshold_similarity_sld setToolTip: [NSString stringWithFormat:@"%lli", config_GetInt( p_intf, "colorthres-similaritythres" )]];
     b_state = [o_threshold_ckb state];
     [o_threshold_color_fld setEnabled: b_state];
     [o_threshold_color_lbl setEnabled: b_state];
@@ -325,14 +325,14 @@ static VLCVideoEffects *_o_sharedInstance = nil;
     [o_gradient_mode_lbl setEnabled: b_state];
     [o_gradient_cartoon_ckb setEnabled: b_state];
     [o_gradient_color_ckb setEnabled: b_state];
-    [o_extract_fld setStringValue: [[NSString stringWithFormat:@"%x", config_GetInt( p_intf, "extract-component" )] uppercaseString]];
+    [o_extract_fld setStringValue: [[NSString stringWithFormat:@"%llx", config_GetInt( p_intf, "extract-component" )] uppercaseString]];
     [o_extract_fld setEnabled: [o_extract_ckb state]];
     [o_extract_lbl setEnabled: [o_extract_ckb state]];
     [o_posterize_fld setIntValue: config_GetInt( p_intf, "posterize-level" )];
     [o_posterize_fld setEnabled: [o_posterize_ckb state]];
     [o_posterize_lbl setEnabled: [o_posterize_ckb state]];
     [o_blur_sld setIntValue: config_GetInt( p_intf, "blur-factor" )];
-    [o_blur_sld setToolTip: [NSString stringWithFormat:@"%i", config_GetInt( p_intf, "blur-factor" )]];
+    [o_blur_sld setToolTip: [NSString stringWithFormat:@"%lli", config_GetInt( p_intf, "blur-factor" )]];
     [o_blur_sld setEnabled: [o_blur_ckb state]];
     [o_blur_lbl setEnabled: [o_blur_ckb state]];
 
@@ -357,7 +357,7 @@ static VLCVideoEffects *_o_sharedInstance = nil;
     }
     [o_addlogo_pos_pop selectItemWithTag: config_GetInt( p_intf, "logo-position" )];
     [o_addlogo_transparency_sld setIntValue: config_GetInt( p_intf, "logo-opacity" )];
-    [o_addlogo_transparency_sld setToolTip: [NSString stringWithFormat:@"%i", config_GetInt( p_intf, "logo-opacity" )]];
+    [o_addlogo_transparency_sld setToolTip: [NSString stringWithFormat:@"%lli", config_GetInt( p_intf, "logo-opacity" )]];
     b_state = [o_addlogo_ckb state];
     [o_addlogo_pos_pop setEnabled: b_state];
     [o_addlogo_pos_lbl setEnabled: b_state];
@@ -753,7 +753,7 @@ static VLCVideoEffects *_o_sharedInstance = nil;
 - (IBAction)transformModifierChanged:(id)sender
 {
     NSInteger tag = [[o_transform_pop selectedItem] tag];
-    char * psz_string = (char *)[[NSString stringWithFormat:@"%i", tag] UTF8String];
+    char * psz_string = (char *)[[NSString stringWithFormat:@"%li", tag] UTF8String];
     if( tag == 1 )
         psz_string = (char *)"hflip";
     else if( tag == 2 )

modules/gui/macosx/coredialogs.m

@@ -97,7 +97,7 @@ static VLCCoreDialogProvider *_o_sharedInstance = nil;
     dialog_fatal_t *p_dialog = [o_value pointerValue];
     NSAlert *o_alert;
 
-    o_alert = [NSAlert alertWithMessageText: [NSString stringWithUTF8String: p_dialog->title] defaultButton: _NS("OK") alternateButton: nil otherButton: nil informativeTextWithFormat: [NSString stringWithUTF8String: p_dialog->message]];
+    o_alert = [NSAlert alertWithMessageText: [NSString stringWithUTF8String: p_dialog->title] defaultButton: _NS("OK") alternateButton: nil otherButton: nil informativeTextWithFormat: @"%s", p_dialog->message];
     [o_alert setAlertStyle: NSCriticalAlertStyle];
     [o_alert runModal];
 }
@@ -116,7 +116,7 @@ static VLCCoreDialogProvider *_o_sharedInstance = nil;
     if( p_dialog->cancel != NULL )
         o_cancel = [NSString stringWithUTF8String: p_dialog->cancel];
 
-    o_alert = [NSAlert alertWithMessageText: [NSString stringWithUTF8String: p_dialog->title] defaultButton: o_yes alternateButton:o_no otherButton: o_cancel informativeTextWithFormat: [NSString stringWithUTF8String: p_dialog->message]];
+    o_alert = [NSAlert alertWithMessageText: [NSString stringWithUTF8String: p_dialog->title] defaultButton: o_yes alternateButton:o_no otherButton: o_cancel informativeTextWithFormat: @"%s", p_dialog->message];
     [o_alert setAlertStyle: NSInformationalAlertStyle];
     i_returnValue = [o_alert runModal];
 

modules/gui/macosx/open.m

@@ -392,7 +392,7 @@ static VLCOpen *_o_sharedMainInstance = nil;
                     @"subsdec-encoding=%@",
                     [o_file_sub_encoding_pop titleOfSelectedItem]]];
             [o_options addObject: [NSString stringWithFormat:
-                    @"subsdec-align=%i",
+                    @"subsdec-align=%li",
                     [o_file_sub_align_pop indexOfSelectedItem]]];
 
             p_item = config_FindConfig( VLC_OBJECT(p_intf),
@@ -1044,9 +1044,9 @@ static VLCOpen *_o_sharedMainInstance = nil;
             int i_port = [o_net_udp_port intValue];
 
             if( [[o_net_udp_protocol_mat selectedCell] tag] == 0 )
-                o_mrl_string = [NSString stringWithString: @"udp://"];
+                o_mrl_string = @"udp://";
             else
-                o_mrl_string = [NSString stringWithString: @"rtp://"];
+                o_mrl_string = @"rtp://";
 
             if( i_port != config_GetInt( p_intf, "server-port" ) )
             {
@@ -1102,9 +1102,9 @@ static VLCOpen *_o_sharedMainInstance = nil;
             int i_port = [o_net_udp_port intValue];
 
             if( [[o_net_udp_protocol_mat selectedCell] tag] == 0 )
-                o_mrl_string = [NSString stringWithString: @"udp://"];
+                o_mrl_string = @"udp://";
             else
-                o_mrl_string = [NSString stringWithString: @"rtp://"];
+                o_mrl_string = @"rtp://";
 
             if( i_port != config_GetInt( p_intf, "server-port" ) )
             {

modules/gui/macosx/output.m

@@ -372,8 +372,7 @@
         {
             NSMutableArray * o_sout_options;
             o_sout_options = [NSArray arrayWithObjects:
-                                    [NSString stringWithString:
-                                    @":demux=dump"],
+                                    @":demux=dump",
                                     [NSString stringWithFormat:
                                     @":demuxdump-file=%@",
                                     [o_file_field stringValue]],

modules/gui/macosx/prefs_widgets.m

@@ -982,7 +982,7 @@ o_textfield = [[[NSSecureTextField alloc] initWithFrame: s_rc] retain];       \
         if( p_item->psz_text )
             o_labelString = _NS((char *)p_item->psz_text);
         else
-            o_labelString = [NSString stringWithString:@""];
+            o_labelString = @"";
         ADD_LABEL( o_label, mainFrame, 0, -3, o_labelString, o_textfieldTooltip )
         [o_label setAutoresizingMask:NSViewNotSizable ];
         [self addSubview: o_label];
@@ -991,7 +991,7 @@ o_textfield = [[[NSSecureTextField alloc] initWithFrame: s_rc] retain];       \
         if( p_item->value.psz )
             o_textfieldString = _NS((char *)p_item->value.psz);
         else
-            o_textfieldString = [NSString stringWithString: @""];
+            o_textfieldString = @"";
         if( p_item->i_type == CONFIG_ITEM_PASSWORD )
         {
             ADD_SECURETEXTFIELD( o_textfield, mainFrame, [o_label frame].size.width + 2,
@@ -1044,7 +1044,7 @@ o_textfield = [[[NSSecureTextField alloc] initWithFrame: s_rc] retain];       \
     if( psz_value )
         o_textfieldString = _NS(psz_value);
     else
-        o_textfieldString = [NSString stringWithString: @""];
+        o_textfieldString = @"";
     free( psz_value );
     [super resetValues];
 }
@@ -1072,7 +1072,7 @@ o_textfield = [[[NSSecureTextField alloc] initWithFrame: s_rc] retain];       \
         if( p_item->psz_text )
             o_labelString = _NS((char *)p_item->psz_text);
         else
-            o_labelString = [NSString stringWithString:@""];
+            o_labelString = @"";
         ADD_LABEL( o_label, mainFrame, 0, -3, o_labelString, o_textfieldTooltip )
         [o_label setAutoresizingMask:NSViewNotSizable ];
         [self addSubview: o_label];
@@ -1187,7 +1187,7 @@ o_textfield = [[[NSSecureTextField alloc] initWithFrame: s_rc] retain];       \
         if( p_item->psz_text )
             o_labelString = _NS((char *)p_item->psz_text);
         else
-            o_labelString = [NSString stringWithString:@""];
+            o_labelString = @"";
         ADD_LABEL( o_label, mainFrame, 0, 3, o_labelString, o_itemTooltip )
         [o_label setAutoresizingMask:NSViewNotSizable ];
         [self addSubview: o_label];
@@ -1202,7 +1202,7 @@ o_textfield = [[[NSSecureTextField alloc] initWithFrame: s_rc] retain];       \
         if( p_item->value.psz )
             o_textfieldString = [NSString stringWithFormat: @"%s", (char *)p_item->value.psz];
         else
-            o_textfieldString = [NSString stringWithString: @""];
+            o_textfieldString = @"";
         ADD_TEXTFIELD( o_textfield, mainFrame, 12, 2, mainFrame.size.width -
                         8 - [o_button frame].size.width,
                         o_itemTooltip, o_textfieldString )
@@ -1270,7 +1270,7 @@ o_textfield = [[[NSSecureTextField alloc] initWithFrame: s_rc] retain];       \
     if( psz_value )
         o_textfieldString = [NSString stringWithFormat: @"%s", psz_value];
     else
-        o_textfieldString = [NSString stringWithString: @""];
+        o_textfieldString = @"";
 
     free(psz_value);
     [super resetValues];
@@ -1298,7 +1298,7 @@ o_textfield = [[[NSSecureTextField alloc] initWithFrame: s_rc] retain];       \
         if( p_item->psz_text )
             o_labelString = _NS((char *)p_item->psz_text);
         else
-            o_labelString = [NSString stringWithString:@""];
+            o_labelString = @"";
 
         ADD_LABEL( o_label, mainFrame, 0, -1, o_labelString, o_popupTooltip )
         [o_label setAutoresizingMask:NSViewNotSizable ];
@@ -1468,7 +1468,7 @@ o_textfield = [[[NSSecureTextField alloc] initWithFrame: s_rc] retain];       \
         if( p_item->psz_text )
             o_labelString = _NS((char *)p_item->psz_text);
         else
-            o_labelString = [NSString stringWithString:@""];
+            o_labelString = @"";
         ADD_LABEL( o_label, mainFrame, 0, -3, o_labelString, o_tooltip )
         [o_label setAutoresizingMask:NSViewNotSizable ];
         [self addSubview: o_label];
@@ -1563,7 +1563,7 @@ o_textfield = [[[NSSecureTextField alloc] initWithFrame: s_rc] retain];       \
         if( p_item->psz_text )
             o_labelString = _NS((char *)p_item->psz_text);
         else
-            o_labelString = [NSString stringWithString:@""];
+            o_labelString = @"";
         ADD_LABEL( o_label, mainFrame, 0, -3, o_labelString, o_textfieldTooltip )
         [o_label setAutoresizingMask:NSViewNotSizable ];
         [self addSubview: o_label];
@@ -1663,7 +1663,7 @@ o_textfield = [[[NSSecureTextField alloc] initWithFrame: s_rc] retain];       \
         if( p_item->psz_text )
             o_labelString = _NS((char *)p_item->psz_text);
         else
-            o_labelString = [NSString stringWithString:@""];
+            o_labelString = @"";
         ADD_LABEL( o_label, mainFrame, 0, -3, o_labelString, o_tooltip )
         [o_label setAutoresizingMask:NSViewNotSizable ];
         [self addSubview: o_label];
@@ -1779,7 +1779,7 @@ o_textfield = [[[NSSecureTextField alloc] initWithFrame: s_rc] retain];       \
         if( p_item->psz_text )
             o_labelString = _NS((char *)p_item->psz_text);
         else
-            o_labelString = [NSString stringWithString:@""];
+            o_labelString = @"";
         ADD_LABEL( o_label, mainFrame, 0, -2, o_labelString, o_tooltip )
         [o_label setAutoresizingMask:NSViewNotSizable ];
         [self addSubview: o_label];
@@ -1872,7 +1872,7 @@ o_textfield = [[[NSSecureTextField alloc] initWithFrame: s_rc] retain];       \
         if( p_item->psz_text )
             o_labelString = _NS((char *)p_item->psz_text);
         else
-            o_labelString = [NSString stringWithString:@""];
+            o_labelString = @"";
         ADD_LABEL( o_label, mainFrame, 0, -3, o_labelString, o_tooltip )
         [o_label setAutoresizingMask:NSViewNotSizable ];
         [self addSubview: o_label];
@@ -1992,7 +1992,7 @@ o_textfield = [[[NSSecureTextField alloc] initWithFrame: s_rc] retain];       \
         if( p_item->psz_text )
             o_labelString = _NS((char *)p_item->psz_text);
         else
-            o_labelString = [NSString stringWithString:@""];
+            o_labelString = @"";
         ADD_LABEL( o_label, mainFrame, [o_checkbox frame].size.width, 0, o_labelString, o_tooltip )
         [o_label setAutoresizingMask:NSViewNotSizable ];
         [self addSubview: o_label];
@@ -2039,7 +2039,7 @@ o_textfield = [[[NSSecureTextField alloc] initWithFrame: s_rc] retain];       \
         if( p_item->psz_text )
             o_labelString = _NS((char *)p_item->psz_text);
         else
-            o_labelString = [NSString stringWithString:@""];
+            o_labelString = @"";
         ADD_LABEL( o_label, mainFrame, 0, -1, o_labelString, o_tooltip )
         [o_label setAutoresizingMask:NSViewNotSizable ];
         [self addSubview: o_label];
@@ -2176,7 +2176,7 @@ o_textfield = [[[NSSecureTextField alloc] initWithFrame: s_rc] retain];       \
         if( p_item->psz_text )
             o_labelString = _NS((char *)p_item->psz_text);
         else
-            o_labelString = [NSString stringWithString:@""];
+            o_labelString = @"";
         ADD_LABEL( o_label, mainFrame, 0, -3, o_labelString, o_tooltip )
         [o_label setAutoresizingMask:NSViewNotSizable ];
         [self addSubview: o_label];
@@ -2185,7 +2185,7 @@ o_textfield = [[[NSSecureTextField alloc] initWithFrame: s_rc] retain];       \
         if( p_item->value.psz )
             o_textfieldString = _NS((char *)p_item->value.psz);
         else
-            o_textfieldString = [NSString stringWithString: @""];
+            o_textfieldString = @"";
         ADD_TEXTFIELD( o_textfield, mainFrame, [o_label frame].size.width + 2,
                       mainFrame.size.height - 22, mainFrame.size.width -
                       [o_label frame].size.width - 2, o_tooltip, o_textfieldString )

modules/gui/macosx/wizard.m

@@ -1081,17 +1081,17 @@ static VLCWizard *_o_sharedInstance = nil;
             if( [[o_userSelections objectForKey:@"pathToStrm"] count] > 1 )
                 NSBeginInformationalAlertSheet(_NS("No folder selected"),
                     _NS("OK"), @"", @"", o_wizard_window, nil, nil, nil, nil,
-                    [NSString stringWithFormat: @"%@\n\n%@", _NS("A directory "
+                    @"%@\n\n%@", _NS("A directory "
                     "where to save the files has to be selected."),
                     _NS("Enter either a valid path or use the \"Choose...\" "
-                    "button to select a location.")]);
+                    "button to select a location."));
             else
                 NSBeginInformationalAlertSheet(_NS("No file selected"),
                     _NS("OK"), @"", @"", o_wizard_window, nil, nil, nil, nil,
-                    [NSString stringWithFormat: @"%@\n\n%@", _NS("A file "
+                    @"%@\n\n%@", _NS("A file "
                     "where to save the stream has to be selected."),
                     _NS("Enter either a valid path or use the \"Choose\" "
-                    "button to select a location.")]);
+                    "button to select a location."));
         } else {
             /* create a string containing the requested suffix for later usage */
             NSString * theEncapFormat = [[o_encapFormats objectAtIndex:
@@ -1378,7 +1378,7 @@ static VLCWizard *_o_sharedInstance = nil;
         /* do only show the destination of the first item and add a counter, if needed */
         if( [[o_userSelections objectForKey: @"trnscdFilePath"] count] > 1 )
             [o_t8_fld_saveFileTo setStringValue:
-                [NSString stringWithFormat: @"%@ (+%i)",
+                [NSString stringWithFormat: @"%@ (+%li)",
                 [[o_userSelections objectForKey: @"trnscdFilePath"] objectAtIndex:0],
                 ([[o_userSelections objectForKey: @"trnscdFilePath"] count] - 1)]];
         else