From 3a58a7e30b63b115be73ea73fe1530cb0758b106 Mon Sep 17 00:00:00 2001
From: Fred Kiefer <fredkiefer@gmx.de>
Date: Fri, 26 Mar 2010 07:51:34 +0000
Subject: [PATCH] Add more missing imports.

git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/back/trunk@30043 72102866-910b-0410-8b05-ffd578937521
---
 ChangeLog               | 12 +++++++++---
 Source/art/ftfont-old.m | 41 ++++++++++++++++++++--------------------
 Source/art/ftfont.m     | 42 ++++++++++++++++++++---------------------
 Source/xlib/XGGState.m  | 13 +++++++------
 4 files changed, 58 insertions(+), 50 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 7e3e64f..583c1b9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,8 +1,14 @@
+2010-03-25 Fred Kiefer <FredKiefer@gmx.de>
+
+	* Source/art/ftfont.m,
+	* Source/art/ftfont-old.m,
+	* Source/xlib/XGGState.m: Add more missing imports.
+
 2010-03-25 Riccardo Mottola <rmottola@users.sf.net>
 
 	* Source/gsc/GSGState.m: import NSValue, include -> import
 	* Source/xlib/XGGState.m: added missing imports
-	
+
 2010-03-24 Doug Simons <doug.simons@testplant.com>
 
 	* Source/winlib/WIN32FontInfo.m: Include NSDebug.h for
@@ -32,9 +38,9 @@
 	and WM_SYSKEYUP messages - these are delivered instead
 	of normal WM_KEYDOWN and WM_KEYUP messages when the
 	ALT key is presesd. (and also F10).
-	
+
 	This fixes NSAlternateKeyMask not being set.
-	
+
 2010-03-13 Eric Wasylishen <ewasylishen@gmail.com>
 
 	* Source/win32/w32_GLcontext.m: Set the WS_DISABLED flag
diff --git a/Source/art/ftfont-old.m b/Source/art/ftfont-old.m
index c79b75e..b733e1a 100644
--- a/Source/art/ftfont-old.m
+++ b/Source/art/ftfont-old.m
@@ -24,30 +24,31 @@
 
 #include <math.h>
 
-#include <Foundation/NSObject.h>
-#include <Foundation/NSArray.h>
-#include <Foundation/NSSet.h>
-#include <Foundation/NSDictionary.h>
-#include <Foundation/NSValue.h>
-#include <Foundation/NSPathUtilities.h>
-#include <Foundation/NSFileManager.h>
-#include <Foundation/NSUserDefaults.h>
-#include <Foundation/NSBundle.h>
-#include <Foundation/NSDebug.h>
-#include <GNUstepBase/Unicode.h>
+#import <Foundation/NSObject.h>
+#import <Foundation/NSArray.h>
+#import <Foundation/NSSet.h>
+#import <Foundation/NSDictionary.h>
+#import <Foundation/NSValue.h>
+#import <Foundation/NSPathUtilities.h>
+#import <Foundation/NSFileManager.h>
+#import <Foundation/NSUserDefaults.h>
+#import <Foundation/NSBundle.h>
+#import <Foundation/NSDebug.h>
+#import <Foundation/NSGeometry.h>
+#import <Foundation/NSString.h>
+#import <GNUstepBase/Unicode.h>
 
-#include <GNUstepGUI/GSFontInfo.h>
-#include <AppKit/NSAffineTransform.h>
-#include <AppKit/NSBezierPath.h>
+#import <GNUstepGUI/GSFontInfo.h>
+#import <AppKit/NSAffineTransform.h>
+#import <AppKit/NSBezierPath.h>
 
-//#include "gsc/GSContext.h"
-#include "gsc/GSGState.h"
+#import "gsc/GSGState.h"
 
-#include "ftfont.h"
-#include "FTFontEnumerator.h"
-#include "FTFaceInfo.h"
+#import "ftfont.h"
+#import "FTFontEnumerator.h"
+#import "FTFaceInfo.h"
 
