Changeset 412 for trunk/Cocoa

Timestamp:

02/24/08 21:40:25 (17 years ago)

Author:

Nicholas Riley

Message:

Fewer warnings and extraneous build settings.

Location:

trunk/Cocoa/F-Script Anywhere/Source

Files:

• F-Script Anywhere.xcodeproj/project.pbxproj (modified) (6 diffs)
• FSAApp.h (modified) (2 diffs)
• FSAAppList.m (modified) (4 diffs)
• FSAController.h (modified) (1 diff)
• FSAWindowManager.m (modified) (1 diff)
• Read Me (modified) (1 diff)

trunk/Cocoa/F-Script Anywhere/Source/F-Script Anywhere.xcodeproj/project.pbxproj

@@ -648 +648 @@
                                 GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
                                 GCC_OPTIMIZATION_LEVEL = 0;
-                                GCC_WARN_FOUR_CHARACTER_CONSTANTS = NO;
-                                GCC_WARN_UNKNOWN_PRAGMAS = NO;
                                 INFOPLIST_FILE = "Bundle-Info.plist";
-                                OTHER_CFLAGS = "";
                                 PRODUCT_NAME = "F-Script Anywhere";
                                 SKIP_INSTALL = YES;
@@ -670 +667 @@
                                 );
                                 GCC_ENABLE_OBJC_GC = supported;
-                                GCC_WARN_FOUR_CHARACTER_CONSTANTS = NO;
-                                GCC_WARN_UNKNOWN_PRAGMAS = NO;
                                 INFOPLIST_FILE = "Bundle-Info.plist";
-                                OTHER_CFLAGS = "-DFSA_DEBUG=0";
                                 PRODUCT_NAME = "F-Script Anywhere";
                                 SKIP_INSTALL = YES;
@@ -687 +681 @@
                                 GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
                                 GCC_OPTIMIZATION_LEVEL = 0;
-                                GCC_PRECOMPILE_PREFIX_HEADER = YES;
-                                GCC_PREFIX_HEADER = "$(SDKROOT)/$(SYSTEM_LIBRARY_DIR)/Frameworks/Carbon.framework/Headers/Carbon.h";
-                                GCC_WARN_FOUR_CHARACTER_CONSTANTS = NO;
-                                GCC_WARN_UNKNOWN_PRAGMAS = NO;
                                 INFOPLIST_FILE = "Bundle Loader-Info.plist";
-                                OPTIMIZATION_CFLAGS = "-O0";
-                                OTHER_CFLAGS = "";
                                 PRODUCT_NAME = SCPatchLoader;
-                                WARNING_CFLAGS = "-Wmost";
-                                ZERO_LINK = NO;
                         };
                         name = Development;
@@ -709 +695 @@
                                 COPY_PHASE_STRIP = YES;
                                 GCC_ENABLE_OBJC_GC = supported;
-                                GCC_PRECOMPILE_PREFIX_HEADER = YES;
-                                GCC_PREFIX_HEADER = "$(SDKROOT)/$(SYSTEM_LIBRARY_DIR)/Frameworks/Carbon.framework/Headers/Carbon.h";
-                                GCC_WARN_FOUR_CHARACTER_CONSTANTS = NO;
-                                GCC_WARN_UNKNOWN_PRAGMAS = NO;
                                 INFOPLIST_FILE = "Bundle Loader-Info.plist";
-                                OTHER_CFLAGS = "-DFSA_DEBUG=0";
                                 PRODUCT_NAME = SCPatchLoader;
-                                WARNING_CFLAGS = "-Wmost";
-                                ZERO_LINK = NO;
                         };
                         name = Deployment;
@@ -748 +727 @@
                                 );
                                 PRODUCT_NAME = "F-Script Anywhere";
-                                WARNING_CFLAGS = (
-                                        "-Wno-long-double",
-                                        "-Wmost",
-                                        "-Wno-four-char-constants",
-                                        "-Wno-unknown-pragmas",
-                                );
                                 WRAPPER_EXTENSION = app;
                         };
@@ -789 +762 @@
                                 );
                                 PRODUCT_NAME = "F-Script Anywhere";
-                                WARNING_CFLAGS = (
-                                        "-Wno-long-double",
-                                        "-Wmost",
-                                        "-Wno-four-char-constants",
-                                        "-Wno-unknown-pragmas",
-                                );
                                 WRAPPER_EXTENSION = app;
                         };

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

@@ -29 +29 @@
 #import "FSAAppList.h"
 
+#ifdef __cplusplus
+
 #include "SCPatchController.h"
 
@@ -43 +45 @@
     FSAApp *mApp;
 };
+
+#else
+
+#define FSAPatchController void
+
+#endif /* __cplusplus */
 
 @interface FSAApp : NSApplication

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

@@ -27 +27 @@
 #include <sys/types.h>
 #include <sys/sysctl.h>
+#import "FSAApp.h"
 #import "FSAAppList.h"
 #import "FSAnywhere.h"
@@ -241 +242 @@
             if(finishedLaunch){
                 if([alwaysApps containsObject:[app name]] && ![patchedApps containsObject:app])
-                    [NSApp installBundleInAppWithPID:[app pid]];
+                    [(FSAApp *)NSApp installBundleInAppWithPID:[app pid]];
             }
         }
@@ -465 +466 @@
     while(anApp = [e nextObject]){
         if([alwaysApps containsObject:[anApp name]]){
-            [NSApp installBundleInAppWithPID:[anApp pid]];
+            [(FSAApp *)NSApp installBundleInAppWithPID:[anApp pid]];
         }
     }
@@ -482 +483 @@
             NSString *appName = [[cocoaApps objectAtIndex:[sender clickedRow]] name];
             if(![alwaysApps containsObject:appName]){
-                [NSApp installBundleInAppWithPID:[[cocoaApps objectAtIndex:[sender clickedRow]] pid]];
+                [(FSAApp *)NSApp installBundleInAppWithPID:[[cocoaApps objectAtIndex:[sender clickedRow]] pid]];
                 [alwaysApps addObject:appName];
             } else

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

@@ -46 +46 @@
 
 - (IBAction)setFloating:(id)sender;
-- (IBAction)FSA_associateWithInterface:(id)sender;
 - (IBAction)FSA_associateAndOpenBrowser:(id)sender;
 

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

@@ -234 +234 @@
     int itemIndex = [menu indexOfItemWithRepresentedObject: window];
 
-    NSAssert1(itemIndex != -1, @"CanÕt get menu item for window %@", window);
+    NSAssert1(itemIndex != -1, @"Can't get menu item for window %@", window);
     [self addRecord: record];
     [menu insertItem: [record menuItem] atIndex: itemIndex + 1];

trunk/Cocoa/F-Script Anywhere/Source/Read Me

@@ -168 +168 @@
 ---------------
 2.0   - unreleased      - Injectable into Cocoa garbage collected apps
+                          (64-bit applications are not yet supported)
                         - Requires F-Script 2.0 and Mac OS X 10.5
 1.3.1 - 17 October 2007 - Compatible with Mac OS X 10.5