Merge branch 'master' of github.com:LIJI32/SameBoy

LIJI32 · Oct 3, 2024 · 122549d · 122549d
2 parents e13048d + 1fac887
commit 122549d
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 9 deletions.
diff --git a/Cocoa/GBTerminalTextFieldCell.m b/Cocoa/GBTerminalTextFieldCell.m
@@ -45,7 +45,7 @@ - (instancetype)init
 {
     self = [super init];
     if (!self) {
-        return NULL;
+        return nil;
     }
     lines = [[NSMutableOrderedSet alloc] init];
     return self;

diff --git a/Cocoa/KeyboardShortcutPrivateAPIs.h b/Cocoa/KeyboardShortcutPrivateAPIs.h
@@ -4,10 +4,10 @@
 @interface NSKeyboardShortcut : NSObject <NSCopying>
 
 + (id)shortcutWithPreferencesEncoding:(NSString *)encoding;
-+ (id)shortcutWithKeyEquivalent:(NSString *)key_equivalent modifierMask:(unsigned long long)mask;
-- (id)initWithKeyEquivalent:(NSString *)key_equivalent modifierMask:(unsigned long long)mask;
++ (id)shortcutWithKeyEquivalent:(NSString *)key_equivalent modifierMask:(NSUInteger)mask;
+- (id)initWithKeyEquivalent:(NSString *)key_equivalent modifierMask:(NSUInteger)mask;
 
-@property(readonly) unsigned long long modifierMask;
+@property(readonly) NSUInteger modifierMask;
 @property(readonly) NSString *keyEquivalent;
 @property(readonly) NSString *preferencesEncoding;
 @property(readonly) NSString *localizedModifierMaskDisplayName;

diff --git a/HexFiend/HFPasteboardOwner.m b/HexFiend/HFPasteboardOwner.m
@@ -44,7 +44,7 @@ - (void)tearDownPasteboardReferenceIfExists {
         [[NSNotificationCenter defaultCenter] removeObserver:self name:HFPrepareForChangeInFileNotification object:nil];
     }
     if (retainedSelfOnBehalfOfPboard) {
-        CFRelease(self);
+        [self release];
         retainedSelfOnBehalfOfPboard = NO;
     }
 }

diff --git a/iOS/GBViewController.m b/iOS/GBViewController.m
@@ -617,13 +617,10 @@ - (void)verifyEntitlements
     const char *_teamIdentifier = xpc_dictionary_get_string(entitlements, "com.apple.developer.team-identifier");
     NSString *teamIdentifier = _teamIdentifier? @(_teamIdentifier) : nil;
 
-    CFRelease(entitlements);
-
     if (!entIdentifier) { // No identifier. Installed using a jailbreak, we're fine.
         return;
     }
-
-
+
     if (teamIdentifier && [entIdentifier hasPrefix:[teamIdentifier stringByAppendingString:@"."]]) {
         entIdentifier = [entIdentifier substringFromIndex:teamIdentifier.length + 1];
     }