-#include "blit.h"
+#import "blit.h"
 
 
 #define DI (*di)
diff --git a/Source/art/ftfont.m b/Source/art/ftfont.m
index 86faddf..4211ed7 100644
--- a/Source/art/ftfont.m
+++ b/Source/art/ftfont.m
@@ -28,37 +28,37 @@
 
 #if (FREETYPE_MAJOR==2) && ((FREETYPE_MINOR<1) || ((FREETYPE_MINOR==1) && (FREETYPE_PATCH<8)))
 
-#include "ftfont-old.m"
+#import "ftfont-old.m"
 
 #else
 
 
 #include <math.h>
 
-#include <Foundation/NSObject.h>
-#include <Foundation/NSArray.h>
-#include <Foundation/NSSet.h>
-#include <Foundation/NSDictionary.h>
-#include <Foundation/NSValue.h>
-#include <Foundation/NSPathUtilities.h>
-#include <Foundation/NSFileManager.h>
-#include <Foundation/NSUserDefaults.h>
-#include <Foundation/NSBundle.h>
-#include <Foundation/NSDebug.h>
-#include <GNUstepBase/Unicode.h>
+#import <Foundation/NSObject.h>
+#import <Foundation/NSArray.h>
+#import <Foundation/NSCharacterSet.h>
+#import <Foundation/NSSet.h>
+#import <Foundation/NSDictionary.h>
+#import <Foundation/NSValue.h>
+#import <Foundation/NSPathUtilities.h>
+#import <Foundation/NSFileManager.h>
+#import <Foundation/NSUserDefaults.h>
+#import <Foundation/NSBundle.h>
+#import <Foundation/NSDebug.h>
+#import <GNUstepBase/Unicode.h>
 
-#include <GNUstepGUI/GSFontInfo.h>
-#include <AppKit/NSAffineTransform.h>
-#include <AppKit/NSBezierPath.h>
+#import <GNUstepGUI/GSFontInfo.h>
+#import <AppKit/NSAffineTransform.h>
+#import <AppKit/NSBezierPath.h>
 
-//#include "gsc/GSContext.h"
-#include "gsc/GSGState.h"
+#import "gsc/GSGState.h"
 
-#include "ftfont.h"
-#include "FTFontEnumerator.h"
-#include "FTFaceInfo.h"
+#import "ftfont.h"
+#import "FTFontEnumerator.h"
+#import "FTFaceInfo.h"
 
-#include "blit.h"
+#import "blit.h"
 
 
 #define DI (*di)
diff --git a/Source/xlib/XGGState.m b/Source/xlib/XGGState.m
index 0897230..f15dd78 100644
--- a/Source/xlib/XGGState.m
+++ b/Source/xlib/XGGState.m
@@ -24,21 +24,22 @@
    Boston, MA 02110-1301, USA.
 */
 
-#include "config.h"
+#import "config.h"
 #import <Foundation/NSObjCRuntime.h>
 #import <Foundation/NSUserDefaults.h>
 #import <Foundation/NSValue.h>
 #import <Foundation/NSDebug.h>
+#import <Foundation/NSDictionary.h>
 #import <Foundation/NSException.h>
 #import <AppKit/NSBezierPath.h>
 #import <AppKit/NSFont.h>
 #import <AppKit/NSGraphics.h>
 
-#include "xlib/XGGeometry.h"
-#include "xlib/XGContext.h"
-#include "xlib/XGGState.h"
-#include "xlib/XGContext.h"
-#include "xlib/XGPrivate.h"
+#import "xlib/XGGeometry.h"
+#import "xlib/XGContext.h"
+#import "xlib/XGGState.h"
+#import "xlib/XGContext.h"
+#import "xlib/XGPrivate.h"
 #include "math.h"
 
 #define XDPY (((RContext *)context)->dpy)