BookMacster 1.21 (was 1.20.7), prior to Code Review. After updating to Xcode 5.1 which wanted lots of stupid integer typecasts, finally fixed the #import Sparkle/SUUpdater.h phenomena (removed the path), added “Periodic” advanced trigger.

Author: jerrykrinock

SSYAlert.m

@@ -127,7 +127,8 @@ @implementation NSTextView (SSYAlertUsage)
 - (void)configureForSSYAlertUsage {
 	[self setEditable:NO] ;
 	[self setDrawsBackground:NO] ;
-	[self setSelectable:NO] ;
+    // Changed in BookMacster 1.21.  Why not allow text to be copied?
+	[self setSelectable:YES] ;
 
 	// The next two lines are very important.  Took me many months to learn that,
 	// by default, NSTextViews will resize themselves automatically to accomodate

SSYAlertSounder.m

@@ -22,7 +22,7 @@ - (id)init {
 
 - (void)dealloc {
 	for (NSNumber* soundId in [m_soundIds allValues]) {
-		AudioServicesDisposeSystemSoundID([soundId longValue]) ;
+		AudioServicesDisposeSystemSoundID((unsigned int)[soundId longValue]) ;
 	}
 
 	[m_soundIds release] ;
@@ -77,7 +77,7 @@ - (void)playAlertSoundNamed:(NSString*)name {
     }
 
 	// First, see if we've got this sound cached
-	SystemSoundID soundId = [[[self soundIds] objectForKey:name] longValue] ;
+	SystemSoundID soundId = (SystemSoundID)[[[self soundIds] objectForKey:name] longValue] ;
 	// Used -longValue because SystemSoundID is a UInt32
 
 	NSString* path ;

SSYDocFileObserver.m

@@ -72,7 +72,7 @@ - (id)initWithDocument:(NSDocument*)document
              The following was changed in BookMacster 1.20.2, to catch updates
              by both Dropbox and ChronoSync.
              */
-            NSInteger watchFlags = (SSYPathObserverChangeFlagsRename | SSYPathObserverChangeFlagsDelete) ;
+            uint32_t watchFlags = (SSYPathObserverChangeFlagsRename | SSYPathObserverChangeFlagsDelete) ;
 
 			ok = [[self pathObserver] addPath:path
 								   watchFlags:watchFlags

SSYEventInfo.m

@@ -4,12 +4,12 @@
 @implementation SSYEventInfo
 
 + (BOOL)alternateKeyDown {
-	NSUInteger modifiers  = CGEventSourceFlagsState(kCGEventSourceStateCombinedSessionState) ;	
+	CGEventFlags modifiers  = (CGEventFlags)CGEventSourceFlagsState(kCGEventSourceStateCombinedSessionState) ;
 	return  (modifiers & kCGEventFlagMaskAlternate) != 0 ;
 }
 
 + (BOOL)shiftKeyDown {
-	NSUInteger modifiers  = CGEventSourceFlagsState(kCGEventSourceStateCombinedSessionState) ;	
+	CGEventFlags modifiers  = (CGEventFlags)CGEventSourceFlagsState(kCGEventSourceStateCombinedSessionState) ;
 	return  (modifiers & kCGEventFlagMaskShift) != 0 ;
 }
 

SSYKeychain.m

@@ -133,7 +133,7 @@ + (NSArray*)genericAccountsForServiceName:(NSString*)serviceName {
 		struct SecKeychainAttribute attribute ;
 		attribute.tag = kSecServiceItemAttr ;
 		// Being careful here because strlen(0) causes a crash
-		attribute.length = serviceNameC ? strlen(serviceNameC) : 0 ;
+		attribute.length = serviceNameC ? (UInt32)strlen(serviceNameC) : 0 ;
 		attribute.data = (void*)serviceNameC ;
 
 		struct SecKeychainAttributeList attributeList ;
@@ -179,7 +179,7 @@ + (NSArray*)internetAccountsForHost:(NSString*)host {
 	struct SecKeychainAttribute attribute ;
 	attribute.tag = kSecServerItemAttr ;
 	// Being careful here because strlen(0) causes a crash
-	attribute.length = hostC ? strlen(hostC) : 0 ;
+	attribute.length = hostC ? (UInt32)strlen(hostC) : 0 ;
 	attribute.data = (void*)hostC ;
 
 	struct SecKeychainAttributeList attributeList ;
@@ -277,18 +277,18 @@ + (NSString*)internetPasswordUsername:(NSString*)username
 			}
 
 			const char *hostC = [hostWithSub UTF8String] ;
-			attribute.length = strlen(hostC) ;
+			attribute.length = (UInt32)strlen(hostC) ;
 			attribute.data = (void*)hostC ;
 			// strlen(0) causes a crash but we've already checked that [host length] > 0
 			NSInteger lengthHost = hostC ? strlen(hostC) : 0 ;
 
 			OSStatus findResult = SecKeychainFindInternetPassword (
 				NULL, // default keychain
-				lengthHost, // server name length
+				(UInt32)lengthHost, // server name length
 				hostC, // server name
-				lengthDomain, // security domain length
+				(UInt32)lengthDomain, // security domain length
 				dom, // security domain
-				lengthUser, // account name length
+				(UInt32)lengthUser, // account name length
 				user, // account name
 				0, // path length
 				NULL, // path
@@ -366,18 +366,18 @@ + (BOOL)addInternetPassword:(NSString*)password
 			NSInteger lengthNewPassword = pass ? strlen(pass) : 0 ;
 			OSStatus addResult = SecKeychainAddInternetPassword (
 																 NULL, // default keychain
-																 lengthHost, // server name length
+																 (UInt32)lengthHost, // server name length
 																 host, // server name
-																 lengthDomain, // security domain length
+																 (UInt32)lengthDomain, // security domain length
 																 dom, // security domain
-																 lengthUser, // account name length
+																 (UInt32)lengthUser, // account name length
 																 user, // account name
 																 0, // path length
 																 NULL, // path
 																 port, // port
 																 kSecProtocolTypeHTTP, // protocol
 																 kSecAuthenticationTypeHTTPBasic, // authentication type
-																 lengthNewPassword, // password length
+																 (UInt32)lengthNewPassword, // password length
 																 pass, // password
 																 NULL // item ref
 																 ) ;
@@ -414,15 +414,15 @@ + (NSString*)genericPasswordServiceName:(NSString*)serviceName
 		NSInteger accountNameLength = strlen(accountNameC) ;
 
 		const char* serviceNameC = [serviceName UTF8String] ;
-		attribute.length = strlen(serviceNameC) ;
+		attribute.length = (UInt32)strlen(serviceNameC) ;
 		attribute.data = (void*)serviceNameC ;
 		NSInteger serviceNameLength = serviceNameC ? strlen(serviceNameC) : 0 ;
 
 		OSStatus findResult = SecKeychainFindGenericPassword (
 															  NULL, // default keychain
-															  serviceNameLength, // server name length
+															  (UInt32)serviceNameLength, // server name length
 															  serviceNameC, // service name
-															  accountNameLength, // account name length
+															  (UInt32)accountNameLength, // account name length
 															  accountNameC, // account name
 															  &passwordLength, // password length
 															  &passwordC, // password
@@ -472,11 +472,11 @@ + (BOOL)addGenericPassword:(NSString*)password
 			NSInteger passwordLength = passwordC ? strlen(passwordC) : 0 ;
 			OSStatus addResult = SecKeychainAddGenericPassword (
 																NULL, // default keychain
-																serviceNameLength,
+																(UInt32)serviceNameLength,
 																serviceNameC,
-																accountNameLength,
+																(UInt32)accountNameLength,
 																accountNameC,
-																passwordLength,
+																(UInt32)passwordLength,
 																passwordC,
 																NULL
 																);
@@ -493,7 +493,7 @@ + (BOOL)changeKeychainItemRef:(SecKeychainItemRef)itemRef
 
 	if (password && itemRef) {
 		const char *pass = [password UTF8String] ;
-		OSErr status = SecKeychainItemModifyContent(itemRef, nil, strlen(pass), pass) ;
+		OSErr status = SecKeychainItemModifyContent(itemRef, nil, (UInt32)strlen(pass), pass) ;
 		success = (status == noErr)  ;
 	}
 

SSYManagedObject.m

@@ -393,7 +393,7 @@ - (void)breakRetainCycles {
 
 - (uint32_t)valuesHash {
 	NSArray* attributeKeys = [[[self entity] attributesByName] allKeys] ;
-	unsigned long valuesHash = 0 ;
+	uint32_t valuesHash = 0 ;
 	for (NSString* key in attributeKeys) {
 #ifdef __LP64__
 		uint32_t aHash = [[self valueForKey:key] hash] & 0x00000000ffffffff ;

SSYOperationQueue.m

@@ -212,7 +212,7 @@ - (void)observeValueForKeyPath:(NSString*)keyPath
 			NSScriptCommand* scriptCommand = [self scriptCommand] ;
 			NSError* error = [self error] ;
 			if (error) {
-				[scriptCommand setScriptErrorNumber:[error code]] ;
+				[scriptCommand setScriptErrorNumber:(int)[error code]] ;
 				[scriptCommand setScriptErrorString:[error localizedDescription]] ;
 			}		
 			[self setError:nil

SSYProgressView.m

@@ -699,7 +699,7 @@ - (void)unsafeShowCompletionVerb:(NSString*)verb
 								   result, constKeyCompletionResult,
 								   nil] ;
 
-    // Remove any prior completions of same verb (Added BookMacster 1.20.7)
+    // Remove any prior completions of same verb (Added BookMacster 1.21)
     NSArray* completionsCopy = [[self completions] copy] ;
     NSInteger i = [completionsCopy count] - 1 ;
     for (NSDictionary* completion in [completionsCopy reverseObjectEnumerator]) {

SSYRecurringDate.m

@@ -52,7 +52,8 @@ + (NSString*)displayStringForWeekday:(NSInteger)weekday {
 		case SSRecurringDateWildcard:
 			key = @"everyDay" ;
 			break ;
-		default:
+		case 0:
+        default:
 			day = @"Sun" ;
 			break;
 	}

SSYResourceForks.m

@@ -58,7 +58,7 @@ - (void)     parser:(NSXMLParser*)parser
 - (NSArray*)weblocFilenamesAndUrlsInPaths:(NSArray*)paths {
 	OSErr err ;
 	FSRef fsRef ;
-	NSInteger fileRef ;
+	ResFileRefNum fileRef ;
 	NSMutableArray* filenamesAndURLs = [NSMutableArray array] ;
 
 	for (NSString* path in paths) {

SSYSheetManager.m

@@ -119,7 +119,7 @@ - (void)windowDidEndSheet:(NSNotification*)note {
      -[NSSavePanel beginSheetModalForWindow:completionHandler:].  In a conflict
      between one of our those and one of ours, we will lose.  Our sheet will
      never be presented, and the user will hear an NSBeep().  ARGHHHH!!!
-     So, starting with BookMacster 1.20.7, we wait here for a 0 second delay,
+     So, starting with BookMacster 1.21, we wait here for a 0 second delay,
      and THEN invoke tryToDequeueWindow: which will only do so if there is not
      THEN an attached sheet on our window.  If there is, that method will
      no-op, and then this method will be reinvoked when that other sheet ends,

SSYShortcutActuator.m

@@ -120,7 +120,9 @@ + (NSString*)stringForKeyCode:(NSInteger)keyCode
 		UniChar unicodeString[maxStringLength] ;
 
 		OSStatus status = UCKeyTranslate(keyboardLayout,
-										 keyCode, kUCKeyActionDown, modifierFlags,
+										 keyCode,
+                                         kUCKeyActionDown,
+                                         (unsigned int)modifierFlags,
 										 LMGetKbdType(), 0,
 										 &deadKeyState,
 										 maxStringLength,
@@ -356,17 +358,17 @@ - (NSDictionary*)registerShortcutWithInfo:(NSDictionary*)info
         return nil ;
     }
 
-	int32_t keyCode = [[info objectForKey:constKeyKeyCode] longValue] ;
-	uint32_t modifiers = [[info objectForKey:constKeyModifierFlags] unsignedLongValue] ;
-    modifiers = SRCocoaToCarbonFlags(modifiers) ;
+	int32_t keyCode = (int32_t)[[info objectForKey:constKeyKeyCode] longValue] ;
+	uint32_t modifiers = (uint32_t)[[info objectForKey:constKeyModifierFlags] unsignedLongValue] ;
+    modifiers = (uint32_t)SRCocoaToCarbonFlags(modifiers) ;
 
 	EventHotKeyID hotKeyID ;
 	EventTypeSpec eventType ;
 	eventType.eventClass = kEventClassKeyboard ;
 	eventType.eventKind = kEventHotKeyPressed ;
 	EventHandlerUPP handler = &SSYShortcutActuate ;
 
-	hotKeyID.id = ++m_shortcutSerialNumber ;
+	hotKeyID.id = (UInt32)(++m_shortcutSerialNumber) ;
 	EventTargetRef thisAppEventTarget = GetApplicationEventTarget() ;
 	EventHotKeyRef hotKeyRef = NULL ;
 	EventHandlerRef handlerRef = NULL ;

SSYSqliter.m

@@ -860,7 +860,7 @@ - (NSDictionary*)nextRowFromPreparedStatement:(sqlite3_stmt*)preparedStatement {
 		row = [[NSMutableDictionary alloc] init] ;
 	}
 
-	NSInteger iColumn  ;
+	int iColumn  ;
 	for (iColumn= 0; iColumn<nColumns; iColumn++) {
 		NSInteger type = sqlite3_column_type(preparedStatement, iColumn) ;
 		// The sqlite3_column_type() routine returns datatype code for the initial data type of the result column.
@@ -1340,7 +1340,7 @@ - (BOOL)setBlobData:(NSData*)blobData
 
 	if (result == SQLITE_OK) {
 		// bind attribute object
-		result = sqlite3_bind_blob(preparedStatement, 1, [blobData bytes], [blobData length], SQLITE_TRANSIENT) ;
+		result = sqlite3_bind_blob(preparedStatement, 1, [blobData bytes], (int)[blobData length], SQLITE_TRANSIENT) ;
 		if (result != SQLITE_OK) {
 			error = [self makeErrorWithAppCode:453043
 									sqliteCode:result
@@ -1482,7 +1482,7 @@ - (BOOL)setObject:(id)object
 														errorDescription:&errorStr];
 
 		// bind attribute object
-		result = sqlite3_bind_blob(preparedStatement, 1, [data bytes], [data length], SQLITE_TRANSIENT) ;
+		result = sqlite3_bind_blob(preparedStatement, 1, [data bytes], (int)[data length], SQLITE_TRANSIENT) ;
 		if (result != SQLITE_OK) {  
 			error = [self makeErrorWithAppCode:453013
 									sqliteCode:result
@@ -1678,7 +1678,7 @@ - (NSArray*)debugReadAllDataInTable:(NSString*)table
 			NSInteger nBytes = 0;
 
 			NSMutableArray* rowColumns = [[NSMutableArray alloc] init] ;
-			NSInteger iColumn ;
+			int iColumn ;
 			for (iColumn=0; iColumn<numberOfColumns; iColumn++) {
 				pFirstByte = sqlite3_column_blob(preparedStatement, iColumn) ;
 				nBytes = sqlite3_column_bytes(preparedStatement, iColumn);	
@@ -1796,15 +1796,15 @@ - (BOOL)addNewItemWithIdentifier:(NSInteger)identifier
 	{
 		if (result == SQLITE_OK) {
 			// Now, another loop to bind each parameter value to its question mark
-			NSInteger i ;
+			int i ;
 			for (i=0; i<nAttributes; i++) {
 				NSString *errorStr = nil ;
 				NSData* data = [NSPropertyListSerialization dataFromPropertyList:[valuesArray objectAtIndex:i]
 																		  format:NSPropertyListBinaryFormat_v1_0
 																errorDescription:&errorStr];
 
 				// i+1 in next line is because the question marks in sqlite are indexed starting with 1, not 0
-				result = sqlite3_bind_blob(preparedStatement, i+1, [data bytes], [data length], SQLITE_TRANSIENT) ;
+				result = sqlite3_bind_blob(preparedStatement, i+1, [data bytes], (int)[data length], SQLITE_TRANSIENT) ;
 				if (result != SQLITE_OK) {  
 					error = [self makeErrorWithAppCode:453022
 											sqliteCode:result
@@ -1938,7 +1938,7 @@ - (void)demonstrateInsertPreparedTable:(NSString*)table {
 		sprintf(sample.c, "sample %ld %f", (long)(sample.a), sample.b );
 
 		// bind parameter values
-		sqlite3_bind_int(insert, 1, sample.a);
+		sqlite3_bind_int(insert, 1, (int)(sample.a));
 		sqlite3_bind_double(insert, 2, sample.b);
 		sqlite3_bind_text(insert, 3, sample.c, -1, SQLITE_STATIC);
 

SSYSuperFileManager.m

@@ -293,7 +293,7 @@ - (BOOL)canExecutePath:(NSString *)fullPath
 		}
 		else {
 			// See if given groupID can execute it as group
-			uint32_t owningGroupID = [[attributes objectForKey:NSFileGroupOwnerAccountID] unsignedIntegerValue] ;
+			uint32_t owningGroupID = (uint32_t)[[attributes objectForKey:NSFileGroupOwnerAccountID] unsignedIntegerValue] ;
 			if ( (owningGroupID==groupID) && ((posixPermissions & S_IXGRP) != 0) ) {
 				canX = YES ;
 			}

SSYToolbar.m

@@ -3,9 +3,6 @@
 NSString* const constBindingToolbarDisplayStyle = @"displayStyle" ;
 static BOOL static_alreadyEntered = NO ;
 
-// Superclass (NSToolbar) properties
-static NSString* const constKeyDisplayMode = @"displayMode" ;
-static NSString* const constKeySizeMode = @"sizeMode" ;
 
 @implementation SSYToolbar
 
@@ -30,16 +27,6 @@ - (SSYToolbarDisplayStyle)displayStyle {
 }
 
 
-#if 0
-//This is not needed?
-+ (NSSet*)keyPathsForValuesAffectingDisplayStyle {
-	return [NSSet setWithObjects:
-			constKeyDisplayMode,
-			constKeySizeMode,
-			nil] ;
-}
-#endif
-
 /*
  The following override is a kludge is to fix a very strange bug:
  Open two documents.

SSYVolumeMountie.m

@@ -231,7 +231,7 @@ + (BOOL)unmountVolumePath:(NSString*)path
 						 @"%@() returned underlying error",
 						 failedFunction] ;
 		*error_p = SSYMakeError(errCode, msg) ;
-		NSError* error_ = [NSError errorWithMacErrorCode:errCode_] ;
+		NSError* error_ = [NSError errorWithMacErrorCode:(OSStatus)errCode_] ;
 		*error_p = [*error_p errorByAddingUnderlyingError:error_] ;
 	}
 

SSYWrappingCheckbox.m

@@ -54,7 +54,6 @@ - (void)sizeHeightToFitAllowShrinking:(BOOL)allowShrinking {
 }
 
 // You could change these if you wanted a different size checkbox
-NSControlSize static const constCheckboxSize = NSSmallControlSize ;
 CGFloat static const constCheckboxWidth = 18.0 ;
 CGFloat static const constCheckboxHeight = 18.0 ;
 // It is possible that I should define only one of the following