Minor pokes

MaddTheSane · Oct 9, 2023 · f867a3c · f867a3c
1 parent 736c0a9
commit f867a3c
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 14 deletions.
diff --git a/Boxer/BXEmulatedMT32.h b/Boxer/BXEmulatedMT32.h
@@ -66,20 +66,20 @@ typedef NS_OPTIONS(NSUInteger, BXMT32ROMType) {
     BXMT32ROMTypeUnknown    = 0,
 
     //Mutually exclusive
-    BXMT32ROMIsControl      = 1 << 0,
-    BXMT32ROMIsPCM          = 1 << 1,
+    BXMT32ROMIsControl NS_SWIFT_NAME(isControl) = 1 << 0,
+    BXMT32ROMIsPCM NS_SWIFT_NAME(isPCM)         = 1 << 1,
 
     //Mutually exclusive
-    BXMT32ROMIsMT32         = 1 << 2,
-    BXMT32ROMIsCM32L        = 1 << 3,
+    BXMT32ROMIsMT32 NS_SWIFT_NAME(isMT32)   = 1 << 2,
+    BXMT32ROMIsCM32L NS_SWIFT_NAME(isCM32)  = 1 << 3,
 
-    BXMT32Control   = BXMT32ROMIsControl | BXMT32ROMIsMT32,
-    BXMT32PCM       = BXMT32ROMIsPCM | BXMT32ROMIsMT32,
-    BXCM32LControl  = BXMT32ROMIsControl | BXMT32ROMIsCM32L,
-    BXCM32LPCM      = BXMT32ROMIsPCM | BXMT32ROMIsCM32L,
+    BXMT32Control NS_SWIFT_NAME(control)    = BXMT32ROMIsControl | BXMT32ROMIsMT32,
+    BXMT32PCM NS_SWIFT_NAME(pcm)            = BXMT32ROMIsPCM | BXMT32ROMIsMT32,
+    BXCM32LControl NS_SWIFT_NAME(lControl)  = BXMT32ROMIsControl | BXMT32ROMIsCM32L,
+    BXCM32LPCM NS_SWIFT_NAME(lPCM)          = BXMT32ROMIsPCM | BXMT32ROMIsCM32L,
 
-    BXMT32ModelMask = BXMT32ROMIsMT32 | BXMT32ROMIsCM32L,
-    BXMT32TypeMask  = BXMT32ROMIsControl | BXMT32ROMIsPCM,
+    BXMT32ModelMask NS_SWIFT_NAME(modelMask)    = BXMT32ROMIsMT32 | BXMT32ROMIsCM32L,
+    BXMT32TypeMask NS_SWIFT_NAME(typeMask)      = BXMT32ROMIsControl | BXMT32ROMIsPCM,
 };
 
 

diff --git a/Boxer/BXEmulatorPrivate.h b/Boxer/BXEmulatorPrivate.h
@@ -194,7 +194,7 @@ typedef NS_ERROR_ENUM(BXDOSBoxMountErrorDomain, BXDOSBoxMountErrors) {
 
 /// Convenience method for sending a notification to both the default notification center and to a selector
 /// on the emulator's delegate. The object of the notification will be the @c BXEmulator instance.
-- (void) _postNotificationName: (NSString *)name
+- (void) _postNotificationName: (NSNotificationName)name
 			  delegateSelector: (SEL)selector
 					  userInfo: (nullable NSDictionary *)userInfo;
 
@@ -737,7 +737,7 @@ struct boxer_emulatorException: public std::exception {
 @property (copy) NSArray<NSNumber*> *callStackReturnAddresses;
 @property (copy) NSArray<NSString*> *callStackSymbols;
 
-+ (instancetype) exceptionWithName: (NSString *)name originalException: (boxer_emulatorException *)info;
++ (instancetype) exceptionWithName: (NSExceptionName)name originalException: (boxer_emulatorException *)info;
 
 @end
 

diff --git a/Other Sources/ADBToolkit/ADBGeometry.h b/Other Sources/ADBToolkit/ADBGeometry.h
@@ -26,13 +26,13 @@
 
 //ADBGeometry provides various functions for manipulating NSPoints, NSSizes and NSRects.
 
+#import <Foundation/Foundation.h>
+
 //The C brace is needed when including this header from an Objective C++ file
 #if __cplusplus
 extern "C" {
 #endif
 
-	#import <Foundation/Foundation.h>
-
 	/// Returns the nearest power of two that can accommodate the specified value
 	NSInteger fitToPowerOfTwo(NSInteger value);