diff options
| author | Philipp Stephani <phst@google.com> | 2017-05-20 16:36:24 +0200 |
|---|---|---|
| committer | Philipp Stephani <phst@google.com> | 2017-05-21 21:49:09 +0200 |
| commit | 84b28ec759ed3d294c2f49353942ae76e0c75532 (patch) | |
| tree | 2f562d459878de7c76b03bcb62bf87ca555f0e79 /src/nsmenu.m | |
| parent | 08212929ba7052883bd506be320dfaaae5b68970 (diff) | |
| download | emacs-84b28ec759ed3d294c2f49353942ae76e0c75532.tar.gz | |
Nextstep: Use instancetype explicit return type
This removes compiler warnings on macOS and improves type safety.
* nsterm.m (initFrameFromEmacs:):
(menuDown:):
(toolbarClicked:):
(toggleToolbar:):
(setMiniwindowImage:):
(initFrame:window:):
(condemn, reprieve, setPosition:portion:whole:):
(repeatScroll:):
* nsmenu.m (initWithTitle:):
(initWithTitle:frame:):
(initForView:withIdentifier:):
(init, initWithContentRect:styleMask:backing:defer:):
(initFromContents:isQuestion:):
* nsimage.m (allocInitFromFile:):
(initFromXBM:width:height:fg:bg:):
(setXBMColor:):
(initForXPMWithDepth:width:height:): Use instancetype as return
type instead of implicit id.
Diffstat (limited to 'src/nsmenu.m')
| -rw-r--r-- | src/nsmenu.m | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/nsmenu.m b/src/nsmenu.m index 8dc6ea1d344..5e863bb17d7 100644 --- a/src/nsmenu.m +++ b/src/nsmenu.m @@ -493,7 +493,7 @@ x_activate_menubar (struct frame *f) @implementation EmacsMenu /* override designated initializer */ -- initWithTitle: (NSString *)title +- (instancetype)initWithTitle: (NSString *)title { frame = 0; if ((self = [super initWithTitle: title])) @@ -503,7 +503,7 @@ x_activate_menubar (struct frame *f) /* used for top-level */ -- initWithTitle: (NSString *)title frame: (struct frame *)f +- (instancetype)initWithTitle: (NSString *)title frame: (struct frame *)f { [self initWithTitle: title]; frame = f; @@ -1146,7 +1146,7 @@ update_frame_tool_bar (struct frame *f) @implementation EmacsToolbar -- initForView: (EmacsView *)view withIdentifier: (NSString *)identifier +- (instancetype)initForView: (EmacsView *)view withIdentifier: (NSString *)identifier { NSTRACE ("[EmacsToolbar initForView: withIdentifier:]"); @@ -1302,7 +1302,7 @@ update_frame_tool_bar (struct frame *f) display. */ @implementation EmacsTooltip -- init +- (instancetype)init { NSColor *col = [NSColor colorWithCalibratedRed: 1.0 green: 1.0 blue: 0.792 alpha: 0.95]; @@ -1493,7 +1493,7 @@ ns_popup_dialog (struct frame *f, Lisp_Object header, Lisp_Object contents) #define TEXTHEIGHT 20.0 #define MINCELLWIDTH 90.0 -- initWithContentRect: (NSRect)contentRect styleMask: (NSUInteger)aStyle +- (instancetype)initWithContentRect: (NSRect)contentRect styleMask: (NSWindowStyleMask)aStyle backing: (NSBackingStoreType)backingType defer: (BOOL)flag { NSSize spacing = {SPACER, SPACER}; @@ -1697,7 +1697,7 @@ ns_popup_dialog (struct frame *f, Lisp_Object header, Lisp_Object contents) } -- initFromContents: (Lisp_Object)contents isQuestion: (BOOL)isQ +- (instancetype)initFromContents: (Lisp_Object)contents isQuestion: (BOOL)isQ { Lisp_Object head; [super init]; |