Revision: 29819
http://sourceforge.net/p/bibdesk/svn/29819
Author: hofman
Date: 2025-11-16 09:41:02 +0000 (Sun, 16 Nov 2025)
Log Message:
-----------
rename property
Modified Paths:
--------------
trunk/bibdesk/BDSKComplexString.h
trunk/bibdesk/BDSKComplexString.m
trunk/bibdesk/BDSKSharedGroup.m
trunk/bibdesk/BibItem.m
Modified: trunk/bibdesk/BDSKComplexString.h
===================================================================
--- trunk/bibdesk/BDSKComplexString.h 2025-11-16 09:32:11 UTC (rev 29818)
+++ trunk/bibdesk/BDSKComplexString.h 2025-11-16 09:41:02 UTC (rev 29819)
@@ -193,7 +193,7 @@
@interface NSCoder (BDSKComplexString)
// macroResolver used for decoded complex strings, nil by default
-@property (nonatomic, nullable, readonly) BDSKMacroResolver *macroResolver;
+@property (nonatomic, nullable, readonly) BDSKMacroResolver
*macroResolverForComplexString;
@end
// unarchiver that allows setting a macroResolver used for decoded complex
strings
@@ -200,7 +200,7 @@
@interface BDSKKeyedUnarchiver : NSKeyedUnarchiver {
BDSKMacroResolver *macroResolver;
}
-@property (nonatomic, nullable, retain) BDSKMacroResolver *macroResolver;
+@property (nonatomic, nullable, retain) BDSKMacroResolver
*macroResolverForComplexString;
@end
NS_ASSUME_NONNULL_END
Modified: trunk/bibdesk/BDSKComplexString.m
===================================================================
--- trunk/bibdesk/BDSKComplexString.m 2025-11-16 09:32:11 UTC (rev 29818)
+++ trunk/bibdesk/BDSKComplexString.m 2025-11-16 09:41:02 UTC (rev 29819)
@@ -368,7 +368,7 @@
nodes = [coder decodeObjectOfClasses:[NSSet
setWithObjects:[NSArray class], [BDSKStringNode class], nil] forKey:@"nodes"];
isComplex = [coder decodeBoolForKey:@"complex"];
isInherited = [coder decodeBoolForKey:@"inherited"];
- macroResolver = [coder macroResolver];
+ macroResolver = [coder macroResolverForComplexString];
expandedString = nil;
modification = 0;
defaultModification = 0;
@@ -918,9 +918,9 @@
#pragma mark -
@implementation NSCoder (BDSKComplexString)
-- (BDSKMacroResolver *)macroResolver { return nil; }
+- (BDSKMacroResolver *)macroResolverForComplexString { return nil; }
@end
@implementation BDSKKeyedUnarchiver
-@synthesize macroResolver;
+@synthesize macroResolverForComplexString;
@end
Modified: trunk/bibdesk/BDSKSharedGroup.m
===================================================================
--- trunk/bibdesk/BDSKSharedGroup.m 2025-11-16 09:32:11 UTC (rev 29818)
+++ trunk/bibdesk/BDSKSharedGroup.m 2025-11-16 09:41:02 UTC (rev 29819)
@@ -178,7 +178,7 @@
if (pubsArchive) {
BDSKKeyedUnarchiver *unarchiver = [[BDSKKeyedUnarchiver alloc]
initForReadingFromData:pubsArchive error:NULL];
- [unarchiver setMacroResolver:[self macroResolver]];
+ [unarchiver setMacroResolverForComplexString:[self macroResolver]];
@try{ pubs = [unarchiver decodeObjectOfClasses:[NSSet
setWithObjects:[NSArray class], [BibItem class], nil]
forKey:NSKeyedArchiveRootObjectKey]; }
@catch(id e) {}
[unarchiver finishDecoding];
@@ -185,7 +185,7 @@
}
if (macrosArchive) {
BDSKKeyedUnarchiver *unarchiver = [[BDSKKeyedUnarchiver alloc]
initForReadingFromData:pubsArchive error:NULL];
- [unarchiver setMacroResolver:[self macroResolver]];
+ [unarchiver setMacroResolverForComplexString:[self macroResolver]];
NSDictionary *dict = nil;
@try{ dict = [unarchiver decodeObjectOfClasses:[NSSet
setWithObjects:[NSDictionary class], [NSString class], nil]
forKey:NSKeyedArchiveRootObjectKey]; }
@catch(id e) {}
Modified: trunk/bibdesk/BibItem.m
===================================================================
--- trunk/bibdesk/BibItem.m 2025-11-16 09:32:11 UTC (rev 29818)
+++ trunk/bibdesk/BibItem.m 2025-11-16 09:41:02 UTC (rev 29819)
@@ -495,7 +495,7 @@
BDSKKeyedUnarchiver *unarchiver = [[BDSKKeyedUnarchiver alloc]
initForReadingFromData:data error:NULL];
NSArray *pubs = nil;
- [unarchiver setMacroResolver:aMacroResolver];
+ [unarchiver setMacroResolverForComplexString:aMacroResolver];
@try { pubs = [unarchiver decodeObjectOfClasses:[NSSet
setWithObjects:[NSArray class], [BibItem class], nil] forKey:@"publications"]; }
@catch (id e) {}
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
