[vlc-commits] macosx: future compilation fix

[Felix Paul Kühne]

vlc/vlc-3.0 | branch: master | Felix Paul Kühne <felix at feepk.net> | Fri Sep 27 20:57:26 2019 +0200| [f9379f4d108b7a97269eb841050a6d31781207b5] | committer: Felix Paul Kühne

macosx: future compilation fix

In the future, the use of a 'value' property on custom classes will lead to conflicts with the SDK.

This is a manual backport of 3d3cdb24.

> http://git.videolan.org/gitweb.cgi/vlc/vlc-3.0.git/?a=commit;h=f9379f4d108b7a97269eb841050a6d31781207b5
---

 modules/gui/macosx/VLCPlaylistInfo.h |  4 ++--
 modules/gui/macosx/VLCPlaylistInfo.m | 14 +++++---------
 2 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/modules/gui/macosx/VLCPlaylistInfo.h b/modules/gui/macosx/VLCPlaylistInfo.h
index 7b63fe378d..a229e9c86c 100644
--- a/modules/gui/macosx/VLCPlaylistInfo.h
+++ b/modules/gui/macosx/VLCPlaylistInfo.h
@@ -106,8 +106,8 @@
  */
 @interface VLCInfoTreeItem : NSObject
 
- at property (readwrite) NSString *name;
- at property (readwrite) NSString *value;
+ at property (readwrite) NSString *propertyName;
+ at property (readwrite) NSString *propertyValue;
 
 @property (readwrite) NSArray *children;
 
diff --git a/modules/gui/macosx/VLCPlaylistInfo.m b/modules/gui/macosx/VLCPlaylistInfo.m
index ef9817ff47..53b05221ed 100644
--- a/modules/gui/macosx/VLCPlaylistInfo.m
+++ b/modules/gui/macosx/VLCPlaylistInfo.m
@@ -43,10 +43,6 @@
 - (id)init
 {
     self = [super initWithWindowNibName:@"MediaInfo"];
-    if (self) {
-
-    }
-
     return self;
 }
 
@@ -303,15 +299,15 @@ FREENULL( psz_##foo );
             info_category_t *cat = p_item->pp_categories[i];
 
             VLCInfoTreeItem *subItem = [[VLCInfoTreeItem alloc] init];
-            subItem.name = toNSStr(cat->psz_name);
+            subItem.propertyName = toNSStr(cat->psz_name);
 
             // Build list of codec details
             NSMutableArray *infos = [NSMutableArray array];
 
             for (int j = 0; j < cat->i_infos; j++) {
                 VLCInfoTreeItem *infoItem = [[VLCInfoTreeItem alloc] init];
-                infoItem.name = toNSStr(cat->pp_infos[j]->psz_name);
-                infoItem.value = toNSStr(cat->pp_infos[j]->psz_value);
+                infoItem.propertyName = toNSStr(cat->pp_infos[j]->psz_name);
+                infoItem.propertyValue = toNSStr(cat->pp_infos[j]->psz_value);
                 [infos addObject:infoItem];
             }
 
@@ -397,9 +393,9 @@ FREENULL( psz_##foo );
         return @"";
 
     if ([[tableColumn identifier] isEqualToString:@"0"])
-        return [item name];
+        return [item propertyName];
     else
-        return [item value];
+        return [item propertyValue];
 }
 
 @end