Revision: 13931
http://sourceforge.net/p/skim-app/code/13931
Author: hofman
Date: 2023-12-19 15:54:37 +0000 (Tue, 19 Dec 2023)
Log Message:
-----------
add some more __bridge
Modified Paths:
--------------
trunk/NSURL_SKExtensions.m
trunk/PDFPage_SKExtensions.m
trunk/SKBookmark.m
trunk/SKBookmarkController.m
trunk/SKDownloadController.m
trunk/SKNoteWindowController.m
trunk/SKScriptMenu.m
Modified: trunk/NSURL_SKExtensions.m
===================================================================
--- trunk/NSURL_SKExtensions.m 2023-12-19 15:39:53 UTC (rev 13930)
+++ trunk/NSURL_SKExtensions.m 2023-12-19 15:54:37 UTC (rev 13931)
@@ -302,11 +302,11 @@
@implementation SKURL
+ (NSArray *)readableTypesForPasteboard:(NSPasteboard *)pasteboard {
- return @[(NSString *)kUTTypeURL, (NSString *)kUTTypeFileURL,
NSPasteboardTypeString];
+ return @[(__bridge NSString *)kUTTypeURL, (__bridge NSString
*)kUTTypeFileURL, NSPasteboardTypeString];
}
+ (NSPasteboardReadingOptions)readingOptionsForType:(NSString *)type
pasteboard:(NSPasteboard *)pasteboard {
- if ([type isEqualToString:(NSString *)kUTTypeURL] || [type
isEqualToString:(NSString *)kUTTypeFileURL] || [type
isEqualToString:NSPasteboardTypeString])
+ if ([type isEqualToString:(__bridge NSString *)kUTTypeURL] || [type
isEqualToString:(__bridge NSString *)kUTTypeFileURL] || [type
isEqualToString:NSPasteboardTypeString])
return NSPasteboardReadingAsString;
return NSPasteboardReadingAsData;
}
@@ -315,7 +315,7 @@
self = nil;
if ([propertyList isKindOfClass:[NSString class]]) {
NSString *string = propertyList;
- if ([type isEqualToString:(NSString *)kUTTypeURL] || [type
isEqualToString:(NSString *)kUTTypeFileURL]) {
+ if ([type isEqualToString:(__bridge NSString *)kUTTypeURL] || [type
isEqualToString:(__bridge NSString *)kUTTypeFileURL]) {
self = (id)[[NSURL alloc] initWithString:string];
} else if ([type isEqualToString:NSPasteboardTypeString]) {
if ([string rangeOfString:@"://"].length) {
Modified: trunk/PDFPage_SKExtensions.m
===================================================================
--- trunk/PDFPage_SKExtensions.m 2023-12-19 15:39:53 UTC (rev 13930)
+++ trunk/PDFPage_SKExtensions.m 2023-12-19 15:54:37 UTC (rev 13931)
@@ -339,7 +339,7 @@
- (id<NSPasteboardWriting>)filePromiseForPageIndexes:(NSIndexSet *)pageIndexes
{
if ([[self document] isLocked] == NO) {
- NSString *fileUTI = [[self document] allowsPrinting] ? (NSString
*)kUTTypePDF : (NSString *)kUTTypeTIFF;
+ NSString *fileUTI = [[self document] allowsPrinting] ? (__bridge
NSString *)kUTTypePDF : (__bridge NSString *)kUTTypeTIFF;
NSFilePromiseProvider *item = [[NSFilePromiseProvider alloc]
initWithFileType:fileUTI delegate:self];
if (pageIndexes)
[item setUserInfo:pageIndexes];
Modified: trunk/SKBookmark.m
===================================================================
--- trunk/SKBookmark.m 2023-12-19 15:39:53 UTC (rev 13930)
+++ trunk/SKBookmark.m 2023-12-19 15:54:37 UTC (rev 13931)
@@ -708,7 +708,7 @@
type = [aType integerValue];
else if (aURL == nil)
type = SKBookmarkTypeSession;
- else if ([[NSWorkspace sharedWorkspace] type:[[NSWorkspace
sharedWorkspace] typeOfFile:[aURL path] error:NULL] conformsToType:(NSString
*)kUTTypeFolder])
+ else if ([[NSWorkspace sharedWorkspace] type:[[NSWorkspace
sharedWorkspace] typeOfFile:[aURL path] error:NULL] conformsToType:(__bridge
NSString *)kUTTypeFolder])
type = SKBookmarkTypeFolder;
else
type = SKBookmarkTypeBookmark;
Modified: trunk/SKBookmarkController.m
===================================================================
--- trunk/SKBookmarkController.m 2023-12-19 15:39:53 UTC (rev 13930)
+++ trunk/SKBookmarkController.m 2023-12-19 15:54:37 UTC (rev 13931)
@@ -195,7 +195,7 @@
[outlineView setTypeSelectHelper:[SKTypeSelectHelper typeSelectHelper]];
- [outlineView registerForDraggedTypes:@[SKPasteboardTypeBookmarkRow,
(NSString *)kUTTypeFileURL, NSFilenamesPboardType]];
+ [outlineView registerForDraggedTypes:@[SKPasteboardTypeBookmarkRow,
(__bridge NSString *)kUTTypeFileURL, NSFilenamesPboardType]];
[outlineView setDraggingSourceOperationMask:NSDragOperationMove
forLocal:YES];
[outlineView setDraggingSourceOperationMask:NSDragOperationDelete
forLocal:NO];
@@ -206,7 +206,7 @@
[outlineView sizeToFit];
- NSArray *sendTypes = @[(NSString *)kUTTypeFileURL];
+ NSArray *sendTypes = @[(__bridge NSString *)kUTTypeFileURL];
[NSApp registerServicesMenuSendTypes:sendTypes returnTypes:@[]];
}
@@ -1311,7 +1311,7 @@
#pragma mark Services
- (BOOL)writeSelectionToPasteboard:(NSPasteboard *)pboard types:(NSArray
*)types {
- if ([types containsObject:(NSString *)kUTTypeFileURL] && ([outlineView
selectedRow] != -1 || [outlineView clickedRow] != -1)) {
+ if ([types containsObject:(__bridge NSString *)kUTTypeFileURL] &&
([outlineView selectedRow] != -1 || [outlineView clickedRow] != -1)) {
NSInteger rowIndex = [outlineView clickedRow];
NSIndexSet *indexes = [outlineView selectedRowIndexes];
if (rowIndex != -1 && [indexes containsIndex:rowIndex] == NO)
@@ -1333,7 +1333,7 @@
}
- (id)validRequestorForSendType:(NSString *)sendType returnType:(NSString
*)returnType {
- if ([sendType isEqualToString:(NSString *)kUTTypeFileURL] && returnType ==
nil)
+ if ([sendType isEqualToString:(__bridge NSString *)kUTTypeFileURL] &&
returnType == nil)
return [outlineView selectedRow] != -1 || [outlineView clickedRow] !=
-1 ? self : nil;
return [super validRequestorForSendType:sendType returnType:returnType];
}
Modified: trunk/SKDownloadController.m
===================================================================
--- trunk/SKDownloadController.m 2023-12-19 15:39:53 UTC (rev 13930)
+++ trunk/SKDownloadController.m 2023-12-19 15:54:37 UTC (rev 13931)
@@ -143,7 +143,7 @@
[tableView setTypeSelectHelper:[SKTypeSelectHelper typeSelectHelper]];
- [tableView registerForDraggedTypes:@[(NSString *)kUTTypeURL, (NSString
*)kUTTypeFileURL, NSURLPboardType, NSFilenamesPboardType,
NSPasteboardTypeString]];
+ [tableView registerForDraggedTypes:@[(__bridge NSString *)kUTTypeURL,
(__bridge NSString *)kUTTypeFileURL, NSURLPboardType, NSFilenamesPboardType,
NSPasteboardTypeString]];
[tableView setSupportsQuickLook:YES];
}
Modified: trunk/SKNoteWindowController.m
===================================================================
--- trunk/SKNoteWindowController.m 2023-12-19 15:39:53 UTC (rev 13930)
+++ trunk/SKNoteWindowController.m 2023-12-19 15:54:37 UTC (rev 13931)
@@ -365,7 +365,7 @@
- (id<NSPasteboardWriting>)draggedObjectForDragImageView {
NSImage *image = [note image];
if (image)
- return [[NSFilePromiseProvider alloc] initWithFileType:(NSString
*)kUTTypeTIFF delegate:self];
+ return [[NSFilePromiseProvider alloc] initWithFileType:(__bridge
NSString *)kUTTypeTIFF delegate:self];
else
return nil;
}
Modified: trunk/SKScriptMenu.m
===================================================================
--- trunk/SKScriptMenu.m 2023-12-19 15:39:53 UTC (rev 13930)
+++ trunk/SKScriptMenu.m 2023-12-19 15:54:37 UTC (rev 13931)
@@ -187,7 +187,7 @@
static BOOL isApplicationUTI(NSString *theUTI) {
if (theUTI == NULL)
return NO;
- return [[NSWorkspace sharedWorkspace] type:theUTI
conformsToType:(id)kUTTypeApplication];
+ return [[NSWorkspace sharedWorkspace] type:theUTI conformsToType:(__bridge
NSString *)kUTTypeApplication];
}
static BOOL isAutomatorWorkflowUTI(NSString *theUTI) {
@@ -199,7 +199,7 @@
static BOOL isFolderUTI(NSString *theUTI) {
if (theUTI == NULL)
return NO;
- return [[NSWorkspace sharedWorkspace] type:theUTI
conformsToType:(id)kUTTypeFolder];
+ return [[NSWorkspace sharedWorkspace] type:theUTI conformsToType:(__bridge
NSString *)kUTTypeFolder];
}
- (NSArray *)directoryContentsAtURL:(NSURL *)url
recursionDepth:(NSInteger)depth {
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
