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

Correct coding/decoding after type changes.

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@36160 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Fred Kiefer 2013-02-17 16:53:48 +00:00
parent 4d953a5122
commit b1fc7cb066
15 changed files with 266 additions and 209 deletions
Download patch file Download diff file Expand all files Collapse all files

18
Source/NSParagraphStyle.m
View file

@ -470,8 +470,8 @@ static NSParagraphStyle *defaultStyle = nil;
{
unsigned count;
[aCoder decodeValueOfObjCType: @encode(int) at: &_alignment];
[aCoder decodeValueOfObjCType: @encode(int) at: &_lineBreakMode];
[aCoder decodeValueOfObjCType: @encode(NSTextAlignment) at: &_alignment];
[aCoder decodeValueOfObjCType: @encode(NSLineBreakMode) at: &_lineBreakMode];
[aCoder decodeValueOfObjCType: @encode(float) at: &_firstLineHeadIndent];
[aCoder decodeValueOfObjCType: @encode(float) at: &_headIndent];
[aCoder decodeValueOfObjCType: @encode(float) at: &_lineSpacing];
@ -494,7 +494,7 @@ static NSParagraphStyle *defaultStyle = nil;
[aCoder decodeArrayOfObjCType: @encode(float)
count: count
at: locations];
[aCoder decodeArrayOfObjCType: @encode(int)
[aCoder decodeArrayOfObjCType: @encode(NSTextTabType)
count: count
at: types];
for (i = 0; i < count; i++)
@ -510,7 +510,7 @@ static NSParagraphStyle *defaultStyle = nil;
if ([aCoder versionForClassName: @"NSParagraphStyle"] >= 2)
{
[aCoder decodeValueOfObjCType: @encode(int) at: &_baseDirection];
[aCoder decodeValueOfObjCType: @encode(NSWritingDirection) at: &_baseDirection];
}
}
@ -527,8 +527,8 @@ static NSParagraphStyle *defaultStyle = nil;
{
unsigned count;
[aCoder encodeValueOfObjCType: @encode(int) at: &_alignment];
[aCoder encodeValueOfObjCType: @encode(int) at: &_lineBreakMode];
[aCoder encodeValueOfObjCType: @encode(NSTextAlignment) at: &_alignment];
[aCoder encodeValueOfObjCType: @encode(NSLineBreakMode) at: &_lineBreakMode];
[aCoder encodeValueOfObjCType: @encode(float) at: &_firstLineHeadIndent];
[aCoder encodeValueOfObjCType: @encode(float) at: &_headIndent];
[aCoder encodeValueOfObjCType: @encode(float) at: &_lineSpacing];
@ -558,12 +558,12 @@ static NSParagraphStyle *defaultStyle = nil;
[aCoder encodeArrayOfObjCType: @encode(float)
count: count
at: locations];
[aCoder encodeArrayOfObjCType: @encode(int)
[aCoder encodeArrayOfObjCType: @encode(NSTextTabType)
count: count
at: types];
}
[aCoder encodeValueOfObjCType: @encode(int) at: &_baseDirection];
[aCoder encodeValueOfObjCType: @encode(NSWritingDirection) at: &_baseDirection];
}
}
@ -692,7 +692,7 @@ static NSParagraphStyle *defaultStyle = nil;
_lineHeightMultiple = factor;
}
- (void) setParagraphSpacingBefore: (float)spacing
- (void) setParagraphSpacingBefore: (CGFloat)spacing
{
_paragraphSpacingBefore = spacing;
}