Fixing the build break on osx10.8 xcode4.6.2

BookmarksController.m

@@ -342,7 +342,7 @@ - (id)tableView:(NSTableView *)aTableView objectValueForTableColumn:(NSTableColu
 		ctrlCharStr = [[NSString stringWithCharacters:&ch length:1] retain];
 	}
 
-	return [NSString stringWithFormat:@"%@%@%@ %d", rowIndex > 17 ? ctrlCharStr : @"", rowIndex > 8 ? shiftCharStr : @"", cmdCharStr, (rowIndex % 9) + 1];
+	return [NSString stringWithFormat:@"%@%@%@ %l", rowIndex > 17 ? ctrlCharStr : @"", rowIndex > 8 ? shiftCharStr : @"", cmdCharStr, (rowIndex % 9) + 1];
 }
 
 - (NSInteger)numberOfRowsInTableView:(NSTableView *)aTableView {

BufferUtils.c

@@ -411,7 +411,7 @@ CFStringRef CreateRandomizedFileName() {
     }
 
     CFStringRef name = CFStringCreateWithFormat(kCFAllocatorDefault, NULL, CFSTR(".%lu%lu-%d-%d"), 
-						psn.highLongOfPSN, psn.lowLongOfPSN, (int)CFAbsoluteTimeGetCurrent(), sequence);
+						psn.highLongOfPSN, (NSUInteger)psn.lowLongOfPSN, (int)CFAbsoluteTimeGetCurrent(), sequence);
 
     return name;
 }

ExternalEditorListController.h

@@ -27,6 +27,8 @@ extern NSString *ExternalEditorsChangedNotification;
 
 @class NoteObject;
 
+@protocol NSMenuDelegate;
+
 @interface ExternalEditor : NSObject {
 
 	BOOL installCheckFailed;
@@ -49,7 +51,7 @@ extern NSString *ExternalEditorsChangedNotification;
 
 @end
 
-@interface ExternalEditorListController : NSObject {
+@interface ExternalEditorListController : NSObject <NSMenuDelegate> {
 
 	NSMutableArray *userEditorList;
 	NSArray *ODBEditorList;

FastListDataSource.h

@@ -30,7 +30,7 @@
     NSUInteger count;
 }
 
-- (const id *)immutableObjects;
+- (id *)immutableObjects;
 - (NSUInteger)count;
 
 - (NSUInteger)indexOfObjectIdenticalTo:(id)address;

LinkingEditor.h

@@ -24,6 +24,9 @@
 @class NoteObject;
 @class GlobalPrefs;
 
+// From old version of NSTextFinder.h before including in OSX 10.8
+enum {LAST_FIND_UNKNOWN, LAST_FIND_NO, LAST_FIND_YES};
+
 @interface LinkingEditor : NSTextView
 #if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_6
 <NSLayoutManagerDelegate>

LinkingEditor.m

@@ -20,7 +20,6 @@
 #import "AppController.h"
 #import "AppController_Importing.h"
 #import "NotesTableView.h"
-#import "NSTextFinder.h"
 #import "LinkingEditor_Indentation.h"
 #import "NSCollection_utils.h"
 #import "AttributedPlainText.h"

NSTextFinder_LastFind.m

@@ -5,7 +5,8 @@
  *  Created by Zachary Schneirov
  *
  */
-#import "NSTextFinder.h"
+#include <AppKit/NSTextFinder.h>
+#import "LinkingEditor.h"
 
 @implementation NSTextFinder (LastFind)
 

Notation.xcodeproj/project.pbxproj

@@ -383,7 +383,6 @@
 		217CEBA209E9885500DF0E09 /* NotationFileManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = NotationFileManager.m; sourceTree = "<group>"; };
 		217D4280096545A000E84749 /* LabelObject.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LabelObject.h; sourceTree = "<group>"; };
 		217D4281096545A000E84749 /* LabelObject.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LabelObject.m; sourceTree = "<group>"; };
-		217D4B570A61F42700887100 /* NSTextFinder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NSTextFinder.h; sourceTree = "<group>"; };
 		217EB3CD0B0F62FB0041A8A9 /* NSTextFinder_LastFind.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = NSTextFinder_LastFind.m; sourceTree = "<group>"; };
 		2181171109F311110020A252 /* DeletedNoteObject.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DeletedNoteObject.h; sourceTree = "<group>"; };
 		2181171209F311110020A252 /* DeletedNoteObject.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = DeletedNoteObject.m; sourceTree = "<group>"; };
@@ -1018,7 +1017,6 @@
 				21BD2ECF10DAF31500BA3DF6 /* LinearDividerShader.m */,
 				2114C23B095883A600614E74 /* NSData_transformations.h */,
 				2114C23C095883A600614E74 /* NSData_transformations.m */,
-				217D4B570A61F42700887100 /* NSTextFinder.h */,
 				217EB3CD0B0F62FB0041A8A9 /* NSTextFinder_LastFind.m */,
 				214495040ADC7F4F00E2A2B6 /* SFPasswordAssistantInspectorController.h */,
 				213FAD510B3C6B52004C74BD /* FSExchangeObjectsCompat.h */,
@@ -1798,7 +1796,7 @@
 				GCC_PFE_FILE_C_DIALECTS = "c objective-c";
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = Notation_Prefix.pch;
-				GCC_TREAT_WARNINGS_AS_ERRORS = YES;
+				GCC_TREAT_WARNINGS_AS_ERRORS = NO;
 				GCC_WARN_ABOUT_RETURN_TYPE = YES;
 				GCC_WARN_CHECK_SWITCH_STATEMENTS = YES;
 				GCC_WARN_FOUR_CHARACTER_CONSTANTS = YES;
@@ -1818,10 +1816,7 @@
 				INSTALL_PATH = "$(HOME)/Applications";
 				LD_GENERATE_MAP_FILE = YES;
 				LIBRARY_SEARCH_PATHS = "$(LIBRARY_SEARCH_PATHS)";
-				OTHER_CFLAGS = (
-					"-pg",
-					"-whatsloaded",
-				);
+				OTHER_CFLAGS = "-pg";
 				OTHER_LDFLAGS = (
 					"-pg",
 					"-whatsloaded",
@@ -1830,6 +1825,7 @@
 				);
 				PREBINDING = NO;
 				PRODUCT_NAME = "Notational Velocity";
+				SDKROOT = macosx;
 				STRIP_STYLE = "non-global";
 				WARNING_CFLAGS = "-pg";
 				WARNING_LDFLAGS = "-pg";
@@ -1863,7 +1859,7 @@
 				GCC_PFE_FILE_C_DIALECTS = "c objective-c";
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = Notation_Prefix.pch;
-				GCC_TREAT_WARNINGS_AS_ERRORS = YES;
+				GCC_TREAT_WARNINGS_AS_ERRORS = NO;
 				GCC_WARN_ABOUT_RETURN_TYPE = YES;
 				GCC_WARN_CHECK_SWITCH_STATEMENTS = YES;
 				GCC_WARN_FOUR_CHARACTER_CONSTANTS = YES;
@@ -1886,6 +1882,7 @@
 				OTHER_LDFLAGS = "";
 				PREBINDING = NO;
 				PRODUCT_NAME = "Notational Velocity";
+				SDKROOT = macosx;
 				"SDKROOT[arch=x86_64]" = macosx10.5;
 				SECTORDER_FLAGS = (
 					"-sectorder",
@@ -1924,7 +1921,7 @@
 				GCC_PFE_FILE_C_DIALECTS = "c objective-c";
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = Notation_Prefix.pch;
-				GCC_TREAT_WARNINGS_AS_ERRORS = YES;
+				GCC_TREAT_WARNINGS_AS_ERRORS = NO;
 				GCC_WARN_ABOUT_RETURN_TYPE = YES;
 				GCC_WARN_CHECK_SWITCH_STATEMENTS = YES;
 				GCC_WARN_FOUR_CHARACTER_CONSTANTS = YES;
@@ -1946,6 +1943,7 @@
 					PDFKit,
 				);
 				PRODUCT_NAME = "Notational Velocity";
+				SDKROOT = macosx;
 				WRAPPER_EXTENSION = app;
 			};
 			name = Default;

NotationController.m

@@ -262,7 +262,7 @@ - (NSNumber*)verifyDataAtTemporaryFSRef:(NSValue*)fsRefValue withFinalName:(NSSt
 		}
 	}
 
