[vlc-commits] macosx: future compilation fix

Felix Paul Kühne git at videolan.org
Tue Sep 17 21:27:38 CEST 2019


vlc | branch: master | Felix Paul Kühne <felix at feepk.net> | Tue Sep 17 21:20:26 2019 +0200| [3d3cdb244e8902ac676a3da4bda51b976c16c140] | 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.

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

 .../gui/macosx/panels/VLCInformationWindowController.m   | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/modules/gui/macosx/panels/VLCInformationWindowController.m b/modules/gui/macosx/panels/VLCInformationWindowController.m
index 054485579b..6f2808749b 100644
--- a/modules/gui/macosx/panels/VLCInformationWindowController.m
+++ b/modules/gui/macosx/panels/VLCInformationWindowController.m
@@ -35,8 +35,8 @@
 
 @interface VLCCodecInformationTreeItem : 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;
 
@@ -46,7 +46,7 @@
 
 - (NSString *)description
 {
-    return [NSString stringWithFormat:@"%@: name: %@ value: %@ children: %lu", NSStringFromClass([self class]), self.name, self.value, self.children.count];
+    return [NSString stringWithFormat:@"%@: name: %@ value: %@ children: %lu", NSStringFromClass([self class]), self.propertyName, self.propertyValue, self.children.count];
 }
 
 @end
@@ -354,15 +354,15 @@
             info_t *info;
 
             VLCCodecInformationTreeItem *subItem = [[VLCCodecInformationTreeItem alloc] init];
-            subItem.name = toNSStr(cat->psz_name);
+            subItem.propertyName = toNSStr(cat->psz_name);
 
             // Build list of codec details
             NSMutableArray *infos = [NSMutableArray array];
 
             info_foreach(info, &cat->infos) {
                 VLCCodecInformationTreeItem *infoItem = [[VLCCodecInformationTreeItem alloc] init];
-                infoItem.name = toNSStr(info->psz_name);
-                infoItem.value = toNSStr(info->psz_value);
+                infoItem.propertyName = toNSStr(info->psz_name);
+                infoItem.propertyValue = toNSStr(info->psz_value);
                 [infos addObject:infoItem];
             }
 
@@ -444,9 +444,9 @@ objectValueForTableColumn:(NSTableColumn *)tableColumn
         return @"";
 
     if ([[tableColumn identifier] isEqualToString:@"0"]) {
-        return [item name];
+        return [item propertyName];
     } else {
-        return [item value];
+        return [item propertyValue];
     }
 }
 



More information about the vlc-commits mailing list