Revision: 14519
http://sourceforge.net/p/skim-app/code/14519
Author: hofman
Date: 2024-10-05 16:14:56 +0000 (Sat, 05 Oct 2024)
Log Message:
-----------
avoid custom initializer
Modified Paths:
--------------
trunk/SKMainDocument.m
trunk/SKPresentationOptionsSheetController.m
trunk/SKTransitionController.m
trunk/SKTransitionInfo.h
trunk/SKTransitionInfo.m
Modified: trunk/SKMainDocument.m
===================================================================
--- trunk/SKMainDocument.m 2024-10-05 15:40:50 UTC (rev 14518)
+++ trunk/SKMainDocument.m 2024-10-05 16:14:56 UTC (rev 14519)
@@ -1588,7 +1588,9 @@
- (void)setPresentationOptions:(NSDictionary *)dictionary {
SKTransitionController *transitions = [[self mainWindowController]
transitionControllerCreating:YES];
- [transitions setTransition:[[SKTransitionInfo alloc]
initWithProperties:dictionary]];
+ SKTransitionInfo *transition = [[SKTransitionInfo alloc] init];
+ [transition setProperties:dictionary];
+ [transitions setTransition:transition];
[transitions setPageTransitions:[dictionary
objectForKey:PAGETRANSITIONS_KEY]];
}
Modified: trunk/SKPresentationOptionsSheetController.m
===================================================================
--- trunk/SKPresentationOptionsSheetController.m 2024-10-05 15:40:50 UTC
(rev 14518)
+++ trunk/SKPresentationOptionsSheetController.m 2024-10-05 16:14:56 UTC
(rev 14519)
@@ -216,7 +216,8 @@
for (SKThumbnail *next in [controller thumbnails]) {
if (tn) {
- SKLabeledTransitionInfo *info = [[SKLabeledTransitionInfo alloc]
initWithProperties:([ptEnum nextObject] ?: dictionary)];
+ SKLabeledTransitionInfo *info = [[SKLabeledTransitionInfo alloc]
init];
+ [info setProperties:([ptEnum nextObject] ?: dictionary)];
[info setThumbnail:tn];
[info setToThumbnail:next];
[array addObject:info];
Modified: trunk/SKTransitionController.m
===================================================================
--- trunk/SKTransitionController.m 2024-10-05 15:40:50 UTC (rev 14518)
+++ trunk/SKTransitionController.m 2024-10-05 16:14:56 UTC (rev 14519)
@@ -178,8 +178,10 @@
}
SKTransitionInfo *currentTransition = transition;
- if (idx < [pageTransitions count])
- currentTransition = [[SKTransitionInfo alloc]
initWithProperties:[pageTransitions objectAtIndex:idx]];
+ if (idx < [pageTransitions count]) {
+ currentTransition = [[SKTransitionInfo alloc] init];
+ [currentTransition setProperties:[pageTransitions objectAtIndex:idx]];
+ }
if ([currentTransition style] == SKNoTransition) {
Modified: trunk/SKTransitionInfo.h
===================================================================
--- trunk/SKTransitionInfo.h 2024-10-05 15:40:50 UTC (rev 14518)
+++ trunk/SKTransitionInfo.h 2024-10-05 16:14:56 UTC (rev 14519)
@@ -53,8 +53,6 @@
BOOL shouldRestrict;
}
-- (instancetype)initWithProperties:(NSDictionary *)properies;
-
@property (nonatomic, copy) NSDictionary *properties;
@property (nonatomic) SKTransitionStyle style;
Modified: trunk/SKTransitionInfo.m
===================================================================
--- trunk/SKTransitionInfo.m 2024-10-05 15:40:50 UTC (rev 14518)
+++ trunk/SKTransitionInfo.m 2024-10-05 16:14:56 UTC (rev 14519)
@@ -117,12 +117,6 @@
return self;
}
-- (instancetype)initWithProperties:(NSDictionary *)properies {
- self = [self init];
- [self setProperties:properies];
- return self;
-}
-
+ (NSArray *)readableTypesForPasteboard:(NSPasteboard *)pasteboard {
return @[SKPasteboardTypeTransition];
}
@@ -145,7 +139,8 @@
- (instancetype)initWithPasteboardPropertyList:(id)propertyList
ofType:(NSString *)type {
if ([type isEqualToString:SKPasteboardTypeTransition]) {
- self = [self initWithProperties:propertyList];
+ self = [self init];
+ [self setProperties:propertyList];
} else {
self = nil;
}
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
