From c932b83c3e9ccf1683a14e593d0050b1b24c9589 Mon Sep 17 00:00:00 2001 From: "C.W. Betts" Date: Thu, 30 Jan 2025 00:49:50 -0700 Subject: [PATCH] Initial work on migrating to ObjC 2 properties. --- XADArchiveParser.h | 27 +++++++++++--------------- XADArchiveParser.m | 25 ++++++++---------------- XADPath.h | 2 +- XADSimpleUnarchiver.h | 45 +++++++++++++++---------------------------- XADSimpleUnarchiver.m | 44 ++++++++++++++++++------------------------ XADUnarchiver.h | 17 ++++++---------- XADUnarchiver.m | 26 ++++++------------------- 7 files changed, 67 insertions(+), 119 deletions(-) diff --git a/XADArchiveParser.h b/XADArchiveParser.h index 68acd804..99ccc952 100644 --- a/XADArchiveParser.h +++ b/XADArchiveParser.h @@ -144,10 +144,8 @@ resourceFork:(XADResourceFork *)fork name:(NSString *)name propertiesToAdd:(NSMu -(id)init; -(void)dealloc; --(CSHandle *)handle; --(void)setHandle:(CSHandle *)newhandle; --(XADResourceFork *)resourceFork; --(void)setResourceFork:(XADResourceFork *)newfork; +@property (nonatomic, retain) CSHandle *handle; +@property (retain) XADResourceFork *resourceFork; -(NSString *)name; -(void)setName:(NSString *)newname; -(NSString *)filename; @@ -155,24 +153,21 @@ resourceFork:(XADResourceFork *)fork name:(NSString *)name propertiesToAdd:(NSMu -(NSArray *)allFilenames; -(void)setAllFilenames:(NSArray *)newnames; --(id)delegate; --(void)setDelegate:(id)newdelegate; +@property (assign) id delegate; --(NSDictionary *)properties; +@property (readonly, copy) NSDictionary *properties; -(NSString *)currentFilename; --(BOOL)isEncrypted; --(NSString *)password; --(BOOL)hasPassword; --(void)setPassword:(NSString *)newpassword; +@property (readonly, nonatomic, getter=isEncrypted) BOOL encrypted; +@property (nonatomic, copy) NSString *password; +@property (nonatomic, readonly) BOOL hasPassword; -(NSString *)encodingName; --(float)encodingConfidence; +@property (nonatomic, readonly) float encodingConfidence; -(void)setEncodingName:(NSString *)encodingname; --(BOOL)caresAboutPasswordEncoding; --(NSString *)passwordEncodingName; --(void)setPasswordEncodingName:(NSString *)encodingname; --(XADStringSource *)stringSource; +@property (readonly) BOOL caresAboutPasswordEncoding; +@property (nonatomic, retain) NSString *passwordEncodingName; +@property (readonly, retain) XADStringSource *stringSource; -(XADString *)linkDestinationForDictionary:(NSDictionary *)dict; -(XADString *)linkDestinationForDictionary:(NSDictionary *)dict error:(XADError *)errorptr; diff --git a/XADArchiveParser.m b/XADArchiveParser.m index baaeb6e1..4e08daca 100644 --- a/XADArchiveParser.m +++ b/XADArchiveParser.m @@ -564,13 +564,14 @@ -(void)dealloc [currsolidhandle release]; [firstsoliddict release]; [prevsoliddict release]; + [resourcefork release]; [super dealloc]; } --(CSHandle *)handle { return sourcehandle; } +@synthesize handle = sourcehandle; -(void)setHandle:(CSHandle *)newhandle { @@ -587,13 +588,7 @@ -(void)setHandle:(CSHandle *)newhandle else forcesolid=NO; } --(XADResourceFork *)resourceFork { return resourcefork; } - --(void)setResourceFork:(XADResourceFork *)newfork -{ - [resourcefork autorelease]; - resourcefork=[newfork retain]; -} +@synthesize resourceFork = resourcefork; -(NSString *)name { return [properties objectForKey:XADArchiveNameKey]; } @@ -618,11 +613,9 @@ -(void)setAllFilenames:(NSArray *)newnames [self setName:[newnames objectAtIndex:0]]; } --(id)delegate { return delegate; } +@synthesize delegate; --(void)setDelegate:(id)newdelegate { delegate=newdelegate; } - --(NSDictionary *)properties { return properties; } +-(NSDictionary *)properties { return [[properties copy] autorelease]; } -(NSString *)currentFilename { @@ -687,10 +680,8 @@ -(void)setEncodingName:(NSString *)encodingname [stringsource setFixedEncodingName:encodingname]; } --(BOOL)caresAboutPasswordEncoding -{ - return caresaboutpasswordencoding; -} +@synthesize caresAboutPasswordEncoding = caresaboutpasswordencoding; +@synthesize passwordEncodingName = passwordencodingname; -(NSString *)passwordEncodingName { @@ -707,7 +698,7 @@ -(void)setPasswordEncodingName:(NSString *)encodingname } } --(XADStringSource *)stringSource { return stringsource; } +@synthesize stringSource = stringsource; diff --git a/XADPath.h b/XADPath.h index da9eaa51..5e0bd31f 100644 --- a/XADPath.h +++ b/XADPath.h @@ -111,7 +111,7 @@ separators:(const char *)pathseparators; -(id)copyWithZone:(NSZone *)zone; // Deprecated. --(XADPath *)safePath; // Deprecated. Use sanitizedPathString: instead. +-(XADPath *)safePath DEPRECATED_ATTRIBUTE; // Deprecated. Use sanitizedPathString: instead. // Subclass methods. -(BOOL)_isPartAbsolute; diff --git a/XADSimpleUnarchiver.h b/XADSimpleUnarchiver.h index d4a69f23..da87c7b8 100644 --- a/XADSimpleUnarchiver.h +++ b/XADSimpleUnarchiver.h @@ -35,7 +35,7 @@ XADArchiveParser *parser; XADUnarchiver *unarchiver,*subunarchiver; - id delegate; + id delegate; BOOL shouldstop; NSString *destination,*enclosingdir; @@ -72,55 +72,42 @@ -(XADArchiveParser *)innerArchiveParser; -(NSArray *)reasonsForInterest; --(id)delegate; --(void)setDelegate:(id)newdelegate; +@property (assign) id delegate; // TODO: Encoding wrappers? -(NSString *)password; -(void)setPassword:(NSString *)password; --(NSString *)destination; --(void)setDestination:(NSString *)destpath; +@property (nonatomic, copy) NSString *destination; --(NSString *)enclosingDirectoryName; --(void)setEnclosingDirectoryName:(NSString *)dirname; +@property (nonatomic, copy) NSString *enclosingDirectoryName; --(BOOL)removesEnclosingDirectoryForSoloItems; --(void)setRemovesEnclosingDirectoryForSoloItems:(BOOL)removeflag; +@property BOOL removesEnclosingDirectoryForSoloItems; --(BOOL)alwaysOverwritesFiles; --(void)setAlwaysOverwritesFiles:(BOOL)overwriteflag; +@property BOOL alwaysOverwritesFiles; --(BOOL)alwaysRenamesFiles; --(void)setAlwaysRenamesFiles:(BOOL)renameflag; +@property BOOL alwaysRenamesFiles; --(BOOL)alwaysSkipsFiles; --(void)setAlwaysSkipsFiles:(BOOL)skipflag; +@property BOOL alwaysSkipsFiles; --(BOOL)extractsSubArchives; --(void)setExtractsSubArchives:(BOOL)extractflag; +@property BOOL extractsSubArchives; --(BOOL)copiesArchiveModificationTimeToEnclosingDirectory; --(void)setCopiesArchiveModificationTimeToEnclosingDirectory:(BOOL)copyflag; +@property BOOL copiesArchiveModificationTimeToEnclosingDirectory; --(BOOL)copiesArchiveModificationTimeToSoloItems; --(void)setCopiesArchiveModificationTimeToSoloItems:(BOOL)copyflag; +@property BOOL copiesArchiveModificationTimeToSoloItems; --(BOOL)resetsDateForSoloItems; --(void)setResetsDateForSoloItems:(BOOL)resetflag; +@property BOOL resetsDateForSoloItems; --(BOOL)propagatesRelevantMetadata; --(void)setPropagatesRelevantMetadata:(BOOL)propagateflag; +@property BOOL propagatesRelevantMetadata; -(int)macResourceForkStyle; -(void)setMacResourceForkStyle:(int)style; --(BOOL)preservesPermissions; --(void)setPreserevesPermissions:(BOOL)preserveflag; +@property (nonatomic) BOOL preservesPermissions; +-(void)setPreserevesPermissions:(BOOL)preserveflag DEPRECATED_ATTRIBUTE; --(double)updateInterval; --(void)setUpdateInterval:(double)interval; +@property (nonatomic) NSTimeInterval updateInterval; -(void)addGlobFilter:(NSString *)wildcard; -(void)addRegexFilter:(XADRegex *)regex; diff --git a/XADSimpleUnarchiver.m b/XADSimpleUnarchiver.m index 6dbf6449..206a5256 100644 --- a/XADSimpleUnarchiver.m +++ b/XADSimpleUnarchiver.m @@ -151,8 +151,7 @@ -(XADArchiveParser *)innerArchiveParser { return [subunarchiver archiveParser]; -(NSArray *)reasonsForInterest { return reasonsforinterest; } --(id)delegate { return delegate; } --(void)setDelegate:(id)newdelegate { delegate=newdelegate; } +@synthesize delegate; -(NSString *)password { return [parser password]; } -(void)setPassword:(NSString *)password @@ -161,52 +160,43 @@ -(void)setPassword:(NSString *)password [[subunarchiver archiveParser] setPassword:password]; } --(NSString *)destination { return destination; } +@synthesize destination; -(void)setDestination:(NSString *)destpath { if(destpath!=destination) { [destination release]; - destination=[destpath retain]; + destination=[destpath copy]; } } --(NSString *)enclosingDirectoryName { return enclosingdir; } +@synthesize enclosingDirectoryName = enclosingdir; -(void)setEnclosingDirectoryName:(NSString *)dirname { if(dirname!=enclosingdir) { [enclosingdir release]; - enclosingdir=[dirname retain]; + enclosingdir=[dirname copy]; } } --(BOOL)removesEnclosingDirectoryForSoloItems { return removesolo; } --(void)setRemovesEnclosingDirectoryForSoloItems:(BOOL)removeflag { removesolo=removeflag; } +@synthesize removesEnclosingDirectoryForSoloItems = removesolo; --(BOOL)alwaysOverwritesFiles { return overwrite; } --(void)setAlwaysOverwritesFiles:(BOOL)overwriteflag { overwrite=overwriteflag; } +@synthesize alwaysOverwritesFiles = overwrite; --(BOOL)alwaysRenamesFiles { return rename; } --(void)setAlwaysRenamesFiles:(BOOL)renameflag { rename=renameflag; } +@synthesize alwaysRenamesFiles = rename; --(BOOL)alwaysSkipsFiles { return skip; } --(void)setAlwaysSkipsFiles:(BOOL)skipflag { skip=skipflag; } +@synthesize alwaysSkipsFiles = skip; --(BOOL)extractsSubArchives { return extractsubarchives; } --(void)setExtractsSubArchives:(BOOL)extractflag { extractsubarchives=extractflag; } +@synthesize extractsSubArchives = extractsubarchives; --(BOOL)copiesArchiveModificationTimeToEnclosingDirectory { return copydatetoenclosing; } --(void)setCopiesArchiveModificationTimeToEnclosingDirectory:(BOOL)copyflag { copydatetoenclosing=copyflag; } +@synthesize copiesArchiveModificationTimeToEnclosingDirectory = copydatetoenclosing; --(BOOL)copiesArchiveModificationTimeToSoloItems { return copydatetosolo; } --(void)setCopiesArchiveModificationTimeToSoloItems:(BOOL)copyflag { copydatetosolo=copyflag; } +@synthesize copiesArchiveModificationTimeToSoloItems = copydatetosolo; --(BOOL)resetsDateForSoloItems { return resetsolodate; } --(void)setResetsDateForSoloItems:(BOOL)resetflag { resetsolodate=resetflag; } +@synthesize resetsDateForSoloItems = resetsolodate; --(BOOL)propagatesRelevantMetadata { return propagatemetadata; } --(void)setPropagatesRelevantMetadata:(BOOL)propagateflag { propagatemetadata=propagateflag; } +@synthesize propagatesRelevantMetadata = propagatemetadata; -(int)macResourceForkStyle { return [unarchiver macResourceForkStyle]; } -(void)setMacResourceForkStyle:(int)style @@ -216,11 +206,15 @@ -(void)setMacResourceForkStyle:(int)style } -(BOOL)preservesPermissions { return [unarchiver preservesPermissions]; } --(void)setPreserevesPermissions:(BOOL)preserveflag +-(void)setPreservesPermissions:(BOOL)preserveflag { [unarchiver setPreserevesPermissions:preserveflag]; [subunarchiver setPreserevesPermissions:preserveflag]; } +-(void)setPreserevesPermissions:(BOOL)preserveflag +{ + self.preservesPermissions = preserveflag; +} -(double)updateInterval { return [unarchiver updateInterval]; } -(void)setUpdateInterval:(double)interval diff --git a/XADUnarchiver.h b/XADUnarchiver.h index 52d37955..64313f93 100644 --- a/XADUnarchiver.h +++ b/XADUnarchiver.h @@ -58,23 +58,18 @@ -(id)initWithArchiveParser:(XADArchiveParser *)archiveparser; -(void)dealloc; --(XADArchiveParser *)archiveParser; +@property (readonly, retain) XADArchiveParser *archiveParser; --(id)delegate; --(void)setDelegate:(id)newdelegate; +@property (assign) id delegate; --(NSString *)destination; --(void)setDestination:(NSString *)destpath; +@property (copy) NSString *destination; --(int)macResourceForkStyle; --(void)setMacResourceForkStyle:(int)style; +@property int macResourceForkStyle; --(BOOL)preservesPermissions; --(void)setPreservesPermissions:(BOOL)preserveflag; +@property BOOL preservesPermissions; -(void)setPreserevesPermissions:(BOOL)preserveflag DEPRECATED_ATTRIBUTE; --(double)updateInterval; --(void)setUpdateInterval:(double)interval; +@property NSTimeInterval updateInterval; -(XADError)parseAndUnarchive; diff --git a/XADUnarchiver.m b/XADUnarchiver.m index a3f61265..bb02ef0e 100644 --- a/XADUnarchiver.m +++ b/XADUnarchiver.m @@ -70,32 +70,18 @@ -(void)dealloc [super dealloc]; } --(XADArchiveParser *)archiveParser { return parser; } +@synthesize archiveParser = parser; --(id)delegate { return delegate; } +@synthesize delegate; --(void)setDelegate:(id)newdelegate { delegate=newdelegate; } +@synthesize destination; --(NSString *)destination { return destination; } +@synthesize macResourceForkStyle = forkstyle; --(void)setDestination:(NSString *)destpath -{ - [destination autorelease]; - destination=[destpath retain]; -} - --(int)macResourceForkStyle { return forkstyle; } - --(void)setMacResourceForkStyle:(int)style { forkstyle=style; } - --(BOOL)preservesPermissions { return preservepermissions; } - --(void)setPreservesPermissions:(BOOL)preserveflag { preservepermissions=preserveflag; } - --(double)updateInterval { return updateinterval; } +@synthesize preservesPermissions = preservepermissions; --(void)setUpdateInterval:(double)interval { updateinterval=interval; } +@synthesize updateInterval = updateinterval;