Yet another set of #include -> #import replacement.

git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@30083 72102866-910b-0410-8b05-ffd578937521
2025-04-23 06:51:44 +00:00 · 2010-03-31 08:14:50 +00:00 · 2010-03-31 08:14:50 +00:00 · 7e289df84b
commit 7e289df84b
parent bb7df81e99
49 changed files with 301 additions and 223 deletions
--- a/52
+++ b/52
@ -1,3 +1,55 @@
+2010-03-31 Fred Kiefer <FredKiefer@gmx.de>
+
+	* Headers/AppKit/NSSound.h
+	* Headers/AppKit/NSTextAttachment.h
+	* Headers/AppKit/NSTableHeaderCell.h
+	* Headers/AppKit/NSScreen.h
+	* Headers/AppKit/NSSliderCell.h
+	* Headers/AppKit/NSText.h
+	* Headers/AppKit/NSTableHeaderView.h
+	* Headers/AppKit/NSSplitView.h
+	* Headers/AppKit/NSResponder.h
+	* Headers/AppKit/NSTableColumn.h
+	* Headers/AppKit/NSSavePanel.h
+	* Headers/AppKit/NSSearchFieldCell.h
+	* Headers/AppKit/NSScroller.h
+	* Headers/AppKit/NSRulerMarker.h
+	* Headers/AppKit/NSSearchField.h
+	* Headers/AppKit/NSTabViewItem.h
+	* Headers/AppKit/NSRulerView.h
+	* Headers/AppKit/NSSecureTextField.h
+	* Headers/AppKit/NSSegmentedCell.h
+	* Headers/AppKit/NSSlider.h
+	* Headers/AppKit/NSStringDrawing.h
+	* Headers/AppKit/NSScrollView.h
+	* Headers/AppKit/NSSpellProtocol.h
+	* Headers/AppKit/NSTabView.h
+	* Headers/AppKit/NSSegmentedControl.h
+	* Headers/AppKit/NSTableView.h
+	* Headers/AppKit/NSSelection.h
+	* Headers/AppKit/NSSpellChecker.h
+	* Headers/AppKit/NSSpeechSynthesizer.h
+	* Headers/Additions/GNUstepGUI/GSSoundSource.h
+	* Headers/Additions/GNUstepGUI/GSSoundSink.h
+	* Source/NSButtonCell.m
+	* Source/NSTextFieldCell.m
+	* Source/NSTableColumn.m
+	* Source/GSTitleView.m
+	* Source/NSOutlineView.m
+	* Source/NSPageLayout.m
+	* Source/NSTabViewItem.m
+	* Source/NSRulerView.m
+	* Source/NSMenuView.m
+	* Source/NSSecureTextField.m
+	* Source/GSThemeDrawing.m
+	* Source/NSToolbarItem.m
+	* Source/NSPrintInfo.m
+	* Source/NSCell.m
+	* Source/NSTableView.m
+	* Source/GSDragView.m
+	* Source/GSToolTips.m: Yet another set of #include -> #import
+	replacement.
+
 2010-03-31 00:02-EDT Gregory John Casamento <greg.casamento@gmail.com>

 	* Source/NSTableView.m: Add nil check to make sure that the 
--- a/Headers/Additions/GNUstepGUI/GSSoundSink.h
+++ b/Headers/Additions/GNUstepGUI/GSSoundSink.h
@ -30,6 +30,9 @@
 #ifndef _GNUstep_H_GSSoundSink
 #define _GNUstep_H_GSSoundSink

+#import <Foundation/NSByteOrder.h>
+#import <Foundation/NSObject.h>
+
@protocol GSSoundSink <NSObject>

 /** Returns YES if class has the ability of playing audio data
--- a/Headers/Additions/GNUstepGUI/GSSoundSource.h
+++ b/Headers/Additions/GNUstepGUI/GSSoundSource.h
@ -30,6 +30,9 @@
 #ifndef _GNUstep_H_GSSoundSource
 #define _GNUstep_H_GSSoundSource

+#import <Foundation/NSByteOrder.h>
+#import <Foundation/NSObject.h>
+
@class NSArray;

 enum
--- a/Headers/AppKit/NSResponder.h
+++ b/Headers/AppKit/NSResponder.h
@ -31,9 +31,9 @@
 #define _GNUstep_H_NSResponder
 #import <GNUstepBase/GSVersionMacros.h>

-#include <Foundation/NSObject.h>
-#include <AppKit/NSInterfaceStyle.h>
-#include <AppKit/AppKitDefines.h>
+#import <Foundation/NSObject.h>
+#import <AppKit/NSInterfaceStyle.h>
+#import <AppKit/AppKitDefines.h>

@class NSCoder;
@class NSError;
--- a/Headers/AppKit/NSRulerMarker.h
+++ b/Headers/AppKit/NSRulerMarker.h
@ -32,8 +32,8 @@
 #ifndef _GNUstep_H_NSRulerMarker
 #define _GNUstep_H_NSRulerMarker

-#include <Foundation/NSObject.h>
-#include <Foundation/NSGeometry.h>
+#import <Foundation/NSObject.h>
+#import <Foundation/NSGeometry.h>

@class NSRulerView;
@class NSImage;
--- a/Headers/AppKit/NSRulerView.h
+++ b/Headers/AppKit/NSRulerView.h
@ -34,7 +34,7 @@
 #ifndef _GNUstep_H_NSRulerView
 #define _GNUstep_H_NSRulerView

-#include <AppKit/NSView.h>
+#import <AppKit/NSView.h>

 /* Declaring classes, rather than #including the full class header,
 * results in much faster compilations.  */
