Revision: 13932
http://sourceforge.net/p/skim-app/code/13932
Author: hofman
Date: 2023-12-19 16:03:27 +0000 (Tue, 19 Dec 2023)
Log Message:
-----------
add some more __bridge to be sure
Modified Paths:
--------------
trunk/NSFileManager_SKExtensions.m
trunk/SKApplicationController.m
trunk/SKColorList.m
trunk/SKKeychain.m
trunk/vendorsrc/iospirit/HIDRemote/HIDRemote.m
Modified: trunk/NSFileManager_SKExtensions.m
===================================================================
--- trunk/NSFileManager_SKExtensions.m 2023-12-19 15:54:37 UTC (rev 13931)
+++ trunk/NSFileManager_SKExtensions.m 2023-12-19 16:03:27 UTC (rev 13932)
@@ -45,7 +45,7 @@
static NSArray *applicationSupportDirectoryURLs = nil;
if (applicationSupportDirectoryURLs == nil) {
NSMutableArray *urlArray = [NSMutableArray array];
- NSString *appName = [[NSBundle mainBundle]
objectForInfoDictionaryKey:(NSString *)kCFBundleNameKey];
+ NSString *appName = [[NSBundle mainBundle]
objectForInfoDictionaryKey:(__bridge NSString *)kCFBundleNameKey];
for (NSURL *url in [self
URLsForDirectory:NSApplicationSupportDirectory inDomains:NSAllDomainsMask])
[urlArray addObject:[url URLByAppendingPathComponent:appName
isDirectory:YES]];
applicationSupportDirectoryURLs = [urlArray copy];
@@ -63,7 +63,7 @@
if (noErr == FSFindFolder(kUserDomain, kChewableItemsFolderType, TRUE,
&chewableRef)) {
NSURL *chewableURL =
CFBridgingRelease(CFURLCreateFromFSRef(kCFAllocatorDefault, &chewableRef));
#pragma clang diagnostic pop
- NSString *appName = [[NSBundle mainBundle]
objectForInfoDictionaryKey:(NSString *)kCFBundleNameKey];
+ NSString *appName = [[NSBundle mainBundle]
objectForInfoDictionaryKey:(__bridge NSString *)kCFBundleNameKey];
chewableItemsDirectoryURL = [[chewableURL
URLByAppendingPathComponent:appName isDirectory:YES] copy];
} else {
char *template = strdup([[NSTemporaryDirectory()
stringByAppendingPathComponent:@"Skim.XXXXXX"] fileSystemRepresentation]);
Modified: trunk/SKApplicationController.m
===================================================================
--- trunk/SKApplicationController.m 2023-12-19 15:54:37 UTC (rev 13931)
+++ trunk/SKApplicationController.m 2023-12-19 16:03:27 UTC (rev 13932)
@@ -222,7 +222,7 @@
[NSApp setServicesProvider:[NSDocumentController
sharedDocumentController]];
- NSString *versionString = [[[NSBundle mainBundle] infoDictionary]
objectForKey:(NSString *)kCFBundleVersionKey];
+ NSString *versionString = [[[NSBundle mainBundle] infoDictionary]
objectForKey:(__bridge NSString *)kCFBundleVersionKey];
NSString *lastVersionString = [sud stringForKey:SKLastVersionLaunchedKey];
if (lastVersionString == nil || [SKVersionNumber
compareVersionString:lastVersionString toVersionString:versionString] ==
NSOrderedAscending) {
[self showReleaseNotes:nil];
Modified: trunk/SKColorList.m
===================================================================
--- trunk/SKColorList.m 2023-12-19 15:54:37 UTC (rev 13931)
+++ trunk/SKColorList.m 2023-12-19 16:03:27 UTC (rev 13932)
@@ -50,7 +50,7 @@
+ (NSColorList *)favoriteColorList {
static SKColorList *colorList = nil;
if (colorList == nil) {
- NSString *appName = [[NSBundle mainBundle]
objectForInfoDictionaryKey:(NSString *)kCFBundleNameKey];
+ NSString *appName = [[NSBundle mainBundle]
objectForInfoDictionaryKey:(__bridge NSString *)kCFBundleNameKey];
colorList = [[SKColorList alloc] initWithName:appName];
[(SKColorList *)colorList setEditable:YES];
NSInteger i = 0;
Modified: trunk/SKKeychain.m
===================================================================
--- trunk/SKKeychain.m 2023-12-19 15:54:37 UTC (rev 13931)
+++ trunk/SKKeychain.m 2023-12-19 16:03:27 UTC (rev 13932)
@@ -50,9 +50,9 @@
CFDictionarySetValue(query, kSecClass, kSecClassGenericPassword);
CFDictionarySetValue(query, kSecMatchLimit, kSecMatchLimitOne);
if (service)
- CFDictionarySetValue(query, kSecAttrService, (CFStringRef)service);
+ CFDictionarySetValue(query, kSecAttrService, (__bridge
CFStringRef)service);
if (account)
- CFDictionarySetValue(query, kSecAttrAccount, (CFStringRef)account);
+ CFDictionarySetValue(query, kSecAttrAccount, (__bridge
CFStringRef)account);
CFDictionarySetValue(query, kSecReturnData, kCFBooleanTrue);
OSStatus err = SecItemCopyMatching(query, &passwordData);
@@ -77,15 +77,15 @@
OSStatus err;
// password not on keychain, so add it
- CFDictionarySetValue(attributes, kSecAttrService, (CFStringRef)service);
- CFDictionarySetValue(attributes, kSecAttrAccount, (CFStringRef)account);
+ CFDictionarySetValue(attributes, kSecAttrService, (__bridge
CFStringRef)service);
+ CFDictionarySetValue(attributes, kSecAttrAccount, (__bridge
CFStringRef)account);
CFDictionarySetValue(attributes, kSecClass, kSecClassGenericPassword);
if (label)
- CFDictionarySetValue(attributes, kSecAttrLabel, (CFStringRef)label);
+ CFDictionarySetValue(attributes, kSecAttrLabel, (__bridge
CFStringRef)label);
if (comment)
- CFDictionarySetValue(attributes, kSecAttrComment,
(CFStringRef)comment);
+ CFDictionarySetValue(attributes, kSecAttrComment, (__bridge
CFStringRef)comment);
if (password)
- CFDictionarySetValue(attributes, kSecValueData, (CFDataRef)[password
dataUsingEncoding:NSUTF8StringEncoding]);
+ CFDictionarySetValue(attributes, kSecValueData, (__bridge
CFDataRef)[password dataUsingEncoding:NSUTF8StringEncoding]);
err = SecItemAdd(attributes, NULL);
CFRelease(attributes);
@@ -102,20 +102,20 @@
CFDictionarySetValue(query, kSecClass, kSecClassGenericPassword);
CFDictionarySetValue(query, kSecMatchLimit, kSecMatchLimitOne);
if (itemService)
- CFDictionarySetValue(query, kSecAttrService, (CFStringRef)itemService);
+ CFDictionarySetValue(query, kSecAttrService, (__bridge
CFStringRef)itemService);
if (itemAccount)
- CFDictionarySetValue(query, kSecAttrAccount, (CFStringRef)itemAccount);
+ CFDictionarySetValue(query, kSecAttrAccount, (__bridge
CFStringRef)itemAccount);
if (service && [service isEqualToString:itemService] == NO)
- CFDictionarySetValue(attributes, kSecAttrService,
(CFStringRef)service);
+ CFDictionarySetValue(attributes, kSecAttrService, (__bridge
CFStringRef)service);
if (account && [account isEqualToString:itemAccount] == NO)
- CFDictionarySetValue(attributes, kSecAttrAccount,
(CFStringRef)account);
+ CFDictionarySetValue(attributes, kSecAttrAccount, (__bridge
CFStringRef)account);
if (label)
- CFDictionarySetValue(attributes, kSecAttrLabel, (CFStringRef)label);
+ CFDictionarySetValue(attributes, kSecAttrLabel, (__bridge
CFStringRef)label);
if (comment)
- CFDictionarySetValue(attributes, kSecAttrComment,
(CFStringRef)comment);
+ CFDictionarySetValue(attributes, kSecAttrComment, (__bridge
CFStringRef)comment);
if (password)
- CFDictionarySetValue(attributes, kSecValueData, (CFDataRef)[password
dataUsingEncoding:NSUTF8StringEncoding]);
+ CFDictionarySetValue(attributes, kSecValueData, (__bridge
CFDataRef)[password dataUsingEncoding:NSUTF8StringEncoding]);
// password was on keychain, so modify the keychain
err = SecItemUpdate(query, attributes);
Modified: trunk/vendorsrc/iospirit/HIDRemote/HIDRemote.m
===================================================================
--- trunk/vendorsrc/iospirit/HIDRemote/HIDRemote.m 2023-12-19 15:54:37 UTC
(rev 13931)
+++ trunk/vendorsrc/iospirit/HIDRemote/HIDRemote.m 2023-12-19 16:03:27 UTC
(rev 13932)
@@ -418,7 +418,7 @@
object:kHIDRemoteDNHIDRemoteRetryGlobalObject
userInfo:[NSDictionary dictionaryWithObjectsAndKeys:
[NSNumber numberWithUnsignedInt:(unsigned
int)getpid()], kHIDRemoteDNStatusPIDKey,
-
[[NSBundle mainBundle] bundleIdentifier],
(NSString *)kCFBundleIdentifierKey,
+
[[NSBundle mainBundle] bundleIdentifier],
(__bridge NSString *)kCFBundleIdentifierKey,
nil]
deliverImmediately:YES];
}
@@ -648,7 +648,7 @@
[NSNumber numberWithUnsignedInt:(unsigned int)[self
activeRemoteControlCount]], kHIDRemoteDNStatusRemoteControlCountKey,
((_unusedButtonCodes!=nil) ? _unusedButtonCodes : [NSArray
array]), kHIDRemoteDNStatusUnusedButtonCodesKey,
action,
kHIDRemoteDNStatusActionKey,
-
[[NSBundle mainBundle] bundleIdentifier],
(NSString *)kCFBundleIdentifierKey,
+
[[NSBundle mainBundle] bundleIdentifier],
(__bridge NSString *)kCFBundleIdentifierKey,
_returnToPID,
kHIDRemoteDNStatusReturnToPIDKey,
nil]
deliverImmediately:YES
@@ -822,7 +822,7 @@
object:[NSString
stringWithFormat:@"%d", [_waitForReturnByPID intValue]]
userInfo:[NSDictionary dictionaryWithObjectsAndKeys:
[NSNumber numberWithUnsignedInt:(unsigned int)getpid()],
kHIDRemoteDNStatusPIDKey,
-
[[NSBundle mainBundle] bundleIdentifier], (NSString
*)kCFBundleIdentifierKey,
+
[[NSBundle mainBundle] bundleIdentifier], (__bridge NSString
*)kCFBundleIdentifierKey,
nil]
deliverImmediately:YES];
}
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
_______________________________________________
Skim-app-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/skim-app-commit
