Skip to content

Commit 37c6661

Browse files
rmottolarmottola
committed
Fix warnings: make NSMenuItem follow protocol
1 parent ab20c4d commit 37c6661

File tree

3 files changed

+70
-64
lines changed

3 files changed

+70
-64
lines changed

‎ChangeLog

+6
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
2018-01-24 Riccardo Mottola <[email protected]>
2+
3+
* GWMetadata/MDFinder/MDFinder.h
4+
* GWMetadata/MDFinder/MDFinder.m
5+
Fix warnings: make NSMenuItem follow protocol.
6+
17
2018-01-17 Riccardo Mottola <[email protected]>
28

39
* Tools/ddbd/ddbd.m

‎GWMetadata/MDFinder/MDFinder.h

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/* MDFinder.h
22
*
3-
* Copyright (C) 2007 Free Software Foundation, Inc.
3+
* Copyright (C) 2007-2018 Free Software Foundation, Inc.
44
*
55
* Author: Enrico Sersale <[email protected]>
66
* Date: January 2007
@@ -25,7 +25,7 @@
2525
#ifndef MDFINDER_H
2626
#define MDFINDER_H
2727

28-
#include <Foundation/Foundation.h>
28+
#import <Foundation/Foundation.h>
2929

3030
@class MDKWindow;
3131
@class StartAppWin;
@@ -112,7 +112,7 @@
112112
@end
113113

114114

115-
NSMenuItem *addItemToMenu(NSMenu *menu, NSString *str,
115+
id<NSMenuItem> addItemToMenu(NSMenu *menu, NSString *str,
116116
NSString *comm, NSString *sel, NSString *key);
117117

118118
#endif // MDFINDER_H

‎GWMetadata/MDFinder/MDFinder.m

+61-61
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/* MDFinder.m
22
*
3-
* Copyright (C) 2007-2011 Free Software Foundation, Inc.
3+
* Copyright (C) 2007-2018 Free Software Foundation, Inc.
44
*
55
* Author: Enrico Sersale <[email protected]>
66
* Date: January 2007
@@ -22,12 +22,12 @@
2222
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111 USA.
2323
*/
2424

25-
#include <Foundation/Foundation.h>
26-
#include <AppKit/AppKit.h>
27-
#include "MDFinder.h"
28-
#include "MDKWindow.h"
29-
#include "MDKQuery.h"
30-
#include "FSNode.h"
25+
#import <Foundation/Foundation.h>
26+
#import <AppKit/AppKit.h>
27+
#import "MDFinder.h"
28+
#import "MDKWindow.h"
29+
#import "MDKQuery.h"
30+
#import "FSNode.h"
3131

3232
static MDFinder *mdfinder = nil;
3333

