diff --git a/ChangeLog b/ChangeLog index b517f62c3..3ae719a47 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,104 @@ +2011-03-04 Fred Kiefer + + * Headers/AppKit/PSOperators.h + * Source/NSFontPanel.m + * Source/NSSound.m + * Source/NSTextAttachment.m + * Source/NSOpenGLPixelFormat.m + * Source/GSThemeOpenSavePanels.m + * Source/NSTableHeaderCell.m + * Source/GSTypesetter.m + * Source/NSAlert.m + * Source/NSOpenPanel.m + * Source/NSImageCell.m + * Source/NSManagedObjectContext.h + * Source/GSGormLoader.m + * Source/NSText.m + * Source/NSTokenField.m + * Source/NSParagraphStyle.m + * Source/NSManagedObjectContext.m + * Source/GNUmakefile + * Source/NSTableHeaderView.m + * Source/NSTextTable.m + * Source/NSTextBlock.m + * Source/NSFontManager.m + * Source/NSFormCell.m + * Source/NSLevelIndicator.m + * Source/NSMatrix.m + * Source/NSTextTableBlock.m + * Source/NSObjectController.m + * Source/NSOpenGLView.m + * Source/NSDataLinkManager.m + * Source/GSThemeInspector.m + * Source/GSStandardWindowDecorationView.m + * Source/NSInputServer.m + * Source/NSSplitView.m + * Source/NSImageRep.m + * Source/NSBezierPath.m + * Source/GSTextStorage.h + * Source/GSNibLoading.m + * Source/NSResponder.m + * Source/NSColorWell.m + * Source/GSTextStorage.m + * Source/NSForm.m + * Source/NSApplication.m + * Source/GSGuiPrivate.h + * Source/NSComboBox.m + * Source/NSMovieView.m + * Source/NSSavePanel.m + * Source/NSMovie.m + * Source/GSThemeMenu.m + * Source/NSMenuItemCell.m + * Source/NSPrinter.m + * Source/NSPasteboard.m + * Source/NSTextContainer.m + * Source/NSButtonImageSource.h + * Source/GSToolbarCustomizationPalette.h + * Source/NSFontDescriptor.m + * Source/GSTrackingRect.m + * Source/NSCursor.m + * Source/NSPrintOperation.m + * Source/GSSlideView.h + * Source/NSControl.m + * Source/NSInterfaceStyle.m + * Source/NSDocumentFrameworkPrivate.h + * Source/NSTokenFieldCell.m + * Source/GSSlideView.m + * Source/NSOpenGLContext.m + * Source/NSInputManager.m + * Source/NSRulerMarker.m + * Source/NSToolbarItemGroup.m + * Source/NSProgressIndicator.m + * Source/NSLevelIndicatorCell.m + * Source/NSTextStorage.m + * Source/NSFileWrapper.m + * Source/NSDocumentController.m + * Source/NSDrawer.m + * Source/NSCustomImageRep.m + * Source/NSMenuView.m + * Source/NSHelpPanel.m + * Source/NSComboBoxCell.m + * Source/NSSegmentedCell.m + * Source/NSStepperCell.m + * Source/NSDataLink.m + * Source/tiff.m + * Source/NSScrollView.m + * Source/NSEPSImageRep.m + * Source/NSUserDefaultsController.m + * Source/NSSegmentedControl.m + * Source/GSTable.m + * Source/NSKeyValueBinding.m + * Source/NSTextList.m + * Source/NSEvent.m + * Source/NSController.m + * Source/NSSelection.m + * Source/NSTextField.m + * Source/GSToolTips.h + * Source/NSToolbarFrameworkPrivate.h + * Source/NSAnimation.m + * Source/NSSpeechSynthesizer.m: Replace #include -> #import + * Source/NSParagraphStyle.m: Use GSClassSwizzle. + 2011-03-02 Fred Kiefer * Source/NSImage.m: Remove the -awakeAfterUsingCoder: method as @@ -91,7 +192,7 @@ * Source/NSWindow.m, * Source/NSToolbar.m, * Source/NSScroller.m, - * Source/NSTextView.m: Remove diract usage of isa. + * Source/NSTextView.m: Remove direct usage of isa. * Source/GSBindingHelpers.h: Replace #include with #import. 2011-02-19 Richard Frith-Macdonald diff --git a/Headers/AppKit/PSOperators.h b/Headers/AppKit/PSOperators.h index a103b0396..7148a0d34 100644 --- a/Headers/AppKit/PSOperators.h +++ b/Headers/AppKit/PSOperators.h @@ -27,7 +27,7 @@ #ifndef _PSOperators_h_INCLUDE #define _PSOperators_h_INCLUDE -#include +#import #if OS_API_VERSION(GS_API_NONE, GS_API_NONE) #define DEFCTXT GSCurrentContext() diff --git a/Source/GNUmakefile b/Source/GNUmakefile index 2c75eada9..82c34d872 100644 --- a/Source/GNUmakefile +++ b/Source/GNUmakefile @@ -110,6 +110,7 @@ NSKeyValueBinding.m \ NSLayoutManager.m \ NSLevelIndicator.m \ NSLevelIndicatorCell.m \ +NSManagedObjectContext.m \ NSMatrix.m \ NSMenu.m \ NSMenuView.m \ @@ -176,6 +177,8 @@ NSTextList.m \ NSTextStorage.m \ NSTextTable.m \ NSTextTableBlock.m \ +NSTextView.m \ +NSTextView_actions.m \ NSToolbar.m \ NSToolbarItem.m \ NSToolbarItemGroup.m \ @@ -199,13 +202,6 @@ GSServicesManager.m \ tiff.m \ externs.m \ linking.m \ -GSTheme.m \ -GSThemeDrawing.m \ -GSThemeInspector.m \ -GSThemeMenu.m \ -GSThemeOpenSavePanels.m \ -GSThemePanel.m \ -GSThemeTools.m \ GSDragView.m \ GSFontInfo.m \ GSTable.m \ @@ -213,8 +209,6 @@ GSHbox.m \ GSVbox.m \ GSKeyBindingAction.m \ GSKeyBindingTable.m \ -NSTextView.m \ -NSTextView_actions.m \ GSTextFinder.m \ GSLayoutManager.m \ GSTypesetter.m \ @@ -222,6 +216,13 @@ GSHorizontalTypesetter.m \ GSGormLoading.m \ GSIconManager.m \ GSNibLoading.m \ +GSTheme.m \ +GSThemeDrawing.m \ +GSThemeInspector.m \ +GSThemeMenu.m \ +GSThemeOpenSavePanels.m \ +GSThemePanel.m \ +GSThemeTools.m \ GSTitleView.m \ GSToolTips.m \ GSToolbarView.m \ @@ -237,7 +238,6 @@ GSGormLoader.m \ GSGModelLoader.m \ GSNibLoader.m \ GSXibLoader.m \ -NSManagedObjectContext.m \ GSHelpAttachment.m # Turn off NSMenuItem warning that NSMenuItem conforms to , diff --git a/Source/GSGormLoader.m b/Source/GSGormLoader.m index d3828759f..3d6719260 100644 --- a/Source/GSGormLoader.m +++ b/Source/GSGormLoader.m @@ -37,8 +37,8 @@ #import #import -#import -#import +#import "AppKit/NSApplication.h" +#import "AppKit/NSImage.h" #import "GNUstepGUI/GSModelLoaderFactory.h" #import "GNUstepGUI/GSGormLoading.h" diff --git a/Source/GSGuiPrivate.h b/Source/GSGuiPrivate.h index d41b0fa7c..dd97a3a97 100644 --- a/Source/GSGuiPrivate.h +++ b/Source/GSGuiPrivate.h @@ -30,7 +30,7 @@ #ifndef _GNUstep_H_GSGuiPrivate #define _GNUstep_H_GSGuiPrivate -#include +#import #include "GNUstepBase/preface.h" /* diff --git a/Source/GSNibLoading.m b/Source/GSNibLoading.m index 1ecf3b485..c6724f47d 100644 --- a/Source/GSNibLoading.m +++ b/Source/GSNibLoading.m @@ -56,7 +56,7 @@ #define GSI_ARRAY_RETAIN(A, X) RETAIN((X).obj) #define GSI_ARRAY_RELEASE(A, X) RELEASE((X).obj) #define GSI_ARRAY_TYPES GSUNION_OBJ -#import +#include #import "GNUstepGUI/GSNibLoading.h" #import "AppKit/NSApplication.h" diff --git a/Source/GSSlideView.h b/Source/GSSlideView.h index 56e8c62a0..4239bf6c0 100644 --- a/Source/GSSlideView.h +++ b/Source/GSSlideView.h @@ -27,8 +27,8 @@ Boston, MA 02110-1301, USA. */ -#include -#include "AppKit/NSView.h" +#import +#import "AppKit/NSView.h" @class NSCell; diff --git a/Source/GSSlideView.m b/Source/GSSlideView.m index add8156e3..2d8b8b37c 100644 --- a/Source/GSSlideView.m +++ b/Source/GSSlideView.m @@ -27,16 +27,16 @@ Boston, MA 02110-1301, USA. */ -#include -#include "AppKit/NSApplication.h" -#include "AppKit/NSCell.h" -#include "AppKit/NSEvent.h" -#include "AppKit/NSImage.h" -#include "AppKit/NSView.h" -#include "AppKit/NSWindow.h" +#import +#import "AppKit/NSApplication.h" +#import "AppKit/NSCell.h" +#import "AppKit/NSEvent.h" +#import "AppKit/NSImage.h" +#import "AppKit/NSView.h" +#import "AppKit/NSWindow.h" -#include "GNUstepGUI/GSDisplayServer.h" -#include "GSSlideView.h" +#import "GNUstepGUI/GSDisplayServer.h" +#import "GSSlideView.h" #include // Minimal slide distance per step in pixel diff --git a/Source/GSStandardWindowDecorationView.m b/Source/GSStandardWindowDecorationView.m index 3a0051f97..4442e43d7 100644 --- a/Source/GSStandardWindowDecorationView.m +++ b/Source/GSStandardWindowDecorationView.m @@ -24,23 +24,23 @@ Boston, MA 02110-1301, USA. */ -#include -#include +#import +#import -#include "AppKit/NSApplication.h" -#include "AppKit/NSAttributedString.h" -#include "AppKit/NSButton.h" -#include "AppKit/NSEvent.h" -#include "AppKit/NSImage.h" -#include "AppKit/NSParagraphStyle.h" -#include "AppKit/NSScreen.h" -#include "AppKit/NSStringDrawing.h" -#include "AppKit/NSWindow.h" -#include "AppKit/PSOperators.h" -#include "GNUstepGUI/GSDisplayServer.h" -#include "GNUstepGUI/GSTheme.h" +#import "AppKit/NSApplication.h" +#import "AppKit/NSAttributedString.h" +#import "AppKit/NSButton.h" +#import "AppKit/NSEvent.h" +#import "AppKit/NSImage.h" +#import "AppKit/NSParagraphStyle.h" +#import "AppKit/NSScreen.h" +#import "AppKit/NSStringDrawing.h" +#import "AppKit/NSWindow.h" +#import "AppKit/PSOperators.h" +#import "GNUstepGUI/GSDisplayServer.h" +#import "GNUstepGUI/GSTheme.h" -#include +#import @interface GSStandardWindowDecorationView (GSTheme) - (void) _themeDidActivate: (NSNotification*)notification; diff --git a/Source/GSTable.m b/Source/GSTable.m index 01d006324..d5283d84b 100644 --- a/Source/GSTable.m +++ b/Source/GSTable.m @@ -26,7 +26,7 @@ Boston, MA 02110-1301, USA. */ -#include "GNUstepGUI/GSTable.h" +#import "GNUstepGUI/GSTable.h" @interface GSTable (Private) -(void) _updateForNewFrameSize: (NSSize)newFrameSize; diff --git a/Source/GSTextStorage.h b/Source/GSTextStorage.h index fee85926e..3a3ba5cd2 100644 --- a/Source/GSTextStorage.h +++ b/Source/GSTextStorage.h @@ -28,7 +28,7 @@ Boston, MA 02110-1301, USA. */ -#include "AppKit/NSTextStorage.h" +#import "AppKit/NSTextStorage.h" @class NSMutableString; @class NSMutableArray; diff --git a/Source/GSTextStorage.m b/Source/GSTextStorage.m index 1ce84c23c..d30c20ce4 100644 --- a/Source/GSTextStorage.m +++ b/Source/GSTextStorage.m @@ -65,7 +65,6 @@ #define GSI_MAP_KTYPES GSUNION_OBJ #define GSI_MAP_VTYPES GSUNION_INT #define GSI_MAP_NOCLEAN 1 - #include static NSDictionary *blank; diff --git a/Source/GSThemeInspector.m b/Source/GSThemeInspector.m index 94c6d724c..95a338a51 100644 --- a/Source/GSThemeInspector.m +++ b/Source/GSThemeInspector.m @@ -26,14 +26,14 @@ Boston, MA 02110-1301, USA. */ -#include "AppKit/NSImageView.h" -#include "AppKit/NSScrollView.h" -#include "AppKit/NSTextField.h" -#include "AppKit/NSTextContainer.h" -#include "AppKit/NSTextView.h" -#include "AppKit/NSWindow.h" -#include "GSThemePrivate.h" -#include "GSGuiPrivate.h" +#import "AppKit/NSImageView.h" +#import "AppKit/NSScrollView.h" +#import "AppKit/NSTextField.h" +#import "AppKit/NSTextContainer.h" +#import "AppKit/NSTextView.h" +#import "AppKit/NSWindow.h" +#import "GSThemePrivate.h" +#import "GSGuiPrivate.h" static NSTextField * new_label (NSString *value) diff --git a/Source/GSThemeMenu.m b/Source/GSThemeMenu.m index 2d1639c5f..50e2822c8 100644 --- a/Source/GSThemeMenu.m +++ b/Source/GSThemeMenu.m @@ -26,17 +26,17 @@ Boston, MA 02110-1301, USA. */ -#include -#include -#include -#include -#include -#include +#import +#import +#import "AppKit/NSMenu.h" +#import "AppKit/NSWindow.h" +#import "AppKit/NSMenuView.h" +#import "AppKit/NSApplication.h" -#include -#include +#import "GNUstepGUI/GSTheme.h" +#import "GNUstepGUI/GSWindowDecorationView.h" -#include "NSToolbarFrameworkPrivate.h" +#import "NSToolbarFrameworkPrivate.h" @interface NSWindow (Private) - (GSWindowDecorationView *) windowView; diff --git a/Source/GSThemeOpenSavePanels.m b/Source/GSThemeOpenSavePanels.m index 4b880cd27..665e08cbc 100644 --- a/Source/GSThemeOpenSavePanels.m +++ b/Source/GSThemeOpenSavePanels.m @@ -26,9 +26,9 @@ Boston, MA 02110-1301, USA. */ -#include "AppKit/NSOpenPanel.h" -#include "AppKit/NSSavePanel.h" -#include "GNUstepGUI/GSTheme.h" +#import "AppKit/NSOpenPanel.h" +#import "AppKit/NSSavePanel.h" +#import "GNUstepGUI/GSTheme.h" @implementation GSTheme (OpenSavePanels) /** diff --git a/Source/GSToolTips.h b/Source/GSToolTips.h index 8482ca9b5..8383be21e 100644 --- a/Source/GSToolTips.h +++ b/Source/GSToolTips.h @@ -25,9 +25,8 @@ Boston, MA 02110-1301, USA. */ -#include -#include "GNUstepGUI/GSTrackingRect.h" - +#import +#import "GNUstepGUI/GSTrackingRect.h" @class NSTimer; @class NSView; diff --git a/Source/GSToolbarCustomizationPalette.h b/Source/GSToolbarCustomizationPalette.h index 964119698..413945f5c 100644 --- a/Source/GSToolbarCustomizationPalette.h +++ b/Source/GSToolbarCustomizationPalette.h @@ -29,7 +29,7 @@ #ifndef _GNUstep_H_GSToolbarCustomizationPalette #define _GNUstep_H_GSToolbarCustomizationPalette -#include +#import @class NSMutableArray; @class NSToolbar; diff --git a/Source/GSTrackingRect.m b/Source/GSTrackingRect.m index 3c75bd9d7..dc805af86 100644 --- a/Source/GSTrackingRect.m +++ b/Source/GSTrackingRect.m @@ -28,7 +28,7 @@ */ #include "config.h" -#include "GNUstepGUI/GSTrackingRect.h" +#import "GNUstepGUI/GSTrackingRect.h" @implementation GSTrackingRect diff --git a/Source/GSTypesetter.m b/Source/GSTypesetter.m index 8856923d1..f3afcead9 100644 --- a/Source/GSTypesetter.m +++ b/Source/GSTypesetter.m @@ -25,14 +25,11 @@ Boston, MA 02110-1301, USA. */ -#include "GNUstepGUI/GSTypesetter.h" - -#include "GNUstepGUI/GSLayoutManager.h" -#include "GNUstepGUI/GSHorizontalTypesetter.h" - -#include -#include "AppKit/NSAttributedString.h" - +#import +#import "AppKit/NSAttributedString.h" +#import "GNUstepGUI/GSTypesetter.h" +#import "GNUstepGUI/GSLayoutManager.h" +#import "GNUstepGUI/GSHorizontalTypesetter.h" @implementation GSTypesetter diff --git a/Source/NSAlert.m b/Source/NSAlert.m index 6780bfa0c..77573b828 100644 --- a/Source/NSAlert.m +++ b/Source/NSAlert.m @@ -58,7 +58,7 @@ #import "AppKit/NSScreen.h" #import "AppKit/NSScroller.h" #import "AppKit/NSScrollView.h" -#import +#import "AppKit/NSStringDrawing.h" #import "AppKit/NSTextField.h" #import "AppKit/NSTextView.h" diff --git a/Source/NSAnimation.m b/Source/NSAnimation.m index 2057ddd67..cde56f1c6 100644 --- a/Source/NSAnimation.m +++ b/Source/NSAnimation.m @@ -35,13 +35,13 @@ #import #import #import -#include +#import -#import -#import +#import "AppKit/NSAnimation.h" +#import "AppKit/NSApplication.h" // needed by NSViewAnimation -#import -#import +#import "AppKit/NSView.h" +#import "AppKit/NSWindow.h" #include diff --git a/Source/NSApplication.m b/Source/NSApplication.m index 6df647220..769354b62 100644 --- a/Source/NSApplication.m +++ b/Source/NSApplication.m @@ -57,7 +57,7 @@ #import #ifndef LIB_FOUNDATION_LIBRARY -#include +#import #endif #import "AppKit/AppKitExceptions.h" diff --git a/Source/NSBezierPath.m b/Source/NSBezierPath.m index 46fde85a8..4334e00b1 100644 --- a/Source/NSBezierPath.m +++ b/Source/NSBezierPath.m @@ -79,7 +79,7 @@ typedef struct _PathElement #ifdef GSIArray #undef GSIArray #endif -#import +#include @interface GSBezierPath : NSBezierPath { diff --git a/Source/NSButtonImageSource.h b/Source/NSButtonImageSource.h index 3112deb53..3760b79b8 100644 --- a/Source/NSButtonImageSource.h +++ b/Source/NSButtonImageSource.h @@ -29,9 +29,9 @@ #define _GNUstep_H_NSImageSource #import -#import -#import -#import +#import + +@class NSString, NSMutableDictionary; /** * Handle images for button cell theming. @@ -44,14 +44,10 @@ + (BOOL) archiveButtonImageSourceWithName: (NSString*)name toDirectory: (NSString*)path; + (id) buttonImageSourceWithName: (NSString*)name; -- (id) copyWithZone: (NSZone*)zone; -- (void) dealloc; -- (void) encodeWithCode: (NSCoder*)aCoder; - (id) imageForState: (struct NSButtonState)state; -- (id) initWithCoder: (NSCoder*)aCoder; @end -@interface NSButtonCell (NSButtonImageSource) +@interface NSButtonCell (NSButtonImageSource) - (id) _buttonImageSource; - (void) _setButtonImageSource: (id)source; @end diff --git a/Source/NSButtonImageSource.m b/Source/NSButtonImageSource.m index 246d80466..2d2e90520 100644 --- a/Source/NSButtonImageSource.m +++ b/Source/NSButtonImageSource.m @@ -25,9 +25,11 @@ Boston, MA 02110-1301, USA. */ +#import +#import +#import #import "NSButtonImageSource.h" - @implementation NSButtonImageSource NSMutableDictionary *sources = nil; diff --git a/Source/NSColorWell.m b/Source/NSColorWell.m index 9f86feb01..8a022fa35 100644 --- a/Source/NSColorWell.m +++ b/Source/NSColorWell.m @@ -29,20 +29,20 @@ */ #include "config.h" -#include "AppKit/NSActionCell.h" -#include "AppKit/NSApplication.h" -#include "AppKit/NSBezierPath.h" -#include "AppKit/NSColorPanel.h" -#include "AppKit/NSColorWell.h" -#include "AppKit/NSColor.h" -#include "AppKit/NSDragging.h" -#include "AppKit/NSEvent.h" -#include "AppKit/NSGraphics.h" -#include "AppKit/NSPasteboard.h" -#include "AppKit/NSWindow.h" -#include "GNUstepGUI/GSTheme.h" -#include -#include +#import "AppKit/NSActionCell.h" +#import "AppKit/NSApplication.h" +#import "AppKit/NSBezierPath.h" +#import "AppKit/NSColorPanel.h" +#import "AppKit/NSColorWell.h" +#import "AppKit/NSColor.h" +#import "AppKit/NSDragging.h" +#import "AppKit/NSEvent.h" +#import "AppKit/NSGraphics.h" +#import "AppKit/NSPasteboard.h" +#import "AppKit/NSWindow.h" +#import "GNUstepGUI/GSTheme.h" +#import +#import #include static NSString *GSColorWellDidBecomeExclusiveNotification = diff --git a/Source/NSComboBox.m b/Source/NSComboBox.m index 060bc24a6..8b418840f 100644 --- a/Source/NSComboBox.m +++ b/Source/NSComboBox.m @@ -24,12 +24,12 @@ Boston, MA 02110-1301, USA. */ -#include -#include -#include "AppKit/NSComboBox.h" -#include "AppKit/NSComboBoxCell.h" -#include "AppKit/NSEvent.h" -#include "AppKit/NSTextView.h" +#import +#import +#import "AppKit/NSComboBox.h" +#import "AppKit/NSComboBoxCell.h" +#import "AppKit/NSEvent.h" +#import "AppKit/NSTextView.h" /* * Class variables diff --git a/Source/NSComboBoxCell.m b/Source/NSComboBoxCell.m index d0df4c83d..169900e37 100644 --- a/Source/NSComboBoxCell.m +++ b/Source/NSComboBoxCell.m @@ -26,34 +26,34 @@ Boston, MA 02110-1301, USA. */ -#include -#include -#include -#include -#include -#include -#include -#include "AppKit/NSApplication.h" -#include "AppKit/NSBezierPath.h" -#include "AppKit/NSBox.h" -#include "AppKit/NSBrowser.h" -#include "AppKit/NSBrowserCell.h" -#include "AppKit/NSButtonCell.h" -#include "AppKit/NSComboBox.h" -#include "AppKit/NSComboBoxCell.h" -#include "AppKit/NSEvent.h" -#include "AppKit/NSGraphicsContext.h" -#include "AppKit/NSImage.h" -#include "AppKit/NSMatrix.h" -#include "AppKit/NSPanel.h" -#include "AppKit/NSScreen.h" -#include "AppKit/NSScroller.h" -#include "AppKit/NSScrollView.h" -#include "AppKit/NSTableColumn.h" -#include "AppKit/NSTableView.h" -#include "AppKit/NSTextView.h" -#include "GNUstepGUI/GSTheme.h" -#include "GSGuiPrivate.h" +#import +#import +#import +#import +#import +#import +#import +#import "AppKit/NSApplication.h" +#import "AppKit/NSBezierPath.h" +#import "AppKit/NSBox.h" +#import "AppKit/NSBrowser.h" +#import "AppKit/NSBrowserCell.h" +#import "AppKit/NSButtonCell.h" +#import "AppKit/NSComboBox.h" +#import "AppKit/NSComboBoxCell.h" +#import "AppKit/NSEvent.h" +#import "AppKit/NSGraphicsContext.h" +#import "AppKit/NSImage.h" +#import "AppKit/NSMatrix.h" +#import "AppKit/NSPanel.h" +#import "AppKit/NSScreen.h" +#import "AppKit/NSScroller.h" +#import "AppKit/NSScrollView.h" +#import "AppKit/NSTableColumn.h" +#import "AppKit/NSTableView.h" +#import "AppKit/NSTextView.h" +#import "GNUstepGUI/GSTheme.h" +#import "GSGuiPrivate.h" static NSNotificationCenter *nc; static const BOOL ForceBrowser = NO; diff --git a/Source/NSControl.m b/Source/NSControl.m index fe7dd96d1..e36c30c9d 100644 --- a/Source/NSControl.m +++ b/Source/NSControl.m @@ -30,20 +30,20 @@ #include "config.h" -#include -#include -#include -#include "AppKit/NSActionCell.h" -#include "AppKit/NSApplication.h" -#include "AppKit/NSCell.h" -#include "AppKit/NSControl.h" -#include "AppKit/NSColor.h" -#include "AppKit/NSEvent.h" -#include "AppKit/NSKeyValueBinding.h" -#include "AppKit/NSTextStorage.h" -#include "AppKit/NSTextView.h" -#include "AppKit/NSWindow.h" -#include "GSBindingHelpers.h" +#import +#import +#import +#import "AppKit/NSActionCell.h" +#import "AppKit/NSApplication.h" +#import "AppKit/NSCell.h" +#import "AppKit/NSControl.h" +#import "AppKit/NSColor.h" +#import "AppKit/NSEvent.h" +#import "AppKit/NSKeyValueBinding.h" +#import "AppKit/NSTextStorage.h" +#import "AppKit/NSTextView.h" +#import "AppKit/NSWindow.h" +#import "GSBindingHelpers.h" /* * Class variables diff --git a/Source/NSController.m b/Source/NSController.m index 7f527c94e..43cd9cd0c 100644 --- a/Source/NSController.m +++ b/Source/NSController.m @@ -26,10 +26,10 @@ Boston, MA 02110-1301, USA. */ -#include -#include -#include -#include +#import +#import +#import +#import "AppKit/NSController.h" @implementation NSController diff --git a/Source/NSCursor.m b/Source/NSCursor.m index 6f06b7e56..6a727294f 100644 --- a/Source/NSCursor.m +++ b/Source/NSCursor.m @@ -28,18 +28,18 @@ Boston, MA 02110-1301, USA. */ -#include -#include -#include -#include +#import +#import +#import +#import -#include "AppKit/NSColor.h" -#include "AppKit/NSCursor.h" -#include "AppKit/NSGraphics.h" -#include "AppKit/NSImage.h" -#include "AppKit/NSBitmapImageRep.h" +#import "AppKit/NSColor.h" +#import "AppKit/NSCursor.h" +#import "AppKit/NSGraphics.h" +#import "AppKit/NSImage.h" +#import "AppKit/NSBitmapImageRep.h" -#include "GNUstepGUI/GSDisplayServer.h" +#import "GNUstepGUI/GSDisplayServer.h" // Class variables static NSMutableArray *gnustep_gui_cursor_stack; diff --git a/Source/NSCustomImageRep.m b/Source/NSCustomImageRep.m index 1ede4ba4d..43fd4733d 100644 --- a/Source/NSCustomImageRep.m +++ b/Source/NSCustomImageRep.m @@ -27,13 +27,13 @@ */ #include "config.h" -#include -#include -#include "AppKit/NSCustomImageRep.h" -#include "AppKit/NSGraphicsContext.h" -#include "AppKit/NSView.h" -#include "AppKit/NSColor.h" -#include "AppKit/DPSOperators.h" +#import +#import +#import "AppKit/NSCustomImageRep.h" +#import "AppKit/NSGraphicsContext.h" +#import "AppKit/NSView.h" +#import "AppKit/NSColor.h" +#import "AppKit/DPSOperators.h" /**

