diff --git a/ChangeLog b/ChangeLog index b644ff8bd..900d215e2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,34 @@ +2010-03-25 Fred Kiefer + + * Headers/AppKit/NSImageCell.h + * Headers/AppKit/NSLevelIndicator.h + * Headers/AppKit/NSMatrix.h + * Headers/AppKit/NSMenu.h + * Headers/AppKit/NSLayoutManager.h + * Headers/AppKit/NSInputServer.h + * Headers/AppKit/NSImageRep.h + * Headers/AppKit/NSMovieView.h + * Headers/AppKit/NSMovie.h + * Headers/AppKit/NSHelpManager.h + * Headers/AppKit/NSMenuItemCell.h + * Headers/AppKit/NSInterfaceStyle.h + * Headers/AppKit/NSMenuItem.h + * Headers/AppKit/NSInputManager.h + * Headers/AppKit/NSLevelIndicatorCell.h + * Headers/AppKit/NSMenuView.h + * Headers/AppKit/NSHelpPanel.h + * Headers/AppKit/NSImage.h + * Headers/AppKit/NSKeyValueBinding.h + * Source/NSPopUpButtonCell.m + * Source/GSWindowDecorationView.m + * Source/NSPopUpButton.m + * Source/NSHelpManager.m + * Source/NSToolbar.m + * Source/GSToolbarCustomizationPalette.m + * Source/GSTitleView.m + * Source/NSMenuView.m + * Source/NSCell.m: Some more #include -> #import replacement. + 2010-03-25 Fred Kiefer * Source/GSNibLoading.m diff --git a/Headers/AppKit/NSHelpManager.h b/Headers/AppKit/NSHelpManager.h index 6a51cf9eb..da746be62 100644 --- a/Headers/AppKit/NSHelpManager.h +++ b/Headers/AppKit/NSHelpManager.h @@ -31,12 +31,13 @@ #define __GNUstep_H_NSHelpManager #import -#include -#include -#include -#include +#import +#import +#import @class NSAttributedString; +@class NSString; +@class NSMapTable; @interface NSBundle (NSHelpManager) - (NSString *)pathForHelpResource:(NSString *)fileName; diff --git a/Headers/AppKit/NSHelpPanel.h b/Headers/AppKit/NSHelpPanel.h index 64c3f0569..c16b420e6 100644 --- a/Headers/AppKit/NSHelpPanel.h +++ b/Headers/AppKit/NSHelpPanel.h @@ -31,10 +31,10 @@ #define _GNUstep_H_NSHelpPanel #import -#if OS_API_VERSION(GS_API_OPENSTEP,GS_API_MACOSX) || GS_API_VERSION(GS_API_NONE, GS_API_LATEST) +#if OS_API_VERSION(GS_API_OPENSTEP,GS_API_MACOSX) || GS_API_VERSION(GS_API_NONE, GS_API_LATEST) -#include -#include +#import +#import @class NSString; @@ -82,12 +82,6 @@ // - (void) print: (id)sender; -// -// NSCoding protocol -// -- (void) encodeWithCoder: (NSCoder *)aCoder; -- (id) initWithCoder: (NSCoder *)aDecoder; - @end #endif // !GS_API_MACOSX diff --git a/Headers/AppKit/NSImage.h b/Headers/AppKit/NSImage.h index 8badfba9c..7e0c43f78 100644 --- a/Headers/AppKit/NSImage.h +++ b/Headers/AppKit/NSImage.h @@ -31,9 +31,9 @@ #define _GNUstep_H_NSImage #import -#include -#include -#include +#import +#import +#import @class NSString; @class NSMutableArray; diff --git a/Headers/AppKit/NSImageCell.h b/Headers/AppKit/NSImageCell.h index 9f6969513..29feb0dce 100644 --- a/Headers/AppKit/NSImageCell.h +++ b/Headers/AppKit/NSImageCell.h @@ -31,7 +31,7 @@ #define _GNUstep_H_NSImageCell #import -#include +#import /** *

