Allow requestDataForPageIndex to be an async Swift function.

Nothing takes advantage of this yet, though.
MaddTheSane · Oct 25, 2021 · 47b5894 · 47b5894
1 parent f827470
commit 47b5894
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/Classes/Managed Objects/TSSTManagedGroup.h b/Classes/Managed Objects/TSSTManagedGroup.h
@@ -34,7 +34,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (copy) NSString *path;
 @property (copy) NSURL *fileURL;
 
-- (void)requestDataForPageIndex:(NSInteger)index callback:(void(^)(NSData *_Nullable pageData, NSError *_Nullable error))callback;
+- (void)requestDataForPageIndex:(NSInteger)index completionHandler:(void(^)(NSData *_Nullable pageData, NSError *_Nullable error))callback;
 @property (readonly, strong, nullable) NSManagedObject *topLevelGroup;
 
 /**

diff --git a/Classes/Managed Objects/TSSTManagedGroup.m b/Classes/Managed Objects/TSSTManagedGroup.m
@@ -170,7 +170,7 @@ - (NSData *)dataForPageIndex:(NSInteger)index
 	return nil;
 }
 
-- (void)requestDataForPageIndex:(NSInteger)index callback:(void(^)(NSData *_Nullable pageData, NSError *_Nullable error))callback
+- (void)requestDataForPageIndex:(NSInteger)index completionHandler:(void(^)(NSData *_Nullable pageData, NSError *_Nullable error))callback
 {
 	callback(nil, [NSError errorWithDomain:NSOSStatusErrorDomain code:unimpErr userInfo:nil]);
 }
@@ -350,7 +350,7 @@ - (id)instance
 }
 
 
-- (void)requestDataForPageIndex:(NSInteger)index callback:(void(^)(NSData *_Nullable pageData, NSError *_Nullable error))callback
+- (void)requestDataForPageIndex:(NSInteger)index completionHandler:(void(^)(NSData *_Nullable pageData, NSError *_Nullable error))callback
 {
 	NSString * solidDirectory = self.solidDirectory;
 	NSData * imageData;
@@ -540,7 +540,7 @@ - (id)instance
 	return instance;
 }
 
-- (void)requestDataForPageIndex:(NSInteger)index callback:(void(^)(NSData *_Nullable pageData, NSError *_Nullable error))callback
+- (void)requestDataForPageIndex:(NSInteger)index completionHandler:(void(^)(NSData *_Nullable pageData, NSError *_Nullable error))callback
 {
 	[groupLock lock];
 	PDFPage * page = [(PDFDocument*)[self instance] pageAtIndex: index];

diff --git a/Classes/Managed Objects/TSSTPage.m b/Classes/Managed Objects/TSSTPage.m
@@ -241,7 +241,7 @@ - (NSImage *)textPage
 	__block NSData * textData;
 	if(self.index)
 	{
-		[self.group requestDataForPageIndex: [self.index integerValue] callback:^(NSData * _Nullable pageData, NSError * _Nullable error) {
+		[self.group requestDataForPageIndex: [self.index integerValue] completionHandler:^(NSData * _Nullable pageData, NSError * _Nullable error) {
 			textData = pageData;
 		}];
 	}
@@ -299,7 +299,7 @@ - (NSData *)pageData
 	if(self.index)
 	{
 		NSInteger entryIndex = [self.index integerValue];
-		[group requestDataForPageIndex:entryIndex callback:^(NSData * _Nullable pageData, NSError * _Nullable error) {
+		[group requestDataForPageIndex:entryIndex completionHandler:^(NSData * _Nullable pageData, NSError * _Nullable error) {
 			imageData = pageData;
 		}];
 	}