--- a/Headers/AppKit/NSSavePanel.h
+++ b/Headers/AppKit/NSSavePanel.h
@ -7,9 +7,9 @@

   Author:  Scott Christley <scottc@net-community.com>
   Date: 1996
-   Author:  Daniel B?hringer <boehring@biomed.ruhr-uni-bochum.de>
+   Author:  Daniel Boehringer <boehring@biomed.ruhr-uni-bochum.de>
   Date: August 1998
-   Source by Daniel B?hringer integrated into Scott Christley's preliminary
+   Source by Daniel Boehringer integrated into Scott Christley's preliminary
   implementation by Felipe A. Rodriguez <far@ix.netcom.com> 

   This file is part of the GNUstep GUI Library.
@ -35,7 +35,7 @@
 #define _GNUstep_H_NSSavePanel
 #import <GNUstepBase/GSVersionMacros.h>

-#include <AppKit/NSPanel.h>
+#import <AppKit/NSPanel.h>

@class NSString;
@class NSURL;
--- a/Headers/AppKit/NSScreen.h
+++ b/Headers/AppKit/NSScreen.h
@ -35,8 +35,8 @@
 #define _GNUstep_H_NSScreen
 #import <GNUstepBase/GSVersionMacros.h>

-#include <Foundation/NSObject.h>
-#include <AppKit/NSGraphics.h>
+#import <Foundation/NSObject.h>
+#import <AppKit/NSGraphics.h>

@class NSArray;
@class NSDictionary;
--- a/Headers/AppKit/NSScrollView.h
+++ b/Headers/AppKit/NSScrollView.h
@ -32,7 +32,7 @@
 #define _GNUstep_H_NSScrollView
 #import <GNUstepBase/GSVersionMacros.h>

-#include <AppKit/NSView.h>
+#import <AppKit/NSView.h>

@class NSClipView;
@class NSRulerView;
--- a/Headers/AppKit/NSScroller.h
+++ b/Headers/AppKit/NSScroller.h
@ -32,8 +32,8 @@
 #define _GNUstep_H_NSScroller
 #import <GNUstepBase/GSVersionMacros.h>

-#include <AppKit/NSControl.h>
-#include <AppKit/NSCell.h>
+#import <AppKit/NSControl.h>
+#import <AppKit/NSCell.h>

@class NSEvent;

--- a/Headers/AppKit/NSSearchField.h
+++ b/Headers/AppKit/NSSearchField.h
@ -30,7 +30,7 @@
 #ifndef _GNUstep_H_NSSearchField
 #define _GNUstep_H_NSSearchField

-#include <AppKit/NSTextField.h>
+#import <AppKit/NSTextField.h>

@interface NSSearchField : NSTextField

--- a/Headers/AppKit/NSSearchFieldCell.h
+++ b/Headers/AppKit/NSSearchFieldCell.h
@ -32,7 +32,7 @@

 #if OS_API_VERSION(MAC_OS_X_VERSION_10_3, GS_API_LATEST)

-#include <AppKit/NSTextFieldCell.h>
+#import <AppKit/NSTextFieldCell.h>

@class NSButtonCell;
@class NSMenu;
--- a/Headers/AppKit/NSSecureTextField.h
+++ b/Headers/AppKit/NSSecureTextField.h
@ -30,8 +30,8 @@
 #ifndef _GNUstep_H_NSSecureTextField
 #define _GNUstep_H_NSSecureTextField

-#include <AppKit/NSTextField.h>
-#include <AppKit/NSTextFieldCell.h>
+#import <AppKit/NSTextField.h>
+#import <AppKit/NSTextFieldCell.h>

@interface NSSecureTextField : NSTextField
 {}
--- a/Headers/AppKit/NSSegmentedCell.h
+++ b/Headers/AppKit/NSSegmentedCell.h
@ -26,8 +26,8 @@
 #ifndef _GNUstep_H_NSSegmentedCell
 #define _GNUstep_H_NSSegmentedCell