TODO : Desciption

*/ diff --git a/Source/NSDataLink.m b/Source/NSDataLink.m index 9c6a37294..b415ef921 100644 --- a/Source/NSDataLink.m +++ b/Source/NSDataLink.m @@ -27,14 +27,14 @@ */ #include "config.h" -#include -#include -#include -#include "AppKit/NSDataLink.h" -#include "AppKit/NSDataLinkManager.h" -#include "AppKit/NSPasteboard.h" -#include "AppKit/NSSavePanel.h" -#include "AppKit/NSSelection.h" +#import +#import +#import +#import "AppKit/NSDataLink.h" +#import "AppKit/NSDataLinkManager.h" +#import "AppKit/NSPasteboard.h" +#import "AppKit/NSSavePanel.h" +#import "AppKit/NSSelection.h" @implementation NSDataLink diff --git a/Source/NSDataLinkManager.m b/Source/NSDataLinkManager.m index 141323bee..99436c729 100644 --- a/Source/NSDataLinkManager.m +++ b/Source/NSDataLinkManager.m @@ -27,13 +27,13 @@ */ #include "config.h" -#include -#include -#include -#include -#include -#include -#include +#import +#import +#import +#import +#import "AppKit/NSDataLinkManager.h" +#import "AppKit/NSDataLink.h" +#import "AppKit/NSPasteboard.h" @interface NSDataLink (Private) - (void) setLastUpdateTime: (NSDate *)date; diff --git a/Source/NSDocumentController.m b/Source/NSDocumentController.m index 8f7fb7be9..24d711f55 100644 --- a/Source/NSDocumentController.m +++ b/Source/NSDocumentController.m @@ -28,24 +28,24 @@ Boston, MA 02110-1301, USA. */ -#include -#include -#include -#include -#include -#include -#include -#include -#include +#import +#import +#import +#import +#import +#import +#import +#import +#import -#include "AppKit/NSDocumentController.h" -#include "AppKit/NSOpenPanel.h" -#include "AppKit/NSApplication.h" -#include "AppKit/NSMenu.h" -#include "AppKit/NSMenuItem.h" -#include "AppKit/NSWorkspace.h" -#include "NSDocumentFrameworkPrivate.h" -#include "GSGuiPrivate.h" +#import "AppKit/NSDocumentController.h" +#import "AppKit/NSOpenPanel.h" +#import "AppKit/NSApplication.h" +#import "AppKit/NSMenu.h" +#import "AppKit/NSMenuItem.h" +#import "AppKit/NSWorkspace.h" +#import "NSDocumentFrameworkPrivate.h" +#import "GSGuiPrivate.h" static NSString *NSTypesKey = @"NSTypes"; static NSString *NSNameKey = @"NSName"; diff --git a/Source/NSDocumentFrameworkPrivate.h b/Source/NSDocumentFrameworkPrivate.h index e4452cb55..881f7f5d6 100644 --- a/Source/NSDocumentFrameworkPrivate.h +++ b/Source/NSDocumentFrameworkPrivate.h @@ -30,7 +30,9 @@ #ifndef _GNUstep_H_NSDocumentFramworkPrivate #define _GNUstep_H_NSDocumentFramworkPrivate -#include +#import "AppKit/NSDocument.h" +#import "AppKit/NSDocumentController.h" +#import "AppKit/NSWindowController.h" @class NSTimer; @@ -50,18 +52,12 @@ - (IBAction) _openRecentDocument: (id)sender; @end - -#include - @interface NSDocument (Private) - (void)_removeWindowController:(NSWindowController *)controller; - (NSWindow *)_transferWindowOwnership; - (void)_removeAutosavedContentsFile; @end - -#include - @interface NSWindowController (Private) - (void)_windowDidLoad; @end diff --git a/Source/NSDrawer.m b/Source/NSDrawer.m index ec2c908c8..dfa7bb74b 100644 --- a/Source/NSDrawer.m +++ b/Source/NSDrawer.m @@ -30,18 +30,18 @@ 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 "AppKit/NSWindow.h" +#import "AppKit/NSBox.h" +#import "AppKit/NSView.h" +#import "AppKit/NSDrawer.h" +#import "AppKit/NSGraphics.h" static NSNotificationCenter *nc = nil; diff --git a/Source/NSEPSImageRep.m b/Source/NSEPSImageRep.m index 9cb89224d..805e21497 100644 --- a/Source/NSEPSImageRep.m +++ b/Source/NSEPSImageRep.m @@ -26,11 +26,11 @@ Boston, MA 02110-1301, USA. */ -#include -#include -#include -#include "AppKit/NSPasteboard.h" -#include "AppKit/NSEPSImageRep.h" +#import +#import +#import +#import "AppKit/NSPasteboard.h" +#import "AppKit/NSEPSImageRep.h" @implementation NSEPSImageRep diff --git a/Source/NSEvent.m b/Source/NSEvent.m index 64e9ad215..72b8a9832 100644 --- a/Source/NSEvent.m +++ b/Source/NSEvent.m @@ -32,23 +32,23 @@ */ #include "config.h" -#include -#include -#include -#include -#include -#include -#include -#include +#import +#import +#import +#import +#import +#import +#import +#import -#include "AppKit/NSEvent.h" -#include "AppKit/NSApplication.h" -#include "AppKit/NSWindow.h" -#include "AppKit/NSGraphicsContext.h" -#include "AppKit/NSGraphics.h" -#include "AppKit/PSOperators.h" +#import "AppKit/NSEvent.h" +#import "AppKit/NSApplication.h" +#import "AppKit/NSWindow.h" +#import "AppKit/NSGraphicsContext.h" +#import "AppKit/NSGraphics.h" +#import "AppKit/PSOperators.h" -#include "GNUstepGUI/GSDisplayServer.h" +#import "GNUstepGUI/GSDisplayServer.h" /* * gstep-base has a faster mechanism to get the current thread. diff --git a/Source/NSFileWrapper.m b/Source/NSFileWrapper.m index ac1a8c794..ea37151a8 100644 --- a/Source/NSFileWrapper.m +++ b/Source/NSFileWrapper.m @@ -30,17 +30,17 @@ #include "config.h" -#include "AppKit/NSFileWrapper.h" -#include "AppKit/NSFont.h" -#include "AppKit/NSWorkspace.h" -#include -#include -#include -#include -#include -#include -#include -#include +#import +#import +#import +#import +#import +#import +#import +#import +#import "AppKit/NSFileWrapper.h" +#import "AppKit/NSFont.h" +#import "AppKit/NSWorkspace.h" @implementation NSFileWrapper diff --git a/Source/NSFontDescriptor.m b/Source/NSFontDescriptor.m index 8793340d4..2cbbbe38c 100644 --- a/Source/NSFontDescriptor.m +++ b/Source/NSFontDescriptor.m @@ -29,16 +29,16 @@ */ #include "config.h" -#include -#include -#include -#include -#include -#include -#include +#import +#import +#import +#import +#import +#import +#import -#include "AppKit/NSFontDescriptor.h" -#include "AppKit/NSFontManager.h" +#import "AppKit/NSFontDescriptor.h" +#import "AppKit/NSFontManager.h" @interface NSFontManager (GNUstep) - (NSArray *) matchingFontDescriptorsFor: (NSDictionary *)attributes; diff --git a/Source/NSFontManager.m b/Source/NSFontManager.m index c7d700fcd..e8e6f91ad 100644 --- a/Source/NSFontManager.m +++ b/Source/NSFontManager.m @@ -28,20 +28,20 @@ */ #include "config.h" -#include -#include -#include -#include -#include -#include -#include "AppKit/NSFontDescriptor.h" -#include "AppKit/NSFontManager.h" -#include "AppKit/NSApplication.h" -#include "AppKit/NSFont.h" -#include "AppKit/NSFontPanel.h" -#include "AppKit/NSMenu.h" -#include "AppKit/NSMenuItem.h" -#include "GNUstepGUI/GSFontInfo.h" +#import +#import +#import +#import +#import +#import +#import "AppKit/NSFontDescriptor.h" +#import "AppKit/NSFontManager.h" +#import "AppKit/NSApplication.h" +#import "AppKit/NSFont.h" +#import "AppKit/NSFontPanel.h" +#import "AppKit/NSMenu.h" +#import "AppKit/NSMenuItem.h" +#import "GNUstepGUI/GSFontInfo.h" /* diff --git a/Source/NSFontPanel.m b/Source/NSFontPanel.m index 1cf382fad..d25b79eb2 100644 --- a/Source/NSFontPanel.m +++ b/Source/NSFontPanel.m @@ -29,26 +29,26 @@ */ #include "config.h" -#include -#include -#include "AppKit/NSDragging.h" -#include "AppKit/NSFont.h" -#include "AppKit/NSFontPanel.h" -#include "AppKit/NSFontManager.h" -#include "AppKit/NSApplication.h" -#include "AppKit/NSSplitView.h" -#include "AppKit/NSScrollView.h" -#include "AppKit/NSBrowser.h" -#include "AppKit/NSBrowserCell.h" -#include "AppKit/NSTextView.h" -#include "AppKit/NSTextField.h" -#include "AppKit/NSTextFieldCell.h" -#include "AppKit/NSColor.h" -#include "AppKit/NSPanel.h" -#include "AppKit/NSButton.h" -#include "AppKit/NSBox.h" +#import +#import +#import "AppKit/NSDragging.h" +#import "AppKit/NSFont.h" +#import "AppKit/NSFontPanel.h" +#import "AppKit/NSFontManager.h" +#import "AppKit/NSApplication.h" +#import "AppKit/NSSplitView.h" +#import "AppKit/NSScrollView.h" +#import "AppKit/NSBrowser.h" +#import "AppKit/NSBrowserCell.h" +#import "AppKit/NSTextView.h" +#import "AppKit/NSTextField.h" +#import "AppKit/NSTextFieldCell.h" +#import "AppKit/NSColor.h" +#import "AppKit/NSPanel.h" +#import "AppKit/NSButton.h" +#import "AppKit/NSBox.h" -#include "GSGuiPrivate.h" +#import "GSGuiPrivate.h" #define _SAVE_PANEL_X_PAD 5 #define _SAVE_PANEL_Y_PAD 4 diff --git a/Source/NSForm.m b/Source/NSForm.m index e0c0d07d3..4affdb24b 100644 --- a/Source/NSForm.m +++ b/Source/NSForm.m @@ -27,9 +27,9 @@ */ #include "config.h" -#include -#include "AppKit/NSForm.h" -#include "AppKit/NSFormCell.h" +#import +#import "AppKit/NSForm.h" +#import "AppKit/NSFormCell.h" @implementation NSForm diff --git a/Source/NSFormCell.m b/Source/NSFormCell.m index 5dadec7c5..3779b258c 100644 --- a/Source/NSFormCell.m +++ b/Source/NSFormCell.m @@ -29,14 +29,14 @@ */ #include "config.h" -#include -#include "AppKit/NSAttributedString.h" -#include "AppKit/NSColor.h" -#include "AppKit/NSFormCell.h" -#include "AppKit/NSFont.h" -#include "AppKit/NSGraphics.h" -#include "AppKit/NSTextFieldCell.h" -#include "GNUstepGUI/GSTheme.h" +#import +#import "AppKit/NSAttributedString.h" +#import "AppKit/NSColor.h" +#import "AppKit/NSFormCell.h" +#import "AppKit/NSFont.h" +#import "AppKit/NSGraphics.h" +#import "AppKit/NSTextFieldCell.h" +#import "GNUstepGUI/GSTheme.h" /**

