From 3c712e2e456c74bd08bb47ac29ec7edce50e2610 Mon Sep 17 00:00:00 2001 From: matthewleon Date: Wed, 13 Feb 2008 17:14:19 +0000 Subject: [PATCH] Changed CogUrlsPbboardType to CogUrlsPboardType throughout project --- FileDrawer/FileTreeDataSource.m | 4 ++-- Playlist/DNDArrayController.h | 2 +- Playlist/DNDArrayController.m | 4 ++-- Playlist/PlaylistController.m | 6 +++--- Spotlight/SpotlightPlaylistController.m | 4 ++-- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/FileDrawer/FileTreeDataSource.m b/FileDrawer/FileTreeDataSource.m index 4b61376e0..9034bb502 100644 --- a/FileDrawer/FileTreeDataSource.m +++ b/FileDrawer/FileTreeDataSource.m @@ -74,8 +74,8 @@ [urls addObject:[p url]]; } NSLog(@"URLS: %@", urls); - [pboard declareTypes:[NSArray arrayWithObjects:CogUrlsPbboardType,nil] owner:nil]; //add it to pboard - [pboard setData:[NSArchiver archivedDataWithRootObject:urls] forType:CogUrlsPbboardType]; + [pboard declareTypes:[NSArray arrayWithObjects:CogUrlsPboardType,nil] owner:nil]; //add it to pboard + [pboard setData:[NSArchiver archivedDataWithRootObject:urls] forType:CogUrlsPboardType]; return YES; } diff --git a/Playlist/DNDArrayController.h b/Playlist/DNDArrayController.h index fae52c834..6d1d957cd 100755 --- a/Playlist/DNDArrayController.h +++ b/Playlist/DNDArrayController.h @@ -2,7 +2,7 @@ #import extern NSString *MovedRowsType; -extern NSString *CogUrlsPbboardType; +extern NSString *CogUrlsPboardType; extern NSString *iTunesDropType; @interface DNDArrayController : NSArrayController diff --git a/Playlist/DNDArrayController.m b/Playlist/DNDArrayController.m index 9f45aaf4f..cc5191faf 100755 --- a/Playlist/DNDArrayController.m +++ b/Playlist/DNDArrayController.m @@ -4,7 +4,7 @@ @implementation DNDArrayController NSString *MovedRowsType = @"MOVED_ROWS_TYPE"; -NSString *CogUrlsPbboardType = @"COG_URLS_TYPE"; +NSString *CogUrlsPboardType = @"COG_URLS_TYPE"; // @"CorePasteboardFlavorType 0x6974756E" is the "itun" type representing an iTunes plist NSString *iTunesDropType = @"CorePasteboardFlavorType 0x6974756E"; @@ -12,7 +12,7 @@ NSString *iTunesDropType = @"CorePasteboardFlavorType 0x6974756E"; - (void)awakeFromNib { // register for drag and drop - [tableView registerForDraggedTypes:[NSArray arrayWithObjects:MovedRowsType, CogUrlsPbboardType, NSFilenamesPboardType, iTunesDropType, nil]]; + [tableView registerForDraggedTypes:[NSArray arrayWithObjects:MovedRowsType, CogUrlsPboardType, NSFilenamesPboardType, iTunesDropType, nil]]; } diff --git a/Playlist/PlaylistController.m b/Playlist/PlaylistController.m index 96ef4b0a6..599d515c2 100644 --- a/Playlist/PlaylistController.m +++ b/Playlist/PlaylistController.m @@ -84,13 +84,13 @@ row = 0; // Determine the type of object that was dropped - NSArray *supportedtypes = [NSArray arrayWithObjects:CogUrlsPbboardType, NSFilenamesPboardType, iTunesDropType, nil]; + NSArray *supportedtypes = [NSArray arrayWithObjects:CogUrlsPboardType, NSFilenamesPboardType, iTunesDropType, nil]; NSPasteboard *pboard = [info draggingPasteboard]; NSString *bestType = [pboard availableTypeFromArray:supportedtypes]; // Get files from an file drawer drop - if ([bestType isEqualToString:CogUrlsPbboardType]) { - NSArray *urls = [NSUnarchiver unarchiveObjectWithData:[[info draggingPasteboard] dataForType:CogUrlsPbboardType]]; + if ([bestType isEqualToString:CogUrlsPboardType]) { + NSArray *urls = [NSUnarchiver unarchiveObjectWithData:[[info draggingPasteboard] dataForType:CogUrlsPboardType]]; NSLog(@"URLS: %@", urls); [playlistLoader insertURLs: urls atIndex:row sort:YES]; } diff --git a/Spotlight/SpotlightPlaylistController.m b/Spotlight/SpotlightPlaylistController.m index 02b6030dd..8ddd45ac4 100644 --- a/Spotlight/SpotlightPlaylistController.m +++ b/Spotlight/SpotlightPlaylistController.m @@ -18,8 +18,8 @@ [spotlightSearchController.query disableUpdates]; NSArray *urls = [[self selectedObjects]valueForKey:@"url"]; - [pboard declareTypes:[NSArray arrayWithObjects:CogUrlsPbboardType,nil] owner:nil]; //add it to pboard - [pboard setData:[NSArchiver archivedDataWithRootObject:urls] forType:CogUrlsPbboardType]; + [pboard declareTypes:[NSArray arrayWithObjects:CogUrlsPboardType,nil] owner:nil]; //add it to pboard + [pboard setData:[NSArchiver archivedDataWithRootObject:urls] forType:CogUrlsPboardType]; [spotlightSearchController.query enableUpdates];