Revision: 28547
http://sourceforge.net/p/bibdesk/svn/28547
Author: hofman
Date: 2024-01-05 10:21:29 +0000 (Fri, 05 Jan 2024)
Log Message:
-----------
add some more __bridge
Modified Paths:
--------------
trunk/bibdesk/BDSKBookmarkController.m
trunk/bibdesk/BDSKEditor.m
trunk/bibdesk/BDSKFileMatchConfigController.m
trunk/bibdesk/BDSKFileMatcher.m
trunk/bibdesk/BDSKMacroWindowController.m
trunk/bibdesk/BDSKPasswordController.m
trunk/bibdesk/BDSKPersonController.m
trunk/bibdesk/BDSKScriptGroupSheetController.m
trunk/bibdesk/BDSKSearchBookmarkController.m
trunk/bibdesk/BDSKSearchGroup.m
trunk/bibdesk/BDSKURLGroupSheetController.m
trunk/bibdesk/BDSKWebGroupViewController.m
trunk/bibdesk/BibDocument.m
trunk/bibdesk/BibDocument_DataSource.m
trunk/bibdesk/BibImporter/GetMetadataForFile.m
trunk/bibdesk/BibItem.m
trunk/bibdesk/BibPref_Defaults.m
trunk/bibdesk/BibPref_Export.m
trunk/bibdesk/BibPref_ScriptHooks.m
trunk/bibdesk/NSMenu_BDSKExtensions.m
trunk/bibdesk/NSPasteboard_BDSKExtensions.m
trunk/bibdesk/NSWorkspace_BDSKExtensions.m
Modified: trunk/bibdesk/BDSKBookmarkController.m
===================================================================
--- trunk/bibdesk/BDSKBookmarkController.m 2024-01-05 00:09:34 UTC (rev
28546)
+++ trunk/bibdesk/BDSKBookmarkController.m 2024-01-05 10:21:29 UTC (rev
28547)
@@ -129,7 +129,7 @@
[self setupToolbar];
[self setWindowFrameAutosaveName:BDSKBookmarksWindowFrameAutosaveName];
[outlineView setAutoresizesOutlineColumn:NO];
- [outlineView registerForDraggedTypes:@[BDSKPasteboardBookmarkRows,
(NSString *)kUTTypeURL, NSURLPboardType]];
+ [outlineView registerForDraggedTypes:@[BDSKPasteboardBookmarkRows,
(__bridge NSString *)kUTTypeURL, NSURLPboardType]];
[outlineView setDraggingSourceOperationMask:NSDragOperationMove
forLocal:YES];
[outlineView setDraggingSourceOperationMask:NSDragOperationDelete
forLocal:NO];
[outlineView setStronglyReferencesItems:YES];
Modified: trunk/bibdesk/BDSKEditor.m
===================================================================
--- trunk/bibdesk/BDSKEditor.m 2024-01-05 00:09:34 UTC (rev 28546)
+++ trunk/bibdesk/BDSKEditor.m 2024-01-05 10:21:29 UTC (rev 28547)
@@ -236,7 +236,7 @@
[self resetFields:BDSKReloadTable];
[self setupCollectionView];
if (editorFlags.isEditable)
- [tableView registerForDraggedTypes:@[BDSKPasteboardTypePublications,
NSPasteboardTypeString, (NSString *)kUTTypeURL, (NSString *)kUTTypeFileURL,
NSURLPboardType, NSFilenamesPboardType]];
+ [tableView registerForDraggedTypes:@[BDSKPasteboardTypePublications,
NSPasteboardTypeString, (__bridge NSString *)kUTTypeURL, (__bridge NSString
*)kUTTypeFileURL, NSURLPboardType, NSFilenamesPboardType]];
// Setup the citekey textfield
[citeKeyField setStringValue:[publication citeKey]];
@@ -1385,7 +1385,7 @@
[[BDSKPersistentSearch sharedSearch] addRecentDownloadsQuery];
});
- NSArray *paths = [[BDSKPersistentSearch sharedSearch]
resultsForQuery:[BDSKPersistentSearch recentDownloadsQuery] attribute:(NSString
*)kMDItemPath];
+ NSArray *paths = [[BDSKPersistentSearch sharedSearch]
resultsForQuery:[BDSKPersistentSearch recentDownloadsQuery] attribute:(__bridge
NSString *)kMDItemPath];
NSMenuItem *item;
for (NSString *filePath in paths) {
@@ -2722,7 +2722,7 @@
if (dragFieldEditor == nil) {
dragFieldEditor = [[BDSKFieldEditor alloc] init];
if (editorFlags.isEditable)
- [(BDSKFieldEditor *)dragFieldEditor
registerForDelegatedDraggedTypes:@[BDSKPasteboardTypePublications, (NSString
*)kUTTypeURL, (NSString *)kUTTypeFileURL, NSURLPboardType,
NSFilenamesPboardType]];
+ [(BDSKFieldEditor *)dragFieldEditor
registerForDelegatedDraggedTypes:@[BDSKPasteboardTypePublications, (__bridge
NSString *)kUTTypeURL, (__bridge NSString *)kUTTypeFileURL, NSURLPboardType,
NSFilenamesPboardType]];
}
return dragFieldEditor;
}
Modified: trunk/bibdesk/BDSKFileMatchConfigController.m
===================================================================
--- trunk/bibdesk/BDSKFileMatchConfigController.m 2024-01-05 00:09:34 UTC
(rev 28546)
+++ trunk/bibdesk/BDSKFileMatchConfigController.m 2024-01-05 10:21:29 UTC
(rev 28547)
@@ -149,7 +149,7 @@
- (void)windowDidLoad
{
[self handleDocumentAddRemove:nil];
- [fileTableView registerForDraggedTypes:@[(NSString *)kUTTypeFileURL,
NSFilenamesPboardType]];
+ [fileTableView registerForDraggedTypes:@[(__bridge NSString
*)kUTTypeFileURL, NSFilenamesPboardType]];
[addRemoveButton setEnabled:[fileTableView numberOfSelectedRows] > 0
forSegment:1];
}
Modified: trunk/bibdesk/BDSKFileMatcher.m
===================================================================
--- trunk/bibdesk/BDSKFileMatcher.m 2024-01-05 00:09:34 UTC (rev 28546)
+++ trunk/bibdesk/BDSKFileMatcher.m 2024-01-05 10:21:29 UTC (rev 28547)
@@ -130,7 +130,7 @@
[outlineView setDoubleAction:@selector(openAction:)];
[outlineView setTarget:self];
- [outlineView registerForDraggedTypes:@[(NSString *)kUTTypeFileURL,
NSFilenamesPboardType]];
+ [outlineView registerForDraggedTypes:@[(__bridge NSString
*)kUTTypeFileURL, NSFilenamesPboardType]];
[progressIndicator setUsesThreadedAnimation:YES];
[abortButton setEnabled:NO];
[statusField setStringValue:@""];
Modified: trunk/bibdesk/BDSKMacroWindowController.m
===================================================================
--- trunk/bibdesk/BDSKMacroWindowController.m 2024-01-05 00:09:34 UTC (rev
28546)
+++ trunk/bibdesk/BDSKMacroWindowController.m 2024-01-05 10:21:29 UTC (rev
28547)
@@ -144,7 +144,7 @@
[tableView setDraggingSourceOperationMask:NSDragOperationCopy forLocal:NO];
if (isEditable)
- [tableView registerForDraggedTypes:@[NSPasteboardTypeString, (NSString
*)kUTTypeURL, (NSString *)kUTTypeFileURL, NSURLPboardType,
NSFilenamesPboardType]];
+ [tableView registerForDraggedTypes:@[NSPasteboardTypeString, (__bridge
NSString *)kUTTypeURL, (__bridge NSString *)kUTTypeFileURL, NSURLPboardType,
NSFilenamesPboardType]];
BDSKTypeSelectHelper *aTypeSelectHelper = [[BDSKTypeSelectHelper alloc]
init];
[aTypeSelectHelper setCyclesSimilarResults:YES];
Modified: trunk/bibdesk/BDSKPasswordController.m
===================================================================
--- trunk/bibdesk/BDSKPasswordController.m 2024-01-05 00:09:34 UTC (rev
28546)
+++ trunk/bibdesk/BDSKPasswordController.m 2024-01-05 10:21:29 UTC (rev
28547)
@@ -54,34 +54,33 @@
+ (NSString *)passwordForKeychainService:(NSString *)service account:(NSString
*)account name:(NSString *)name {
// use the service name to get password from keychain and hash it with
sha1 for comparison purposes
NSString *passwordString = nil;
- NSData *passwordData = nil;
+ CFTypeRef passwordData = nil;
OSStatus err;
NSMutableDictionary *query = [NSMutableDictionary dictionary];
- [query setObject:(NSString *)kSecClassGenericPassword forKey:(NSString
*)kSecClass];
- [query setObject:@YES forKey:(NSString *)kSecReturnData];
- [query setObject:service forKey:(NSString *)kSecAttrService];
+ [query setObject:(NSString *)kSecClassGenericPassword forKey:(__bridge
NSString *)kSecClass];
+ [query setObject:@YES forKey:(__bridge NSString *)kSecReturnData];
+ [query setObject:service forKey:(__bridge NSString *)kSecAttrService];
if (account)
- [query setObject:account forKey:(NSString *)kSecAttrAccount];
+ [query setObject:account forKey:(__bridge NSString *)kSecAttrAccount];
// see if the password exists in the keychain
- err = SecItemCopyMatching((CFDictionaryRef)query, (CFTypeRef
*)&passwordData);
+ err = SecItemCopyMatching((__bridge CFDictionaryRef)query, &passwordData);
if (err == errSecItemNotFound && name) {
// see if an item in the old format exists
- [query setObject:name forKey:(NSString *)kSecAttrService];
- [query removeObjectForKey:(NSString *)kSecAttrAccount];
- err = SecItemCopyMatching((CFDictionaryRef)query, (CFTypeRef
*)&passwordData);
+ [query setObject:name forKey:(__bridge NSString *)kSecAttrService];
+ [query removeObjectForKey:(__bridge NSString *)kSecAttrAccount];
+ err = SecItemCopyMatching((__bridge CFDictionaryRef)query,
&passwordData);
if (err == errSecSuccess) {
// item in old format exists, update to new format
- NSDictionary *attributes = [NSDictionary
dictionaryWithObjectsAndKeys:service, (NSString *)kSecAttrService, account ?:
[NSUserName() dataUsingEncoding:NSUTF8StringEncoding], (NSString
*)kSecAttrAccount, name, (NSString *)kSecAttrLabel, nil];
- [query removeObjectForKey:(NSString *)kSecReturnData];
- SecItemUpdate((CFDictionaryRef)query, (CFDictionaryRef)attributes);
+ NSDictionary *attributes = [NSDictionary
dictionaryWithObjectsAndKeys:service, (__bridge NSString *)kSecAttrService,
account ?: [NSUserName() dataUsingEncoding:NSUTF8StringEncoding], (__bridge
NSString *)kSecAttrAccount, name, (__bridge NSString *)kSecAttrLabel, nil];
+ [query removeObjectForKey:(__bridge NSString *)kSecReturnData];
+ SecItemUpdate((__bridge CFDictionaryRef)query, (__bridge
CFDictionaryRef)attributes);
}
}
if (err == errSecSuccess) {
- passwordString = [[[NSString alloc] initWithData:passwordData
encoding:NSUTF8StringEncoding] autorelease];
- [passwordData release];
+ passwordString = [[[NSString alloc]
initWithData:CFBridgingRelease(passwordData) encoding:NSUTF8StringEncoding]
autorelease];
} else {
logError(@"getting", err);
}
@@ -95,29 +94,29 @@
NSMutableDictionary *attributes = [NSMutableDictionary dictionary];
// first try to update an existing item
- [query setObject:(NSString *)kSecClassGenericPassword forKey:(NSString
*)kSecClass];
- [query setObject:service forKey:(NSString *)kSecAttrService];
+ [query setObject:(__bridge NSString *)kSecClassGenericPassword
forKey:(__bridge NSString *)kSecClass];
+ [query setObject:service forKey:(__bridge NSString *)kSecAttrService];
if (account)
- [query setObject:account forKey:(NSString *)kSecAttrAccount];
+ [query setObject:account forKey:(__bridge NSString *)kSecAttrAccount];
- [attributes setObject:[password dataUsingEncoding:NSUTF8StringEncoding]
forKey:(NSString *)kSecValueData];
+ [attributes setObject:[password dataUsingEncoding:NSUTF8StringEncoding]
forKey:(__bridge NSString *)kSecValueData];
- err = SecItemUpdate((CFDictionaryRef)query, (CFDictionaryRef)attributes);
+ err = SecItemUpdate((__bridge CFDictionaryRef)query, (__bridge
CFDictionaryRef)attributes);
logError(@"updating", err);
if (err == errSecItemNotFound) {
- [attributes setObject:service forKey:(NSString *)kSecAttrService];
- [attributes setObject:account ?: [NSUserName()
dataUsingEncoding:NSUTF8StringEncoding] forKey:(NSString *)kSecAttrAccount];
+ [attributes setObject:service forKey:(__bridge NSString
*)kSecAttrService];
+ [attributes setObject:account ?: [NSUserName()
dataUsingEncoding:NSUTF8StringEncoding] forKey:(__bridge NSString
*)kSecAttrAccount];
if (name) {
// see if an item in the old format exists
- [attributes setObject:name forKey:(NSString *)kSecAttrLabel];
+ [attributes setObject:name forKey:(__bridge NSString
*)kSecAttrLabel];
- [query setObject:name forKey:(NSString *)kSecAttrService];
- [query removeObjectForKey:(NSString *)kSecAttrAccount];
+ [query setObject:name forKey:(__bridge NSString *)kSecAttrService];
+ [query removeObjectForKey:(__bridge NSString *)kSecAttrAccount];
- err = SecItemUpdate((CFDictionaryRef)query,
(CFDictionaryRef)attributes);
+ err = SecItemUpdate((__bridge CFDictionaryRef)query, (__bridge
CFDictionaryRef)attributes);
logError(@"updating", err);
}
@@ -124,9 +123,9 @@
if (err == errSecItemNotFound) {
// password not yet on keychain, so add it
- [attributes setObject:(NSString *)kSecClassGenericPassword
forKey:(NSString *)kSecClass];
+ [attributes setObject:(__bridge NSString
*)kSecClassGenericPassword forKey:(__bridge NSString *)kSecClass];
- err = SecItemAdd((CFDictionaryRef)attributes, NULL);
+ err = SecItemAdd((__bridge CFDictionaryRef)attributes, NULL);
logError(@"adding", err);
}
@@ -138,23 +137,22 @@
+ (NSString *)passwordForKeychainServer:(NSString *)server
port:(NSInteger)port account:(NSString *)account {
// use the service name to get password from keychain and hash it with
sha1 for comparison purposes
NSString *passwordString = nil;
- NSData *passwordData = nil;
+ CFTypeRef passwordData = nil;
OSStatus err;
NSMutableDictionary *query = [NSMutableDictionary dictionary];
- [query setObject:(NSString *)kSecClassInternetPassword forKey:(NSString
*)kSecClass];
- [query setObject:@YES forKey:(NSString *)kSecReturnData];
- [query setObject:server forKey:(NSString *)kSecAttrServer];
- [query setObject:account forKey:(NSString *)kSecAttrAccount];
+ [query setObject:(__bridge NSString *)kSecClassInternetPassword
forKey:(__bridge NSString *)kSecClass];
+ [query setObject:@YES forKey:(__bridge NSString *)kSecReturnData];
+ [query setObject:server forKey:(__bridge NSString *)kSecAttrServer];
+ [query setObject:account forKey:(__bridge NSString *)kSecAttrAccount];
if (port != 0)
- [query setObject:[NSNumber numberWithInteger:port] forKey:(NSString
*)kSecAttrPort];
+ [query setObject:[NSNumber numberWithInteger:port] forKey:(__bridge
NSString *)kSecAttrPort];
// see if the password exists in the keychain
- err = SecItemCopyMatching((CFDictionaryRef)query, (CFTypeRef
*)&passwordData);
+ err = SecItemCopyMatching((__bridge CFDictionaryRef)query, &passwordData);
if (err == errSecSuccess) {
- passwordString = [[[NSString alloc] initWithData:passwordData
encoding:NSUTF8StringEncoding] autorelease];
- [passwordData release];
+ passwordString = [[[NSString alloc]
initWithData:CFBridgingRelease(passwordData) encoding:NSUTF8StringEncoding]
autorelease];
} else {
logError(@"getting", err);
}
@@ -168,15 +166,15 @@
NSMutableDictionary *attributes = [NSMutableDictionary dictionary];
// first try to update an existing item
- [query setObject:(NSString *)kSecClassInternetPassword forKey:(NSString
*)kSecClass];
- [query setObject:server forKey:(NSString *)kSecAttrServer];
- [query setObject:account forKey:(NSString *)kSecAttrAccount];
+ [query setObject:(__bridge NSString *)kSecClassInternetPassword
forKey:(__bridge NSString *)kSecClass];
+ [query setObject:server forKey:(__bridge NSString *)kSecAttrServer];
+ [query setObject:account forKey:(__bridge NSString *)kSecAttrAccount];
if (port != 0)
- [query setObject:[NSNumber numberWithInteger:port] forKey:(NSString
*)kSecAttrPort];
+ [query setObject:[NSNumber numberWithInteger:port] forKey:(__bridge
NSString *)kSecAttrPort];
- [attributes setObject:[password dataUsingEncoding:NSUTF8StringEncoding]
forKey:(NSString *)kSecValueData];
+ [attributes setObject:[password dataUsingEncoding:NSUTF8StringEncoding]
forKey:(__bridge NSString *)kSecValueData];
- err = SecItemUpdate((CFDictionaryRef)query, (CFDictionaryRef)attributes);
+ err = SecItemUpdate((__bridge CFDictionaryRef)query, (__bridge
CFDictionaryRef)attributes);
logError(@"updating", err);
@@ -183,10 +181,10 @@
if (err == errSecItemNotFound) {
// password not yet on keychain, so add it
[attributes addEntriesFromDictionary:query];
- [attributes setObject:(NSString *)kSecAttrProtocolHTTPS
forKey:(NSString *)kSecAttrProtocol];
- [attributes setObject:[NSNumber numberWithUnsignedInt:'BDsg']
forKey:(NSString *)kSecAttrType];
+ [attributes setObject:(__bridge NSString *)kSecAttrProtocolHTTPS
forKey:(__bridge NSString *)kSecAttrProtocol];
+ [attributes setObject:[NSNumber numberWithUnsignedInt:'BDsg']
forKey:(__bridge NSString *)kSecAttrType];
- err = SecItemAdd((CFDictionaryRef)attributes, NULL);
+ err = SecItemAdd((__bridge CFDictionaryRef)attributes, NULL);
logError(@"adding", err);
}
Modified: trunk/bibdesk/BDSKPersonController.m
===================================================================
--- trunk/bibdesk/BDSKPersonController.m 2024-01-05 00:09:34 UTC (rev
28546)
+++ trunk/bibdesk/BDSKPersonController.m 2024-01-05 10:21:29 UTC (rev
28547)
@@ -144,7 +144,7 @@
if (isEditable) {
[nameTableView setDoubleAction:@selector(edit:)];
- [imageView registerForDraggedTypes:@[(NSString *)kUTTypeVCard]];
+ [imageView registerForDraggedTypes:@[(__bridge NSString
*)kUTTypeVCard]];
}
[editButton setEnabled:isEditable];
@@ -427,7 +427,7 @@
NSPasteboard *pboard = [sender draggingPasteboard];
- if([pboard canReadItemWithDataConformingToTypes:@[(NSString
*)kUTTypeVCard]])
+ if([pboard canReadItemWithDataConformingToTypes:@[(__bridge NSString
*)kUTTypeVCard]])
return NSDragOperationCopy;
return NSDragOperationNone;
@@ -436,10 +436,10 @@
- (BOOL)dragImageView:(BDSKDragImageView *)view acceptDrop:(id
<NSDraggingInfo>)sender {
NSPasteboard *pboard = [sender draggingPasteboard];
- if([pboard canReadItemWithDataConformingToTypes:@[(NSString
*)kUTTypeVCard]] == NO)
+ if([pboard canReadItemWithDataConformingToTypes:@[(__bridge NSString
*)kUTTypeVCard]] == NO)
return NO;
- BibAuthor *newAuthor = [BibAuthor authorWithVCardRepresentation:[pboard
dataForType:(NSString *)kUTTypeVCard]];
+ BibAuthor *newAuthor = [BibAuthor authorWithVCardRepresentation:[pboard
dataForType:(__bridge NSString *)kUTTypeVCard]];
if([newAuthor isEqual:[BibAuthor emptyAuthor]])
return NO;
@@ -474,11 +474,11 @@
id item = nil;
Class providerClass = NSClassFromString(@"NSFilePromiseProvider");
if (providerClass) {
- item = [[[providerClass alloc] initWithFileType:(NSString
*)kUTTypeVCard delegate:self] autorelease];
+ item = [[[providerClass alloc] initWithFileType:(__bridge NSString
*)kUTTypeVCard delegate:self] autorelease];
} else {
item = [[[NSPasteboardItem alloc] init] autorelease];
- [item setString:(NSString *)kUTTypeVCard forType:(NSString
*)kPasteboardTypeFilePromiseContent];
- [item setDataProvider:self forTypes:@[(NSString
*)kPasteboardTypeFileURLPromise, (NSString *)kUTTypeVCard]];
+ [item setString:(__bridge NSString *)kUTTypeVCard forType:(__bridge
NSString *)kPasteboardTypeFilePromiseContent];
+ [item setDataProvider:self forTypes:@[(NSString
*)kPasteboardTypeFileURLPromise, (__bridge NSString *)kUTTypeVCard]];
}
return @[item];
@@ -489,7 +489,7 @@
}
- (void)pasteboard:(NSPasteboard *)pboard item:(NSPasteboardItem *)item
provideDataForType:(NSString *)type {
- if ([type isEqualToString:(NSString *)kPasteboardTypeFileURLPromise]) {
+ if ([type isEqualToString:(__bridge NSString
*)kPasteboardTypeFileURLPromise]) {
NSURL *dropDestination = [pboard pasteLocationURL];
if (dropDestination) {
NSData *data = [person vCardRepresentation];
@@ -500,7 +500,7 @@
} else {
[item setString:@"" forType:type];
}
- } else if ([type isEqualToString:(NSString *)kUTTypeVCard]) {
+ } else if ([type isEqualToString:(__bridge NSString *)kUTTypeVCard]) {
[item setData:[person vCardRepresentation] forType:type];
}
}
Modified: trunk/bibdesk/BDSKScriptGroupSheetController.m
===================================================================
--- trunk/bibdesk/BDSKScriptGroupSheetController.m 2024-01-05 00:09:34 UTC
(rev 28546)
+++ trunk/bibdesk/BDSKScriptGroupSheetController.m 2024-01-05 10:21:29 UTC
(rev 28547)
@@ -78,7 +78,7 @@
}
- (void)windowDidLoad {
- [pathField registerForDraggedTypes:@[(NSString *)kUTTypeFileURL,
NSFilenamesPboardType]];
+ [pathField registerForDraggedTypes:@[(__bridge NSString *)kUTTypeFileURL,
NSFilenamesPboardType]];
}
- (NSString *)windowNibName {
@@ -185,7 +185,7 @@
if (anObject == pathField) {
if (dragFieldEditor == nil) {
dragFieldEditor = [[BDSKFieldEditor alloc] init];
- [(BDSKFieldEditor *)dragFieldEditor
registerForDelegatedDraggedTypes:@[(NSString *)kUTTypeFileURL,
NSFilenamesPboardType]];
+ [(BDSKFieldEditor *)dragFieldEditor
registerForDelegatedDraggedTypes:@[(__bridge NSString *)kUTTypeFileURL,
NSFilenamesPboardType]];
}
return dragFieldEditor;
}
Modified: trunk/bibdesk/BDSKSearchBookmarkController.m
===================================================================
--- trunk/bibdesk/BDSKSearchBookmarkController.m 2024-01-05 00:09:34 UTC
(rev 28546)
+++ trunk/bibdesk/BDSKSearchBookmarkController.m 2024-01-05 10:21:29 UTC
(rev 28547)
@@ -122,7 +122,7 @@
[self
setWindowFrameAutosaveName:BDSKSearchBookmarksWindowFrameAutosaveName];
[outlineView setAutoresizesOutlineColumn:NO];
[outlineView setStronglyReferencesItems:YES];
- [outlineView
registerForDraggedTypes:@[BDSKPasteboardTypeSearchBookmarkRows, (NSString
*)kUTTypeFileURL, NSFilenamesPboardType]];
+ [outlineView
registerForDraggedTypes:@[BDSKPasteboardTypeSearchBookmarkRows, (__bridge
NSString *)kUTTypeFileURL, NSFilenamesPboardType]];
[outlineView setDraggingSourceOperationMask:NSDragOperationMove
forLocal:YES];
[outlineView setDraggingSourceOperationMask:NSDragOperationDelete
forLocal:NO];
[outlineView setDoubleAction:@selector(editAction:)];
Modified: trunk/bibdesk/BDSKSearchGroup.m
===================================================================
--- trunk/bibdesk/BDSKSearchGroup.m 2024-01-05 00:09:34 UTC (rev 28546)
+++ trunk/bibdesk/BDSKSearchGroup.m 2024-01-05 10:21:29 UTC (rev 28547)
@@ -321,9 +321,9 @@
#pragma mark NSPasteboardItemDataProvider
- (void)pasteboard:(NSPasteboard *)pboard item:(NSPasteboardItem *)item
provideDataForType:(NSString *)type {
- if ([type isEqualToString:(NSString *)kPasteboardTypeFilePromiseContent]) {
+ if ([type isEqualToString:(__bridge NSString
*)kPasteboardTypeFilePromiseContent]) {
[item setString:@"net.sourceforge.bibdesk.bdsksearch" forType:type];
- } else if ([type isEqualToString:(NSString
*)kPasteboardTypeFileURLPromise]) {
+ } else if ([type isEqualToString:(__bridge NSString
*)kPasteboardTypeFileURLPromise]) {
NSURL *dropDestination = [pboard pasteLocationURL];
if (dropDestination) {
Modified: trunk/bibdesk/BDSKURLGroupSheetController.m
===================================================================
--- trunk/bibdesk/BDSKURLGroupSheetController.m 2024-01-05 00:09:34 UTC (rev
28546)
+++ trunk/bibdesk/BDSKURLGroupSheetController.m 2024-01-05 10:21:29 UTC (rev
28547)
@@ -78,7 +78,7 @@
}
- (void)windowDidLoad {
- [urlField registerForDraggedTypes:@[(NSString *)kUTTypeURL, (NSString
*)kUTTypeFileURL, NSFilenamesPboardType, NSURLPboardType]];
+ [urlField registerForDraggedTypes:@[(__bridge NSString *)kUTTypeURL,
(__bridge NSString *)kUTTypeFileURL, NSFilenamesPboardType, NSURLPboardType]];
}
- (NSString *)windowNibName {
@@ -153,7 +153,7 @@
- (id)windowWillReturnFieldEditor:(NSWindow *)sender toObject:(id)anObject {
if (dragFieldEditor == nil) {
dragFieldEditor = [[BDSKFieldEditor alloc] init];
- [(BDSKFieldEditor *)dragFieldEditor
registerForDelegatedDraggedTypes:@[(NSString *)kUTTypeURL, (NSString
*)kUTTypeFileURL, NSURLPboardType, NSFilenamesPboardType]];
+ [(BDSKFieldEditor *)dragFieldEditor
registerForDelegatedDraggedTypes:@[(__bridge NSString *)kUTTypeURL, (__bridge
NSString *)kUTTypeFileURL, NSURLPboardType, NSFilenamesPboardType]];
}
return dragFieldEditor;
}
Modified: trunk/bibdesk/BDSKWebGroupViewController.m
===================================================================
--- trunk/bibdesk/BDSKWebGroupViewController.m 2024-01-05 00:09:34 UTC (rev
28546)
+++ trunk/bibdesk/BDSKWebGroupViewController.m 2024-01-05 10:21:29 UTC (rev
28547)
@@ -93,7 +93,7 @@
// update the buttons, we should not be retrieving at this point
[self webView:nil setLoading:NO];
- [urlField registerForDraggedTypes:@[(NSString *)kUTTypeURL, (NSString
*)kUTTypeFileURL, NSURLPboardType, NSFilenamesPboardType]];
+ [urlField registerForDraggedTypes:@[(__bridge NSString *)kUTTypeURL,
(__bridge NSString *)kUTTypeFileURL, NSURLPboardType, NSFilenamesPboardType]];
[[urlField button] setTarget:self];
[[urlField button] setAction:@selector(stopOrReloadAction:)];
@@ -218,7 +218,7 @@
if (anObject == urlField) {
if (fieldEditor == nil) {
fieldEditor = [[BDSKFieldEditor alloc] init];
- [(BDSKFieldEditor *)fieldEditor
registerForDelegatedDraggedTypes:@[(NSString *)kUTTypeURL, (NSString
*)kUTTypeFileURL, NSURLPboardType, NSFilenamesPboardType]];
+ [(BDSKFieldEditor *)fieldEditor
registerForDelegatedDraggedTypes:@[(__bridge NSString *)kUTTypeURL, (__bridge
NSString *)kUTTypeFileURL, NSURLPboardType, NSFilenamesPboardType]];
}
return fieldEditor;
}
Modified: trunk/bibdesk/BibDocument.m
===================================================================
--- trunk/bibdesk/BibDocument.m 2024-01-05 00:09:34 UTC (rev 28546)
+++ trunk/bibdesk/BibDocument.m 2024-01-05 10:21:29 UTC (rev 28547)
@@ -497,8 +497,8 @@
[groups addCategoryParent:[[[BDSKCategoryParentGroup alloc]
initWithKey:groupField] autorelease]];
[tableView setDoubleAction:@selector(editPubOrOpenURLAction:)];
- [tableView registerForDraggedTypes:@[BDSKPasteboardTypePublications,
(NSString *)kUTTypeURL, (NSString *)kUTTypeFileURL, NSFilenamesPboardType,
NSURLPboardType, NSPasteboardTypeString, NSPasteboardTypeColor]];
- [groupOutlineView
registerForDraggedTypes:@[BDSKPasteboardTypePublications, (NSString
*)kUTTypeURL, (NSString *)kUTTypeFileURL, NSFilenamesPboardType,
NSURLPboardType, NSPasteboardTypeString]];
+ [tableView registerForDraggedTypes:@[BDSKPasteboardTypePublications,
(__bridge NSString *)kUTTypeURL, (__bridge NSString *)kUTTypeFileURL,
NSFilenamesPboardType, NSURLPboardType, NSPasteboardTypeString,
NSPasteboardTypeColor]];
+ [groupOutlineView
registerForDraggedTypes:@[BDSKPasteboardTypePublications, (__bridge NSString
*)kUTTypeURL, (__bridge NSString *)kUTTypeFileURL, NSFilenamesPboardType,
NSURLPboardType, NSPasteboardTypeString]];
[tableView setDraggingSourceOperationMask:NSDragOperationEvery
forLocal:YES];
[tableView setDraggingSourceOperationMask:NSDragOperationCopy forLocal:NO];
[groupOutlineView setDraggingSourceOperationMask:NSDragOperationEvery
forLocal:YES];
@@ -1243,7 +1243,7 @@
// set com.apple.TextEncoding for other apps
NSString *UTI = [[NSWorkspace sharedWorkspace] typeOfFile:[absoluteURL
path] error:NULL];
- if (UTI && [[NSWorkspace sharedWorkspace] type:UTI
conformsToType:(id)kUTTypePlainText])
+ if (UTI && [[NSWorkspace sharedWorkspace] type:UTI
conformsToType:(__bridge NSString *)kUTTypePlainText])
[fm setAppleStringEncoding:encoding atURL:absoluteURL error:NULL];
if (BDSKIsSaveToOperation(saveOperation)) {
Modified: trunk/bibdesk/BibDocument_DataSource.m
===================================================================
--- trunk/bibdesk/BibDocument_DataSource.m 2024-01-05 00:09:34 UTC (rev
28546)
+++ trunk/bibdesk/BibDocument_DataSource.m 2024-01-05 10:21:29 UTC (rev
28547)
@@ -508,9 +508,9 @@
BOOL inside = NO;
BOOL isIcon = NO;
- if ([pb availableTypeFromArray:@[(NSString
*)kPasteboardTypeFilePromiseContent]]) {
+ if ([pb availableTypeFromArray:@[(__bridge NSString
*)kPasteboardTypeFilePromiseContent]]) {
// dragging a search group
- NSString *fileUTI = [pb stringForType:(NSString
*)kPasteboardTypeFilePromiseContent];
+ NSString *fileUTI = [pb stringForType:(__bridge NSString
*)kPasteboardTypeFilePromiseContent];
count = 1;
image = [[NSWorkspace sharedWorkspace] iconForFileType:fileUTI];
isIcon = YES;
@@ -1154,7 +1154,7 @@
[item setUserInfo:@"BDSKIncludePassword"];
} else {
item = [[[NSPasteboardItem alloc] init] autorelease];
- [item setDataProvider:searchGroup forTypes:@[(NSString
*)kPasteboardTypeFileURLPromise, (NSString
*)kPasteboardTypeFilePromiseContent]];
+ [item setDataProvider:searchGroup forTypes:@[(__bridge NSString
*)kPasteboardTypeFileURLPromise, (__bridge NSString
*)kPasteboardTypeFilePromiseContent]];
if (([NSEvent standardModifierFlags] & NSEventModifierFlagOption)
!= 0)
[item setPropertyList:@YES
forType:@"net.sourceforge.bibdesk.bdsksearch.includepassword"];
}
Modified: trunk/bibdesk/BibImporter/GetMetadataForFile.m
===================================================================
--- trunk/bibdesk/BibImporter/GetMetadataForFile.m 2024-01-05 00:09:34 UTC
(rev 28546)
+++ trunk/bibdesk/BibImporter/GetMetadataForFile.m 2024-01-05 10:21:29 UTC
(rev 28547)
@@ -69,7 +69,7 @@
// this is what the user sees as the name in BibDesk, so it's a
reasonable title
value = [dictionary objectForKey:@"name"];
if (value) {
- [(__bridge NSMutableDictionary *)attributes setObject:value
forKey:(NSString *)kMDItemTitle];
+ [(__bridge NSMutableDictionary *)attributes setObject:value
forKey:(__bridge NSString *)kMDItemTitle];
[(__bridge NSMutableDictionary *)attributes setObject:value
forKey:(__bridge NSString *)kMDItemDisplayName];
}
@@ -82,7 +82,7 @@
if (value)
[whereFroms addObject:value];
if ([whereFroms count])
- [(__bridge NSMutableDictionary *)attributes
setObject:whereFroms forKey:(NSString *)kMDItemWhereFroms];
+ [(__bridge NSMutableDictionary *)attributes
setObject:whereFroms forKey:(__bridge NSString *)kMDItemWhereFroms];
// rest of the information (port, type, options) doesn't seem as
useful
}
Modified: trunk/bibdesk/BibItem.m
===================================================================
--- trunk/bibdesk/BibItem.m 2024-01-05 00:09:34 UTC (rev 28546)
+++ trunk/bibdesk/BibItem.m 2024-01-05 10:21:29 UTC (rev 28547)
@@ -1640,21 +1640,21 @@
if(value = [self citeKey])
[info setObject:value forKey:@"net_sourceforge_bibdesk_citekey"];
- [info setObject:@"BibDesk" forKey:(NSString *)kMDItemCreator];
+ [info setObject:@"BibDesk" forKey:(__bridge NSString *)kMDItemCreator];
// A given item is not guaranteed to have all of these, so make sure they
are non-nil
if(value = [[self displayTitle] expandedString])
- [info setObject:value forKey:(NSString *)kMDItemTitle];
+ [info setObject:value forKey:(__bridge NSString *)kMDItemTitle];
// this is what shows up in search results
- [info setObject:value ?: @"Unknown" forKey:(NSString *)kMDItemDisplayName];
+ [info setObject:value ?: @"Unknown" forKey:(__bridge NSString
*)kMDItemDisplayName];
[info setObject:[[self pubAuthors] valueForKey:@"normalizedName"]
forKey:(NSString *)kMDItemAuthors];
- [info setObject:[[self pubEditors] valueForKey:@"normalizedName"]
forKey:(NSString *)kMDItemEditors];
+ [info setObject:[[self pubEditors] valueForKey:@"normalizedName"]
forKey:(__bridge NSString *)kMDItemEditors];
if(value = [[self valueOfField:BDSKAbstractString] stringByRemovingTeX])
- [info setObject:value forKey:(NSString *)kMDItemDescription];
+ [info setObject:value forKey:(__bridge NSString *)kMDItemDescription];
if(value = [[[self container] expandedString] stringByRemovingTeX])
[info setObject:value forKey:@"net_sourceforge_bibdesk_container"];
@@ -1666,23 +1666,23 @@
[info setObject:date
forKey:@"net_sourceforge_bibdesk_publicationdate"];
if(date = [self dateModified])
- [info setObject:date forKey:(NSString
*)kMDItemContentModificationDate];
+ [info setObject:date forKey:(__bridge NSString
*)kMDItemContentModificationDate];
if(date = [self dateAdded])
- [info setObject:date forKey:(NSString *)kMDItemContentCreationDate];
+ [info setObject:date forKey:(__bridge NSString
*)kMDItemContentCreationDate];
// keywords is supposed to be a CFArray type, so we'll use the group
splitting code
if(array = [[self groupsForField:BDSKKeywordsString] allObjects])
- [info setObject:array forKey:(NSString *)kMDItemKeywords];
+ [info setObject:array forKey:(__bridge NSString *)kMDItemKeywords];
if(rating = [self rating])
- [info setObject:[NSNumber numberWithInteger:rating] forKey:(NSString
*)kMDItemStarRating];
+ [info setObject:[NSNumber numberWithInteger:rating] forKey:(__bridge
NSString *)kMDItemStarRating];
// properly supporting tri-state fields will need a new key of type
CFNumber; it will only show up as a number in get info, though, which is not
particularly useful
if([BDSKReadString isBooleanField])
- [info setObject:(id)([self boolValueOfField:BDSKReadString] ?
kCFBooleanTrue : kCFBooleanFalse)
forKey:@"net_sourceforge_bibdesk_itemreadstatus"];
+ [info setObject:(__bridge id)([self boolValueOfField:BDSKReadString] ?
kCFBooleanTrue : kCFBooleanFalse)
forKey:@"net_sourceforge_bibdesk_itemreadstatus"];
else if([BDSKReadString isTriStateField])
- [info setObject:(id)([self triStateValueOfField:BDSKReadString] ==
NSOnState ? kCFBooleanTrue : kCFBooleanFalse)
forKey:@"net_sourceforge_bibdesk_itemreadstatus"];
+ [info setObject:(__bridge id)([self
triStateValueOfField:BDSKReadString] == NSOnState ? kCFBooleanTrue :
kCFBooleanFalse) forKey:@"net_sourceforge_bibdesk_itemreadstatus"];
// kMDItemWhereFroms is the closest we get to a URL field, so add our
standard fields if available
NSMutableArray *mutableArray = [[NSMutableArray alloc] initWithCapacity:2];
@@ -1707,7 +1707,7 @@
}
if ([mutableArray count])
- [info setObject:mutableArray forKey:(NSString *)kMDItemWhereFroms];
+ [info setObject:mutableArray forKey:(__bridge NSString
*)kMDItemWhereFroms];
[mutableArray release];
return info;
@@ -3971,7 +3971,7 @@
}
// GJ try parsing pdf to extract info that is then used to get a PubMed
record
- if(newBI == nil && [[[NSWorkspace sharedWorkspace] typeOfFile:[[[fileURL
URLByStandardizingPath] URLByResolvingSymlinksInPath] path] error:NULL]
isEqualToUTI:(NSString *)kUTTypePDF]){
+ if(newBI == nil && [[[NSWorkspace sharedWorkspace] typeOfFile:[[[fileURL
URLByStandardizingPath] URLByResolvingSymlinksInPath] path] error:NULL]
isEqualToUTI:(__bridge NSString *)kUTTypePDF]){
if([[NSUserDefaults standardUserDefaults]
boolForKey:BDSKShouldParsePDFToGeneratePubMedSearchTermKey])
newBI = [self itemByParsingPDFAtURL:fileURL owner:anOwner];
// fall back on the least reliable metadata source (hidden pref)
Modified: trunk/bibdesk/BibPref_Defaults.m
===================================================================
--- trunk/bibdesk/BibPref_Defaults.m 2024-01-05 00:09:34 UTC (rev 28546)
+++ trunk/bibdesk/BibPref_Defaults.m 2024-01-05 10:21:29 UTC (rev 28547)
@@ -206,10 +206,10 @@
[globalMacroFilesTableView sizeToFit];
- [globalMacroFilesTableView registerForDraggedTypes:[NSArray
arrayWithObjects:(NSString *)kUTTypeFileURL, NSFilenamesPboardType, nil]];
+ [globalMacroFilesTableView registerForDraggedTypes:[NSArray
arrayWithObjects:(__bridge NSString *)kUTTypeFileURL, NSFilenamesPboardType,
nil]];
NSWorkspace *sws = [NSWorkspace sharedWorkspace];
- NSArray *pdfViewers = [sws
editorAndViewerNamesAndBundleIDsForType:(NSString *)kUTTypePDF];
+ NSArray *pdfViewers = [sws
editorAndViewerNamesAndBundleIDsForType:(__bridge NSString *)kUTTypePDF];
NSString *pdfViewerID = [[sud dictionaryForKey:BDSKDefaultViewersKey]
objectForKey:@"pdf"];
NSInteger i, iMax = [pdfViewers count];
NSInteger idx = 0;
@@ -623,7 +623,7 @@
[openPanel setAllowsMultipleSelection:NO];
[openPanel setPrompt:NSLocalizedString(@"Choose Viewer", @"Prompt for
Choose panel")];
[openPanel setDirectoryURL:[[NSFileManager defaultManager]
applicationsDirectoryURL]];
- [openPanel setAllowedFileTypes:@[(NSString
*)kUTTypeApplicationBundle]];
+ [openPanel setAllowedFileTypes:@[(__bridge NSString
*)kUTTypeApplicationBundle]];
[openPanel beginSheetModalForWindow:[[self view] window]
completionHandler:^(NSInteger result){
NSString *bundleID;
if (result == NSModalResponseOK)
Modified: trunk/bibdesk/BibPref_Export.m
===================================================================
--- trunk/bibdesk/BibPref_Export.m 2024-01-05 00:09:34 UTC (rev 28546)
+++ trunk/bibdesk/BibPref_Export.m 2024-01-05 10:21:29 UTC (rev 28547)
@@ -86,7 +86,7 @@
- (void)viewDidLoad {
[super viewDidLoad];
- [outlineView registerForDraggedTypes:@[BDSKPasteboardTypeTemplateRows,
(NSString *)kUTTypeFileURL, NSFilenamesPboardType]];
+ [outlineView registerForDraggedTypes:@[BDSKPasteboardTypeTemplateRows,
(__bridge NSString *)kUTTypeFileURL, NSFilenamesPboardType]];
[outlineView setDoubleAction:@selector(chooseFileDoubleAction:)];
[outlineView setTarget:self];
Modified: trunk/bibdesk/BibPref_ScriptHooks.m
===================================================================
--- trunk/bibdesk/BibPref_ScriptHooks.m 2024-01-05 00:09:34 UTC (rev 28546)
+++ trunk/bibdesk/BibPref_ScriptHooks.m 2024-01-05 10:21:29 UTC (rev 28547)
@@ -83,7 +83,7 @@
[tableView setTarget:self];
[tableView setDoubleAction:@selector(showOrChooseScriptFile:)];
- [tableView registerForDraggedTypes:@[(NSString *)kUTTypeFileURL,
NSFilenamesPboardType]];
+ [tableView registerForDraggedTypes:@[(__bridge NSString *)kUTTypeFileURL,
NSFilenamesPboardType]];
NSTableColumn *tc = [tableView tableColumnWithIdentifier:@"name"];
NSCell *cell = [tc dataCell];
Modified: trunk/bibdesk/NSMenu_BDSKExtensions.m
===================================================================
--- trunk/bibdesk/NSMenu_BDSKExtensions.m 2024-01-05 00:09:34 UTC (rev
28546)
+++ trunk/bibdesk/NSMenu_BDSKExtensions.m 2024-01-05 10:21:29 UTC (rev
28547)
@@ -170,7 +170,7 @@
[openPanel setAllowsMultipleSelection:NO];
[openPanel setPrompt:NSLocalizedString(@"Choose Viewer", @"Prompt for
Choose panel")];
[openPanel setDirectoryURL:[[NSFileManager defaultManager]
applicationsDirectoryURL]];
- [openPanel setAllowedFileTypes:@[(NSString *)kUTTypeApplicationBundle]];
+ [openPanel setAllowedFileTypes:@[(__bridge NSString
*)kUTTypeApplicationBundle]];
NSInteger rv = [openPanel runModal];
if(NSModalResponseOK == rv)
Modified: trunk/bibdesk/NSPasteboard_BDSKExtensions.m
===================================================================
--- trunk/bibdesk/NSPasteboard_BDSKExtensions.m 2024-01-05 00:09:34 UTC (rev
28546)
+++ trunk/bibdesk/NSPasteboard_BDSKExtensions.m 2024-01-05 10:21:29 UTC (rev
28547)
@@ -51,7 +51,7 @@
}
+ (NSArray *)readableTypesForPasteboard:(NSPasteboard *)pasteboard {
- return @[(NSString *)kUTTypeURL, (NSString *)kUTTypeFileURL];
+ return @[(__bridge NSString *)kUTTypeURL, (__bridge NSString
*)kUTTypeFileURL];
}
@end
Modified: trunk/bibdesk/NSWorkspace_BDSKExtensions.m
===================================================================
--- trunk/bibdesk/NSWorkspace_BDSKExtensions.m 2024-01-05 00:09:34 UTC (rev
28546)
+++ trunk/bibdesk/NSWorkspace_BDSKExtensions.m 2024-01-05 10:21:29 UTC (rev
28547)
@@ -244,7 +244,7 @@
- (BOOL)isApplicationAtPath:(NSString *)path {
NSString *theUTI = [self typeOfFile:[[path stringByStandardizingPath]
stringByResolvingSymlinksInPath] error:NULL];
- return theUTI ? [self type:theUTI conformsToType:(id)kUTTypeApplication] :
NO;
+ return theUTI ? [self type:theUTI conformsToType:(__bridge NSString
*)kUTTypeApplication] : NO;
}
- (BOOL)isAutomatorWorkflowAtPath:(NSString *)path {
@@ -254,7 +254,7 @@
- (BOOL)isFolderAtPath:(NSString *)path {
NSString *theUTI = [self typeOfFile:[[path stringByStandardizingPath]
stringByResolvingSymlinksInPath] error:NULL];
- return theUTI ? [self type:theUTI conformsToType:(id)kUTTypeFolder] : NO;
+ return theUTI ? [self type:theUTI conformsToType:(__bridge NSString
*)kUTTypeFolder] : NO;
}
#pragma mark Email support
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
_______________________________________________
Bibdesk-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/bibdesk-commit
