Revision: 16778
http://sourceforge.net/p/skim-app/code/16778
Author: hofman
Date: 2026-11-02 15:21:32 +0000 (Mon, 02 Nov 2026)
Log Message:
-----------
pass nil instead of empty array
Modified Paths:
--------------
trunk/SKBookmark.m
trunk/SKMainDocument.m
trunk/SKNoteWindowController.m
trunk/SKTemplateManager.m
Modified: trunk/SKBookmark.m
===================================================================
--- trunk/SKBookmark.m 2026-11-01 22:44:09 UTC (rev 16777)
+++ trunk/SKBookmark.m 2026-11-02 15:21:32 UTC (rev 16778)
@@ -134,7 +134,7 @@
NSString *label = nil;
[url getResourceValue:&label forKey:NSURLLocalizedNameKey error:NULL];
if ([[NSWorkspace sharedWorkspace] type:fileType
conformsToType:SKUTTypeFolder]) {
- NSArray *children = [self bookmarksForURLs:[fm
contentsOfDirectoryAtURL:url includingPropertiesForKeys:@[]
options:NSDirectoryEnumerationSkipsHiddenFiles error:NULL]];
+ NSArray *children = [self bookmarksForURLs:[fm
contentsOfDirectoryAtURL:url includingPropertiesForKeys:nil
options:NSDirectoryEnumerationSkipsHiddenFiles error:NULL]];
if ([children count] && (bookmark = [[self alloc]
initFolderWithChildren:children label:label])) {
[array addObject:bookmark];
}
@@ -826,7 +826,7 @@
{
NSArray *aChildren = nil;
if (aURL) {
- aChildren = [SKBookmark bookmarksForURLs:[[NSFileManager
defaultManager] contentsOfDirectoryAtURL:aURL includingPropertiesForKeys:@[]
options:NSDirectoryEnumerationSkipsHiddenFiles error:NULL]];
+ aChildren = [SKBookmark bookmarksForURLs:[[NSFileManager
defaultManager] contentsOfDirectoryAtURL:aURL includingPropertiesForKeys:nil
options:NSDirectoryEnumerationSkipsHiddenFiles error:NULL]];
if (aLabel == nil)
[aURL getResourceValue:&aLabel
forKey:NSURLLocalizedNameKey error:NULL];
}
Modified: trunk/SKMainDocument.m
===================================================================
--- trunk/SKMainDocument.m 2026-11-01 22:44:09 UTC (rev 16777)
+++ trunk/SKMainDocument.m 2026-11-02 15:21:32 UTC (rev 16778)
@@ -628,7 +628,7 @@
NSURL *fileURL = [self fileURL];
// we move everything that's not ours out of the way, so we can
preserve version control info
NSSet *ourExtensions = [NSSet setWithObjects:@"pdf", @"skim", @"fdf",
@"txt", @"text", @"rtf", @"plist", nil];
- for (NSURL *url in [fm contentsOfDirectoryAtURL:fileURL
includingPropertiesForKeys:@[] options:0 error:NULL]) {
+ for (NSURL *url in [fm contentsOfDirectoryAtURL:fileURL
includingPropertiesForKeys:nil options:0 error:NULL]) {
if ([ourExtensions containsObject:[[url pathExtension]
lowercaseString]] == NO) {
if (tmpURL == nil)
tmpURL = [fm URLForDirectory:NSItemReplacementDirectory
inDomain:NSUserDomainMask appropriateForURL:fileURL create:YES error:NULL];
@@ -670,7 +670,7 @@
} else if (tmpURL) {
// move extra package content like version info to the new location
NSFileManager *fm = [NSFileManager defaultManager];
- for (NSURL *url in [fm contentsOfDirectoryAtURL:tmpURL
includingPropertiesForKeys:@[] options:0 error:NULL])
+ for (NSURL *url in [fm contentsOfDirectoryAtURL:tmpURL
includingPropertiesForKeys:nil options:0 error:NULL])
[fm moveItemAtURL:url toURL:[absoluteURL
URLByAppendingPathComponent:[url lastPathComponent] isDirectory:[[url
absoluteString] hasSuffix:@"/"]] error:NULL];
}
} else if ([attributes count]) {
Modified: trunk/SKNoteWindowController.m
===================================================================
--- trunk/SKNoteWindowController.m 2026-11-01 22:44:09 UTC (rev 16777)
+++ trunk/SKNoteWindowController.m 2026-11-02 15:21:32 UTC (rev 16778)
@@ -465,7 +465,7 @@
NSFileManager *fm = [NSFileManager defaultManager];
NSURL *tmpDirURL = [previewURL URLByDeletingLastPathComponent];
[fm removeItemAtURL:previewURL error:NULL];
- if ([[fm contentsOfDirectoryAtURL:tmpDirURL
includingPropertiesForKeys:@[] options:NSDirectoryEnumerationSkipsHiddenFiles
error:NULL] count] == 0)
+ if ([[fm contentsOfDirectoryAtURL:tmpDirURL
includingPropertiesForKeys:nil options:NSDirectoryEnumerationSkipsHiddenFiles
error:NULL] count] == 0)
[fm removeItemAtURL:tmpDirURL error:NULL];
previewURL = nil;
}
Modified: trunk/SKTemplateManager.m
===================================================================
--- trunk/SKTemplateManager.m 2026-11-01 22:44:09 UTC (rev 16777)
+++ trunk/SKTemplateManager.m 2026-11-02 15:21:32 UTC (rev 16778)
@@ -74,7 +74,7 @@
NSNumber *isDir = nil;
[appSupportURL getResourceValue:&isDir forKey:NSURLIsDirectoryKey
error:NULL];
if ([isDir boolValue]) {
- for (NSURL *url in [fm contentsOfDirectoryAtURL:templatesURL
includingPropertiesForKeys:@[] options:NSDirectoryEnumerationSkipsHiddenFiles
error:NULL]) {
+ for (NSURL *url in [fm contentsOfDirectoryAtURL:templatesURL
includingPropertiesForKeys:nil options:NSDirectoryEnumerationSkipsHiddenFiles
error:NULL]) {
NSString *file = [url lastPathComponent];
if ([[file stringByDeletingPathExtension]
isEqualToString:@"notesTemplate"] == NO &&
[templates containsObject:file] == NO) {
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