-#include <AppKit/NSActionCell.h>
-#include <AppKit/NSSegmentedControl.h>
+#import <AppKit/NSActionCell.h>
+#import <AppKit/NSSegmentedControl.h>

 // tracking types...
 typedef enum {
--- a/Headers/AppKit/NSSegmentedControl.h
+++ b/Headers/AppKit/NSSegmentedControl.h
@ -26,7 +26,7 @@
 #ifndef _GNUstep_H_NSSegmentedControl
 #define _GNUstep_H_NSSegmentedControl

-#include <AppKit/NSControl.h>
+#import <AppKit/NSControl.h>

 #if OS_API_VERSION(GS_API_MACOSX, GS_API_LATEST)
 typedef enum _NSSegmentStyle {
--- a/Headers/AppKit/NSSelection.h
+++ b/Headers/AppKit/NSSelection.h
@ -30,7 +30,7 @@
 #ifndef _GNUstep_H_NSSelection
 #define _GNUstep_H_NSSelection

-#include <Foundation/NSCoder.h>
+#import <Foundation/NSObject.h>

@class NSData;
@class NSPasteboard;
@ -69,12 +69,6 @@
 //
 - (void)writeToPasteboard:(NSPasteboard *)pasteboard;

-//
-// NSCoding protocol
-//
- (void)encodeWithCoder: (NSCoder *)aCoder;
- initWithCoder: (NSCoder *)aDecoder;
-
@end

 #endif // _GNUstep_H_NSSelection
--- a/Headers/AppKit/NSSlider.h
+++ b/Headers/AppKit/NSSlider.h
@ -28,8 +28,8 @@
 #ifndef _GNUstep_H_NSSlider
 #define _GNUstep_H_NSSlider

-#include <AppKit/NSControl.h>
-#include <AppKit/NSSliderCell.h>
+#import <AppKit/NSControl.h>
+#import <AppKit/NSSliderCell.h>

@class NSString;
@class NSImage;
--- a/Headers/AppKit/NSSliderCell.h
+++ b/Headers/AppKit/NSSliderCell.h
@ -28,7 +28,7 @@
 #ifndef _GNUstep_H_NSSliderCell
 #define _GNUstep_H_NSSliderCell

-#include <AppKit/NSActionCell.h>
+#import <AppKit/NSActionCell.h>

@class NSString;
@class NSColor;
--- a/Headers/AppKit/NSSound.h
+++ b/Headers/AppKit/NSSound.h
@ -31,12 +31,10 @@
 #ifndef _GNUstep_H_NSSound
 #define _GNUstep_H_NSSound

-#include <Foundation/NSObject.h>
-#include <Foundation/NSBundle.h>
-#include <Foundation/NSByteOrder.h>
+#import <Foundation/NSObject.h>

-#include "GNUstepGUI/GSSoundSource.h"
-#include "GNUstepGUI/GSSoundSink.h"
+#import "GNUstepGUI/GSSoundSource.h"
+#import "GNUstepGUI/GSSoundSink.h"

@class NSArray;
@class NSData;
--- a/Headers/AppKit/NSSpeechSynthesizer.h
+++ b/Headers/AppKit/NSSpeechSynthesizer.h
@ -28,7 +28,7 @@
 #ifndef _GNUstep_H_NSSpeechSynthesizer
 #define _GNUstep_H_NSSpeechSynthesizer

-#include <Foundation/NSObject.h>
+#import <Foundation/NSObject.h>

 // NSSpeechBoundary enumerated type...
 typedef enum 
--- a/Headers/AppKit/NSSpellChecker.h
+++ b/Headers/AppKit/NSSpellChecker.h
@ -33,8 +33,8 @@
 #ifndef _GNUstep_H_NSSpellChecker
 #define _GNUstep_H_NSSpellChecker

-#include <Foundation/NSObject.h>
-#include <Foundation/NSRange.h>
+#import <Foundation/NSObject.h>
+#import <Foundation/NSRange.h>

@class NSProxy;
@class NSString;
--- a/Headers/AppKit/NSSpellProtocol.h
+++ b/Headers/AppKit/NSSpellProtocol.h
@ -30,7 +30,7 @@
 #ifndef _GNUstep_H_NSSpellProtocol
 #define _GNUstep_H_NSSpellProtocol

-#include <objc/objc.h>
+#import <objc/objc.h>

@protocol NSChangeSpelling

--- a/Headers/AppKit/NSSplitView.h
+++ b/Headers/AppKit/NSSplitView.h
@ -30,7 +30,7 @@
 #ifndef _GNUstep_H_NSSplitView
 #define _GNUstep_H_NSSplitView

-#include <AppKit/NSView.h>
+#import <AppKit/NSView.h>

@class NSImage, NSColor, NSNotification;

--- a/Headers/AppKit/NSStringDrawing.h
+++ b/Headers/AppKit/NSStringDrawing.h
@ -36,9 +36,11 @@

 #if OS_API_VERSION(GS_API_MACOSX, GS_API_LATEST)

-#include <Foundation/NSString.h>
-#include <Foundation/NSAttributedString.h>
-#include <Foundation/NSGeometry.h>
+#import <Foundation/NSAttributedString.h>
+#import <Foundation/NSGeometry.h>
+#import <Foundation/NSString.h>
+
+@class NSDictionary;

 #if OS_API_VERSION(MAC_OS_X_VERSION_10_4, GS_API_LATEST)
 typedef enum 
--- a/Headers/AppKit/NSTabView.h
+++ b/Headers/AppKit/NSTabView.h
@ -28,9 +28,9 @@
 #ifndef _GNUstep_H_NSTabView
 #define _GNUstep_H_NSTabView
 
-#include <AppKit/NSView.h>
-#include <AppKit/NSColor.h>
-#include <AppKit/NSCell.h>
+#import <AppKit/NSView.h>
+#import <AppKit/NSColor.h>
+#import <AppKit/NSCell.h>

 typedef enum {
  NSTopTabsBezelBorder, 
--- a/Headers/AppKit/NSTabViewItem.h
+++ b/Headers/AppKit/NSTabViewItem.h
@ -28,7 +28,8 @@
 #ifndef _GNUstep_H_NSTabViewItem
 #define _GNUstep_H_NSTabViewItem

-#include <AppKit/NSTabView.h>
+#import <Foundation/NSGeometry.h>
+#import <Foundation/NSObject.h>

 typedef enum {
  NSSelectedTab = 0,
@ -36,7 +37,10 @@ typedef enum {
  NSPressedTab
 } NSTabState;

+@class NSString;
@class NSColor;
+@class NSTabView;
+@class NSView;

@interface NSTabViewItem : NSObject <NSCoding>
 {
--- a/Headers/AppKit/NSTableColumn.h
+++ b/Headers/AppKit/NSTableColumn.h
@ -31,8 +31,8 @@
 #ifndef _GNUstep_H_NSTableColumn
 #define _GNUstep_H_NSTableColumn

-#include <Foundation/NSObject.h>
-#include <AppKit/AppKitDefines.h>
+#import <Foundation/NSObject.h>
+#import <AppKit/AppKitDefines.h>

@class NSSortDescriptor;
@class NSCell;
--- a/Headers/AppKit/NSTableHeaderCell.h
+++ b/Headers/AppKit/NSTableHeaderCell.h
@ -27,7 +27,7 @@

 #ifndef _GNUstep_H_NSTableHeaderCell
 #define _GNUstep_H_NSTableHeaderCell
-#include <GNUstepBase/GSVersionMacros.h>
+#import <GNUstepBase/GSVersionMacros.h>

 #import <AppKit/NSTextFieldCell.h>

--- a/Headers/AppKit/NSTableHeaderView.h
+++ b/Headers/AppKit/NSTableHeaderView.h
@ -31,8 +31,8 @@
 #ifndef _GNUstep_H_NSTableHeaderView
 #define _GNUstep_H_NSTableHeaderView

-#include <Foundation/NSGeometry.h>
-#include <AppKit/NSView.h>
+#import <Foundation/NSGeometry.h>
+#import <AppKit/NSView.h>

@class NSTableView;

--- a/Headers/AppKit/NSTableView.h
+++ b/Headers/AppKit/NSTableView.h
@ -30,9 +30,9 @@
 #ifndef _GNUstep_H_NSTableView
 #define _GNUstep_H_NSTableView

-#include <AppKit/NSControl.h>
-#include <AppKit/NSDragging.h>
-#include <AppKit/NSUserInterfaceValidation.h>
+#import <AppKit/NSControl.h>
+#import <AppKit/NSDragging.h>
+#import <AppKit/NSUserInterfaceValidation.h>

@class NSArray;
@class NSIndexSet;
--- a/Headers/AppKit/NSText.h
+++ b/Headers/AppKit/NSText.h
@ -56,13 +56,16 @@
 * inside the GNUstep NSView tree, you can write a subclass of NSText
 * which just uses Emacs. */
 
-#include <AppKit/NSView.h>
-#include <AppKit/NSSpellProtocol.h>
-#include <Foundation/NSRange.h>
+#import <Foundation/NSObject.h>
+#import <Foundation/NSRange.h>
+#import <AppKit/NSView.h>
+#import <AppKit/NSSpellProtocol.h>
+//#import <AppKit/NSStringDrawing.h>

-@class NSString;
+@class NSAttributedString;
@class NSData;
@class NSNotification;
+@class NSString;
@class NSColor;
@class NSFont;

@ -107,8 +110,6 @@ enum {
  NSBacktabKey        = 25
 };

-#include <AppKit/NSStringDrawing.h>
-
@interface NSText : NSView <NSChangeSpelling, NSIgnoreMisspelledWords>
 {
 }
--- a/Headers/AppKit/NSTextAttachment.h
+++ b/Headers/AppKit/NSTextAttachment.h
@ -48,13 +48,15 @@ the NSTextAttachment protocol.

 #if OS_API_VERSION(GS_API_MACOSX, GS_API_LATEST)

-#include <Foundation/NSGeometry.h>
-#include <AppKit/NSCell.h>
+#import <Foundation/NSAttributedString.h>
+#import <Foundation/NSGeometry.h>
+#import <Foundation/NSObject.h>
+#import <AppKit/NSCell.h>

-@class NSTextContainer;
@class NSFileWrapper;
-@class NSTextAttachment;
@class NSLayoutManager;
+@class NSTextAttachment;
+@class NSTextContainer;

 enum {
    NSAttachmentCharacter = 0xfffc	/* To denote attachments. */
--- a/Source/GSDragView.m
+++ b/Source/GSDragView.m
@ -31,21 +31,22 @@
   Boston, MA 02110-1301, USA.
 */

-#include <Foundation/NSDebug.h>
-#include <Foundation/NSThread.h>
+#import <Foundation/NSDebug.h>
+#import <Foundation/NSDictionary.h>
+#import <Foundation/NSThread.h>

-#include <AppKit/NSApplication.h>
-#include <AppKit/NSCell.h>
-#include <AppKit/NSCursor.h>
-#include <AppKit/NSEvent.h>
-#include <AppKit/NSGraphics.h>
-#include <AppKit/NSImage.h>
-#include <AppKit/NSPasteboard.h>
-#include <AppKit/NSView.h>
-#include <AppKit/NSWindow.h>
+#import "AppKit/NSApplication.h"
+#import "AppKit/NSCell.h"
+#import "AppKit/NSCursor.h"
+#import "AppKit/NSEvent.h"
+#import "AppKit/NSGraphics.h"
+#import "AppKit/NSImage.h"
+#import "AppKit/NSPasteboard.h"
+#import "AppKit/NSView.h"
+#import "AppKit/NSWindow.h"

-#include "GNUstepGUI/GSDisplayServer.h"
-#include "GNUstepGUI/GSDragView.h"
+#import "GNUstepGUI/GSDisplayServer.h"
+#import "GNUstepGUI/GSDragView.h"
 #include <math.h>

 /* Size of the dragged window */
--- a/Source/GSThemeDrawing.m
+++ b/Source/GSThemeDrawing.m
@ -41,6 +41,7 @@
 #import "AppKit/NSParagraphStyle.h"
 #import "AppKit/NSProgressIndicator.h"
 #import "AppKit/NSScroller.h"
+#import "AppKit/NSStringDrawing.h"
 #import "AppKit/NSView.h"
 #import "AppKit/PSOperators.h"

--- a/Source/GSTitleView.m
+++ b/Source/GSTitleView.m
@ -38,6 +38,7 @@
 #import "AppKit/NSMenu.h"
 #import "AppKit/NSMenuView.h"
 #import "AppKit/NSPanel.h"
+#import "AppKit/NSStringDrawing.h"
 #import "AppKit/NSView.h"
 #import "AppKit/NSWindow.h"

--- a/Source/GSToolTips.m
+++ b/Source/GSToolTips.m
@ -25,18 +25,21 @@
   Boston, MA 02110-1301, USA.
 */

-#include <Foundation/Foundation.h>
+#import <Foundation/NSGeometry.h>
+#import <Foundation/NSString.h>
+#import <Foundation/NSTimer.h>

-#include "AppKit/NSAttributedString.h"
-#include "AppKit/NSBezierPath.h"
-#include "AppKit/NSEvent.h"
-#include "AppKit/NSScreen.h"
-#include "AppKit/NSView.h"
-#include "AppKit/NSPanel.h"
-#include "GNUstepGUI/GSTrackingRect.h"
-#include "GSToolTips.h"
+#import "AppKit/NSAttributedString.h"
+#import "AppKit/NSBezierPath.h"
+#import "AppKit/NSEvent.h"
+#import "AppKit/NSScreen.h"
+#import "AppKit/NSStringDrawing.h"
+#import "AppKit/NSView.h"
+#import "AppKit/NSPanel.h"
+#import "GNUstepGUI/GSTrackingRect.h"
+#import "GSToolTips.h"

-@interface	NSWindow (GNUstepPrivate)
+@interface NSWindow (GNUstepPrivate)

 + (void) _setToolTipVisible: (GSToolTips*)t;
 + (GSToolTips*) _toolTipVisible;
--- a/Source/NSButtonCell.m
+++ b/Source/NSButtonCell.m
@ -32,11 +32,12 @@
 */

 #import "config.h"
-#import <Foundation/NSLock.h>
 #import <Foundation/NSArray.h>
-#import <Foundation/NSString.h>
-#import <Foundation/NSException.h>
+#import <Foundation/NSAttributedString.h>
 #import <Foundation/NSDebug.h>
+#import <Foundation/NSException.h>
+#import <Foundation/NSLock.h>
+#import <Foundation/NSString.h>
 #import <Foundation/NSValue.h>

 #import "AppKit/AppKitExceptions.h"
@ -50,6 +51,7 @@
 #import "AppKit/NSGraphics.h"
 #import "AppKit/NSImage.h"
 #import "AppKit/NSSound.h"
+#import "AppKit/NSStringDrawing.h"
 #import "AppKit/NSWindow.h"
 #import "GNUstepGUI/GSTheme.h"
 #import "GNUstepGUI/GSNibLoading.h"
--- a/Source/NSCell.m
+++ b/Source/NSCell.m
@ -58,6 +58,7 @@
 #import "AppKit/NSImage.h"
 #import "AppKit/NSMenu.h"
 #import "AppKit/NSParagraphStyle.h"
+#import "AppKit/NSStringDrawing.h"
 #import "AppKit/NSTextView.h"
 #import "AppKit/NSTextContainer.h"
 #import "AppKit/NSView.h"
--- a/Source/NSMenuView.m
+++ b/Source/NSMenuView.m
@ -32,9 +32,9 @@
 #import <Foundation/NSCoder.h>
 #import <Foundation/NSDate.h>
 #import <Foundation/NSDebug.h>
+#import <Foundation/NSDictionary.h>
 #import <Foundation/NSException.h>
 #import <Foundation/NSNotification.h>
-//#import <Foundation/NSProcessInfo.h>
 #import <Foundation/NSRunLoop.h>
 #import <Foundation/NSString.h>
 #import <Foundation/NSValue.h>
--- a/Source/NSOutlineView.m
+++ b/Source/NSOutlineView.m
@ -31,31 +31,32 @@
   Boston, MA 02110-1301, USA.
 */

-#include <Foundation/NSArray.h>
-#include <Foundation/NSEnumerator.h>
-#include <Foundation/NSException.h>
-#include <Foundation/NSIndexSet.h>
-#include <Foundation/NSMapTable.h>
-#include <Foundation/NSNotification.h>
-#include <Foundation/NSNull.h>
-#include <Foundation/NSUserDefaults.h>
-#include <Foundation/NSValue.h>
+#import <Foundation/NSArray.h>
+#import <Foundation/NSDictionary.h>
+#import <Foundation/NSEnumerator.h>
+#import <Foundation/NSException.h>
+#import <Foundation/NSIndexSet.h>
+#import <Foundation/NSMapTable.h>
+#import <Foundation/NSNotification.h>
+#import <Foundation/NSNull.h>
+#import <Foundation/NSUserDefaults.h>
+#import <Foundation/NSValue.h>

-#include "AppKit/NSApplication.h"
-#include "AppKit/NSBezierPath.h"
-#include "AppKit/NSCell.h"
-#include "AppKit/NSClipView.h"
-#include "AppKit/NSColor.h"
-#include "AppKit/NSEvent.h"
-#include "AppKit/NSGraphics.h"
-#include "AppKit/NSImage.h"
-#include "AppKit/NSOutlineView.h"
-#include "AppKit/NSScroller.h"
-#include "AppKit/NSTableColumn.h"
-#include "AppKit/NSTableHeaderView.h"
-#include "AppKit/NSText.h"
-#include "AppKit/NSTextFieldCell.h"
-#include "AppKit/NSWindow.h"
+#import "AppKit/NSApplication.h"
+#import "AppKit/NSBezierPath.h"
+#import "AppKit/NSCell.h"
+#import "AppKit/NSClipView.h"
+#import "AppKit/NSColor.h"
+#import "AppKit/NSEvent.h"
+#import "AppKit/NSGraphics.h"
+#import "AppKit/NSImage.h"
+#import "AppKit/NSOutlineView.h"
+#import "AppKit/NSScroller.h"
+#import "AppKit/NSTableColumn.h"
+#import "AppKit/NSTableHeaderView.h"
+#import "AppKit/NSText.h"
+#import "AppKit/NSTextFieldCell.h"
+#import "AppKit/NSWindow.h"

 #include <math.h>

--- a/Source/NSPageLayout.m
+++ b/Source/NSPageLayout.m
@ -29,6 +29,7 @@
   Boston, MA 02110-1301, USA.
 */ 

+#import <Foundation/NSDictionary.h>
 #import <Foundation/NSNumberFormatter.h>
 #import <Foundation/NSDecimalNumber.h>
 #import <Foundation/NSUserDefaults.h>
--- a/Source/NSPrintInfo.m
+++ b/Source/NSPrintInfo.m
@ -30,13 +30,14 @@
   Boston, MA 02110-1301, USA.
 */ 

-#include <Foundation/NSBundle.h>
-#include <Foundation/NSDictionary.h>
-#include <Foundation/NSValue.h>
-#include "AppKit/NSPrinter.h"
-#include "AppKit/NSPrintInfo.h"
-#include "GNUstepGUI/GSPrinting.h"
-#include "GSGuiPrivate.h"
+#import <Foundation/NSBundle.h>
+#import <Foundation/NSCoder.h>
+#import <Foundation/NSDictionary.h>
+#import <Foundation/NSValue.h>
+#import "AppKit/NSPrinter.h"
+#import "AppKit/NSPrintInfo.h"
+#import "GNUstepGUI/GSPrinting.h"
+#import "GSGuiPrivate.h"

 // Class variables:
 static NSPrintInfo *sharedPrintInfo = nil;
--- a/Source/NSRulerView.m
+++ b/Source/NSRulerView.m
@ -26,21 +26,22 @@
 */

 #include <math.h>
-#include "config.h"
+#import "config.h"

-#include <Foundation/NSArray.h>
-#include <Foundation/NSDebug.h>
-#include <Foundation/NSException.h>
-#include <Foundation/NSValue.h>
-#include "AppKit/NSAttributedString.h"
-#include "AppKit/NSBezierPath.h"
-#include "AppKit/NSColor.h"
-#include "AppKit/NSEvent.h"
-#include "AppKit/NSFont.h"
-#include "AppKit/NSGraphics.h"
-#include "AppKit/NSRulerMarker.h"
-#include "AppKit/NSRulerView.h"
-#include "AppKit/NSScrollView.h"
+#import <Foundation/NSArray.h>
+#import <Foundation/NSDebug.h>
+#import <Foundation/NSException.h>
+#import <Foundation/NSValue.h>
+#import "AppKit/NSAttributedString.h"
+#import "AppKit/NSBezierPath.h"
+#import "AppKit/NSColor.h"
+#import "AppKit/NSEvent.h"
+#import "AppKit/NSFont.h"
+#import "AppKit/NSGraphics.h"
+#import "AppKit/NSRulerMarker.h"
+#import "AppKit/NSRulerView.h"
+#import "AppKit/NSScrollView.h"
+#import "AppKit/NSStringDrawing.h"

 DEFINE_RINT_IF_MISSING

--- a/Source/NSSecureTextField.m
+++ b/Source/NSSecureTextField.m
@ -29,18 +29,19 @@
   Boston, MA 02110-1301, USA.
 */

-#include "config.h"
-#include <Foundation/NSException.h>
+#import "config.h"
+#import <Foundation/NSException.h>

-#include "AppKit/NSAttributedString.h"
-#include "AppKit/NSEvent.h"
-#include "AppKit/NSFont.h"
-#include "AppKit/NSImage.h"
-#include "AppKit/NSLayoutManager.h"
-#include "AppKit/NSSecureTextField.h"
-#include "AppKit/NSTextContainer.h"
-#include "AppKit/NSTextView.h"
-#include "AppKit/NSWindow.h"
+#import "AppKit/NSAttributedString.h"
+#import "AppKit/NSEvent.h"
+#import "AppKit/NSFont.h"
+#import "AppKit/NSImage.h"
+#import "AppKit/NSLayoutManager.h"
+#import "AppKit/NSSecureTextField.h"
+#import "AppKit/NSStringDrawing.h"
+#import "AppKit/NSTextContainer.h"
+#import "AppKit/NSTextView.h"
+#import "AppKit/NSWindow.h"

 // the Unicode code point for a bullet
 #define BULLET 0x2022
--- a/Source/NSTabViewItem.m
+++ b/Source/NSTabViewItem.m
@ -24,13 +24,14 @@
   Boston, MA 02110-1301, USA.
 */

-#include "AppKit/NSAttributedString.h"
-#include "AppKit/NSColor.h"
-#include "AppKit/NSFont.h"
-#include "AppKit/NSGraphics.h"
-#include "AppKit/NSImage.h"
-#include "AppKit/NSTabViewItem.h"
-#include "AppKit/PSOperators.h"
+#import "AppKit/NSAttributedString.h"
+#import "AppKit/NSColor.h"
+#import "AppKit/NSFont.h"
+#import "AppKit/NSGraphics.h"
+#import "AppKit/NSImage.h"
+#import "AppKit/NSStringDrawing.h"
+#import "AppKit/NSTabViewItem.h"
+#import "AppKit/PSOperators.h"

@implementation NSTabViewItem

--- a/Source/NSTableColumn.m
+++ b/Source/NSTableColumn.m
@ -62,6 +62,7 @@
 </chapter>
 */  

+#import <Foundation/NSDictionary.h>
 #import <Foundation/NSNotification.h>
 #import <Foundation/NSValue.h>
 #import <Foundation/NSSortDescriptor.h>
--- a/Source/NSTableView.m
+++ b/Source/NSTableView.m
@ -30,40 +30,41 @@
   Boston, MA 02110-1301, USA.
 */ 

-#include <Foundation/NSAutoreleasePool.h>
-#include <Foundation/NSDebug.h>
-#include <Foundation/NSEnumerator.h>
-#include <Foundation/NSException.h>
-#include <Foundation/NSFormatter.h>
-#include <Foundation/NSIndexSet.h>
-#include <Foundation/NSNotification.h>
-#include <Foundation/NSSet.h>
-#include <Foundation/NSSortDescriptor.h>
-#include <Foundation/NSUserDefaults.h>
-#include <Foundation/NSValue.h>
-#include <Foundation/NSKeyedArchiver.h>
+#import <Foundation/NSAutoreleasePool.h>
+#import <Foundation/NSDebug.h>
+#import <Foundation/NSDictionary.h>
+#import <Foundation/NSEnumerator.h>
+#import <Foundation/NSException.h>
+#import <Foundation/NSFormatter.h>
+#import <Foundation/NSIndexSet.h>
+#import <Foundation/NSNotification.h>
+#import <Foundation/NSSet.h>
+#import <Foundation/NSSortDescriptor.h>
+#import <Foundation/NSUserDefaults.h>
+#import <Foundation/NSValue.h>
+#import <Foundation/NSKeyedArchiver.h>

-#include "AppKit/NSTableView.h"
-#include "AppKit/NSApplication.h"
-#include "AppKit/NSCell.h"
-#include "AppKit/NSClipView.h"
-#include "AppKit/NSColor.h"
-#include "AppKit/NSEvent.h"
-#include "AppKit/NSImage.h"
-#include "AppKit/NSGraphics.h"
-#include "AppKit/NSScroller.h"
-#include "AppKit/NSScrollView.h"
-#include "AppKit/NSTableColumn.h"
-#include "AppKit/NSTableHeaderView.h"
-#include "AppKit/NSText.h"
-#include "AppKit/NSTextFieldCell.h"
-#include "AppKit/NSWindow.h"
-#include "AppKit/PSOperators.h"
-#include "AppKit/NSCachedImageRep.h"
-#include "AppKit/NSPasteboard.h"
-#include "AppKit/NSDragging.h"
-#include "AppKit/NSCustomImageRep.h"
-#include "GNUstepGUI/GSTheme.h"
+#import "AppKit/NSTableView.h"
+#import "AppKit/NSApplication.h"
+#import "AppKit/NSCell.h"
+#import "AppKit/NSClipView.h"
+#import "AppKit/NSColor.h"
+#import "AppKit/NSEvent.h"
+#import "AppKit/NSImage.h"
+#import "AppKit/NSGraphics.h"
+#import "AppKit/NSScroller.h"
+#import "AppKit/NSScrollView.h"
+#import "AppKit/NSTableColumn.h"
+#import "AppKit/NSTableHeaderView.h"
+#import "AppKit/NSText.h"
+#import "AppKit/NSTextFieldCell.h"
+#import "AppKit/NSWindow.h"
+#import "AppKit/PSOperators.h"
+#import "AppKit/NSCachedImageRep.h"
+#import "AppKit/NSPasteboard.h"
+#import "AppKit/NSDragging.h"
+#import "AppKit/NSCustomImageRep.h"
+#import "GNUstepGUI/GSTheme.h"

 #include <math.h>
 static NSNotificationCenter *nc = nil;
--- a/Source/NSTextFieldCell.m
+++ b/Source/NSTextFieldCell.m
@ -28,17 +28,18 @@
   Boston, MA 02110-1301, USA.
 */ 

-#include "config.h"
-#include <Foundation/NSNotification.h>
-#include "AppKit/NSAttributedString.h"
-#include "AppKit/NSColor.h"
-#include "AppKit/NSControl.h"
-#include "AppKit/NSEvent.h"
-#include "AppKit/NSFont.h"
-#include "AppKit/NSGraphics.h"
-#include "AppKit/NSTextField.h"
-#include "AppKit/NSTextFieldCell.h"
-#include "AppKit/NSText.h"
+#import "config.h"
+#import <Foundation/NSNotification.h>
+#import "AppKit/NSAttributedString.h"
+#import "AppKit/NSColor.h"
+#import "AppKit/NSControl.h"
+#import "AppKit/NSEvent.h"
+#import "AppKit/NSFont.h"
+#import "AppKit/NSGraphics.h"
+#import "AppKit/NSStringDrawing.h"
+#import "AppKit/NSTextField.h"
+#import "AppKit/NSTextFieldCell.h"
+#import "AppKit/NSText.h"

@implementation NSTextFieldCell

--- a/Source/NSToolbarItem.m
+++ b/Source/NSToolbarItem.m
@ -29,30 +29,31 @@
   Boston, MA 02110-1301, USA.
 */ 

-#include <Foundation/NSObject.h>
-#include <Foundation/NSArray.h>
-#include <Foundation/NSArchiver.h>
-#include <Foundation/NSDictionary.h>
-#include <Foundation/NSString.h>
-#include "AppKit/NSApplication.h"
-#include "AppKit/NSAttributedString.h"
-#include "AppKit/NSButton.h"
-#include "AppKit/NSButtonCell.h"
-#include "AppKit/NSDragging.h"
-#include "AppKit/NSEvent.h"
-#include "AppKit/NSFont.h"
-#include "AppKit/NSImage.h"
-#include "AppKit/NSMenu.h"
-#include "AppKit/NSMenuItem.h"
-#include "AppKit/NSParagraphStyle.h"
-#include "AppKit/NSPasteboard.h"
-#include "AppKit/NSToolbar.h"
-#include "AppKit/NSView.h"
-#include "GNUstepGUI/GSToolbarView.h"
-#include "AppKit/NSToolbarItem.h"
+#import <Foundation/NSObject.h>
+#import <Foundation/NSArray.h>
+#import <Foundation/NSArchiver.h>
+#import <Foundation/NSDictionary.h>
+#import <Foundation/NSString.h>
+#import "AppKit/NSApplication.h"
+#import "AppKit/NSAttributedString.h"
+#import "AppKit/NSButton.h"
+#import "AppKit/NSButtonCell.h"
+#import "AppKit/NSDragging.h"
+#import "AppKit/NSEvent.h"
+#import "AppKit/NSFont.h"
+#import "AppKit/NSImage.h"
+#import "AppKit/NSMenu.h"
+#import "AppKit/NSMenuItem.h"
+#import "AppKit/NSParagraphStyle.h"
+#import "AppKit/NSPasteboard.h"
+#import "AppKit/NSStringDrawing.h"
+#import "AppKit/NSToolbar.h"
+#import "AppKit/NSView.h"
+#import "GNUstepGUI/GSToolbarView.h"
+#import "AppKit/NSToolbarItem.h"

-#include "NSToolbarFrameworkPrivate.h"
-#include "GSGuiPrivate.h"
+#import "NSToolbarFrameworkPrivate.h"
+#import "GSGuiPrivate.h"

 /*
 * Each NSToolbarItem object are coupled with a backView which is their