From df3e9bcdc29b37218d429170abd8db2f1f1c8b03 Mon Sep 17 00:00:00 2001 From: jtbandes Date: Sat, 11 Aug 2012 21:21:41 -0700 Subject: [PATCH] QLPreviewPanel is no longer private --- Frameworks/OakAppKit/src/OakPreview.mm | 24 +++--------------------- Frameworks/OakAppKit/target | 2 +- 2 files changed, 4 insertions(+), 22 deletions(-) diff --git a/Frameworks/OakAppKit/src/OakPreview.mm b/Frameworks/OakAppKit/src/OakPreview.mm index 018127fd..cdbf5834 100644 --- a/Frameworks/OakAppKit/src/OakPreview.mm +++ b/Frameworks/OakAppKit/src/OakPreview.mm @@ -1,23 +1,5 @@ #import "OakPreview.h" - -@class QLPreviewPanel; -@protocol QLPreviewItem; - -static id SharedQuickLookPanel () -{ - Class cl = NSClassFromString(@"QLPreviewPanel"); - if(!cl) - { - NSString* qlPath = @"/System/Library/Frameworks/Quartz.framework/Frameworks/QuickLookUI.framework"; - if([[NSFileManager defaultManager] fileExistsAtPath:qlPath]) - { - static NSBundle* QuickLookBundle = [[NSBundle bundleWithPath:qlPath] retain]; - if([QuickLookBundle load]) - cl = NSClassFromString(@"QLPreviewPanel"); - } - } - return [cl performSelector:@selector(sharedPreviewPanel)]; -} +#import @interface OakPreviewItemHelper : NSObject// { @@ -43,7 +25,7 @@ static id SharedQuickLookPanel () } @end -@interface OakPreviewDelegateHelper : NSObject// +@interface OakPreviewDelegateHelper : NSObject { NSArray* items; } @@ -87,7 +69,7 @@ static id SharedQuickLookPanel () PUBLIC void OakShowPreviewForURLs (NSArray* someURLs) { - if(id panel = SharedQuickLookPanel()) + if(QLPreviewPanel* panel = [QLPreviewPanel sharedPreviewPanel]) { // FIXME one is not allowed to set datasource/delegate — instead we need to be “first responder” when the QL preview panel opens OakPreviewDelegateHelper* helper = [[OakPreviewDelegateHelper alloc] initWithItems:someURLs]; diff --git a/Frameworks/OakAppKit/target b/Frameworks/OakAppKit/target index 312bdc27..abb7a7a0 100644 --- a/Frameworks/OakAppKit/target +++ b/Frameworks/OakAppKit/target @@ -3,4 +3,4 @@ CP_Resources = resources/* gfx/**/*.{png,tiff,icns} icons/* TEST_SOURCES = tests/*.{cc,mm} LINK += text ns io OakFoundation regexp scm EXPORT = src/*.h -FRAMEWORKS = Carbon Cocoa AudioToolbox +FRAMEWORKS = Carbon Cocoa AudioToolbox Quartz