Revision: 16770
http://sourceforge.net/p/skim-app/code/16770
Author: hofman
Date: 2026-11-01 16:57:54 +0000 (Sun, 01 Nov 2026)
Log Message:
-----------
declare valid initializers in concrete bookmark subclasses, use different
initializer name for folder and subclasses
Modified Paths:
--------------
trunk/SKBookmark.m
Modified: trunk/SKBookmark.m
===================================================================
--- trunk/SKBookmark.m 2026-11-01 16:18:40 UTC (rev 16769)
+++ trunk/SKBookmark.m 2026-11-01 16:57:54 UTC (rev 16770)
@@ -75,7 +75,8 @@
NSUInteger pageIndex;
NSDictionary *setup;
}
-- (nullable instancetype)initWithURL:(NSURL *)aURL
pageIndex:(NSUInteger)aPageIndex snapshots:(nullable
NSArray<NSDictionary<NSString *, id> *> *)aSnapshots label:(nullable NSString
*)aLabel;
+- (instancetype)initWithURL:(NSURL *)aURL pageIndex:(NSUInteger)aPageIndex
snapshots:(NSArray *)aSnapshots label:(NSString *)aLabel;
+- (instancetype)initWithSetup:(NSDictionary *)aSetupDict label:(NSString
*)aLabel;
@end
@interface SKFolderBookmark : SKBookmark {
@@ -82,6 +83,7 @@
NSString *label;
NSMutableArray *children;
}
+- (instancetype)initWithChildren:(NSArray *)aChildren label:(NSString *)aLabel;
@end
@interface SKRootBookmark : SKFolderBookmark
@@ -343,7 +345,7 @@
}
- (instancetype)initFolderWithChildren:(NSArray *)aChildren label:(NSString
*)aLabel {
- return (id)[[SKFolderBookmark alloc] initFolderWithChildren:aChildren
label:aLabel];
+ return (id)[[SKFolderBookmark alloc] initWithChildren:aChildren
label:aLabel];
}
- (instancetype)initRootWithChildrenProperties:(NSArray *)childrenProperties {
@@ -354,7 +356,7 @@
[aChildren addObject:child];
}
}
- return (id)[[SKRootBookmark alloc] initFolderWithChildren:aChildren
label:NSLocalizedString(@"Bookmarks Menu", @"Menu item title")];
+ return (id)[[SKRootBookmark alloc] initWithChildren:aChildren
label:NSLocalizedString(@"Bookmarks Menu", @"Menu item title")];
}
- (instancetype)initSessionWithSetups:(NSArray *)aSetupDicts label:(NSString
*)aLabel {
@@ -365,7 +367,7 @@
[aChildren addObject:child];
}
}
- return (id)[[SKSessionBookmark alloc] initFolderWithChildren:aChildren
label:aLabel];
+ return (id)[[SKSessionBookmark alloc] initWithChildren:aChildren
label:aLabel];
}
- (instancetype)initSeparator {
@@ -650,7 +652,7 @@
return keyPaths;
}
-- (instancetype)initFolderWithChildren:(NSArray *)aChildren label:(NSString
*)aLabel {
+- (instancetype)initWithChildren:(NSArray *)aChildren label:(NSString *)aLabel
{
self = [super init];
if (self) {
label = [aLabel copy];
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