diff --git a/macosx/Controller.m b/macosx/Controller.m index 6ddd9831e..ded00ced6 100644 --- a/macosx/Controller.m +++ b/macosx/Controller.m @@ -696,18 +696,18 @@ static void sleepCallback(void * controller, io_service_t y, natural_t messageTy //remember window states and close all windows [fDefaults setBool: [[fInfoController window] isVisible] forKey: @"InfoVisible"]; - const BOOL quickLookOpen = [NSApp isOnSnowLeopardOrBetter] && [QLPreviewPanel sharedPreviewPanelExists] - && [[QLPreviewPanel sharedPreviewPanel] isVisible]; + const BOOL quickLookOpen = [NSApp isOnSnowLeopardOrBetter] && [QLPreviewPanelSL sharedPreviewPanelExists] + && [[QLPreviewPanelSL sharedPreviewPanel] isVisible]; for (NSWindow * window in [NSApp windows]) { - if (!quickLookOpen || window != [QLPreviewPanel sharedPreviewPanel]) //hide quicklook window last to avoid animation + if (!quickLookOpen || window != [QLPreviewPanelSL sharedPreviewPanel]) //hide quicklook window last to avoid animation [window orderOut: nil]; } if (quickLookOpen) { - [[QLPreviewPanel sharedPreviewPanel] updateController]; - [[QLPreviewPanel sharedPreviewPanel] orderOut: nil]; + [[QLPreviewPanelSL sharedPreviewPanel] updateController]; + [[QLPreviewPanelSL sharedPreviewPanel] orderOut: nil]; } [self showStatusBar: NO animate: NO]; @@ -1522,8 +1522,8 @@ static void sleepCallback(void * controller, io_service_t y, natural_t messageTy { [fInfoController setInfoForTorrents: [fTableView selectedTorrents]]; - if ([NSApp isOnSnowLeopardOrBetter] && [QLPreviewPanel sharedPreviewPanelExists] && [[QLPreviewPanel sharedPreviewPanel] isVisible]) - [[QLPreviewPanel sharedPreviewPanel] reloadData]; + if ([NSApp isOnSnowLeopardOrBetter] && [QLPreviewPanelSL sharedPreviewPanelExists] && [[QLPreviewPanelSL sharedPreviewPanel] isVisible]) + [[QLPreviewPanelSL sharedPreviewPanel] reloadData]; } - (void) setInfoTab: (id) sender @@ -4024,10 +4024,10 @@ static void sleepCallback(void * controller, io_service_t y, natural_t messageTy if (![NSApp isOnSnowLeopardOrBetter]) return; - if ([[QLPreviewPanel sharedPreviewPanel] isVisible]) - [[QLPreviewPanel sharedPreviewPanel] orderOut: nil]; + if ([[QLPreviewPanelSL sharedPreviewPanel] isVisible]) + [[QLPreviewPanelSL sharedPreviewPanel] orderOut: nil]; else - [[QLPreviewPanel sharedPreviewPanel] makeKeyAndOrderFront: nil]; + [[QLPreviewPanelSL sharedPreviewPanel] makeKeyAndOrderFront: nil]; } - (void) linkHomepage: (id) sender diff --git a/macosx/FileOutlineController.m b/macosx/FileOutlineController.m index d11bccc3d..7209a7a6b 100644 --- a/macosx/FileOutlineController.m +++ b/macosx/FileOutlineController.m @@ -132,10 +132,11 @@ typedef enum - (void) outlineViewSelectionDidChange: (NSNotification *) notification { - if ([NSApp isOnSnowLeopardOrBetter] && [QLPreviewPanel sharedPreviewPanelExists] && [[QLPreviewPanel sharedPreviewPanel] isVisible]) + if ([NSApp isOnSnowLeopardOrBetter] && [QLPreviewPanelSL sharedPreviewPanelExists] + && [[QLPreviewPanelSL sharedPreviewPanel] isVisible]) { - [[QLPreviewPanel sharedPreviewPanel] reloadData]; - [[QLPreviewPanel sharedPreviewPanel] updateController]; + [[QLPreviewPanelSL sharedPreviewPanel] reloadData]; + [[QLPreviewPanelSL sharedPreviewPanel] updateController]; } } diff --git a/macosx/FileOutlineView.m b/macosx/FileOutlineView.m index aa817646a..07264345f 100644 --- a/macosx/FileOutlineView.m +++ b/macosx/FileOutlineView.m @@ -91,12 +91,13 @@ const unichar firstChar = [[event charactersIgnoringModifiers] characterAtIndex: 0]; //don't allow quick look on add window - if ([NSApp isOnSnowLeopardOrBetter] && firstChar == ' ' && [[[self window] windowController] conformsToProtocol: @protocol(QLPreviewPanelDataSource)]) + #warning get rid of conversion of protocol and replace with @protocol(QLPreviewPanelDataSource) + if ([NSApp isOnSnowLeopardOrBetter] && firstChar == ' ' && [[[self window] windowController] conformsToProtocol: NSProtocolFromString(@"QLPreviewPanelDataSource")]) { - if ([[QLPreviewPanel sharedPreviewPanel] isVisible]) - [[QLPreviewPanel sharedPreviewPanel] orderOut: nil]; + if ([[QLPreviewPanelSL sharedPreviewPanel] isVisible]) + [[QLPreviewPanelSL sharedPreviewPanel] orderOut: nil]; else - [[QLPreviewPanel sharedPreviewPanel] makeKeyAndOrderFront: nil]; + [[QLPreviewPanelSL sharedPreviewPanel] makeKeyAndOrderFront: nil]; } [super keyDown: event]; diff --git a/macosx/InfoWindowController.h b/macosx/InfoWindowController.h index 24cc5693c..e88d3f08f 100644 --- a/macosx/InfoWindowController.h +++ b/macosx/InfoWindowController.h @@ -32,7 +32,8 @@ @class FileOutlineController; @class PiecesView; -@interface InfoWindowController : NSWindowController +#warning uncomment +@interface InfoWindowController : NSWindowController // { NSArray * fTorrents; @@ -78,7 +79,8 @@ NSString * fInitialString; - QLPreviewPanel * fPreviewPanel; + #warning change to QLPreviewPanel + id fPreviewPanel; } - (void) setInfoForTorrents: (NSArray *) torrents; diff --git a/macosx/InfoWindowController.m b/macosx/InfoWindowController.m index b7ddd363a..2c283279a 100644 --- a/macosx/InfoWindowController.m +++ b/macosx/InfoWindowController.m @@ -814,8 +814,8 @@ typedef enum [view setHidden: NO]; if ([NSApp isOnSnowLeopardOrBetter] && (fCurrentTabTag == TAB_FILES_TAG || oldTabTag == TAB_FILES_TAG) - && ([QLPreviewPanel sharedPreviewPanelExists] && [[QLPreviewPanel sharedPreviewPanel] isVisible])) - [[QLPreviewPanel sharedPreviewPanel] updateController]; + && ([QLPreviewPanelSL sharedPreviewPanelExists] && [[QLPreviewPanelSL sharedPreviewPanel] isVisible])) + [[QLPreviewPanelSL sharedPreviewPanel] updateController]; } - (void) setNextTab @@ -1114,35 +1114,36 @@ typedef enum return [[fTrackers objectAtIndex: i] intValue] == 0; }*/ -- (BOOL) acceptsPreviewPanelControl: (QLPreviewPanel *) panel +#warning change to QLPreviewPanel +- (BOOL) acceptsPreviewPanelControl: (id) panel { return fCurrentTabTag == TAB_FILES_TAG && [self canQuickLook]; } -- (void) beginPreviewPanelControl: (QLPreviewPanel *) panel +- (void) beginPreviewPanelControl: (id) panel { fPreviewPanel = [panel retain]; - fPreviewPanel.delegate = self; - fPreviewPanel.dataSource = self; + [fPreviewPanel setDelegate: self]; + [fPreviewPanel setDataSource: self]; } -- (void) endPreviewPanelControl: (QLPreviewPanel *) panel +- (void) endPreviewPanelControl: (id) panel { [fPreviewPanel release]; fPreviewPanel = nil; } -- (NSInteger) numberOfPreviewItemsInPreviewPanel: (QLPreviewPanel *) panel +- (NSInteger) numberOfPreviewItemsInPreviewPanel: (id) panel { return [[self quickLookURLs] count]; } -- (id ) previewPanel: (QLPreviewPanel *)panel previewItemAtIndex: (NSInteger) index +- (id /**/) previewPanel: (id)panel previewItemAtIndex: (NSInteger) index { return [[self quickLookURLs] objectAtIndex: index]; } -- (BOOL) previewPanel: (QLPreviewPanel *) panel handleEvent: (NSEvent *) event +- (BOOL) previewPanel: (id) panel handleEvent: (NSEvent *) event { if ([event type] == NSKeyDown) { @@ -1153,7 +1154,7 @@ typedef enum return NO; } -- (NSRect) previewPanel: (QLPreviewPanel *) panel sourceFrameOnScreenForPreviewItem: (id ) item +- (NSRect) previewPanel: (id) panel sourceFrameOnScreenForPreviewItem: (id /**/) item { FileOutlineView * fileOutlineView = [fFileController outlineView]; diff --git a/macosx/NSApplicationAdditions.h b/macosx/NSApplicationAdditions.h index b07c71953..ec7c37f4f 100644 --- a/macosx/NSApplicationAdditions.h +++ b/macosx/NSApplicationAdditions.h @@ -22,6 +22,8 @@ * DEALINGS IN THE SOFTWARE. *****************************************************************************/ +#define QLPreviewPanelSL NSClassFromString(@"QLPreviewPanel") + @interface NSApplication (NSApplicationAdditions) - (BOOL) isOnSnowLeopardOrBetter; diff --git a/macosx/TorrentTableView.h b/macosx/TorrentTableView.h index 44e1d6e7a..9eb8f09b0 100644 --- a/macosx/TorrentTableView.h +++ b/macosx/TorrentTableView.h @@ -31,7 +31,8 @@ #define GROUP_SEPARATOR_HEIGHT 18.0 -@interface TorrentTableView : NSOutlineView +#warning revert +@interface TorrentTableView : NSOutlineView // { IBOutlet Controller * fController; @@ -53,7 +54,8 @@ CGFloat fPiecesBarPercent; NSAnimation * fPiecesBarAnimation; - QLPreviewPanel * fPreviewPanel; + #warning change to QLPreviewPanel + id fPreviewPanel; } - (BOOL) isGroupCollapsed: (NSInteger) value; diff --git a/macosx/TorrentTableView.m b/macosx/TorrentTableView.m index 04f01878c..25d5a4774 100644 --- a/macosx/TorrentTableView.m +++ b/macosx/TorrentTableView.m @@ -874,35 +874,36 @@ return fPiecesBarPercent; } -- (BOOL) acceptsPreviewPanelControl: (QLPreviewPanel *) panel +#warning change from id to QLPreviewPanel +- (BOOL) acceptsPreviewPanelControl: (id) panel { return YES; } -- (void) beginPreviewPanelControl: (QLPreviewPanel *) panel +- (void) beginPreviewPanelControl: (id) panel { fPreviewPanel = [panel retain]; - fPreviewPanel.delegate = self; - fPreviewPanel.dataSource = self; + [fPreviewPanel setDelegate: self]; + [fPreviewPanel setDataSource: self]; } -- (void) endPreviewPanelControl: (QLPreviewPanel *) panel +- (void) endPreviewPanelControl: (id) panel { [fPreviewPanel release]; fPreviewPanel = nil; } -- (NSInteger) numberOfPreviewItemsInPreviewPanel: (QLPreviewPanel *) panel +- (NSInteger) numberOfPreviewItemsInPreviewPanel: (id) panel { return [[self quickLookableTorrents] count]; } -- (id ) previewPanel: (QLPreviewPanel *)panel previewItemAtIndex: (NSInteger) index +- (id /**/) previewPanel: (id) panel previewItemAtIndex: (NSInteger) index { return [[self quickLookableTorrents] objectAtIndex: index]; } -- (BOOL) previewPanel: (QLPreviewPanel *) panel handleEvent: (NSEvent *) event +- (BOOL) previewPanel: (id) panel handleEvent: (NSEvent *) event { if ([event type] == NSKeyDown) { @@ -913,7 +914,7 @@ return NO; } -- (NSRect) previewPanel: (QLPreviewPanel *) panel sourceFrameOnScreenForPreviewItem: (id ) item +- (NSRect) previewPanel: (id) panel sourceFrameOnScreenForPreviewItem: (id /**/) item { const NSInteger row = [self rowForItem: item]; if (row == -1)