• In conformance with the new name announced by Apple last week, replaced all occurrences of "Mac OS X" and "OS X" in comments and string constants with "macOS".

Author: jerrykrinock

MAKVONotificationCenter.m

@@ -217,7 +217,7 @@ - (void)removeObserver:(id)observer {
 		NSMutableArray* keysToRemove = [[NSMutableArray alloc] init] ;
 		@synchronized(self)
 		{
-			// I guess we're still supporting Mac OS X 10.4?...
+			// I guess we're still supporting macOS 10.4?...
 			// Geez, I forgot how to do this...
 			NSEnumerator* e = [observations keyEnumerator];
 			NSString* key ;
@@ -265,4 +265,4 @@ - (void)removeObserver:(id)observer keyPath:(NSString *)keyPath selector:(SEL)se
 	[[MAKVONotificationCenter defaultCenter] removeObserver:observer object:self keyPath:keyPath selector:selector];
 }
 
-@end
+@end

SSWebBrowsing.h

@@ -24,7 +24,7 @@
 + (NSString*)defaultBrowserBundleIdentifier ;
 
 /*!
- @details  In OS X 10.10, there is Apple Bug 19642555, which causes
+ @details  In macOS 10.10, there is Apple Bug 19642555, which causes
  -[NSWorkspace openURLs:::::] to fail (and indeed return NO, if you rapid-fire
  it too quickly.  Experimenting on my 2013 13 inch MacBook Air, opening 13 URLs
  in Safari, I find that a 50-100 millisecond delay is necessary between

SSYAlert.m

@@ -646,7 +646,7 @@ + (NSInteger)tryRecoveryAttempterForError:(NSError*)error
                                                                                      }
                                                                                      else if ([recoveryAttempter respondsToSelector:@selector(attemptRecoveryFromError:optionIndex:delegate:didRecoverSelector:contextInfo:)]) {
                                                                                          /* This is an error produced by Cocoa.
-                                                                                          In particular, in Mac OS X 10.7, it might be one like this:
+                                                                                          In particular, in macOS 10.7, it might be one like this:
                                                                                           Error Domain = NSCocoaErrorDomain
                                                                                           Code = 67000
                                                                                           UserInfo = {

SSYAlertSounder.h

@@ -9,7 +9,7 @@
 
 
 /*!
- @brief    This is wrapper on OS X and iOS Audio Services API, whose purpose is
+ @brief    This is wrapper on macOS and iOS Audio Services API, whose purpose is
  to play an alert sound cheaply and reliably (in contrast to NSSound)
  
  @details   Requires System/Library/Frameworks/AudioToolbox.framework,

SSYDisplayAlotPopUpButtonCell.m

@@ -12,7 +12,7 @@ - (void)dismissPopUp {
 }
 
 #if (MAC_OS_X_VERSION_MAX_ALLOWED < 101000)
-// OS X 10.9.x or earlier
+// macOS 10.9.x or earlier
 // This makes absolutely no sense.
 #define NSCellHitResult NSUInteger
 #endif
@@ -29,4 +29,4 @@ - (NSCellHitResult)hitTestForEvent:(NSEvent *)event
 
 #endif
 
-@end
+@end

SSYDooDooUndoManager.h

@@ -77,7 +77,7 @@ extern NSString* const SSYUndoManagerDocumentWillSaveNotification ;
       will work again the next time it is invoked.
  
  Note that if your document is a subclass of NSPersistentDocument,
- and your SDK is Mac OS X 10.6 or later, you could rewrite SSYDooDooUndoManager
+ and your SDK is macOS 10.6 or later, you could rewrite SSYDooDooUndoManager
  to use SSYUndoManagerDocumentWillSaveNotification instead, and then you wouldn't
  need to send SSYUndoManagerDocumentWillSaveNotification.
  

SSYIOKit.m

@@ -2,7 +2,7 @@
  File:			GetPrimaryMACAddress.c
 	
  Description:	This sample application demonstrates how to do retrieve the Ethernet MAC
- address of the built-in Ethernet interface from the I/O Registry on Mac OS X.
+ address of the built-in Ethernet interface from the I/O Registry on macOS.
  Techniques shown include finding the primary (built-in) Ethernet interface,
  finding the parent Ethernet controller, and retrieving properties from the
  controller's I/O Registry entry.
@@ -187,7 +187,7 @@ + (NSData*)primaryMACAddressData {
 
 	if (MACAddressData == nil) {
 		// May be a Hackintosh.  Use email instead.
-		// Starting with Mac OS X 10.8, -[ABAddressBook me] will produce an ugly warning
+		// Starting with macOS 10.8, -[ABAddressBook me] will produce an ugly warning
 		// asking if it's OK for your app to access Contacts, and will block until
 		// user dismisses the dialog.  But I figure that if someone
 		// is using a Hackintosh, they should expect stuff like that.

SSYInterappClient.m

@@ -118,7 +118,7 @@ + (BOOL)sendHeaderByte:(char)txHeaderByte
 			case kCFMessagePortTransportError:
 				errorDetail = @"Transport Error" ;
 				break ;
-			case -5:  // Mac OS X 10.6 SDK defines this as kCFMessagePortBecameInvalidError
+			case -5:  // macOS 10.6 SDK defines this as kCFMessagePortBecameInvalidError
 				errorDetail = @"Port Became Invalid" ;
 				break ;
 			case SSYInterappClientErrorCantFindReceiver:
@@ -165,4 +165,4 @@ + (BOOL)sendHeaderByte:(char)txHeaderByte
 	return ok ;
 }
 
-@end
+@end

SSYInterappServer.h

@@ -13,11 +13,11 @@ extern NSString* const SSYInterappServerErrorDomain ;
  See comment at bottom of this file.
  
  Troubleshooting tip.  To see if a port is active in the system,
- * On OS X 10.9 or earlier
+ * On macOS 10.9 or earlier
  *      sudo launchctl bstree | grep <fragmentOfYourPortName>
  *    Example:
  *      sudo launchctl bstree | grep sheepsystems
- * On OS X 10.10 or later
+ * On macOS 10.10 or later
  *      sudo launchctl print user/<uid> | grep <fragmentOfYourPortName>
  *    Example:
  *      sudo launchctl print user/501 | grep sheepsystems
@@ -166,4 +166,4 @@ int main(int argc, const char *argv[])
 
     return 0;
 }
-#endif
+#endif

SSYInterappServer.m

@@ -259,7 +259,7 @@ - (id)initWithPortName:(NSString*)portName
 			*error_p = [NSError errorWithDomain:SSYInterappServerErrorDomain
 										   code:errorCode
 									   userInfo:[NSDictionary dictionaryWithObjectsAndKeys:
-												 @"Mac OS X failed to create a local message port.", NSLocalizedDescriptionKey,
+												 @"macOS failed to create a local message port.", NSLocalizedDescriptionKey,
 												 portName, @"Port Name",
                                                  portAppearsToBeInUse ? @"Yup" : @"Nope", @"Port appears to be already in use?",
                                                  localizedFailureReason, NSLocalizedDescriptionKey, // may be nil
@@ -333,4 +333,4 @@ - (void)unleaseForDelegate:(NSObject <SSYInterappServerDelegate> *)delegate {
 	[static_serversInUse removeObject:self] ;
 }
 
-@end
+@end

SSYKeychain.h

@@ -15,7 +15,7 @@ extern NSString *const kSSYKeychainErrorDomain;
 
 
 /*!
- @brief    A class of class methods for accessing items in the user's OS X or
+ @brief    A class of class methods for accessing items in the user's macOS or
  iOS Keychain
  
  @details  This class is a fork of SSKeychain by Sam Soffes,
@@ -95,7 +95,7 @@ extern NSString *const kSSYKeychainErrorDomain;
  you may get a key "class", which I think is supposed to be "kcls", symbolized
  by kSecAttrKeyClass, and I think this is a bug in Keychain Services.
  
- For convenience in debugging, the Attribute Item Keys in OS X 10.10.2 have
+ For convenience in debugging, the Attribute Item Keys in macOS 10.10.2 have
  been dumped below.  Of course, you should use the constants and not the values
  because the latter are an undocumented implementation detail.
  
@@ -141,7 +141,7 @@ extern NSString *const kSSYKeychainErrorDomain;
  kSecAttrCanUnwrap = unwp
  kSecAttrAccessGroup = agrp
  
- You will never see most of those keys.  The keys I found when dumping my OS X
+ You will never see most of those keys.  The keys I found when dumping my macOS
  Keychain of of 114 items, prefixed by their number of occurrences, is:
  
  114 kSecAttrModificationDate = mdat

SSYKeychainQuery.h

@@ -3,7 +3,7 @@
 
 /*
  #define CHECK_FOR_ICLOUD_SYNCHRONIZATION_IN_LATER_SDK to nonzero only if your
- app is sandboxed.  If your app is not sandboxed, in OS X 10.11 or later,
+ app is sandboxed.  If your app is not sandboxed, in macOS 10.11 or later,
  checking for iCloud synchronization will print two warnings like the following
  to the system console every time that your app uses this class to fetch a
  keychain item:
@@ -28,7 +28,7 @@ typedef NS_ENUM(NSUInteger, SSYKeychainQuerySynchronizationMode) {
 #endif
 
 /*!
- @brief  Object for querying and changing items in the OS X or iOS Keychain,
+ @brief  Object for querying and changing items in the macOS or iOS Keychain,
  doing the heavy lifting for SSYKeychain which has an easier interface and is
  recommended as a wrapper
  

SSYLaunchdGuy.m

@@ -42,34 +42,34 @@ + (NSError*)warnUserIfLaunchdHangInTaskResult:(NSInteger)result
 	if ((result != 0) && ([error code] == SSYShellTaskerErrorTimedOut)) {
         /*
          This method was changed in BookMacster 1.14.4.  I've had a couple
-         reports from Mac OS X 10.8 users, and I saw this happen once myself,
-         but unlike the restart that was necessary to fix it in Mac OS X 10.7,
+         reports from macOS 10.8 users, and I saw this happen once myself,
+         but unlike the restart that was necessary to fix it in macOS 10.7,
          it now seems to fix itself.  So Apple didn't really fix it, but they
          made it enough better that we don't want to annoy the user with the
          warning any more.
          */
 		NSTimeInterval timeout = [[[error userInfo] objectForKey:constKeySSYShellTaskerTimeout] doubleValue] ;
 		NSLog(@"Warning 516-7625 launchctl timed out at %0.1f secs.", timeout) ;
-		NSString* reason = @"The launchd process of Mac OS X is not responding." ;
+		NSString* reason = @"The launchd process of macOS is not responding." ;
 		NSString* suggestion = @"You should restart your Mac at the next opportunity.  "
 		@"This bug has reportedly been fixed by Apple in Mac OS 10.8 (Mountain Lion)." ;
 		error = [error errorByAddingLocalizedFailureReason:reason] ;
 		error = [error errorByAddingLocalizedRecoverySuggestion:suggestion] ;
 
         if (NSAppKitVersionNumber < 1187.370000) {
             // The above condition was added in BookMacster 1.14.4.
-            // The above number is for Mac OS X 10.8.3.  I'd like to use the
+            // The above number is for macOS 10.8.3.  I'd like to use the
             // number for 10.8.0, but can't find that.  It doesn't matter that
             // much, oh well.
             // The reason for the condition now, is that this launchd thing
-            // seems to fix itself after some time in Mac OS X 10.8.  It no
+            // seems to fix itself after some time in macOS 10.8.  It no
             // requires a restart
             NSString* message = [NSString stringWithFormat:@"%@\n\n%@",
                                  reason,
                                  suggestion] ;
 
             NSString* windowTitle = [NSString stringWithFormat:
-                                     @"%@ : Problem with Mac OS X",
+                                     @"%@ : Problem with macOS",
                                      [[NSProcessInfo processInfo] processName]] ;
             CFUserNotificationDisplayNotice (
                                              60,  // timeout
@@ -90,7 +90,7 @@ + (NSError*)warnUserIfLaunchdHangInTaskResult:(NSInteger)result
 
 // launchctl itself has a built-in timeout of 25 seconds (Mac OS 10.6.6).
 // So, anything over 25 seconds will act like 25 seconds.  However, on
-// 20120428 launchctl got into some weird state in Mac OS X 10.7.3.
+// 20120428 launchctl got into some weird state in macOS 10.7.3.
 // Whenever I gave it a command to load or unload a job, it would hang
 // indefinitely.  So I reduced this in BookMacster 1.11 from 180.0 to
 // 35.0 seconds.
@@ -471,7 +471,7 @@ + (pid_t)pidIfRunningLabel:(NSString*)label {
             NSString* trimmedResponse = [response stringByTrimmingCharactersInSet:[NSCharacterSet whitespaceAndNewlineCharacterSet]] ;
             /*
              The following line was fixed in BookMacster 1.17 so that it works
-             if fields are separated by tabs (as they are in Mac OS X 10.8)
+             if fields are separated by tabs (as they are in macOS 10.8)
              instead of spaces.  Maybe they were spaces in an earlier OS X
              version?  Anyhow, we handle either now.
              */
@@ -827,4 +827,4 @@ + (BOOL)tryAgentLoad:(BOOL)load
 }
 
 
-@end
+@end

SSYLineBox.h

@@ -4,12 +4,12 @@
  @brief    Subclass of NSBox which makes collapses into a grayscale vertical or
  horizontal line, with whiteness=0.2, alpha=1.0, thickness=1.0 point, restoring
  the darkness of the "Vertical Line" and "Horizontal Line" object that became
- too white in OS X 10.10.
+ too white in macOS 10.10.
  
- @details  This subclass is useful in OS X 10.10 Yosemite.  For some
+ @details  This subclass is useful in macOS 10.10 Yosemite.  For some
  reason, the "Vertical Line" and "Horizontal Line" NSBox objects in the
- xib library, which produce a fairly dark line in earlier versions of OS X,
- produce a very light gray line in OS X 10.10 that is barely discernable on
+ xib library, which produce a fairly dark line in earlier versions of macOS,
+ produce a very light gray line in macOS 10.10 that is barely discernable on
  a white background.  Just change the object class of your Vertical Line and
  Horizontal Line objects from NSBox to SSYLineBox
  */

SSYLoginItems.m

@@ -139,7 +139,7 @@ + (BOOL)loginItemWithURL:(NSURL*)url
             // Bug fixed in BookMacster 1.13.6 right here.  The condition
             // "if (error)" on the next 2  dozen lines, which made no sense,
             // was removed.
-            NSString* desc = @"Mac OS X could not resolve your Login Items." ;
+            NSString* desc = @"macOS could not resolve your Login Items." ;
             NSString* path = [url path] ;
             if (!path) {
                 path = [url absoluteString] ;
@@ -228,7 +228,7 @@ + (BOOL)isURL:(NSURL*)url
 end:
 	if (error_p && !ok) {
 		NSMutableDictionary* userInfo = [NSMutableDictionary dictionary] ;
-        [userInfo setObject:@"Error probing your Mac OS X Login Items"
+        [userInfo setObject:@"Error probing your macOS Login Items"
                      forKey:NSLocalizedDescriptionKey] ;
 		[userInfo setValue:[url absoluteString]
                         forKey:@"Url"] ;
@@ -355,7 +355,7 @@ + (BOOL)removeLoginURL:(NSURL*)url
 
 	if (error_p && !ok) {
 		NSMutableDictionary* userInfo = [NSMutableDictionary dictionary] ;
-        [userInfo setObject:@"Error removing a Mac OS X Login Item"
+        [userInfo setObject:@"Error removing a macOS Login Item"
                      forKey:NSLocalizedDescriptionKey] ;
 		[userInfo setValue:[url absoluteString]
                     forKey:@"Url"] ;
@@ -510,7 +510,7 @@ + (SSYSharedFileListResult)synchronizeLoginItemPath:(NSString*)path
 end:
 	if (error_p && !ok) {
 		NSMutableDictionary* userInfo = [NSMutableDictionary dictionary] ;
-        [userInfo setObject:@"Error synchronizing a Mac OS X Login Item"
+        [userInfo setObject:@"Error synchronizing a macOS Login Item"
                      forKey:NSLocalizedDescriptionKey] ;
 		[userInfo setValue:[url absoluteString]
                     forKey:@"Url"] ;
@@ -629,4 +629,4 @@ + (NSArray*)allLoginPathsError:(NSError**)error_p {
 }
 
 
-@end
+@end

SSYMOCManager.h

@@ -73,7 +73,7 @@
  @param    identifier  A unique identifier for the context/store, or nil to return
  a "common" managed object context/store of the given type for the application.
  If storeType is NSSQLiteStoreType, identifier must contain only characters that are valid
- in a filename. That means, I believe, in Mac OS X, no slashes (/) or colons (:).  
+ in a filename. That means, I believe, in macOS, no slashes (/) or colons (:).  
  This is because the identifier will be incorporated the name of an sqlite database
  file that will be created to support the new managed object context if necessary.
  @param    momdName  The baseName of the baseName.momd directory in 

SSYManagedObject.m

@@ -131,7 +131,7 @@ + (NSString*)entityNameForClass:(Class)class {
 
 + (NSEntityDescription*)entityDescription {
     // This method was rewritten for BookMacster 1.19.2, to work around a
-    // bug in Mac OS X 10.9.  See
+    // bug in macOS 10.9.  See
     // http://stackoverflow.com/questions/19626858/over-optimization-bug-in-10-9-core-data-entity-description-methods
 
 	NSArray* bundles = [NSArray arrayWithObject:[NSBundle mainAppBundle]] ;
@@ -554,4 +554,4 @@ - (void)dealloc {
 #endif
 
 
-@end
+@end

SSYManagedTreeObject.m

@@ -270,16 +270,16 @@ - (NSArray*)childrenOrdered {
  
  * First Indication:  Open Slow.bkmslf.
  
- Expected result:  Open in 7 seconds (MacMini2 - OS X 10.9)
+ Expected result:  Open in 7 seconds (MacMini2 - macOS 10.9)
  Actual Result: Open in 45 seconds.
  
  * Second Indication: Edit a bookmark name in Saul.bkmslf, hit 'return'
- Expected result: less than 1 second (MacMini2 - OS X 10.9)
+ Expected result: less than 1 second (MacMini2 - macOS 10.9)
  Actual result: 18 seconds.
  
  * Third indication.  Export Saul's bookmrks to Firefox, then change a bookmark title in Bkmx, then import from Firefox
  Expected result: Something reasonable
- Actual result: 45 minutes, mostly in Finding Parents (4/7)  (MacMini2 - OS X 10.9)
+ Actual result: 45 minutes, mostly in Finding Parents (4/7)  (MacMini2 - macOS 10.9)
  
  TRIED SOLUTIONS
  
@@ -399,4 +399,4 @@ - (BOOL)extractFromDataRepresentation:(NSData*)dataRepresentation
 }
 */
 
-@end
+@end

SSYOAuthTalker.h

@@ -102,7 +102,7 @@ extern NSString* const constKeyOAuthTokenSecret ;
 + (NSString*)keychainServiceNameForAccounter:(NSObject <SSYOAuthAccounter> *)accounter ;
 
 /*!
- @brief    Returns the Service Name in the Mac OS X Keychain which
+ @brief    Returns the Service Name in the macOS Keychain which
  stores the OAuth Token and OAuth Token Secret for the receiver.
  */
 - (NSString*)keychainServiceName ;
@@ -112,7 +112,7 @@ extern NSString* const constKeyOAuthTokenSecret ;
 
  @param    accounter  An object from which the account name and
  optional service name will be obtained just in time for writing
- an item to the Mac OS X Keychain.  This is kept only as a weak
+ an item to the macOS Keychain.  This is kept only as a weak
  reference.  Make sure it doesn't go away.  (For example, a
  temporary Clientoid produced by a BookMacster Client is not a
  good object to use here.)
@@ -178,7 +178,7 @@ extern NSString* const constKeyOAuthTokenSecret ;
 
 /*!
  @brief    Writes the receiver's current credential information (token,
- token secret, user guid, and session handle) to the Mac OS X Keychain
+ token secret, user guid, and session handle) to the macOS Keychain
  as a generic (application) password, under the current values of
  keychainServiceName and profileName
 */