Rémi Denis-Courmont pushed to branch master at VideoLAN / VLC
Commits:
72730375 by Alexandre Janniaux at 2022-06-19T17:24:59+00:00
macosx: prefs: fix function prototype
The function is actually taking a vlc_config_subcat both from its
definition and its usage, which was creating warnings:
modules/gui/macosx/preferences/prefs.m:533:82: warning: implicit conversion
from enumeration type 'enum vlc_config_subcat' to different enumeration
type 'enum vlc_config_cat' [-Wenum-conversion]
subcategoryItem = [categoryItem
childRepresentingSubcategory:subcat];
~
^~~~~~
modules/gui/macosx/preferences/prefs.m:675:77: warning: conflicting
parameter types in implementation of 'childRepresentingSubcategory:':
'enum vlc_config_cat' vs 'enum vlc_config_subcat'
[-Wmismatched-parameter-types]
- (VLCTreeBranchItem *)childRepresentingSubcategory:(enum
vlc_config_subcat)subcategory
~~~~~~~~~~~~~~~~~~~~~~
^
modules/gui/macosx/preferences/prefs.m:128:74: note: previous definition is
here
- (VLCTreeBranchItem *)childRepresentingSubcategory:(enum
vlc_config_cat)category;
~~~~~~~~~~~~~~~~~~~ ^
- - - - -
1 changed file:
- modules/gui/macosx/preferences/prefs.m
Changes:
=====================================
modules/gui/macosx/preferences/prefs.m
=====================================
@@ -125,7 +125,7 @@ enum VLCTreeBranchType {
- (id)initWithSubcategory:(enum vlc_config_subcat)subcategory;
- (id)initWithPlugin:(module_t *)plugin;
-- (VLCTreeBranchItem *)childRepresentingSubcategory:(enum
vlc_config_cat)category;
+- (VLCTreeBranchItem *)childRepresentingSubcategory:(enum
vlc_config_subcat)category;
- (enum VLCTreeBranchType)branchType;
- (enum vlc_config_cat)category;
View it on GitLab:
https://code.videolan.org/videolan/vlc/-/commit/72730375a56c68860ca4700bfa5aecad75913911
--
View it on GitLab:
https://code.videolan.org/videolan/vlc/-/commit/72730375a56c68860ca4700bfa5aecad75913911
You're receiving this email because of your account on code.videolan.org.
VideoLAN code repository instance_______________________________________________
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits
