From a1cd16df1d08b42111ba735bdcb95a14600a1bef Mon Sep 17 00:00:00 2001 From: Eric Wasylishen Date: Wed, 15 Sep 2010 22:17:51 +0000 Subject: [PATCH] Fix an unsigned->NSUInteger git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@31352 72102866-910b-0410-8b05-ffd578937521 --- ChangeLog | 5 +++++ Source/GSTextStorage.m | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 1fee403a8..8d1896a3f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2010-09-15 Eric Wasylishen + + * Source/GSTextStorage.m: Fix an unisgned->NSUInteger + 2010-09-15 Fred Kiefer * Source/NSView.m (-releaseGState): Check if the window and it's @@ -44,6 +48,7 @@ * Source/GSToolbarCustomizationPalette.m (-paletteItemsWithToolbarItems:): Release the copied toolbar items. +>>>>>>> .r31351 2010-09-09 Eric Wasylishen * Source/GSTheme.m: diff --git a/Source/GSTextStorage.m b/Source/GSTextStorage.m index 41ea43abb..07841cc76 100644 --- a/Source/GSTextStorage.m +++ b/Source/GSTextStorage.m @@ -623,7 +623,7 @@ _attributesAtIndexEffectiveRange( return _textProxy; } -- (NSDictionary*) attributesAtIndex: (unsigned)index +- (NSDictionary*) attributesAtIndex: (NSUInteger)index effectiveRange: (NSRange*)aRange { unsigned dummy; @@ -930,7 +930,7 @@ changeInLength: [aString length] - range.length]; } // The superclass implementation is correct but too slow -- (unsigned int) length +- (NSUInteger) length { return [_textChars length]; }