From 3d559c477eba74fdda8e4d02337c3db85e393d3f Mon Sep 17 00:00:00 2001 From: fredkiefer Date: Wed, 31 Mar 2010 08:14:50 +0000 Subject: [PATCH] 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 --- ChangeLog | 52 +++++++++++++++ Headers/Additions/GNUstepGUI/GSSoundSink.h | 3 + Headers/Additions/GNUstepGUI/GSSoundSource.h | 3 + Headers/AppKit/NSResponder.h | 6 +- Headers/AppKit/NSRulerMarker.h | 4 +- Headers/AppKit/NSRulerView.h | 2 +- Headers/AppKit/NSSavePanel.h | 6 +- Headers/AppKit/NSScreen.h | 4 +- Headers/AppKit/NSScrollView.h | 2 +- Headers/AppKit/NSScroller.h | 4 +- Headers/AppKit/NSSearchField.h | 2 +- Headers/AppKit/NSSearchFieldCell.h | 2 +- Headers/AppKit/NSSecureTextField.h | 4 +- Headers/AppKit/NSSegmentedCell.h | 4 +- Headers/AppKit/NSSegmentedControl.h | 2 +- Headers/AppKit/NSSelection.h | 8 +-- Headers/AppKit/NSSlider.h | 4 +- Headers/AppKit/NSSliderCell.h | 2 +- Headers/AppKit/NSSound.h | 8 +-- Headers/AppKit/NSSpeechSynthesizer.h | 2 +- Headers/AppKit/NSSpellChecker.h | 4 +- Headers/AppKit/NSSpellProtocol.h | 2 +- Headers/AppKit/NSSplitView.h | 2 +- Headers/AppKit/NSStringDrawing.h | 8 ++- Headers/AppKit/NSTabView.h | 6 +- Headers/AppKit/NSTabViewItem.h | 6 +- Headers/AppKit/NSTableColumn.h | 4 +- Headers/AppKit/NSTableHeaderCell.h | 2 +- Headers/AppKit/NSTableHeaderView.h | 4 +- Headers/AppKit/NSTableView.h | 6 +- Headers/AppKit/NSText.h | 13 ++-- Headers/AppKit/NSTextAttachment.h | 10 +-- Source/GSDragView.m | 27 ++++---- Source/GSThemeDrawing.m | 1 + Source/GSTitleView.m | 1 + Source/GSToolTips.m | 23 ++++--- Source/NSButtonCell.m | 8 ++- Source/NSCell.m | 1 + Source/NSMenuView.m | 2 +- Source/NSOutlineView.m | 49 +++++++------- Source/NSPageLayout.m | 1 + Source/NSPrintInfo.m | 15 +++-- Source/NSRulerView.m | 29 +++++---- Source/NSSecureTextField.m | 23 +++---- Source/NSTabViewItem.m | 15 +++-- Source/NSTableColumn.m | 1 + Source/NSTableView.m | 67 ++++++++++---------- Source/NSTextFieldCell.m | 23 +++---- Source/NSToolbarItem.m | 47 +++++++------- 49 files changed, 301 insertions(+), 223 deletions(-) diff --git a/ChangeLog b/ChangeLog index f0ad673ed..dd858f820 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,55 @@ +2010-03-31 Fred Kiefer + + * 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 * Source/NSTableView.m: Add nil check to make sure that the diff --git a/Headers/Additions/GNUstepGUI/GSSoundSink.h b/Headers/Additions/GNUstepGUI/GSSoundSink.h index d31084f83..75b0cd6fe 100644 --- 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 +#import + @protocol GSSoundSink /** Returns YES if class has the ability of playing audio data diff --git a/Headers/Additions/GNUstepGUI/GSSoundSource.h b/Headers/Additions/GNUstepGUI/GSSoundSource.h index 9ae498169..126dd5bda 100644 --- 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 +#import + @class NSArray; enum diff --git a/Headers/AppKit/NSResponder.h b/Headers/AppKit/NSResponder.h index 55a579f2d..6d601ac17 100644 --- a/Headers/AppKit/NSResponder.h +++ b/Headers/AppKit/NSResponder.h @@ -31,9 +31,9 @@ #define _GNUstep_H_NSResponder #import -#include -#include -#include +#import +#import +#import @class NSCoder; @class NSError; diff --git a/Headers/AppKit/NSRulerMarker.h b/Headers/AppKit/NSRulerMarker.h index 74c8e2c90..f4c26ccff 100644 --- a/Headers/AppKit/NSRulerMarker.h +++ b/Headers/AppKit/NSRulerMarker.h @@ -32,8 +32,8 @@ #ifndef _GNUstep_H_NSRulerMarker #define _GNUstep_H_NSRulerMarker -#include -#include +#import +#import @class NSRulerView; @class NSImage; diff --git a/Headers/AppKit/NSRulerView.h b/Headers/AppKit/NSRulerView.h index 50d4a3004..c913e45c9 100644 --- a/Headers/AppKit/NSRulerView.h +++ b/Headers/AppKit/NSRulerView.h @@ -34,7 +34,7 @@ #ifndef _GNUstep_H_NSRulerView #define _GNUstep_H_NSRulerView -#include +#import /* Declaring classes, rather than #including the full class header, * results in much faster compilations. */ diff --git a/Headers/AppKit/NSSavePanel.h b/Headers/AppKit/NSSavePanel.h index 2b12190b1..d42e83cc5 100644 --- a/Headers/AppKit/NSSavePanel.h +++ b/Headers/AppKit/NSSavePanel.h @@ -7,9 +7,9 @@ Author: Scott Christley Date: 1996 - Author: Daniel B?hringer + Author: Daniel Boehringer 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 This file is part of the GNUstep GUI Library. @@ -35,7 +35,7 @@ #define _GNUstep_H_NSSavePanel #import -#include +#import @class NSString; @class NSURL; diff --git a/Headers/AppKit/NSScreen.h b/Headers/AppKit/NSScreen.h index 6d0a4158a..cf4438247 100644 --- a/Headers/AppKit/NSScreen.h +++ b/Headers/AppKit/NSScreen.h @@ -35,8 +35,8 @@ #define _GNUstep_H_NSScreen #import -#include -#include +#import +#import @class NSArray; @class NSDictionary; diff --git a/Headers/AppKit/NSScrollView.h b/Headers/AppKit/NSScrollView.h index 6cf150a99..84258f757 100644 --- a/Headers/AppKit/NSScrollView.h +++ b/Headers/AppKit/NSScrollView.h @@ -32,7 +32,7 @@ #define _GNUstep_H_NSScrollView #import -#include +#import @class NSClipView; @class NSRulerView; diff --git a/Headers/AppKit/NSScroller.h b/Headers/AppKit/NSScroller.h index 62f88cfb4..06810bce7 100644 --- a/Headers/AppKit/NSScroller.h +++ b/Headers/AppKit/NSScroller.h @@ -32,8 +32,8 @@ #define _GNUstep_H_NSScroller #import -#include -#include +#import +#import @class NSEvent; diff --git a/Headers/AppKit/NSSearchField.h b/Headers/AppKit/NSSearchField.h index c97324971..e4e7c1673 100644 --- a/Headers/AppKit/NSSearchField.h +++ b/Headers/AppKit/NSSearchField.h @@ -30,7 +30,7 @@ #ifndef _GNUstep_H_NSSearchField #define _GNUstep_H_NSSearchField -#include +#import @interface NSSearchField : NSTextField diff --git a/Headers/AppKit/NSSearchFieldCell.h b/Headers/AppKit/NSSearchFieldCell.h index a8a09e722..5814996ae 100644 --- 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 +#import @class NSButtonCell; @class NSMenu; diff --git a/Headers/AppKit/NSSecureTextField.h b/Headers/AppKit/NSSecureTextField.h index c3b97d94f..caf3aac6a 100644 --- a/Headers/AppKit/NSSecureTextField.h +++ b/Headers/AppKit/NSSecureTextField.h @@ -30,8 +30,8 @@ #ifndef _GNUstep_H_NSSecureTextField #define _GNUstep_H_NSSecureTextField -#include -#include +#import +#import @interface NSSecureTextField : NSTextField {} diff --git a/Headers/AppKit/NSSegmentedCell.h b/Headers/AppKit/NSSegmentedCell.h index 202b3ffc7..8132563af 100644 --- a/Headers/AppKit/NSSegmentedCell.h +++ b/Headers/AppKit/NSSegmentedCell.h @@ -26,8 +26,8 @@ #ifndef _GNUstep_H_NSSegmentedCell #define _GNUstep_H_NSSegmentedCell -#include -#include +#import +#import // tracking types... typedef enum { diff --git a/Headers/AppKit/NSSegmentedControl.h b/Headers/AppKit/NSSegmentedControl.h index 10c44358b..0e4699d33 100644 --- a/Headers/AppKit/NSSegmentedControl.h +++ b/Headers/AppKit/NSSegmentedControl.h @@ -26,7 +26,7 @@ #ifndef _GNUstep_H_NSSegmentedControl #define _GNUstep_H_NSSegmentedControl -#include +#import #if OS_API_VERSION(GS_API_MACOSX, GS_API_LATEST) typedef enum _NSSegmentStyle { diff --git a/Headers/AppKit/NSSelection.h b/Headers/AppKit/NSSelection.h index 3058a3c02..707e7f8e2 100644 --- a/Headers/AppKit/NSSelection.h +++ b/Headers/AppKit/NSSelection.h @@ -30,7 +30,7 @@ #ifndef _GNUstep_H_NSSelection #define _GNUstep_H_NSSelection -#include +#import @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 diff --git a/Headers/AppKit/NSSlider.h b/Headers/AppKit/NSSlider.h index 1c5c28c4e..d321b1d1d 100644 --- a/Headers/AppKit/NSSlider.h +++ b/Headers/AppKit/NSSlider.h @@ -28,8 +28,8 @@ #ifndef _GNUstep_H_NSSlider #define _GNUstep_H_NSSlider -#include -#include +#import +#import @class NSString; @class NSImage; diff --git a/Headers/AppKit/NSSliderCell.h b/Headers/AppKit/NSSliderCell.h index 8be825b17..e30cc4d83 100644 --- a/Headers/AppKit/NSSliderCell.h +++ b/Headers/AppKit/NSSliderCell.h @@ -28,7 +28,7 @@ #ifndef _GNUstep_H_NSSliderCell #define _GNUstep_H_NSSliderCell -#include +#import @class NSString; @class NSColor; diff --git a/Headers/AppKit/NSSound.h b/Headers/AppKit/NSSound.h index 61f510172..a154531e4 100644 --- a/Headers/AppKit/NSSound.h +++ b/Headers/AppKit/NSSound.h @@ -31,12 +31,10 @@ #ifndef _GNUstep_H_NSSound #define _GNUstep_H_NSSound -#include -#include -#include +#import -#include "GNUstepGUI/GSSoundSource.h" -#include "GNUstepGUI/GSSoundSink.h" +#import "GNUstepGUI/GSSoundSource.h" +#import "GNUstepGUI/GSSoundSink.h" @class NSArray; @class NSData; diff --git a/Headers/AppKit/NSSpeechSynthesizer.h b/Headers/AppKit/NSSpeechSynthesizer.h index 1109db3c0..cb1be92a9 100644 --- a/Headers/AppKit/NSSpeechSynthesizer.h +++ b/Headers/AppKit/NSSpeechSynthesizer.h @@ -28,7 +28,7 @@ #ifndef _GNUstep_H_NSSpeechSynthesizer #define _GNUstep_H_NSSpeechSynthesizer -#include +#import // NSSpeechBoundary enumerated type... typedef enum diff --git a/Headers/AppKit/NSSpellChecker.h b/Headers/AppKit/NSSpellChecker.h index 4e12762cc..280fcefd8 100644 --- a/Headers/AppKit/NSSpellChecker.h +++ b/Headers/AppKit/NSSpellChecker.h @@ -33,8 +33,8 @@ #ifndef _GNUstep_H_NSSpellChecker #define _GNUstep_H_NSSpellChecker -#include -#include +#import +#import @class NSProxy; @class NSString; diff --git a/Headers/AppKit/NSSpellProtocol.h b/Headers/AppKit/NSSpellProtocol.h index 4fc387f02..5157492db 100644 --- a/Headers/AppKit/NSSpellProtocol.h +++ b/Headers/AppKit/NSSpellProtocol.h @@ -30,7 +30,7 @@ #ifndef _GNUstep_H_NSSpellProtocol #define _GNUstep_H_NSSpellProtocol -#include +#import @protocol NSChangeSpelling diff --git a/Headers/AppKit/NSSplitView.h b/Headers/AppKit/NSSplitView.h index 630b98520..36aa39957 100644 --- a/Headers/AppKit/NSSplitView.h +++ b/Headers/AppKit/NSSplitView.h @@ -30,7 +30,7 @@ #ifndef _GNUstep_H_NSSplitView #define _GNUstep_H_NSSplitView -#include +#import @class NSImage, NSColor, NSNotification; diff --git a/Headers/AppKit/NSStringDrawing.h b/Headers/AppKit/NSStringDrawing.h index 26e594935..663e64636 100644 --- 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 -#include -#include +#import +#import +#import + +@class NSDictionary; #if OS_API_VERSION(MAC_OS_X_VERSION_10_4, GS_API_LATEST) typedef enum diff --git a/Headers/AppKit/NSTabView.h b/Headers/AppKit/NSTabView.h index 0f18ab32a..c72e276b0 100644 --- a/Headers/AppKit/NSTabView.h +++ b/Headers/AppKit/NSTabView.h @@ -28,9 +28,9 @@ #ifndef _GNUstep_H_NSTabView #define _GNUstep_H_NSTabView -#include -#include -#include +#import +#import +#import typedef enum { NSTopTabsBezelBorder, diff --git a/Headers/AppKit/NSTabViewItem.h b/Headers/AppKit/NSTabViewItem.h index e2c1be482..75d8fd4ac 100644 --- a/Headers/AppKit/NSTabViewItem.h +++ b/Headers/AppKit/NSTabViewItem.h @@ -28,7 +28,8 @@ #ifndef _GNUstep_H_NSTabViewItem #define _GNUstep_H_NSTabViewItem -#include +#import +#import typedef enum { NSSelectedTab = 0, @@ -36,7 +37,10 @@ typedef enum { NSPressedTab } NSTabState; +@class NSString; @class NSColor; +@class NSTabView; +@class NSView; @interface NSTabViewItem : NSObject { diff --git a/Headers/AppKit/NSTableColumn.h b/Headers/AppKit/NSTableColumn.h index 22aefe179..7edce404f 100644 --- a/Headers/AppKit/NSTableColumn.h +++ b/Headers/AppKit/NSTableColumn.h @@ -31,8 +31,8 @@ #ifndef _GNUstep_H_NSTableColumn #define _GNUstep_H_NSTableColumn -#include -#include +#import +#import @class NSSortDescriptor; @class NSCell; diff --git a/Headers/AppKit/NSTableHeaderCell.h b/Headers/AppKit/NSTableHeaderCell.h index 0edfe9abb..33904bc7a 100644 --- a/Headers/AppKit/NSTableHeaderCell.h +++ b/Headers/AppKit/NSTableHeaderCell.h @@ -27,7 +27,7 @@ #ifndef _GNUstep_H_NSTableHeaderCell #define _GNUstep_H_NSTableHeaderCell -#include +#import #import diff --git a/Headers/AppKit/NSTableHeaderView.h b/Headers/AppKit/NSTableHeaderView.h index 9471ff68a..bee0ad1dd 100644 --- a/Headers/AppKit/NSTableHeaderView.h +++ b/Headers/AppKit/NSTableHeaderView.h @@ -31,8 +31,8 @@ #ifndef _GNUstep_H_NSTableHeaderView #define _GNUstep_H_NSTableHeaderView -#include -#include +#import +#import @class NSTableView; diff --git a/Headers/AppKit/NSTableView.h b/Headers/AppKit/NSTableView.h index f892db7d0..67bec9018 100644 --- a/Headers/AppKit/NSTableView.h +++ b/Headers/AppKit/NSTableView.h @@ -30,9 +30,9 @@ #ifndef _GNUstep_H_NSTableView #define _GNUstep_H_NSTableView -#include -#include -#include +#import +#import +#import @class NSArray; @class NSIndexSet; diff --git a/Headers/AppKit/NSText.h b/Headers/AppKit/NSText.h index a6c384850..ec07a6eac 100644 --- 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 -#include -#include +#import +#import +#import +#import +//#import -@class NSString; +@class NSAttributedString; @class NSData; @class NSNotification; +@class NSString; @class NSColor; @class NSFont; @@ -107,8 +110,6 @@ enum { NSBacktabKey = 25 }; -#include - @interface NSText : NSView { } diff --git a/Headers/AppKit/NSTextAttachment.h b/Headers/AppKit/NSTextAttachment.h index aa6452158..fad38d2ef 100644 --- 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 -#include +#import +#import +#import +#import -@class NSTextContainer; @class NSFileWrapper; -@class NSTextAttachment; @class NSLayoutManager; +@class NSTextAttachment; +@class NSTextContainer; enum { NSAttachmentCharacter = 0xfffc /* To denote attachments. */ diff --git a/Source/GSDragView.m b/Source/GSDragView.m index 6b5d882a7..185b5bcb7 100644 --- a/Source/GSDragView.m +++ b/Source/GSDragView.m @@ -31,21 +31,22 @@ Boston, MA 02110-1301, USA. */ -#include -#include +#import +#import +#import -#include -#include -#include -#include -#include -#include -#include -#include -#include +#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 /* Size of the dragged window */ diff --git a/Source/GSThemeDrawing.m b/Source/GSThemeDrawing.m index 847bc97d1..3bc0cbe92 100644 --- 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" diff --git a/Source/GSTitleView.m b/Source/GSTitleView.m index 78bda3a08..d3f409fce 100644 --- 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" diff --git a/Source/GSToolTips.m b/Source/GSToolTips.m index 49aacad11..9d38da6e0 100644 --- a/Source/GSToolTips.m +++ b/Source/GSToolTips.m @@ -25,18 +25,21 @@ Boston, MA 02110-1301, USA. */ -#include +#import +#import +#import -#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; diff --git a/Source/NSButtonCell.m b/Source/NSButtonCell.m index 7acbc7208..0f15acc96 100644 --- a/Source/NSButtonCell.m +++ b/Source/NSButtonCell.m @@ -32,11 +32,12 @@ */ #import "config.h" -#import #import -#import -#import +#import #import +#import +#import +#import #import #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" diff --git a/Source/NSCell.m b/Source/NSCell.m index 2b0ea5fe0..e589fd311 100644 --- 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" diff --git a/Source/NSMenuView.m b/Source/NSMenuView.m index 182becef9..b7c34d706 100644 --- a/Source/NSMenuView.m +++ b/Source/NSMenuView.m @@ -32,9 +32,9 @@ #import #import #import +#import #import #import -//#import #import #import #import diff --git a/Source/NSOutlineView.m b/Source/NSOutlineView.m index 2e53ec79b..5e5d65ead 100644 --- a/Source/NSOutlineView.m +++ b/Source/NSOutlineView.m @@ -31,31 +31,32 @@ Boston, MA 02110-1301, USA. */ -#include -#include -#include -#include -#include -#include -#include -#include -#include +#import +#import +#import +#import +#import +#import +#import +#import +#import +#import -#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 diff --git a/Source/NSPageLayout.m b/Source/NSPageLayout.m index ea1825b92..052e975cc 100644 --- a/Source/NSPageLayout.m +++ b/Source/NSPageLayout.m @@ -29,6 +29,7 @@ Boston, MA 02110-1301, USA. */ +#import #import #import #import diff --git a/Source/NSPrintInfo.m b/Source/NSPrintInfo.m index b7b5b2ec6..020ddda73 100644 --- a/Source/NSPrintInfo.m +++ b/Source/NSPrintInfo.m @@ -30,13 +30,14 @@ Boston, MA 02110-1301, USA. */ -#include -#include -#include -#include "AppKit/NSPrinter.h" -#include "AppKit/NSPrintInfo.h" -#include "GNUstepGUI/GSPrinting.h" -#include "GSGuiPrivate.h" +#import +#import +#import +#import +#import "AppKit/NSPrinter.h" +#import "AppKit/NSPrintInfo.h" +#import "GNUstepGUI/GSPrinting.h" +#import "GSGuiPrivate.h" // Class variables: static NSPrintInfo *sharedPrintInfo = nil; diff --git a/Source/NSRulerView.m b/Source/NSRulerView.m index 68e12a40f..73b334fda 100644 --- a/Source/NSRulerView.m +++ b/Source/NSRulerView.m @@ -26,21 +26,22 @@ */ #include -#include "config.h" +#import "config.h" -#include -#include -#include -#include -#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 +#import +#import +#import +#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 diff --git a/Source/NSSecureTextField.m b/Source/NSSecureTextField.m index 3327435dc..abfc5a171 100644 --- a/Source/NSSecureTextField.m +++ b/Source/NSSecureTextField.m @@ -29,18 +29,19 @@ Boston, MA 02110-1301, USA. */ -#include "config.h" -#include +#import "config.h" +#import -#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 diff --git a/Source/NSTabViewItem.m b/Source/NSTabViewItem.m index 73d01964a..cd820dccc 100644 --- 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 diff --git a/Source/NSTableColumn.m b/Source/NSTableColumn.m index 4f5cdbf12..fdd820f06 100644 --- a/Source/NSTableColumn.m +++ b/Source/NSTableColumn.m @@ -62,6 +62,7 @@ */ +#import #import #import #import diff --git a/Source/NSTableView.m b/Source/NSTableView.m index bde9e4201..5c6f1887f 100644 --- a/Source/NSTableView.m +++ b/Source/NSTableView.m @@ -30,40 +30,41 @@ Boston, MA 02110-1301, USA. */ -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#import +#import +#import +#import +#import +#import +#import +#import +#import +#import +#import +#import +#import -#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 static NSNotificationCenter *nc = nil; diff --git a/Source/NSTextFieldCell.m b/Source/NSTextFieldCell.m index 690cc7fad..9c2754eed 100644 --- a/Source/NSTextFieldCell.m +++ b/Source/NSTextFieldCell.m @@ -28,17 +28,18 @@ Boston, MA 02110-1301, USA. */ -#include "config.h" -#include -#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 +#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 diff --git a/Source/NSToolbarItem.m b/Source/NSToolbarItem.m index 3a1034cb7..7b1a91b47 100644 --- a/Source/NSToolbarItem.m +++ b/Source/NSToolbarItem.m @@ -29,30 +29,31 @@ Boston, MA 02110-1301, USA. */ -#include -#include -#include -#include -#include -#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 +#import +#import +#import +#import +#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