From ed66e46ec171454f596e60cfce60ebffd9cf0e23 Mon Sep 17 00:00:00 2001
From: fredkiefer <fredkiefer@72102866-910b-0410-8b05-ffd578937521>
Date: Sat, 23 Jun 2012 15:09:08 +0000
Subject: [PATCH] Small consistency updates.

git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@35227 72102866-910b-0410-8b05-ffd578937521
---
 ChangeLog                 |  4 ++++
 Source/NSFontDescriptor.m | 12 ++++++------
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index a7459aa86..d1f95867a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2012-06-23 Fred Kiefer <FredKiefer@gmx.de>
+
+	* Source/NSFontDescriptor.m: Small consistency updates.
+
 2012-06-15  German A. Arias  <german@xelalug.org>
 
 	* Source/GSWindowDecorationView.m (-changeWindowHeight:): Revert
diff --git a/Source/NSFontDescriptor.m b/Source/NSFontDescriptor.m
index ee452bae3..93233d50a 100644
--- a/Source/NSFontDescriptor.m
+++ b/Source/NSFontDescriptor.m
@@ -119,7 +119,7 @@
 {
   NSDictionary *traits;
 
-  traits = [_attributes objectForKey: NSFontTraitsAttribute];
+  traits = [self objectForKey: NSFontTraitsAttribute];
   if (traits == nil)
     {
       traits = [NSDictionary dictionaryWithObject: 
@@ -219,7 +219,7 @@
   return [[NSFontManager sharedFontManager] matchingFontDescriptorsFor: attributes];
 }
 
-- (NSFontDescriptor *) matchingFontDescriptorWithMandatoryKeys: (NSSet *)keys;
+- (NSFontDescriptor *) matchingFontDescriptorWithMandatoryKeys: (NSSet *)keys
 {
   NSArray *found = [self matchingFontDescriptorsWithMandatoryKeys: keys];
 
@@ -235,7 +235,7 @@
 
 - (NSAffineTransform *) matrix
 {
-  return [_attributes objectForKey: NSFontMatrixAttribute];
+  return [self objectForKey: NSFontMatrixAttribute];
 }
 
 - (id) objectForKey: (NSString *)attribute
@@ -245,11 +245,11 @@
 
 - (CGFloat) pointSize
 {
-  id size = [_attributes objectForKey: NSFontSizeAttribute];
+  id size = [self objectForKey: NSFontSizeAttribute];
 
   if (size)
     {
-      return [size floatValue];
+      return [size doubleValue];
     }
   else
     {
@@ -277,7 +277,7 @@
 {
   NSDictionary *traits;
 
-  traits = [_attributes objectForKey: NSFontTraitsAttribute];
+  traits = [self objectForKey: NSFontTraitsAttribute];
   if (traits == nil)
     {
       return 0;