TODO Description

*/ diff --git a/Source/NSHelpPanel.m b/Source/NSHelpPanel.m index 6be0f6aeb..6e4abb5eb 100644 --- a/Source/NSHelpPanel.m +++ b/Source/NSHelpPanel.m @@ -25,12 +25,12 @@ */ #include "config.h" -#include "AppKit/NSHelpPanel.h" -#include "AppKit/NSHelpManager.h" -#include "AppKit/NSScrollView.h" -#include "AppKit/NSTextView.h" -#include "AppKit/NSTextContainer.h" -#include "GSGuiPrivate.h" +#import "AppKit/NSHelpPanel.h" +#import "AppKit/NSHelpManager.h" +#import "AppKit/NSScrollView.h" +#import "AppKit/NSTextView.h" +#import "AppKit/NSTextContainer.h" +#import "GSGuiPrivate.h" @implementation NSApplication (NSHelpPanel) diff --git a/Source/NSImageCell.m b/Source/NSImageCell.m index 0fc0626f8..37139bfa7 100644 --- a/Source/NSImageCell.m +++ b/Source/NSImageCell.m @@ -27,14 +27,14 @@ */ #include "config.h" -#include -#include "AppKit/NSAffineTransform.h" -#include "AppKit/NSCell.h" -#include "AppKit/NSGraphics.h" -#include "AppKit/NSImageCell.h" -#include "AppKit/NSImage.h" -#include "GNUstepGUI/GSTheme.h" -#include "GSGuiPrivate.h" +#import +#import "AppKit/NSAffineTransform.h" +#import "AppKit/NSCell.h" +#import "AppKit/NSGraphics.h" +#import "AppKit/NSImageCell.h" +#import "AppKit/NSImage.h" +#import "GNUstepGUI/GSTheme.h" +#import "GSGuiPrivate.h" @implementation NSImageCell diff --git a/Source/NSImageRep.m b/Source/NSImageRep.m index da1875b19..4a22bc07f 100644 --- a/Source/NSImageRep.m +++ b/Source/NSImageRep.m @@ -28,22 +28,22 @@ #include "config.h" #include -#include -#include -#include -#include -#include -#include -#include -#include -#include "AppKit/NSImageRep.h" -#include "AppKit/NSBitmapImageRep.h" -#include "AppKit/NSEPSImageRep.h" -#include "AppKit/NSPasteboard.h" -#include "AppKit/NSGraphicsContext.h" -#include "AppKit/NSView.h" -#include "AppKit/NSColor.h" -#include "AppKit/DPSOperators.h" +#import +#import +#import +#import +#import +#import +#import +#import +#import "AppKit/NSImageRep.h" +#import "AppKit/NSBitmapImageRep.h" +#import "AppKit/NSEPSImageRep.h" +#import "AppKit/NSPasteboard.h" +#import "AppKit/NSGraphicsContext.h" +#import "AppKit/NSView.h" +#import "AppKit/NSColor.h" +#import "AppKit/DPSOperators.h" static NSMutableArray *imageReps = nil; static Class NSImageRep_class = NULL; diff --git a/Source/NSInputManager.m b/Source/NSInputManager.m index 911a5d244..3daa43cb3 100644 --- a/Source/NSInputManager.m +++ b/Source/NSInputManager.m @@ -24,18 +24,18 @@ Boston, MA 02110-1301, USA. */ -#include -#include "AppKit/NSEvent.h" -#include "AppKit/NSInputManager.h" -#include "AppKit/NSInputServer.h" -#include "AppKit/NSText.h" -#include "AppKit/NSHelpManager.h" +#import +#import "AppKit/NSEvent.h" +#import "AppKit/NSInputManager.h" +#import "AppKit/NSInputServer.h" +#import "AppKit/NSText.h" +#import "AppKit/NSHelpManager.h" /* For NSBeep () */ -#include "AppKit/NSGraphics.h" +#import "AppKit/NSGraphics.h" -#include "GSKeyBindingAction.h" -#include "GSKeyBindingTable.h" +#import "GSKeyBindingAction.h" +#import "GSKeyBindingTable.h" /* A table mapping character names to characters, used to interpret the character names found in KeyBindings dictionaries. */ diff --git a/Source/NSInputServer.m b/Source/NSInputServer.m index 6a519d5a9..a78a1db4c 100644 --- a/Source/NSInputServer.m +++ b/Source/NSInputServer.m @@ -24,7 +24,7 @@ Boston, MA 02110-1301, USA. */ -#include "AppKit/NSInputServer.h" +#import "AppKit/NSInputServer.h" @implementation NSInputServer diff --git a/Source/NSInterfaceStyle.m b/Source/NSInterfaceStyle.m index f2e3f3c33..ffc746533 100644 --- a/Source/NSInterfaceStyle.m +++ b/Source/NSInterfaceStyle.m @@ -25,16 +25,16 @@ */ #include "config.h" -#include -#include -#include -#include -#include -#include +#import +#import +#import +#import +#import +#import -#include "AppKit/NSResponder.h" -#include "AppKit/NSInterfaceStyle.h" -#include "GNUstepGUI/GSTheme.h" +#import "AppKit/NSResponder.h" +#import "AppKit/NSInterfaceStyle.h" +#import "GNUstepGUI/GSTheme.h" NSString *NSInterfaceStyleDefault = @"NSInterfaceStyleDefault"; diff --git a/Source/NSKeyValueBinding.m b/Source/NSKeyValueBinding.m index 1ac303c52..ae4b9c5c2 100644 --- a/Source/NSKeyValueBinding.m +++ b/Source/NSKeyValueBinding.m @@ -28,21 +28,21 @@ 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 -#include "AppKit/NSKeyValueBinding.h" -#include "GSBindingHelpers.h" +#import "AppKit/NSKeyValueBinding.h" +#import "GSBindingHelpers.h" @implementation NSObject (NSKeyValueBindingCreation) diff --git a/Source/NSLevelIndicator.m b/Source/NSLevelIndicator.m index 1f181b961..d53f64686 100644 --- a/Source/NSLevelIndicator.m +++ b/Source/NSLevelIndicator.m @@ -27,7 +27,7 @@ Boston, MA 02110-1301, USA. */ -#include +#import "AppKit/NSLevelIndicator.h" static Class cellClass; diff --git a/Source/NSLevelIndicatorCell.m b/Source/NSLevelIndicatorCell.m index bb0f03715..66f50c3ce 100644 --- a/Source/NSLevelIndicatorCell.m +++ b/Source/NSLevelIndicatorCell.m @@ -27,12 +27,12 @@ Boston, MA 02110-1301, USA. */ -#include +#import -#include "AppKit/NSBezierPath.h" -#include "AppKit/NSGraphics.h" -#include "AppKit/NSImage.h" -#include "AppKit/NSLevelIndicatorCell.h" +#import "AppKit/NSBezierPath.h" +#import "AppKit/NSGraphics.h" +#import "AppKit/NSImage.h" +#import "AppKit/NSLevelIndicatorCell.h" @implementation NSLevelIndicatorCell diff --git a/Source/NSManagedObjectContext.h b/Source/NSManagedObjectContext.h index 8d51ef521..9fe5ed9d8 100644 --- a/Source/NSManagedObjectContext.h +++ b/Source/NSManagedObjectContext.h @@ -30,7 +30,7 @@ Boston, MA 02110-1301, USA. */ -#include +#import @class NSMergePolicy; diff --git a/Source/NSManagedObjectContext.m b/Source/NSManagedObjectContext.m index f2413d442..4c89df1b6 100644 --- a/Source/NSManagedObjectContext.m +++ b/Source/NSManagedObjectContext.m @@ -30,12 +30,12 @@ Boston, MA 02110-1301, USA. */ -#include "NSManagedObjectContext.h" -#include -#include -#include -#include -#include +#import "NSManagedObjectContext.h" +#import +#import +#import +#import +#import @interface NSMergePolicy : NSObject { diff --git a/Source/NSMatrix.m b/Source/NSMatrix.m index e66a5a132..6b8348f62 100644 --- a/Source/NSMatrix.m +++ b/Source/NSMatrix.m @@ -52,26 +52,26 @@ #include "config.h" #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#import +#import +#import +#import +#import +#import +#import +#import +#import +#import +#import -#include "AppKit/NSApplication.h" -#include "AppKit/NSButtonCell.h" -#include "AppKit/NSColor.h" -#include "AppKit/NSCursor.h" -#include "AppKit/NSEvent.h" -#include "AppKit/NSGraphics.h" -#include "AppKit/NSMatrix.h" -#include "AppKit/NSWindow.h" +#import "AppKit/NSApplication.h" +#import "AppKit/NSButtonCell.h" +#import "AppKit/NSColor.h" +#import "AppKit/NSCursor.h" +#import "AppKit/NSEvent.h" +#import "AppKit/NSGraphics.h" +#import "AppKit/NSMatrix.h" +#import "AppKit/NSWindow.h" #include diff --git a/Source/NSMenuItemCell.m b/Source/NSMenuItemCell.m index b9d370526..ca12bd61c 100644 --- a/Source/NSMenuItemCell.m +++ b/Source/NSMenuItemCell.m @@ -25,29 +25,29 @@ */ #include "config.h" -#include -#include -#include -#include -#include -#include -#include -#include -#include +#import +#import +#import +#import +#import +#import +#import +#import +#import -#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/NSImage.h" -#include "AppKit/NSMenu.h" -#include "AppKit/NSMenuItemCell.h" -#include "AppKit/NSMenuView.h" -#include "AppKit/NSParagraphStyle.h" -#include "GNUstepGUI/GSTheme.h" -#include "GSGuiPrivate.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/NSImage.h" +#import "AppKit/NSMenu.h" +#import "AppKit/NSMenuItemCell.h" +#import "AppKit/NSMenuView.h" +#import "AppKit/NSParagraphStyle.h" +#import "GNUstepGUI/GSTheme.h" +#import "GSGuiPrivate.h" @implementation NSMenuItemCell diff --git a/Source/NSMenuView.m b/Source/NSMenuView.m index 62776233f..e07f140c7 100644 --- a/Source/NSMenuView.m +++ b/Source/NSMenuView.m @@ -68,7 +68,7 @@ typedef struct _GSCellRect { #ifdef GSIArray #undef GSIArray #endif -#import +#include static NSMapTable *viewInfo = 0; diff --git a/Source/NSMovie.m b/Source/NSMovie.m index bbf29fb31..7dc47be81 100644 --- a/Source/NSMovie.m +++ b/Source/NSMovie.m @@ -26,12 +26,12 @@ Boston, MA 02110-1301, USA. */ -#include -#include -#include -#include -#include -#include +#import +#import +#import +#import +#import "AppKit/NSMovie.h" +#import "AppKit/NSPasteboard.h" @implementation NSMovie diff --git a/Source/NSMovieView.m b/Source/NSMovieView.m index 15c4adc5d..950d168c5 100644 --- a/Source/NSMovieView.m +++ b/Source/NSMovieView.m @@ -26,12 +26,12 @@ Boston, MA 02110-1301, USA. */ -#include -#include -#include -#include "AppKit/NSMovie.h" -#include "AppKit/NSMovieView.h" -#include "AppKit/NSPasteboard.h" +#import +#import +#import +#import "AppKit/NSMovie.h" +#import "AppKit/NSMovieView.h" +#import "AppKit/NSPasteboard.h" @implementation NSMovieView diff --git a/Source/NSObjectController.m b/Source/NSObjectController.m index 1f9536ad6..c07f3bec2 100644 --- a/Source/NSObjectController.m +++ b/Source/NSObjectController.m @@ -26,18 +26,17 @@ Boston, MA 02110-1301, USA. */ -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include "AppKit/NSKeyValueBinding.h" -#include "GSBindingHelpers.h" +#import +#import +#import +#import +#import +#import +#import +#import +#import "AppKit/NSObjectController.h" +#import "AppKit/NSKeyValueBinding.h" +#import "GSBindingHelpers.h" @interface _NSManagedProxy : NSObject { diff --git a/Source/NSOpenGLContext.m b/Source/NSOpenGLContext.m index c0893990d..729df3462 100644 --- a/Source/NSOpenGLContext.m +++ b/Source/NSOpenGLContext.m @@ -26,9 +26,9 @@ Boston, MA 02110-1301, USA. */ -#include -#include "AppKit/NSOpenGL.h" -#include "GNUstepGUI/GSDisplayServer.h" +#import +#import "AppKit/NSOpenGL.h" +#import "GNUstepGUI/GSDisplayServer.h" @implementation NSOpenGLContext + _classContext diff --git a/Source/NSOpenGLPixelFormat.m b/Source/NSOpenGLPixelFormat.m index 6d7e6d3f9..c3b2e51b5 100644 --- a/Source/NSOpenGLPixelFormat.m +++ b/Source/NSOpenGLPixelFormat.m @@ -26,11 +26,10 @@ Boston, MA 02110-1301, USA. */ -#include - -#include -#include "GNUstepGUI/GSDisplayServer.h" -#include "AppKit/NSOpenGL.h" +#import +#import +#import "AppKit/NSOpenGL.h" +#import "GNUstepGUI/GSDisplayServer.h" // @interface GSGLPixelFormat : NSOpenGLPixelFormat diff --git a/Source/NSOpenGLView.m b/Source/NSOpenGLView.m index 2c6113859..3c7892973 100644 --- a/Source/NSOpenGLView.m +++ b/Source/NSOpenGLView.m @@ -26,11 +26,11 @@ Boston, MA 02110-1301, USA. */ -#include -#include -#include -#include "AppKit/NSOpenGL.h" -#include "AppKit/NSOpenGLView.h" +#import +#import +#import +#import "AppKit/NSOpenGL.h" +#import "AppKit/NSOpenGLView.h" // Declare a private method of NSView @interface NSView (Private) diff --git a/Source/NSOpenPanel.m b/Source/NSOpenPanel.m index 5576c82de..3879e89f5 100644 --- a/Source/NSOpenPanel.m +++ b/Source/NSOpenPanel.m @@ -52,8 +52,8 @@ #import "AppKit/NSMatrix.h" #import "AppKit/NSOpenPanel.h" -#include "GSGuiPrivate.h" -#include "GNUstepGUI/GSTheme.h" +#import "GSGuiPrivate.h" +#import "GNUstepGUI/GSTheme.h" static NSString * pathToColumn(NSBrowser *browser, int column) diff --git a/Source/NSParagraphStyle.m b/Source/NSParagraphStyle.m index b23dcd37b..20fb7cb98 100644 --- a/Source/NSParagraphStyle.m +++ b/Source/NSParagraphStyle.m @@ -27,12 +27,8 @@ Boston, MA 02110-1301, USA. */ -/* To keep the allocation counts valid when swizzling the class in -[NSMutableParagraphStyle -copyWithZone:]. */ -#include - -#include -#include "AppKit/NSParagraphStyle.h" +#import +#import "AppKit/NSParagraphStyle.h" @implementation NSTextTab @@ -804,16 +800,14 @@ static NSParagraphStyle *defaultStyle = nil; - (id) copyWithZone: (NSZone*)aZone { - NSMutableParagraphStyle *c; + NSMutableParagraphStyle *c; c = (NSMutableParagraphStyle*)NSCopyObject (self, 0, aZone); - GSDebugAllocationRemove(c->isa, c); - c->isa = [NSParagraphStyle class]; - GSDebugAllocationAdd(c->isa, c); + GSClassSwizzle(c, [NSParagraphStyle class]); c->_tabStops = [_tabStops mutableCopyWithZone: aZone]; c->_textBlocks = [_textBlocks mutableCopyWithZone: aZone]; c->_textLists = [_textLists mutableCopyWithZone: aZone]; - return c; + return c; } @end diff --git a/Source/NSPasteboard.m b/Source/NSPasteboard.m index 9e227d5b1..0f6c54fd9 100644 --- a/Source/NSPasteboard.m +++ b/Source/NSPasteboard.m @@ -519,40 +519,39 @@ */ #include "config.h" -#include "AppKit/NSPasteboard.h" -#include "AppKit/NSApplication.h" -#include "AppKit/NSWorkspace.h" -#include "AppKit/NSFileWrapper.h" -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include "GNUstepGUI/GSServicesManager.h" -#include "GNUstepGUI/GSPasteboardServer.h" +#import +#import +#import +#import +#import +#import +#import +#import +#import +#import +#import +#import +#import +#import +#import +#import +#import +#import +#import +#import +#import +#import +#import +#import +#import +#import +#import +#import "AppKit/NSPasteboard.h" +#import "AppKit/NSApplication.h" +#import "AppKit/NSWorkspace.h" +#import "AppKit/NSFileWrapper.h" +#import "GNUstepGUI/GSServicesManager.h" +#import "GNUstepGUI/GSPasteboardServer.h" static NSString *contentsPrefix = @"NSTypedFileContentsPboardType:"; static NSString *namePrefix = @"NSTypedFilenamesPboardType:"; diff --git a/Source/NSPrintOperation.m b/Source/NSPrintOperation.m index be1da44ac..6e40bbd1d 100644 --- a/Source/NSPrintOperation.m +++ b/Source/NSPrintOperation.m @@ -36,31 +36,31 @@ #include #include #include "config.h" -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include "AppKit/AppKitExceptions.h" -#include "AppKit/NSAffineTransform.h" -#include "AppKit/NSApplication.h" -#include "AppKit/NSGraphicsContext.h" -#include "AppKit/NSView.h" -#include "AppKit/NSPrinter.h" -#include "AppKit/NSPrintPanel.h" -#include "AppKit/NSPrintInfo.h" -#include "AppKit/NSPrintOperation.h" -#include "AppKit/NSWorkspace.h" -#include "AppKit/PSOperators.h" -#include "GNUstepGUI/GSEPSPrintOperation.h" -#include "GNUstepGUI/GSPDFPrintOperation.h" -#include "GNUstepGUI/GSPrintOperation.h" -#include "GSGuiPrivate.h" +#import +#import +#import +#import +#import +#import +#import +#import +#import +#import +#import "AppKit/AppKitExceptions.h" +#import "AppKit/NSAffineTransform.h" +#import "AppKit/NSApplication.h" +#import "AppKit/NSGraphicsContext.h" +#import "AppKit/NSView.h" +#import "AppKit/NSPrinter.h" +#import "AppKit/NSPrintPanel.h" +#import "AppKit/NSPrintInfo.h" +#import "AppKit/NSPrintOperation.h" +#import "AppKit/NSWorkspace.h" +#import "AppKit/PSOperators.h" +#import "GNUstepGUI/GSEPSPrintOperation.h" +#import "GNUstepGUI/GSPDFPrintOperation.h" +#import "GNUstepGUI/GSPrintOperation.h" +#import "GSGuiPrivate.h" #define NSNUMBER(a) [NSNumber numberWithInt: (a)] #define NSFNUMBER(a) [NSNumber numberWithFloat: (a)] diff --git a/Source/NSPrinter.m b/Source/NSPrinter.m index 8d0059f16..4cd22a69e 100644 --- a/Source/NSPrinter.m +++ b/Source/NSPrinter.m @@ -30,28 +30,28 @@ */ #include "config.h" -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include "AppKit/AppKitExceptions.h" -#include "AppKit/NSGraphics.h" -#include "AppKit/NSPrinter.h" -#include "GNUstepGUI/GSPrinting.h" +#import +#import +#import +#import +#import +#import +#import +#import +#import +#import +#import +#import +#import +#import +#import +#import +#import +#import +#import "AppKit/AppKitExceptions.h" +#import "AppKit/NSGraphics.h" +#import "AppKit/NSPrinter.h" +#import "GNUstepGUI/GSPrinting.h" // // Class variables: diff --git a/Source/NSProgressIndicator.m b/Source/NSProgressIndicator.m index f53ed0777..f1d8e0fcd 100644 --- a/Source/NSProgressIndicator.m +++ b/Source/NSProgressIndicator.m @@ -26,15 +26,15 @@ Boston, MA 02110-1301, USA. */ -#include -#include -#include -#include "AppKit/NSProgressIndicator.h" -#include "AppKit/NSGraphics.h" -#include "AppKit/NSImage.h" -#include "AppKit/NSWindow.h" -#include "GNUstepGUI/GSTheme.h" -#include "GNUstepGUI/GSNibLoading.h" +#import +#import +#import +#import "AppKit/NSProgressIndicator.h" +#import "AppKit/NSGraphics.h" +#import "AppKit/NSImage.h" +#import "AppKit/NSWindow.h" +#import "GNUstepGUI/GSTheme.h" +#import "GNUstepGUI/GSNibLoading.h" @implementation NSProgressIndicator diff --git a/Source/NSResponder.m b/Source/NSResponder.m index 936f76160..bf3882a83 100644 --- a/Source/NSResponder.m +++ b/Source/NSResponder.m @@ -27,16 +27,16 @@ */ #include "config.h" -#include -#include -#include -#include "AppKit/NSResponder.h" -#include "AppKit/NSApplication.h" -#include "AppKit/NSMenu.h" -#include "AppKit/NSEvent.h" -#include "AppKit/NSGraphics.h" -#include "AppKit/NSHelpManager.h" -#include "AppKit/NSInputManager.h" +#import +#import +#import +#import "AppKit/NSResponder.h" +#import "AppKit/NSApplication.h" +#import "AppKit/NSMenu.h" +#import "AppKit/NSEvent.h" +#import "AppKit/NSGraphics.h" +#import "AppKit/NSHelpManager.h" +#import "AppKit/NSInputManager.h" @implementation NSResponder diff --git a/Source/NSRulerMarker.m b/Source/NSRulerMarker.m index b94248e95..9b93e7ab0 100644 --- a/Source/NSRulerMarker.m +++ b/Source/NSRulerMarker.m @@ -26,14 +26,14 @@ Boston, MA 02110-1301, USA. */ -#include -#include "AppKit/NSRulerMarker.h" -#include "AppKit/NSRulerView.h" -#include "AppKit/NSEvent.h" -#include "AppKit/NSImage.h" -#include "AppKit/NSApplication.h" -#include "AppKit/NSWindow.h" -#include "AppKit/NSCursor.h" +#import +#import "AppKit/NSRulerMarker.h" +#import "AppKit/NSRulerView.h" +#import "AppKit/NSEvent.h" +#import "AppKit/NSImage.h" +#import "AppKit/NSApplication.h" +#import "AppKit/NSWindow.h" +#import "AppKit/NSCursor.h" @interface NSRulerView (GNUstepInternal) - (NSRect)_markersRect; diff --git a/Source/NSSavePanel.m b/Source/NSSavePanel.m index 77a844092..fb3241566 100644 --- a/Source/NSSavePanel.m +++ b/Source/NSSavePanel.m @@ -56,8 +56,8 @@ #import "AppKit/NSTextField.h" #import "AppKit/NSWorkspace.h" -#include "GSGuiPrivate.h" -#include "GNUstepGUI/GSTheme.h" +#import "GSGuiPrivate.h" +#import "GNUstepGUI/GSTheme.h" #define _SAVE_PANEL_X_PAD 5 #define _SAVE_PANEL_Y_PAD 4 diff --git a/Source/NSScrollView.m b/Source/NSScrollView.m index 076cb1cc5..55fa363a8 100644 --- a/Source/NSScrollView.m +++ b/Source/NSScrollView.m @@ -30,26 +30,26 @@ Boston, MA 02110-1301, USA. */ -#include -#include -#include -#include +#import +#import +#import +#import -#include "AppKit/NSColor.h" -#include "AppKit/NSColorList.h" -#include "AppKit/NSCell.h" -#include "AppKit/NSClipView.h" -#include "AppKit/NSEvent.h" -#include "AppKit/NSGraphics.h" -#include "AppKit/NSInterfaceStyle.h" -#include "AppKit/NSRulerView.h" -#include "AppKit/NSScroller.h" -#include "AppKit/NSScrollView.h" -#include "AppKit/NSTableHeaderView.h" -#include "AppKit/NSTableView.h" -#include "AppKit/NSWindow.h" -#include "AppKit/PSOperators.h" -#include "GNUstepGUI/GSTheme.h" +#import "AppKit/NSColor.h" +#import "AppKit/NSColorList.h" +#import "AppKit/NSCell.h" +#import "AppKit/NSClipView.h" +#import "AppKit/NSEvent.h" +#import "AppKit/NSGraphics.h" +#import "AppKit/NSInterfaceStyle.h" +#import "AppKit/NSRulerView.h" +#import "AppKit/NSScroller.h" +#import "AppKit/NSScrollView.h" +#import "AppKit/NSTableHeaderView.h" +#import "AppKit/NSTableView.h" +#import "AppKit/NSWindow.h" +#import "AppKit/PSOperators.h" +#import "GNUstepGUI/GSTheme.h" @interface NSClipView (Private) - (void) _scrollToPoint: (NSPoint)aPoint; diff --git a/Source/NSSegmentedCell.m b/Source/NSSegmentedCell.m index 1f63b68ba..43cc66123 100644 --- a/Source/NSSegmentedCell.m +++ b/Source/NSSegmentedCell.m @@ -23,18 +23,18 @@ * USA. */ -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#import +#import +#import +#import "AppKit/NSColor.h" +#import "AppKit/NSEvent.h" +#import "AppKit/NSFont.h" +#import "AppKit/NSGraphics.h" +#import "AppKit/NSImage.h" +#import "AppKit/NSMenu.h" +#import "AppKit/NSSegmentedCell.h" +#import "AppKit/NSStringDrawing.h" +#import "GNUstepGUI/GSTheme.h" @interface NSSegmentItem : NSObject { diff --git a/Source/NSSegmentedControl.m b/Source/NSSegmentedControl.m index 7205b7b40..01214d175 100644 --- a/Source/NSSegmentedControl.m +++ b/Source/NSSegmentedControl.m @@ -23,10 +23,10 @@ * USA. */ -#include -#include -#include -#include +#import "AppKit/NSControl.h" +#import "AppKit/NSEvent.h" +#import "AppKit/NSSegmentedControl.h" +#import "AppKit/NSSegmentedCell.h" static Class segmentedControlCellClass; diff --git a/Source/NSSelection.m b/Source/NSSelection.m index 585a1d1f3..26910e81b 100644 --- a/Source/NSSelection.m +++ b/Source/NSSelection.m @@ -31,10 +31,10 @@ */ #include "config.h" -#include -#include -#include "AppKit/NSSelection.h" -#include "AppKit/NSPasteboard.h" +#import +#import +#import "AppKit/NSSelection.h" +#import "AppKit/NSPasteboard.h" // // Global instances of these selections diff --git a/Source/NSSound.m b/Source/NSSound.m index 437cbbb5a..577291841 100644 --- a/Source/NSSound.m +++ b/Source/NSSound.m @@ -27,12 +27,12 @@ Boston, MA 02110-1301, USA. */ -#include -#include "AppKit/NSPasteboard.h" -#include "AppKit/NSSound.h" +#import +#import "AppKit/NSPasteboard.h" +#import "AppKit/NSSound.h" -#include "GNUstepGUI/GSSoundSource.h" -#include "GNUstepGUI/GSSoundSink.h" +#import "GNUstepGUI/GSSoundSource.h" +#import "GNUstepGUI/GSSoundSink.h" // Private NSConditionLock conditions used for streaming enum diff --git a/Source/NSSpeechSynthesizer.m b/Source/NSSpeechSynthesizer.m index 4c6b8da9c..9d514d9f1 100644 --- a/Source/NSSpeechSynthesizer.m +++ b/Source/NSSpeechSynthesizer.m @@ -25,15 +25,15 @@ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#include -#include -#include -#include -#include -#include -#include -#include "AppKit/NSWorkspace.h" -#include "AppKit/NSSpeechSynthesizer.h" +#import +#import +#import +#import +#import +#import +#import +#import "AppKit/NSWorkspace.h" +#import "AppKit/NSSpeechSynthesizer.h" // Keys for properties... NSString *NSVoiceIdentifier = @"NSVoiceIdentifier"; diff --git a/Source/NSSplitView.m b/Source/NSSplitView.m index 0191dc936..eeeb2b268 100644 --- a/Source/NSSplitView.m +++ b/Source/NSSplitView.m @@ -32,26 +32,26 @@ Boston, MA 02110-1301, USA. */ -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#import +#import +#import +#import +#import +#import +#import +#import +#import +#import +#import -#include "AppKit/NSApplication.h" -#include "AppKit/NSColor.h" -#include "AppKit/NSEvent.h" -#include "AppKit/NSGraphics.h" -#include "AppKit/NSImage.h" -#include "AppKit/NSSplitView.h" -#include "AppKit/NSWindow.h" -#include "GSGuiPrivate.h" +#import "AppKit/NSApplication.h" +#import "AppKit/NSColor.h" +#import "AppKit/NSEvent.h" +#import "AppKit/NSGraphics.h" +#import "AppKit/NSImage.h" +#import "AppKit/NSSplitView.h" +#import "AppKit/NSWindow.h" +#import "GSGuiPrivate.h" static NSNotificationCenter *nc = nil; diff --git a/Source/NSStepperCell.m b/Source/NSStepperCell.m index 274346ef3..c33f64e1d 100644 --- a/Source/NSStepperCell.m +++ b/Source/NSStepperCell.m @@ -34,7 +34,7 @@ #import "AppKit/NSEvent.h" #import "AppKit/NSStepperCell.h" #import "AppKit/NSWindow.h" -#include "GNUstepGUI/GSTheme.h" +#import "GNUstepGUI/GSTheme.h" @interface NSStepperCell (Private) - (void) _increment; diff --git a/Source/NSTableHeaderCell.m b/Source/NSTableHeaderCell.m index fa017ac76..e904c94fe 100644 --- a/Source/NSTableHeaderCell.m +++ b/Source/NSTableHeaderCell.m @@ -28,7 +28,7 @@ #import "AppKit/NSFont.h" #import "AppKit/NSImage.h" #import "AppKit/NSTableHeaderCell.h" -#include "GNUstepGUI/GSTheme.h" +#import "GNUstepGUI/GSTheme.h" @implementation NSTableHeaderCell diff --git a/Source/NSTableHeaderView.m b/Source/NSTableHeaderView.m index 3d1fa6f14..f2f953485 100644 --- a/Source/NSTableHeaderView.m +++ b/Source/NSTableHeaderView.m @@ -29,22 +29,22 @@ Boston, MA 02110-1301, USA. */ -#include -#include -#include -#include -#include "AppKit/NSTableHeaderCell.h" -#include "AppKit/NSTableHeaderView.h" -#include "AppKit/NSTableColumn.h" -#include "AppKit/NSTableView.h" -#include "AppKit/NSWindow.h" -#include "AppKit/NSEvent.h" -#include "AppKit/NSApplication.h" -#include "AppKit/NSColor.h" -#include "AppKit/NSScrollView.h" -#include "AppKit/NSGraphics.h" -#include "GSGuiPrivate.h" -#include "GNUstepGUI/GSTheme.h" +#import +#import +#import +#import +#import "AppKit/NSTableHeaderCell.h" +#import "AppKit/NSTableHeaderView.h" +#import "AppKit/NSTableColumn.h" +#import "AppKit/NSTableView.h" +#import "AppKit/NSWindow.h" +#import "AppKit/NSEvent.h" +#import "AppKit/NSApplication.h" +#import "AppKit/NSColor.h" +#import "AppKit/NSScrollView.h" +#import "AppKit/NSGraphics.h" +#import "GSGuiPrivate.h" +#import "GNUstepGUI/GSTheme.h" /* * Number of pixels in either direction that will be counted as a hit diff --git a/Source/NSText.m b/Source/NSText.m index b707c9b30..71925855e 100644 --- a/Source/NSText.m +++ b/Source/NSText.m @@ -36,12 +36,12 @@ Boston, MA 02110-1301, USA. */ -#include "AppKit/NSText.h" +#import "AppKit/NSText.h" -#include "AppKit/NSAttributedString.h" -#include "AppKit/NSPanel.h" -#include "AppKit/NSSpellChecker.h" -#include "AppKit/NSTextView.h" +#import "AppKit/NSAttributedString.h" +#import "AppKit/NSPanel.h" +#import "AppKit/NSSpellChecker.h" +#import "AppKit/NSTextView.h" static Class abstract; diff --git a/Source/NSTextAttachment.m b/Source/NSTextAttachment.m index 5099feaa1..690847012 100644 --- a/Source/NSTextAttachment.m +++ b/Source/NSTextAttachment.m @@ -36,13 +36,13 @@ Boston, MA 02110-1301, USA. */ -#include "AppKit/NSCell.h" -#include "AppKit/NSFileWrapper.h" -#include "AppKit/NSImage.h" -#include "AppKit/NSEvent.h" -#include "AppKit/NSTextContainer.h" -#include "AppKit/NSTextAttachment.h" -#include "AppKit/NSTextView.h" +#import "AppKit/NSCell.h" +#import "AppKit/NSFileWrapper.h" +#import "AppKit/NSImage.h" +#import "AppKit/NSEvent.h" +#import "AppKit/NSTextContainer.h" +#import "AppKit/NSTextAttachment.h" +#import "AppKit/NSTextView.h" @implementation NSTextAttachmentCell diff --git a/Source/NSTextBlock.m b/Source/NSTextBlock.m index 7e5bc35af..cf6899426 100644 --- a/Source/NSTextBlock.m +++ b/Source/NSTextBlock.m @@ -33,7 +33,7 @@ #import "AppKit/NSColor.h" #import "AppKit/NSGraphics.h" #import "AppKit/NSTextTable.h" -#include "GSGuiPrivate.h" +#import "GSGuiPrivate.h" @implementation NSTextBlock diff --git a/Source/NSTextContainer.m b/Source/NSTextContainer.m index 0926d3664..f7baecc00 100644 --- a/Source/NSTextContainer.m +++ b/Source/NSTextContainer.m @@ -27,15 +27,15 @@ Boston, MA 02110-1301, USA. */ -#include -#include -#include -#include "AppKit/NSLayoutManager.h" -#include "AppKit/NSTextContainer.h" -#include "AppKit/NSTextStorage.h" -#include "AppKit/NSTextView.h" -#include "GNUstepGUI/GSLayoutManager.h" -#include "GSGuiPrivate.h" +#import +#import +#import +#import "AppKit/NSLayoutManager.h" +#import "AppKit/NSTextContainer.h" +#import "AppKit/NSTextStorage.h" +#import "AppKit/NSTextView.h" +#import "GNUstepGUI/GSLayoutManager.h" +#import "GSGuiPrivate.h" @interface NSTextContainer (TextViewObserver) - (void) _textViewFrameChanged: (NSNotification*)aNotification; diff --git a/Source/NSTextField.m b/Source/NSTextField.m index aa1797553..3c6b80c83 100644 --- a/Source/NSTextField.m +++ b/Source/NSTextField.m @@ -32,20 +32,20 @@ #include "config.h" -#include -#include -#include -#include +#import +#import +#import +#import -#include "AppKit/NSApplication.h" -#include "AppKit/NSCursor.h" -#include "AppKit/NSEvent.h" -#include "AppKit/NSGraphics.h" -#include "AppKit/NSTextField.h" -#include "AppKit/NSTextFieldCell.h" -#include "AppKit/NSWindow.h" -#include "AppKit/NSKeyValueBinding.h" -#include "GSBindingHelpers.h" +#import "AppKit/NSApplication.h" +#import "AppKit/NSCursor.h" +#import "AppKit/NSEvent.h" +#import "AppKit/NSGraphics.h" +#import "AppKit/NSTextField.h" +#import "AppKit/NSTextFieldCell.h" +#import "AppKit/NSWindow.h" +#import "AppKit/NSKeyValueBinding.h" +#import "GSBindingHelpers.h" static NSNotificationCenter *nc; diff --git a/Source/NSTextList.m b/Source/NSTextList.m index 7c31639e6..3e6ad834e 100644 --- a/Source/NSTextList.m +++ b/Source/NSTextList.m @@ -27,10 +27,10 @@ Boston, MA 02110-1301, USA. */ -#include -#include +#import +#import -#include "AppKit/NSTextList.h" +#import "AppKit/NSTextList.h" @implementation NSTextList diff --git a/Source/NSTextStorage.m b/Source/NSTextStorage.m index 50435c293..edfcf5894 100644 --- a/Source/NSTextStorage.m +++ b/Source/NSTextStorage.m @@ -24,14 +24,14 @@ Boston, MA 02110-1301, USA. */ -#include -#include -#include -#include -#include "AppKit/NSAttributedString.h" -#include "AppKit/NSTextStorage.h" -#include "GNUstepGUI/GSLayoutManager.h" -#include "GSTextStorage.h" +#import +#import +#import +#import +#import "AppKit/NSAttributedString.h" +#import "AppKit/NSTextStorage.h" +#import "GNUstepGUI/GSLayoutManager.h" +#import "GSTextStorage.h" @implementation NSTextStorage diff --git a/Source/NSTextTable.m b/Source/NSTextTable.m index e8eacfafa..262eb7dd1 100644 --- a/Source/NSTextTable.m +++ b/Source/NSTextTable.m @@ -26,10 +26,10 @@ Boston, MA 02110-1301, USA. */ -#include -#include +#import +#import -#include "AppKit/NSTextTable.h" +#import "AppKit/NSTextTable.h" @implementation NSTextTable diff --git a/Source/NSTextTableBlock.m b/Source/NSTextTableBlock.m index 694f8e8fc..8708131dd 100644 --- a/Source/NSTextTableBlock.m +++ b/Source/NSTextTableBlock.m @@ -26,10 +26,10 @@ Boston, MA 02110-1301, USA. */ -#include -#include +#import +#import -#include "AppKit/NSTextTable.h" +#import "AppKit/NSTextTable.h" @implementation NSTextTableBlock diff --git a/Source/NSTokenField.m b/Source/NSTokenField.m index 78b7540c3..b75bf263f 100644 --- a/Source/NSTokenField.m +++ b/Source/NSTokenField.m @@ -30,15 +30,15 @@ #include "config.h" -#include "AppKit/NSApplication.h" -#include "AppKit/NSCursor.h" -#include "AppKit/NSGraphics.h" -#include "AppKit/NSTokenField.h" -#include "AppKit/NSTokenFieldCell.h" -#include "AppKit/NSWindow.h" -#include "AppKit/NSKeyValueBinding.h" -#include -#include "GSBindingHelpers.h" +#import +#import "AppKit/NSApplication.h" +#import "AppKit/NSCursor.h" +#import "AppKit/NSGraphics.h" +#import "AppKit/NSTokenField.h" +#import "AppKit/NSTokenFieldCell.h" +#import "AppKit/NSWindow.h" +#import "AppKit/NSKeyValueBinding.h" +#import "GSBindingHelpers.h" static NSNotificationCenter *nc = nil; diff --git a/Source/NSTokenFieldCell.m b/Source/NSTokenFieldCell.m index 5a3613a25..8a16b503e 100644 --- a/Source/NSTokenFieldCell.m +++ b/Source/NSTokenFieldCell.m @@ -26,12 +26,12 @@ */ #include "config.h" -#include -#include -#include "AppKit/NSControl.h" -#include "AppKit/NSEvent.h" -#include "AppKit/NSTokenField.h" -#include "AppKit/NSTokenFieldCell.h" +#import +#import +#import "AppKit/NSControl.h" +#import "AppKit/NSEvent.h" +#import "AppKit/NSTokenField.h" +#import "AppKit/NSTokenFieldCell.h" @implementation NSTokenFieldCell diff --git a/Source/NSToolbarFrameworkPrivate.h b/Source/NSToolbarFrameworkPrivate.h index 5ad2a922a..01b54fd13 100644 --- a/Source/NSToolbarFrameworkPrivate.h +++ b/Source/NSToolbarFrameworkPrivate.h @@ -30,12 +30,11 @@ #ifndef _NSToolbarFrameworkPrivate_h_INCLUDE #define _NSToolbarFrameworkPrivate_h_INCLUDE -#include "AppKit/NSMenuView.h" -#include "AppKit/NSToolbar.h" -#include "AppKit/NSToolbarItem.h" -#include "GNUstepGUI/GSToolbarView.h" - -#include +#import "AppKit/NSMenuView.h" +#import "AppKit/NSToolbar.h" +#import "AppKit/NSToolbarItem.h" +#import "GNUstepGUI/GSToolbarView.h" +#import "GNUstepGUI/GSWindowDecorationView.h" @interface GSToolbarView (GNUstepPrivate) - (void) _reload; diff --git a/Source/NSToolbarItemGroup.m b/Source/NSToolbarItemGroup.m index 6f04f3186..ad9fb55cc 100644 --- a/Source/NSToolbarItemGroup.m +++ b/Source/NSToolbarItemGroup.m @@ -27,8 +27,8 @@ Boston, MA 02110-1301, USA. */ -#include -#include "AppKit/NSToolbarItemGroup.h" +#import +#import "AppKit/NSToolbarItemGroup.h" @implementation NSToolbarItemGroup // FIXME: Most of the implementation is missing. diff --git a/Source/NSUserDefaultsController.m b/Source/NSUserDefaultsController.m index b94784d3e..c8dff158d 100644 --- a/Source/NSUserDefaultsController.m +++ b/Source/NSUserDefaultsController.m @@ -26,13 +26,13 @@ Boston, MA 02110-1301, USA. */ -#include -#include -#include -#include -#include -#include -#include +#import +#import +#import +#import +#import +#import +#import "AppKit/NSUserDefaultsController.h" static id shared = nil; diff --git a/Source/tiff.m b/Source/tiff.m index 3e784db85..614ce6205 100644 --- a/Source/tiff.m +++ b/Source/tiff.m @@ -59,12 +59,12 @@ #include "config.h" #include "nsimage-tiff.h" -#include -#include -#include -#include -#include -#include "GSGuiPrivate.h" +#import +#import +#import +#import +#import +#import "GSGuiPrivate.h" #include #include