Added rawNameOfEntry: convenience method back into XADMaster framework.

nishiam27 · Feb 9, 2017 · 72826e2 · 72826e2
1 parent f084b03
commit 72826e2
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 3 deletions.
diff --git a/Frameworks/XADMaster.framework/Versions/A/Headers/XADArchive.h b/Frameworks/XADMaster.framework/Versions/A/Headers/XADArchive.h
@@ -98,6 +98,7 @@ extern NSString *XADFinderFlags;
 -(NSDictionary *)combinedParserDictionaryForEntry:(int)n;
 
 -(NSString *)nameOfEntry:(int)n;
+-(XADPath *)rawNameOfEntry:(int)n;
 -(BOOL)entryHasSize:(int)n;
 -(off_t)uncompressedSizeOfEntry:(int)n;
 -(off_t)compressedSizeOfEntry:(int)n;

diff --git a/Frameworks/XADMaster.framework/Versions/A/XADMaster b/Frameworks/XADMaster.framework/Versions/A/XADMaster
diff --git a/Managed Objects/TSSTManagedGroup.m b/Managed Objects/TSSTManagedGroup.m
@@ -448,7 +448,7 @@ -(void)archiveNeedsPassword:(XADArchive *)archive
         return;
     }
 
-    password = [[NSApp delegate] passwordForArchiveWithPath: [self valueForKey: @"path"]];
+    password = [(SimpleComicAppDelegate *)[NSApp delegate] passwordForArchiveWithPath: [self valueForKey: @"path"]];
     [archive setPassword: password];
 
     [self setValue: password forKey: @"password"];

diff --git a/QuickComic/DTQuickComicCommon.m b/QuickComic/DTQuickComicCommon.m
@@ -26,7 +26,7 @@
     for ( ; index < count; ++index)
     {
         fileName = [archive nameOfEntry: index];
-		XADString * dataString = [archive rawNameOfEntry: index];
+		XADPath * dataString = [archive rawNameOfEntry: index];
 		rawName = [dataString stringWithEncoding: NSNonLossyASCIIStringEncoding];
         if([[NSImage imageFileTypes] containsObject: [fileName pathExtension]])
         {

diff --git a/Session/TSSTSessionWindowController.m b/Session/TSSTSessionWindowController.m
@@ -903,7 +903,7 @@ - (void)setIconWithSelection:(NSInteger)selection andCropRect:(NSRect)cropRect
 			if([(TSSTManagedArchive *)selectedGroup quicklookCompatible])
 			{
 				int coverIndex = [[selectedPage valueForKey: @"index"] intValue];
-				XADString * coverName = [(XADArchive *)[selectedGroup instance] rawNameOfEntry: coverIndex];
+				XADPath * coverName = [(XADArchive *)[selectedGroup instance] rawNameOfEntry: coverIndex];
 				[UKXattrMetadataStore setString: [coverName stringWithEncoding: NSNonLossyASCIIStringEncoding]
 										 forKey: @"QCCoverName" 
 										 atPath: archivePath