vlc | branch: master | Felix Paul Kühne <[email protected]> | Tue Jun 14 01:18:41 2016 +0200| [846296503a139a457fe83e385721af30756d0b72] | committer: Felix Paul Kühne
macosx: fix compilation warning > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=846296503a139a457fe83e385721af30756d0b72 --- modules/gui/macosx/MainWindow.m | 2 +- modules/gui/macosx/PXSourceList.h | 13 ++++++------- modules/gui/macosx/PXSourceList.m | 4 ++-- 3 files changed, 9 insertions(+), 10 deletions(-) diff --git a/modules/gui/macosx/MainWindow.m b/modules/gui/macosx/MainWindow.m index 4b230ec..f6bfe54 100644 --- a/modules/gui/macosx/MainWindow.m +++ b/modules/gui/macosx/MainWindow.m @@ -46,7 +46,7 @@ #import "VLCVoutWindowController.h" -@interface VLCMainWindow() <PXSourceListDataSource, PXSourceListDelegate, NSWindowDelegate, NSAnimationDelegate, NSSplitViewDelegate> +@interface VLCMainWindow() <PXSourceListDataSource, PXSourceListDelegate, NSOutlineViewDataSource, NSOutlineViewDelegate, NSWindowDelegate, NSAnimationDelegate, NSSplitViewDelegate> { BOOL videoPlaybackEnabled; BOOL dropzoneActive; diff --git a/modules/gui/macosx/PXSourceList.h b/modules/gui/macosx/PXSourceList.h index c73bf5e..1a4182e 100644 --- a/modules/gui/macosx/PXSourceList.h +++ b/modules/gui/macosx/PXSourceList.h @@ -19,15 +19,14 @@ @property (nonatomic) NSSize iconSize; -@property (assign) id<PXSourceListDataSource> dataSource; -@property (assign) id<PXSourceListDelegate> delegate; +@property (assign) id<PXSourceListDataSource, NSOutlineViewDataSource> _Nullable dataSource; +@property (assign) id<PXSourceListDelegate, NSOutlineViewDelegate> _Nullable delegate; - (NSUInteger)numberOfGroups; //Returns the number of groups in the Source List -- (BOOL)isGroupItem:(id)item; //Returns whether `item` is a group -- (BOOL)isGroupAlwaysExpanded:(id)group; //Returns whether `group` is displayed as always expanded +- (BOOL)isGroupItem:(nonnull id)item; //Returns whether `item` is a group +- (BOOL)isGroupAlwaysExpanded:(nonnull id)group; //Returns whether `group` is displayed as always expanded -- (BOOL)itemHasBadge:(id)item; //Returns whether `item` has a badge -- (NSInteger)badgeValueForItem:(id)item; //Returns the badge value for `item` +- (BOOL)itemHasBadge:(nonnull id)item; //Returns whether `item` has a badge +- (NSInteger)badgeValueForItem:(nonnull id)item; //Returns the badge value for `item` @end - diff --git a/modules/gui/macosx/PXSourceList.m b/modules/gui/macosx/PXSourceList.m index 18e62e5..08bc598 100644 --- a/modules/gui/macosx/PXSourceList.m +++ b/modules/gui/macosx/PXSourceList.m @@ -58,9 +58,9 @@ NSString * const PXSLDeleteKeyPressedOnRowsNotification = @"PXSourceListDeleteKe { if(self=[super initWithCoder:decoder]) { - [self setDelegate:(id<PXSourceListDelegate>)[super delegate]]; + [self setDelegate:(id<PXSourceListDelegate, NSOutlineViewDelegate>)[super delegate]]; [super setDelegate:self]; - [self setDataSource:(id<PXSourceListDataSource>)[super dataSource]]; + [self setDataSource:(id<PXSourceListDataSource, NSOutlineViewDataSource>)[super dataSource]]; [super setDataSource:self]; _iconSize = NSMakeSize(16,16); _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
