Changeset 397 for trunk

Timestamp:

02/24/08 06:03:02 (17 years ago)

Author:

Nicholas Riley

Message:

Replace id<NSMenuItem> with NSMenuItem * to remove warnings.

Minor code style cleanup.

Location:

trunk/Cocoa/F-Script Anywhere/Source

Files:

• FSAAppList.m (modified) (1 diff)
• FSAController.m (modified) (3 diffs)
• FSAViewAssociationController.m (modified) (3 diffs)
• FSAWindowManager.h (modified) (1 diff)

trunk/Cocoa/F-Script Anywhere/Source/FSAAppList.m

@@ -417 +417 @@
 {
     static NSMenu *dockMenu = nil;
-    id<NSMenuItem> menuItem;
+    NSMenuItem *menuItem;
     DeVercruesseProcess *frontApp = [processManager frontProcess];
     NSString *appName = [frontApp name];

trunk/Cocoa/F-Script Anywhere/Source/FSAController.m

@@ -52 +52 @@
     if (!alreadyInstalled && ((mainMenu = [NSApp mainMenu]) != nil)) {
         NSMenu *insertIntoMenu = nil;
-        id<NSMenuItem> item;
+        NSMenuItem *item;
         unsigned insertLoc = NSNotFound;
         NSBundle *bundle = [NSBundle bundleForClass: self];
@@ -115 +115 @@
 }
 
-+ (BOOL)validateMenuItem:(id <NSMenuItem>)menuItem
++ (BOOL)validateMenuItem:(NSMenuItem *)menuItem
 {
     SEL sel;
@@ -151 +151 @@
         static unsigned numInterpWindows = 0;
         
-        if(showInterpreter){
+        if (showInterpreter) {
             NSAssert(window != nil, @"Can't get interpreter window!");
             if (interpreterNum == 0) interpreterNum = ++numInterpWindows;

trunk/Cocoa/F-Script Anywhere/Source/FSAViewAssociationController.m

@@ -72 +72 @@
 }
 
-- (void)_addElement:(id)element withLabel:(NSString *)label toSubmenuForItem:(id<NSMenuItem>)item;
+- (void)_addElement:(id)element withLabel:(NSString *)label toSubmenuForItem:(NSMenuItem *)item;
 {
     NSMenu *submenu = [item submenu];
-    id<NSMenuItem> subItem;
+    NSMenuItem *subItem;
     if (submenu == nil) {
         id superElement = [item representedObject];
@@ -97 +97 @@
 }
 
-- (void)_addValueForSelector:(SEL)sel withLabel:(NSString *)label toSubmenuForItem:(id<NSMenuItem>)item;
+- (void)_addValueForSelector:(SEL)sel withLabel:(NSString *)label toSubmenuForItem:(NSMenuItem *)item;
 {
     id obj = [item representedObject];
@@ -109 +109 @@
 - (void)_addElementToMenu:(id)element;
 {
-    id<NSMenuItem> item;
+    NSMenuItem *item;
     if (element == nil) return;
     item = [viewHierarchyMenu addItemWithTitle: [@"  "

trunk/Cocoa/F-Script Anywhere/Source/FSAWindowManager.h

@@ -12 +12 @@
     NSMenu *menu;
     NSMutableDictionary *records;
-    id<NSMenuItem> separator, label;
+    NSMenuItem *separator, label;
 }