gnustep/libs-gui
0
0
Fork 0
mirror of https://github.com/gnustep/libs-gui.git synced 2025-05-29 20:27:39 +00:00
Code Issues Projects Releases Packages Wiki Activity

* Source/NSTextStorage.m (-classForCoder, -initWithCoder:,

Browse source 
-encodeWithCoder:): Encode this class and not the concrete 
  one. Also call super encoding/decoding methods as they are
  correct in base now.
* Source/GSTextStorage.m (-classForPortCoder, -encodeWithCoder:,
  -replacementObjectForPortCoder:): Remove these methods.



git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@28456 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Fred Kiefer 2009-08-12 22:00:16 +00:00
parent 5ea075f5ab
commit 81cf28902a
3 changed files with 24 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

29
Source/GSTextStorage.m
View file

@ -464,28 +464,9 @@ _attributesAtIndexEffectiveRange(
}
}
- (Class) classForPortCoder
{
return [self class];
}
- (id) replacementObjectForPortCoder: (NSPortCoder*)aCoder
{
return self;
}
- (void) encodeWithCoder: (NSCoder*)aCoder
{
[super encodeWithCoder: aCoder];
if([aCoder allowsKeyedCoding] == NO)
{
[aCoder encodeValueOfObjCType: @encode(id) at: &_textChars];
[aCoder encodeValueOfObjCType: @encode(id) at: &_infoArray];
}
}
- (id) initWithCoder: (NSCoder*)aCoder
{
NSLog(@"Warning - decoding archive containing obsolete %@ object - please delete/replace this archive", NSStringFromClass([self class]));
self = [super initWithCoder: aCoder];
if([aCoder allowsKeyedCoding] == NO)
{
@ -498,20 +479,20 @@ _attributesAtIndexEffectiveRange(
- (id) initWithString: (NSString*)aString
attributes: (NSDictionary*)attributes
{
NSZone *z = [self zone];
NSZone *z = [self zone];
self = [super initWithString: aString attributes: attributes];
_infoArray = [[NSMutableArray allocWithZone: z] initWithCapacity: 1];
if (aString != nil && [aString isKindOfClass: [NSAttributedString class]])
{
NSAttributedString *as = (NSAttributedString*)aString;
NSAttributedString *as = (NSAttributedString*)aString;
aString = [as string];
_setAttributesFrom(as, NSMakeRange(0, [aString length]), _infoArray);
}
else
{
GSTextInfo *info;
GSTextInfo *info;
if (attributes == nil)
{
@ -541,7 +522,7 @@ _attributesAtIndexEffectiveRange(
- (NSDictionary*) attributesAtIndex: (unsigned)index
effectiveRange: (NSRange*)aRange
{
unsigned dummy;
unsigned dummy;
return _attributesAtIndexEffectiveRange(
index, aRange, [_textChars length], _infoArray, &dummy);