Revision: 7824
http://skim-app.svn.sourceforge.net/skim-app/?rev=7824&view=rev
Author: amaxwell
Date: 2012-12-10 18:00:46 +0000 (Mon, 10 Dec 2012)
Log Message:
-----------
pass pasteboard to URLFromPasteboard, fix Xcode 4 type warnings
Modified Paths:
--------------
trunk/NSURL_SKExtensions.m
Modified: trunk/NSURL_SKExtensions.m
===================================================================
--- trunk/NSURL_SKExtensions.m 2012-12-10 17:58:18 UTC (rev 7823)
+++ trunk/NSURL_SKExtensions.m 2012-12-10 18:00:46 UTC (rev 7824)
@@ -76,7 +76,7 @@
if ([URLs count] == 0) {
NSString *type = [pboard availableTypeFromArray:[NSArray
arrayWithObjects:NSURLPboardType, NSFilenamesPboardType, nil]];
if ([type isEqualToString:NSURLPboardType]) {
- URLs = [NSArray arrayWithObjects:[NSURL URLFromPasteboard:self],
nil];
+ URLs = [NSArray arrayWithObjects:[NSURL URLFromPasteboard:pboard],
nil];
} else if ([type isEqualToString:NSFilenamesPboardType]) {
NSArray *filenames = [pboard
propertyListForType:NSFilenamesPboardType];
if ([filenames count] > 0) {
@@ -205,20 +205,20 @@
if ([propertyList isKindOfClass:[NSString class]]) {
NSString *string = propertyList;
if ([type isEqualToString:(NSString *)kUTTypeURL] || [type
isEqualToString:(NSString *)kUTTypeFileURL]) {
- self = [[NSURL alloc] initWithString:string];
+ self = (id)[[NSURL alloc] initWithString:string];
} else if ([type isEqualToString:NSPasteboardTypeString]) {
if ([string rangeOfString:@"://"].length) {
if ([string hasPrefix:@"<"] && [string hasSuffix:@">"])
string = [string substringWithRange:NSMakeRange(1, [string
length] - 2)];
- self = [[NSURL alloc] initWithString:string];
+ self = (id)[[NSURL alloc] initWithString:string];
if (self == nil)
- self = [[NSURL alloc] initWithString:[string
stringByAddingPercentEscapesUsingEncoding:NSUTF8StringEncoding]];
+ self = (id)[[NSURL alloc] initWithString:[string
stringByAddingPercentEscapesUsingEncoding:NSUTF8StringEncoding]];
}
if (self == nil) {
if ([string hasPrefix:@"~"])
string = [string stringByExpandingTildeInPath];
if ([[NSFileManager defaultManager] fileExistsAtPath:string])
- self = [[NSURL alloc] initFileURLWithPath:string];
+ self = (id)[[NSURL alloc] initFileURLWithPath:string];
}
}
}
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
LogMeIn Rescue: Anywhere, Anytime Remote support for IT. Free Trial
Remotely access PCs and mobile devices and provide instant support
Improve your efficiency, and focus on delivering more value-add services
Discover what IT Professionals Know. Rescue delivers
http://p.sf.net/sfu/logmein_12329d2d
_______________________________________________
Skim-app-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/skim-app-commit