Enumeration of the ways that you can display an image in an diff --git a/Headers/AppKit/NSImageRep.h b/Headers/AppKit/NSImageRep.h index 6391c3277..578f583e1 100644 --- a/Headers/AppKit/NSImageRep.h +++ b/Headers/AppKit/NSImageRep.h @@ -31,8 +31,9 @@ #define _GNUstep_H_NSImageRep #import -#include -#include +#import +#import +#import @class NSString; @class NSArray; diff --git a/Headers/AppKit/NSInputManager.h b/Headers/AppKit/NSInputManager.h index 7136740db..05bfe8925 100644 --- a/Headers/AppKit/NSInputManager.h +++ b/Headers/AppKit/NSInputManager.h @@ -29,12 +29,12 @@ #define _GNUstep_H_NSInputManager #import -#include -#include -#include -#include -#include +#import +#import +@class NSArray; +@class NSAttributedString; +@class NSMutableArray; @class NSInputServer; @class NSEvent; @class NSImage; diff --git a/Headers/AppKit/NSInputServer.h b/Headers/AppKit/NSInputServer.h index 326b97c5f..d65214d0a 100644 --- a/Headers/AppKit/NSInputServer.h +++ b/Headers/AppKit/NSInputServer.h @@ -29,9 +29,10 @@ #define _GNUstep_H_NSInputServer #import -#include -#include -#include +#import +#import + +@class NSString; @protocol NSInputServerMouseTracker - (BOOL) mouseDownOnCharacterIndex: (unsigned)index diff --git a/Headers/AppKit/NSInterfaceStyle.h b/Headers/AppKit/NSInterfaceStyle.h index 92137a437..ab5f606da 100644 --- a/Headers/AppKit/NSInterfaceStyle.h +++ b/Headers/AppKit/NSInterfaceStyle.h @@ -31,7 +31,7 @@ #if OS_API_VERSION(GS_API_MACOSX, GS_API_LATEST) -#include +#import @class NSResponder; @class NSString; diff --git a/Headers/AppKit/NSKeyValueBinding.h b/Headers/AppKit/NSKeyValueBinding.h index 5c4c988df..9816cdd7d 100644 --- a/Headers/AppKit/NSKeyValueBinding.h +++ b/Headers/AppKit/NSKeyValueBinding.h @@ -30,8 +30,8 @@ #define _GNUstep_H_NSKeyValueBinding #import -#include -#include +#import +#import #if OS_API_VERSION(MAC_OS_X_VERSION_10_3, GS_API_LATEST) diff --git a/Headers/AppKit/NSLayoutManager.h b/Headers/AppKit/NSLayoutManager.h index dec6003f2..4c42afa14 100644 --- a/Headers/AppKit/NSLayoutManager.h +++ b/Headers/AppKit/NSLayoutManager.h @@ -29,8 +29,9 @@ #define _GNUstep_H_NSLayoutManager #import -#include -#include +#import +#import +#import @class NSParagraphStyle; diff --git a/Headers/AppKit/NSLevelIndicator.h b/Headers/AppKit/NSLevelIndicator.h index df52ea236..8db6330c7 100644 --- a/Headers/AppKit/NSLevelIndicator.h +++ b/Headers/AppKit/NSLevelIndicator.h @@ -30,9 +30,9 @@ #ifndef _GNUstep_H_NSLevelIndicator #define _GNUstep_H_NSLevelIndicator -#include "AppKit/NSControl.h" +#import "AppKit/NSControl.h" // For the tick mark -#include "AppKit/NSLevelIndicatorCell.h" +#import "AppKit/NSLevelIndicatorCell.h" #if OS_API_VERSION(MAC_OS_X_VERSION_10_4, GS_API_LATEST) diff --git a/Headers/AppKit/NSLevelIndicatorCell.h b/Headers/AppKit/NSLevelIndicatorCell.h index 4983c7c3a..d6d6165e6 100644 --- a/Headers/AppKit/NSLevelIndicatorCell.h +++ b/Headers/AppKit/NSLevelIndicatorCell.h @@ -30,9 +30,9 @@ #ifndef _GNUstep_H_NSLevelIndicatorCell #define _GNUstep_H_NSLevelIndicatorCell -#include "AppKit/NSActionCell.h" +#import "AppKit/NSActionCell.h" // For the tick mark -#include "AppKit/NSSliderCell.h" +#import "AppKit/NSSliderCell.h" #if OS_API_VERSION(MAC_OS_X_VERSION_10_4, GS_API_LATEST) diff --git a/Headers/AppKit/NSMatrix.h b/Headers/AppKit/NSMatrix.h index d81f73234..22c92ba64 100644 --- a/Headers/AppKit/NSMatrix.h +++ b/Headers/AppKit/NSMatrix.h @@ -31,7 +31,7 @@ #define _GNUstep_H_NSMatrix #import -#include +#import @class NSArray; @class NSMutableArray; diff --git a/Headers/AppKit/NSMenu.h b/Headers/AppKit/NSMenu.h index a6740c2f9..deaa60786 100644 --- a/Headers/AppKit/NSMenu.h +++ b/Headers/AppKit/NSMenu.h @@ -30,11 +30,11 @@ #define _GNUstep_H_NSMenu #import -#include -#include +#import +#import -#include -#include +#import +#import @class NSString; @class NSEvent; diff --git a/Headers/AppKit/NSMenuItem.h b/Headers/AppKit/NSMenuItem.h index 020f7e84b..4eebdc1e3 100644 --- a/Headers/AppKit/NSMenuItem.h +++ b/Headers/AppKit/NSMenuItem.h @@ -34,8 +34,8 @@ #define _GNUstep_H_NSMenuItem #import -#include -#include +#import +#import @class NSAttributedString; @class NSString; diff --git a/Headers/AppKit/NSMenuItemCell.h b/Headers/AppKit/NSMenuItemCell.h index 7c3260689..9bb25f983 100644 --- a/Headers/AppKit/NSMenuItemCell.h +++ b/Headers/AppKit/NSMenuItemCell.h @@ -29,8 +29,8 @@ #define _GNUstep_H_NSMenuItemCell #import -#include -#include +#import +#import @class NSMenuView; diff --git a/Headers/AppKit/NSMenuView.h b/Headers/AppKit/NSMenuView.h index 15cd33219..5fab0fb9f 100644 --- a/Headers/AppKit/NSMenuView.h +++ b/Headers/AppKit/NSMenuView.h @@ -29,23 +29,23 @@ #define _GNUstep_H_NSMenuView #import -#include -#include -#include -#include -#include -#include - -#include -#include -#include -#include -#include -#include +#import +#import +//#import +#import +@class NSArray; +@class NSMutableArray; +@class NSNotification; +@class NSString; @class NSColor; +@class NSMenuItemCell; @class NSPopUpButton; +@class NSEvent; @class NSFont; +@class NSScreen; +@class NSWindow; + /** The NSMenu class uses an object implementing the NSMenuView protocol to diff --git a/Headers/AppKit/NSMovie.h b/Headers/AppKit/NSMovie.h index b44479766..63bf6065e 100644 --- a/Headers/AppKit/NSMovie.h +++ b/Headers/AppKit/NSMovie.h @@ -30,7 +30,7 @@ #define _GNUstep_H_NSMovie #import -#include +#import @class NSArray; @class NSData; diff --git a/Headers/AppKit/NSMovieView.h b/Headers/AppKit/NSMovieView.h index ce9c64709..68d170376 100644 --- a/Headers/AppKit/NSMovieView.h +++ b/Headers/AppKit/NSMovieView.h @@ -30,7 +30,7 @@ #define _GNUstep_H_NSMovieView #import -#include +#import @class NSMovie; diff --git a/Source/GSTitleView.m b/Source/GSTitleView.m index 26ad95852..78bda3a08 100644 --- a/Source/GSTitleView.m +++ b/Source/GSTitleView.m @@ -24,22 +24,25 @@ Boston, MA 02110-1301, USA. */ -#include -#include +#import +#import +#import -#include -#include "AppKit/NSAttributedString.h" -#include -#include -#include -#include -#include -#include -#include -#include +#import "AppKit/NSApplication.h" +#import "AppKit/NSAttributedString.h" +#import "AppKit/NSButton.h" +#import "AppKit/NSColor.h" +#import "AppKit/NSEvent.h" +#import "AppKit/NSGraphics.h" +#import "AppKit/NSImage.h" +#import "AppKit/NSMenu.h" +#import "AppKit/NSMenuView.h" +#import "AppKit/NSPanel.h" +#import "AppKit/NSView.h" +#import "AppKit/NSWindow.h" -#include -#include "GNUstepGUI/GSTheme.h" +#import "GNUstepGUI/GSTitleView.h" +#import "GNUstepGUI/GSTheme.h" @implementation GSTitleView diff --git a/Source/GSToolbarCustomizationPalette.m b/Source/GSToolbarCustomizationPalette.m index 8c3c5d11b..ce922d5db 100644 --- a/Source/GSToolbarCustomizationPalette.m +++ b/Source/GSToolbarCustomizationPalette.m @@ -26,17 +26,18 @@ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#include -#include -#include -#include -#include "AppKit/NSNibLoading.h" -#include "AppKit/NSWindow.h" -#include "AppKit/NSToolbar.h" -#include "AppKit/NSToolbarItem.h" -#include "AppKit/NSPopUpButton.h" -#include "NSToolbarFrameworkPrivate.h" -#include "GSToolbarCustomizationPalette.h" +#import +#import +#import +#import +#import +#import "AppKit/NSNibLoading.h" +#import "AppKit/NSWindow.h" +#import "AppKit/NSToolbar.h" +#import "AppKit/NSToolbarItem.h" +#import "AppKit/NSPopUpButton.h" +#import "NSToolbarFrameworkPrivate.h" +#import "GSToolbarCustomizationPalette.h" #define DEBUG_LEVEL @"Toolbar" diff --git a/Source/GSWindowDecorationView.m b/Source/GSWindowDecorationView.m index d73eb1cc1..edd769b15 100644 --- a/Source/GSWindowDecorationView.m +++ b/Source/GSWindowDecorationView.m @@ -24,18 +24,18 @@ Boston, MA 02110-1301, USA. */ -#include +#import +#import -#include -#include +#import +#import "AppKit/NSColor.h" +#import "AppKit/NSGraphics.h" +#import "AppKit/NSMenuView.h" +#import "AppKit/NSWindow.h" +#import "GNUstepGUI/GSDisplayServer.h" +#import "GNUstepGUI/GSTheme.h" -#include "AppKit/NSColor.h" -#include "AppKit/NSMenuView.h" -#include "AppKit/NSWindow.h" -#include "GNUstepGUI/GSDisplayServer.h" -#include "GNUstepGUI/GSTheme.h" - -#include "NSToolbarFrameworkPrivate.h" +#import "NSToolbarFrameworkPrivate.h" @implementation GSWindowDecorationView diff --git a/Source/NSCell.m b/Source/NSCell.m index a22eb82fc..2b0ea5fe0 100644 --- a/Source/NSCell.m +++ b/Source/NSCell.m @@ -1432,7 +1432,7 @@ static NSColor *dtxtCol; { SEL action = [self action]; - if ([sender respondsTo: @selector(sendAction:to:)]) + if ([sender respondsToSelector: @selector(sendAction:to:)]) { return [sender sendAction: action to: [self target]]; } diff --git a/Source/NSHelpManager.m b/Source/NSHelpManager.m index 529161178..6748f36a6 100644 --- a/Source/NSHelpManager.m +++ b/Source/NSHelpManager.m @@ -27,28 +27,29 @@ Boston, MA 02110-1301, USA. */ -#include -#include -#include -#include -#include -#include -#include -#include "AppKit/NSAttributedString.h" -#include "AppKit/NSApplication.h" -#include "AppKit/NSWorkspace.h" -#include "AppKit/NSFileWrapper.h" -#include "AppKit/NSHelpManager.h" -#include "AppKit/NSHelpPanel.h" -#include "AppKit/NSHelpPanel.h" -#include "AppKit/NSCursor.h" -#include "AppKit/NSImage.h" -#include "AppKit/NSGraphics.h" -#include "AppKit/NSScrollView.h" -#include "AppKit/NSTextView.h" -#include "AppKit/NSTextStorage.h" +#import +#import +#import +#import +#import +#import +#import +#import +#import "AppKit/NSAttributedString.h" +#import "AppKit/NSApplication.h" +#import "AppKit/NSWorkspace.h" +#import "AppKit/NSFileWrapper.h" +#import "AppKit/NSHelpManager.h" +#import "AppKit/NSHelpPanel.h" +#import "AppKit/NSHelpPanel.h" +#import "AppKit/NSCursor.h" +#import "AppKit/NSImage.h" +#import "AppKit/NSGraphics.h" +#import "AppKit/NSScrollView.h" +#import "AppKit/NSTextView.h" +#import "AppKit/NSTextStorage.h" -#include "GNUstepGUI/GSHelpManagerPanel.h" +#import "GNUstepGUI/GSHelpManagerPanel.h" @implementation NSBundle (NSHelpManager) diff --git a/Source/NSMenuView.m b/Source/NSMenuView.m index 8f620ef19..182becef9 100644 --- a/Source/NSMenuView.m +++ b/Source/NSMenuView.m @@ -28,24 +28,32 @@ Boston, MA 02110-1301, USA. */ -#include -#include +#import +#import +#import +#import +#import +#import +//#import +#import +#import +#import -#include "AppKit/NSApplication.h" -#include "AppKit/NSEvent.h" -#include "AppKit/NSFont.h" -#include "AppKit/NSMenuView.h" -#include "AppKit/NSMenu.h" -#include "AppKit/NSButton.h" -#include "AppKit/NSPopUpButtonCell.h" -#include "AppKit/NSWindow.h" -#include "AppKit/PSOperators.h" -#include "AppKit/NSImage.h" +#import "AppKit/NSApplication.h" +#import "AppKit/NSEvent.h" +#import "AppKit/NSFont.h" +#import "AppKit/NSImage.h" +#import "AppKit/NSMenuView.h" +#import "AppKit/NSMenu.h" +#import "AppKit/NSButton.h" +#import "AppKit/NSPopUpButtonCell.h" +#import "AppKit/NSScreen.h" +#import "AppKit/NSWindow.h" +#import "AppKit/PSOperators.h" -#include "GNUstepGUI/GSTheme.h" -#include "GNUstepGUI/GSTitleView.h" +#import "GNUstepGUI/GSTheme.h" +#import "GNUstepGUI/GSTitleView.h" -#include typedef struct _GSCellRect { NSRect rect; @@ -60,7 +68,7 @@ typedef struct _GSCellRect { #ifdef GSIArray #undef GSIArray #endif -#include +#import static NSMapTable *viewInfo = 0; diff --git a/Source/NSPopUpButton.m b/Source/NSPopUpButton.m index 9c7ffe1c7..4c110c9b4 100644 --- a/Source/NSPopUpButton.m +++ b/Source/NSPopUpButton.m @@ -33,12 +33,14 @@ #import #import "AppKit/NSApplication.h" #import "AppKit/NSEvent.h" +#import "AppKit/NSGraphics.h" #import "AppKit/NSKeyValueBinding.h" #import "AppKit/NSPopUpButton.h" #import "AppKit/NSPopUpButtonCell.h" #import "AppKit/NSMenu.h" #import "AppKit/NSMenuItem.h" #import "AppKit/NSMenuView.h" +#import "AppKit/NSWindow.h" /* * class variables diff --git a/Source/NSPopUpButtonCell.m b/Source/NSPopUpButtonCell.m index cd945c0d2..c0c522adc 100644 --- a/Source/NSPopUpButtonCell.m +++ b/Source/NSPopUpButtonCell.m @@ -27,6 +27,7 @@ */ #import "config.h" +#import #import #import "AppKit/NSApplication.h" #import "AppKit/NSEvent.h" diff --git a/Source/NSToolbar.m b/Source/NSToolbar.m index 8bfe342e0..f41c3ed87 100644 --- a/Source/NSToolbar.m +++ b/Source/NSToolbar.m @@ -29,31 +29,32 @@ Boston, MA 02110-1301, USA. */ -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include "AppKit/NSApplication.h" -#include "AppKit/NSEvent.h" -#include "AppKit/NSMenu.h" -#include "AppKit/NSNibLoading.h" -#include "AppKit/NSToolbar.h" -#include "AppKit/NSToolbarItem.h" -#include "AppKit/NSView.h" -#include "AppKit/NSWindow.h" -#include "GNUstepGUI/GSToolbarView.h" +#import +#import +#import +#import +#import +#import +#import +#import +#import +#import +#import +#import +#import +#import "AppKit/NSApplication.h" +#import "AppKit/NSEvent.h" +#import "AppKit/NSGraphics.h" +#import "AppKit/NSMenu.h" +#import "AppKit/NSNibLoading.h" +#import "AppKit/NSToolbar.h" +#import "AppKit/NSToolbarItem.h" +#import "AppKit/NSView.h" +#import "AppKit/NSWindow.h" +#import "GNUstepGUI/GSToolbarView.h" -#include "NSToolbarFrameworkPrivate.h" -#include "GSToolbarCustomizationPalette.h" +#import "NSToolbarFrameworkPrivate.h" +#import "GSToolbarCustomizationPalette.h" // internal static NSNotificationCenter *nc = nil;