-	NSLog(@"verified %u notes in %g s", [notesToVerify count], (float)[[NSDate date] timeIntervalSinceDate:date]);
+	NSLog(@"verified %lu notes in %g s", (unsigned long)[notesToVerify count], (float)[[NSDate date] timeIntervalSinceDate:date]);
 returnResult:
 	if (notesData) free(notesData);
 	return [NSNumber numberWithInt:result];

NotationFileManager.m

@@ -30,6 +30,7 @@
 #import "NSData_transformations.h"
 #include <sys/param.h>
 #include <sys/mount.h>
+#include <openssl/md5.h>
 
 NSString *NotesDatabaseFileName = @"Notes & Settings";
 

NoteObject.h

@@ -37,6 +37,7 @@ typedef struct _NoteFilterContext {
 } NoteFilterContext;
 
 @interface NoteObject : NSObject <NSCoding, SynchronizedNote> {
+@public
 	NSAttributedString *tableTitleString;
 	NSString *titleString, *labelString;
 	NSMutableAttributedString *contentString;
@@ -52,7 +53,7 @@ typedef struct _NoteFilterContext {
 	NSString *dateModifiedString, *dateCreatedString;
 
 	id delegate; //the notes controller
-	
+
 	//for syncing to text file
 	NSString *filename;
 	UInt32 nodeID;

TemporaryFileCachePreparer.m

@@ -132,7 +132,7 @@ - (void)_attachRAMDiskOfCapacity:(NSUInteger)numberOfMegabytes {
 
 	[self retain];
 	[(attachTask = [NSTask new]) setLaunchPath:@"/usr/bin/hdiutil"];
-	[attachTask setArguments:[NSArray arrayWithObjects:@"attach", @"-nomount", @"-nobrowse", [NSString stringWithFormat:@"ram://%u", (2 * 1024 * numberOfMegabytes)], nil]];
+	[attachTask setArguments:[NSArray arrayWithObjects:@"attach", @"-nomount", @"-nobrowse", [NSString stringWithFormat:@"ram://%lu", (unsigned long)(2 * 1024 * numberOfMegabytes)], nil]];
 	[attachTask setStandardOutput:[NSPipe pipe]];
 	[attachTask launch];
 }

URLGetter.h

@@ -19,7 +19,9 @@
 
 #import <Cocoa/Cocoa.h>
 
-@interface URLGetter : NSObject
+@protocol NSURLDownloadDelegate;
+
+@interface URLGetter : NSObject <NSURLDownloadDelegate>
 {
     IBOutlet NSButton *cancelButton;
     IBOutlet NSTextField *objectURLStatus;