From 8b6eceecb06652f5e099b88416fafc7d48e38b2a Mon Sep 17 00:00:00 2001 From: Richard Frith-MacDonald Date: Thu, 27 Aug 2009 17:32:15 +0000 Subject: [PATCH] fixup location of compatibility method git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@28559 72102866-910b-0410-8b05-ffd578937521 --- ChangeLog | 6 ++++++ Source/Additions/GSCategories.m | 23 ----------------------- Source/Additions/GSCompatibility.m | 23 +++++++++++++++++++++++ 3 files changed, 29 insertions(+), 23 deletions(-) diff --git a/ChangeLog b/ChangeLog index c02401452..ebbe5d457 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2009-08-27 Richard Frith-Macdonald + + * Source/Additions/GSCategories.m: + * Source/Additions/GSCompatibility.m: + Move -fullPath to correct place to build on OSX + 2009-08-27 Richard Frith-Macdonald * Source/NSAttributedString.m: ([-string]) was returning proxy to diff --git a/Source/Additions/GSCategories.m b/Source/Additions/GSCategories.m index 38a0ecc2f..822c260fc 100644 --- a/Source/Additions/GSCategories.m +++ b/Source/Additions/GSCategories.m @@ -1605,26 +1605,3 @@ executablePath(NSFileManager *mgr, NSString *path) return nil; } @end - -@implementation NSURL (GSCategories) -- (NSString*) fullPath -{ - NSRange r; - NSString *s; - - s = [self absoluteString]; - if ((r = [s rangeOfString: @";"]).length > 0) - { - s = [s substringFromIndex: r.location]; - } - else if ((r = [s rangeOfString: @"?"]).length > 0) - { - s = [s substringFromIndex: r.location]; - } - r = [s rangeOfString: @"//"]; - s = [s substringFromIndex: NSMaxRange(r)]; - r = [s rangeOfString: @"/"]; - s = [s substringFromIndex: r.location]; - return s; -} -@end diff --git a/Source/Additions/GSCompatibility.m b/Source/Additions/GSCompatibility.m index 7c1e9e210..d2aced09e 100644 --- a/Source/Additions/GSCompatibility.m +++ b/Source/Additions/GSCompatibility.m @@ -491,3 +491,26 @@ BOOL GSDebugSet(NSString *level) @end + +@implementation NSURL (GSCompatibility) +- (NSString*) fullPath +{ + NSRange r; + NSString *s; + + s = [self absoluteString]; + if ((r = [s rangeOfString: @";"]).length > 0) + { + s = [s substringToIndex: r.location]; + } + else if ((r = [s rangeOfString: @"?"]).length > 0) + { + s = [s substringToIndex: r.location]; + } + r = [s rangeOfString: @"//"]; + s = [s substringFromIndex: NSMaxRange(r)]; + r = [s rangeOfString: @"/"]; + s = [s substringFromIndex: r.location]; + return s; +} +@end