@@ -69,60 +69,60 @@ - (void)applicationWillFinishLaunching:(NSNotification *)aNotification
6969
{
7070
NSMenu *mainMenu = [NSMenu new];
7171
NSMenu *menu;
72-
NSMenu *windows, *services;
73-
NSMenuItem *menuItem;
74-
75-
// Info
76-
menuItem = addItemToMenu(mainMenu, @"Info", @"", nil, @"");
77-
menu = AUTORELEASE ([NSMenu new]);
78-
[mainMenu setSubmenu: menu forItem: menuItem];
79-
addItemToMenu(menu, @"Activate context help", @"", @"activateContextHelp:", @";");
80-
81-
// File
82-
menuItem = addItemToMenu(mainMenu, @"File", @"", nil, @"");
83-
menu = AUTORELEASE ([NSMenu new]);
84-
[mainMenu setSubmenu: menu forItem: menuItem];
85-
addItemToMenu(menu, @"New", @"", @"newQuery:", @"n");
86-
addItemToMenu(menu, @"Open...", @"", @"openQuery:", @"o");
87-
addItemToMenu(menu, @"Save", @"", @"saveQuery:", @"s");
88-
addItemToMenu(menu, @"Save as...", @"", @"saveQueryAs:", @"");
89-
90-
// Edit
91-
menuItem = addItemToMenu(mainMenu, @"Edit", @"", nil, @"");
92-
menu = AUTORELEASE ([NSMenu new]);
93-
[mainMenu setSubmenu: menu forItem: menuItem];
94-
addItemToMenu(menu, @"Cut", @"", @"cut:", @"x");
95-
addItemToMenu(menu, @"Copy", @"", @"copy:", @"c");
96-
addItemToMenu(menu, @"Paste", @"", @"paste:", @"v");
97-
98-
// Windows
99-
menuItem = addItemToMenu(mainMenu, @"Windows", @"", nil, @"");
100-
windows = AUTORELEASE ([NSMenu new]);
101-
[mainMenu setSubmenu: windows forItem: menuItem];
102-
addItemToMenu(windows, @"Arrange in Front", @"", nil, @"");
103-
addItemToMenu(windows, @"Miniaturize Window", @"", nil, @"");
104-
addItemToMenu(windows, @"Close Window", @"", @"closeMainWin:", @"w");
105-
106-
// Services
107-
menuItem = addItemToMenu(mainMenu, @"Services", @"", nil, @"");
108-
services = AUTORELEASE ([NSMenu new]);
109-
[mainMenu setSubmenu: services forItem: menuItem];
110-
111-
// Hide
112-
addItemToMenu(mainMenu, @"Hide", @"", @"hide:", @"h");
113-
114-
// Print
115-
addItemToMenu(mainMenu, @"Print...", @"", @"print:", @"p");
116-
117-
// Quit
118-
addItemToMenu(mainMenu, @"Quit", @"", @"terminate:", @"q");
119-
120-
[mainMenu update];
121-
122-
[NSApp setServicesMenu: services];
123-
[NSApp setWindowsMenu: windows];
124-
[NSApp setMainMenu: mainMenu];
72+
NSMenu *windows, *services;
73+
id<NSMenuItem> menuItem;
74+
75+
// Info
76+
menuItem = addItemToMenu(mainMenu, @"Info", @"", nil, @"");
77+
menu = AUTORELEASE ([NSMenu new]);
78+
[mainMenu setSubmenu: menu forItem: menuItem];
79+
addItemToMenu(menu, @"Activate context help", @"", @"activateContextHelp:", @";");
80+
81+
// File
82+
menuItem = addItemToMenu(mainMenu, @"File", @"", nil, @"");
83+
menu = AUTORELEASE ([NSMenu new]);
84+
[mainMenu setSubmenu: menu forItem: menuItem];
85+
addItemToMenu(menu, @"New", @"", @"newQuery:", @"n");
86+
addItemToMenu(menu, @"Open...", @"", @"openQuery:", @"o");
87+
addItemToMenu(menu, @"Save", @"", @"saveQuery:", @"s");
88+
addItemToMenu(menu, @"Save as...", @"", @"saveQueryAs:", @"");
89+
90+
// Edit
91+
menuItem = addItemToMenu(mainMenu, @"Edit", @"", nil, @"");
92+
menu = AUTORELEASE ([NSMenu new]);
93+
[mainMenu setSubmenu: menu forItem: menuItem];
94+
addItemToMenu(menu, @"Cut", @"", @"cut:", @"x");
95+
addItemToMenu(menu, @"Copy", @"", @"copy:", @"c");
96+
addItemToMenu(menu, @"Paste", @"", @"paste:", @"v");
97+
98+
// Windows
99+
menuItem = addItemToMenu(mainMenu, @"Windows", @"", nil, @"");
100+
windows = AUTORELEASE ([NSMenu new]);
101+
[mainMenu setSubmenu: windows forItem: menuItem];
102+
addItemToMenu(windows, @"Arrange in Front", @"", nil, @"");
103+
addItemToMenu(windows, @"Miniaturize Window", @"", nil, @"");
104+
addItemToMenu(windows, @"Close Window", @"", @"closeMainWin:", @"w");
105+
106+
// Services
107+
menuItem = addItemToMenu(mainMenu, @"Services", @"", nil, @"");
108+
services = AUTORELEASE ([NSMenu new]);
109+
[mainMenu setSubmenu: services forItem: menuItem];
110+
111+
// Hide
112+
addItemToMenu(mainMenu, @"Hide", @"", @"hide:", @"h");
113+
114+
// Print
115+
addItemToMenu(mainMenu, @"Print...", @"", @"print:", @"p");
116+
117+
// Quit
118+
addItemToMenu(mainMenu, @"Quit", @"", @"terminate:", @"q");
119+
120+
[mainMenu update];
125121

122+
[NSApp setServicesMenu: services];
123+
[NSApp setWindowsMenu: windows];
124+
[NSApp setMainMenu: mainMenu];
125+
126126
RELEASE (mainMenu);
127127

128128
workspaceApp = nil;
@@ -598,7 +598,7 @@ - (BOOL)windowShouldClose:(id)sender
598598
@end
599599

600600

601-
NSMenuItem *addItemToMenu(NSMenu *menu, NSString *str,
601+
id<NSMenuItem> addItemToMenu(NSMenu *menu, NSString *str,
602602
NSString *comm, NSString *sel, NSString *key)
603603
{
604604
return [menu addItemWithTitle: NSLocalizedString(str, comm)

0 commit comments

Comments
 (0)