Author: rmottola
Date: Tue Dec 30 15:51:47 2014
New Revision: 38275
URL: http://svn.gna.org/viewcvs/gnustep?rev=38275&view=rev
Log:
Fix warnings: update code to use id<NSMenuItem> and not NSMenuItem*
Modified:
apps/gworkspace/trunk/ChangeLog
apps/gworkspace/trunk/GWorkspace/GWorkspace.m
apps/gworkspace/trunk/Recycler/main.m
Modified: apps/gworkspace/trunk/ChangeLog
URL:
http://svn.gna.org/viewcvs/gnustep/apps/gworkspace/trunk/ChangeLog?rev=38275&r1=38274&r2=38275&view=diff
==============================================================================
--- apps/gworkspace/trunk/ChangeLog (original)
+++ apps/gworkspace/trunk/ChangeLog Tue Dec 30 15:51:47 2014
@@ -1,3 +1,9 @@
+2014-12-30 Riccardo Mottola <[email protected]>
+
+ * Recycler/main.m
+ * GWorkspace/GWorkspace.m
+ Fix warnings: update code to use id<NSMenuItem> and not NSMenuItem*
+
2014-12-29 Riccardo Mottola <[email protected]>
* Operation/Operation.m (rectForFileOpWindow)
Modified: apps/gworkspace/trunk/GWorkspace/GWorkspace.m
URL:
http://svn.gna.org/viewcvs/gnustep/apps/gworkspace/trunk/GWorkspace/GWorkspace.m?rev=38275&r1=38274&r2=38275&view=diff
==============================================================================
--- apps/gworkspace/trunk/GWorkspace/GWorkspace.m (original)
+++ apps/gworkspace/trunk/GWorkspace/GWorkspace.m Tue Dec 30 15:51:47 2014
@@ -158,7 +158,7 @@
NSMenu *menu;
NSMenu *subMenu;
NSMenu *windows, *services;
- NSMenuItem *menuItem;
+ id<NSMenuItem> menuItem;
// Info
menuItem = [mainMenu addItemWithTitle:_(@"Info") action:NULL
keyEquivalent:@""];
Modified: apps/gworkspace/trunk/Recycler/main.m
URL:
http://svn.gna.org/viewcvs/gnustep/apps/gworkspace/trunk/Recycler/main.m?rev=38275&r1=38274&r2=38275&view=diff
==============================================================================
--- apps/gworkspace/trunk/Recycler/main.m (original)
+++ apps/gworkspace/trunk/Recycler/main.m Tue Dec 30 15:51:47 2014
@@ -1,6 +1,6 @@
/* main.m
*
- * Copyright (C) 2004-2010 Free Software Foundation, Inc.
+ * Copyright (C) 2004-20104Free Software Foundation, Inc.
*
* Author: Enrico Sersale <[email protected]>
* Date: June 2004
@@ -33,32 +33,32 @@
int main(int argc, char **argv, char **env)
{
- CREATE_AUTORELEASE_POOL (pool);
+ CREATE_AUTORELEASE_POOL (pool);
Recycler *recycler = [Recycler recycler];
- NSApplication *app = [NSApplication sharedApplication];
+ NSApplication *app = [NSApplication sharedApplication];
- createMenu();
+ createMenu();
[app setDelegate: recycler];
- [app run];
- RELEASE (pool);
+ [app run];
+ RELEASE (pool);
return 0;
}
-NSMenuItem *addMenuItem(NSMenu *menu, NSString *str,
-
NSString *comm, NSString *sel,
NSString *key)
+id<NSMenuItem> addMenuItem(NSMenu *menu, NSString *str,
+ NSString *comm, NSString *sel, NSString *key)
{
- NSMenuItem *item = [menu addItemWithTitle: NSLocalizedString(str, comm)
-
action: NSSelectorFromString(sel) keyEquivalent: key];
- return item;
+ id<NSMenuItem>item = [menu addItemWithTitle: NSLocalizedString(str, comm)
+ action: NSSelectorFromString(sel)
keyEquivalent: key];
+ return item;
}
void createMenu()
{
NSMenu *mainMenu;
- NSMenu *info, *file, *edit;
- NSMenuItem *menuItem;
+ NSMenu *info, *file, *edit;
+ id<NSMenuItem> menuItem;
// Main
mainMenu = AUTORELEASE ([[NSMenu alloc] initWithTitle: @"Recycler"]);
_______________________________________________
Gnustep-cvs mailing list
[email protected]
https://mail.gna.org/listinfo/gnustep-cvs
