Revision: 28386
http://sourceforge.net/p/bibdesk/svn/28386
Author: hofman
Date: 2023-10-02 21:49:21 +0000 (Mon, 02 Oct 2023)
Log Message:
-----------
name enum for filer error
Modified Paths:
--------------
trunk/bibdesk/BDSKFiler.h
trunk/bibdesk/BDSKFiler.m
Modified: trunk/bibdesk/BDSKFiler.h
===================================================================
--- trunk/bibdesk/BDSKFiler.h 2023-10-02 21:35:43 UTC (rev 28385)
+++ trunk/bibdesk/BDSKFiler.h 2023-10-02 21:49:21 UTC (rev 28386)
@@ -48,7 +48,7 @@
@class BibDocument;
-enum {
+typedef NS_OPTIONS(NSInteger, BDSKFilerError) {
BDSKNoError = 0,
BDSKSourceFileDoesNotExistErrorMask = 1 << 0,
BDSKTargetFileExistsErrorMask = 1 << 1,
@@ -137,6 +137,6 @@
@param error An NSError object set when an error occurs.
@discussion -
*/
-- (BOOL)moveItemAtURL:(NSURL *)fileURL toURL:(NSURL *)newFileURL
ignoring:(NSInteger)ignoredError error:(NSError **)error;
+- (BOOL)moveItemAtURL:(NSURL *)fileURL toURL:(NSURL *)newFileURL
ignoring:(BDSKFilerError)ignoredError error:(NSError **)error;
@end
Modified: trunk/bibdesk/BDSKFiler.m
===================================================================
--- trunk/bibdesk/BDSKFiler.m 2023-10-02 21:35:43 UTC (rev 28385)
+++ trunk/bibdesk/BDSKFiler.m 2023-10-02 21:49:21 UTC (rev 28386)
@@ -196,7 +196,7 @@
id paperInfo = [paperInfos objectAtIndex:i];
BDSKLinkedFile *file = [paperInfo valueForKey:BDSKFilerFileKey];
BibItem *pub = [paperInfo valueForKey:BDSKFilerPublicationKey];
- NSInteger flag = force ? [paperInfo valueForKey:BDSKFilerFlagKey]
: BDSKNoError;
+ BDSKFilerError flag = force ? [paperInfo
valueForKey:BDSKFilerFlagKey] : BDSKNoError;
NSString *oldPath = nil;
NSString *newPath = nil;
@@ -358,12 +358,12 @@
@implementation NSFileManager (BDSKFilerExtensions)
-- (BOOL)moveItemAtURL:(NSURL *)fileURL toURL:(NSURL *)newFileURL
ignoring:(NSInteger)ignoredError error:(NSError **)error{
+- (BOOL)moveItemAtURL:(NSURL *)fileURL toURL:(NSURL *)newFileURL
ignoring:(BDSKFilerError)ignoredError error:(NSError **)error{
NSURL *resolvedURL = nil;
NSURL *resolvedNewURL = nil;
NSString *status = nil;
NSString *fix = nil;
- NSInteger statusFlag = BDSKNoError;
+ BDSKFilerError statusFlag = BDSKNoError;
BOOL ignoreMove = NO;
// filemanager needs aliases resolved for moving and existence checks
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
