mirror of
https://github.com/gnustep/libs-gui.git
synced 2025-04-22 13:10:59 +00:00
Yet another bit of #include -> #import replacement. Replace includes of Foundation.h.
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@30034 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Fred Kiefer
parent
0d78f7f50a
commit
6483053f29
18 changed files with 167 additions and 114 deletions
21
ChangeLog
21
ChangeLog
|
|
@ -1,3 +1,24 @@
|
|||
2010-03-25 Fred Kiefer <FredKiefer@gmx.de>
|
||||
|
||||
* Headers/AppKit/NSController.h
|
||||
* Headers/AppKit/NSGlyphGenerator.h
|
||||
* Headers/AppKit/NSGradient.h
|
||||
* Headers/AppKit/NSGraphicsContext.h
|
||||
* Headers/AppKit/NSPopUpButton.h
|
||||
* Headers/AppKit/NSShadow.h
|
||||
* Source/NSPopUpButtonCell.m
|
||||
* Source/NSGlyphGenerator.m
|
||||
* Source/NSPopUpButton.m
|
||||
* Source/NSMenu.m
|
||||
* Source/NSGradient.m
|
||||
* Source/GSHorizontalTypesetter.m
|
||||
* Source/NSTextView.m
|
||||
* Source/NSShadow.m
|
||||
* Source/NSPrintPanel.m
|
||||
* Source/NSSpellChecker.m
|
||||
* Source/NSDocument.m: Yet another bit of #include -> #import
|
||||
replacement. Replace includes of Foundation.h.
|
||||
|
||||
2010-03-24 Fred Kiefer <FredKiefer@gmx.de>
|
||||
|
||||
* Headers/AppKit/NSColorList.h
|
||||
|
|
|
|||
|
|
@ -28,7 +28,7 @@
|
|||
#ifndef _GNUstep_H_NSController
|
||||
#define _GNUstep_H_NSController
|
||||
|
||||
#include <Foundation/NSObject.h>
|
||||
#import <Foundation/NSObject.h>
|
||||
|
||||
#if OS_API_VERSION(MAC_OS_X_VERSION_10_3, GS_API_LATEST)
|
||||
|
||||
|
|
|
|||
|
|
@ -31,10 +31,12 @@
|
|||
#define _GNUstep_H_NSGlyphGenerator
|
||||
#import <GNUstepBase/GSVersionMacros.h>
|
||||
|
||||
#import <Foundation/Foundation.h>
|
||||
#import <Foundation/NSObject.h>
|
||||
// define NSGlyph
|
||||
#import <AppKit/NSFont.h>
|
||||
|
||||
@class NSAttributedString;
|
||||
|
||||
#if OS_API_VERSION(MAC_OS_X_VERSION_10_3, GS_API_LATEST)
|
||||
|
||||
enum
|
||||
|
|
|
|||
|
|
@ -32,7 +32,13 @@
|
|||
#import <GNUstepBase/GSVersionMacros.h>
|
||||
|
||||
#if OS_API_VERSION(MAC_OS_X_VERSION_10_5, GS_API_LATEST)
|
||||
#import <Foundation/Foundation.h>
|
||||
#import <Foundation/NSGeometry.h>
|
||||
#import <Foundation/NSObject.h>
|
||||
|
||||
@class NSArray;
|
||||
@class NSBezierPath;
|
||||
@class NSColor;
|
||||
@class NSColorSpace;
|
||||
|
||||
typedef NSUInteger NSGradientDrawingOptions;
|
||||
|
||||
|
|
@ -41,10 +47,6 @@ enum {
|
|||
NSGradientDrawsAfterEndingLocation = 2
|
||||
};
|
||||
|
||||
@class NSBezierPath;
|
||||
@class NSColor;
|
||||
@class NSColorSpace;
|
||||
|
||||
@interface NSGradient : NSObject <NSCopying, NSCoding>
|
||||
{
|
||||
NSColorSpace *_colorSpace;
|
||||
|
|
|
|||
|
|
@ -32,10 +32,10 @@
|
|||
#define _NSGraphicsContext_h_INCLUDE
|
||||
#import <GNUstepBase/GSVersionMacros.h>
|
||||
|
||||
#include <Foundation/NSObject.h>
|
||||
#include <Foundation/NSMapTable.h>
|
||||
#import <Foundation/NSObject.h>
|
||||
#import <Foundation/NSMapTable.h>
|
||||
|
||||
#include <AppKit/AppKitDefines.h>
|
||||
#import <AppKit/AppKitDefines.h>
|
||||
|
||||
@class NSDate;
|
||||
@class NSDictionary;
|
||||
|
|
@ -125,7 +125,7 @@ typedef enum _GSTextDrawingMode
|
|||
} GSTextDrawingMode;
|
||||
|
||||
// We have to load this after the NSCompositingOperation are defined!!!
|
||||
#include <GNUstepGUI/GSMethodTable.h>
|
||||
#import <GNUstepGUI/GSMethodTable.h>
|
||||
|
||||
/*
|
||||
* Window ordering
|
||||
|
|
|
|||
|
|
@ -32,10 +32,11 @@
|
|||
#ifndef _GNUstep_H_NSPopUpButton
|
||||
#define _GNUstep_H_NSPopUpButton
|
||||
|
||||
#include <Foundation/Foundation.h>
|
||||
#import <Foundation/NSGeometry.h>
|
||||
|
||||
#include <AppKit/NSButton.h>
|
||||
#include <AppKit/NSMenuItem.h>
|
||||
#import <AppKit/AppKitDefines.h>
|
||||
#import <AppKit/NSButton.h>
|
||||
#import <AppKit/NSMenuItem.h>
|
||||
|
||||
@class NSString;
|
||||
@class NSArray;
|
||||
|
|
|
|||
|
|
@ -32,7 +32,8 @@
|
|||
#import <GNUstepBase/GSVersionMacros.h>
|
||||
|
||||
#if OS_API_VERSION(MAC_OS_X_VERSION_10_3, GS_API_LATEST)
|
||||
#import <Foundation/Foundation.h>
|
||||
#import <Foundation/NSGeometry.h>
|
||||
#import <Foundation/NSObject.h>
|
||||
|
||||
@class NSColor;
|
||||
|
||||
|
|
|
|||
|
|
@ -25,22 +25,23 @@
|
|||
Boston, MA 02110-1301, USA.
|
||||
*/
|
||||
|
||||
#include "GNUstepGUI/GSHorizontalTypesetter.h"
|
||||
|
||||
#include <math.h>
|
||||
|
||||
#include <Foundation/NSDebug.h>
|
||||
#include <Foundation/NSException.h>
|
||||
#include <Foundation/NSGeometry.h>
|
||||
#include <Foundation/NSLock.h>
|
||||
#include <Foundation/NSValue.h>
|
||||
#import <Foundation/NSDebug.h>
|
||||
#import <Foundation/NSException.h>
|
||||
#import <Foundation/NSGeometry.h>
|
||||
#import <Foundation/NSLock.h>
|
||||
#import <Foundation/NSThread.h>
|
||||
#import <Foundation/NSValue.h>
|
||||
|
||||
#include "AppKit/NSAttributedString.h"
|
||||
#include "AppKit/NSParagraphStyle.h"
|
||||
#include "AppKit/NSTextAttachment.h"
|
||||
#include "AppKit/NSTextContainer.h"
|
||||
#include "AppKit/NSTextStorage.h"
|
||||
#include "GNUstepGUI/GSLayoutManager.h"
|
||||
#import "AppKit/NSAttributedString.h"
|
||||
#import "AppKit/NSParagraphStyle.h"
|
||||
#import "AppKit/NSTextAttachment.h"
|
||||
#import "AppKit/NSTextContainer.h"
|
||||
#import "AppKit/NSTextStorage.h"
|
||||
#import "GNUstepGUI/GSLayoutManager.h"
|
||||
#import "GNUstepGUI/GSHorizontalTypesetter.h"
|
||||
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -28,19 +28,25 @@
|
|||
Boston, MA 02110-1301, USA.
|
||||
*/
|
||||
|
||||
#include <Foundation/NSData.h>
|
||||
#include "AppKit/NSBox.h"
|
||||
#include "AppKit/NSDocument.h"
|
||||
#include "AppKit/NSFileWrapper.h"
|
||||
#include "AppKit/NSSavePanel.h"
|
||||
#include "AppKit/NSPageLayout.h"
|
||||
#include "AppKit/NSPrintInfo.h"
|
||||
#include "AppKit/NSPrintOperation.h"
|
||||
#include "AppKit/NSPopUpButton.h"
|
||||
#include "AppKit/NSView.h"
|
||||
#include "NSDocumentFrameworkPrivate.h"
|
||||
#import <Foundation/NSData.h>
|
||||
#import <Foundation/NSException.h>
|
||||
#import <Foundation/NSFileManager.h>
|
||||
#import <Foundation/NSNotification.h>
|
||||
#import <Foundation/NSProcessInfo.h>
|
||||
#import <Foundation/NSUndoManager.h>
|
||||
#import <Foundation/NSURL.h>
|
||||
#import "AppKit/NSBox.h"
|
||||
#import "AppKit/NSDocument.h"
|
||||
#import "AppKit/NSFileWrapper.h"
|
||||
#import "AppKit/NSSavePanel.h"
|
||||
#import "AppKit/NSPageLayout.h"
|
||||
#import "AppKit/NSPopUpButton.h"
|
||||
#import "AppKit/NSPrintInfo.h"
|
||||
#import "AppKit/NSPrintOperation.h"
|
||||
#import "AppKit/NSView.h"
|
||||
#import "NSDocumentFrameworkPrivate.h"
|
||||
|
||||
#include "GSGuiPrivate.h"
|
||||
#import "GSGuiPrivate.h"
|
||||
|
||||
@implementation NSDocument
|
||||
|
||||
|
|
|
|||
|
|
@ -25,15 +25,18 @@
|
|||
Boston, MA 02110-1301, USA.
|
||||
*/
|
||||
|
||||
#include <Foundation/NSDictionary.h>
|
||||
#include <GNUstepBase/Unicode.h>
|
||||
#import <Foundation/NSCharacterSet.h>
|
||||
#import <Foundation/NSDictionary.h>
|
||||
#import <Foundation/NSException.h>
|
||||
#import <Foundation/NSValue.h>
|
||||
#import <GNUstepBase/Unicode.h>
|
||||
|
||||
#include "AppKit/NSAttributedString.h"
|
||||
#include "AppKit/NSFont.h"
|
||||
#include "AppKit/NSGlyphGenerator.h"
|
||||
#import "AppKit/NSAttributedString.h"
|
||||
#import "AppKit/NSFont.h"
|
||||
#import "AppKit/NSGlyphGenerator.h"
|
||||
/* just for NSAttachmentCharacter */
|
||||
#include "AppKit/NSTextAttachment.h"
|
||||
#include "GNUstepGUI/GSFontInfo.h"
|
||||
#import "AppKit/NSTextAttachment.h"
|
||||
#import "GNUstepGUI/GSFontInfo.h"
|
||||
|
||||
static NSGlyphGenerator* instance;
|
||||
|
||||
|
|
|
|||
|
|
@ -29,7 +29,7 @@
|
|||
Boston, MA 02110-1301, USA.
|
||||
*/
|
||||
|
||||
#import <Foundation/NSGeometry.h>
|
||||
#import <Foundation/NSException.h>
|
||||
#import "AppKit/NSBezierPath.h"
|
||||
#import "AppKit/NSColor.h"
|
||||
#import "AppKit/NSColorSpace.h"
|
||||
|
|
|
|||
|
|
@ -33,31 +33,36 @@
|
|||
Boston, MA 02110-1301, USA.
|
||||
*/
|
||||
|
||||
#include "config.h"
|
||||
#include <Foundation/NSCoder.h>
|
||||
#include <Foundation/NSArray.h>
|
||||
#include <Foundation/NSException.h>
|
||||
#include <Foundation/NSProcessInfo.h>
|
||||
#include <Foundation/NSString.h>
|
||||
#include <Foundation/NSNotification.h>
|
||||
#import "config.h"
|
||||
#import <Foundation/NSCoder.h>
|
||||
#import <Foundation/NSArray.h>
|
||||
#import <Foundation/NSDebug.h>
|
||||
#import <Foundation/NSException.h>
|
||||
#import <Foundation/NSProcessInfo.h>
|
||||
#import <Foundation/NSString.h>
|
||||
#import <Foundation/NSNotification.h>
|
||||
#import <Foundation/NSNotificationQueue.h>
|
||||
#import <Foundation/NSRunLoop.h>
|
||||
#import <Foundation/NSUserDefaults.h>
|
||||
#import <Foundation/NSValue.h>
|
||||
|
||||
#include "AppKit/NSMatrix.h"
|
||||
#include "AppKit/NSApplication.h"
|
||||
#include "AppKit/NSWindow.h"
|
||||
#include "AppKit/NSEvent.h"
|
||||
#include "AppKit/NSFont.h"
|
||||
#include "AppKit/NSImage.h"
|
||||
#include "AppKit/NSMenu.h"
|
||||
#include "AppKit/NSMenuItem.h"
|
||||
#include "AppKit/NSMenuView.h"
|
||||
#include "AppKit/NSPanel.h"
|
||||
#include "AppKit/NSPopUpButton.h"
|
||||
#include "AppKit/NSPopUpButtonCell.h"
|
||||
#include "AppKit/NSScreen.h"
|
||||
#include "AppKit/NSAttributedString.h"
|
||||
#import "AppKit/NSMatrix.h"
|
||||
#import "AppKit/NSApplication.h"
|
||||
#import "AppKit/NSWindow.h"
|
||||
#import "AppKit/NSEvent.h"
|
||||
#import "AppKit/NSFont.h"
|
||||
#import "AppKit/NSImage.h"
|
||||
#import "AppKit/NSMenu.h"
|
||||
#import "AppKit/NSMenuItem.h"
|
||||
#import "AppKit/NSMenuView.h"
|
||||
#import "AppKit/NSPanel.h"
|
||||
#import "AppKit/NSPopUpButton.h"
|
||||
#import "AppKit/NSPopUpButtonCell.h"
|
||||
#import "AppKit/NSScreen.h"
|
||||
#import "AppKit/NSAttributedString.h"
|
||||
|
||||
#include "GSGuiPrivate.h"
|
||||
#include "GNUstepGUI/GSTheme.h"
|
||||
#import "GSGuiPrivate.h"
|
||||
#import "GNUstepGUI/GSTheme.h"
|
||||
|
||||
/*
|
||||
Drawing related:
|
||||
|
|
|
|||
|
|
@ -28,16 +28,17 @@
|
|||
Boston, MA 02110-1301, USA.
|
||||
*/
|
||||
|
||||
#include <Foundation/Foundation.h>
|
||||
#include <Foundation/NSKeyValueObserving.h>
|
||||
#include "AppKit/NSApplication.h"
|
||||
#include "AppKit/NSEvent.h"
|
||||
#include "AppKit/NSKeyValueBinding.h"
|
||||
#include "AppKit/NSPopUpButton.h"
|
||||
#include "AppKit/NSPopUpButtonCell.h"
|
||||
#include "AppKit/NSMenu.h"
|
||||
#include "AppKit/NSMenuItem.h"
|
||||
#include "AppKit/NSMenuView.h"
|
||||
#import <Foundation/NSKeyValueCoding.h>
|
||||
#import <Foundation/NSKeyValueObserving.h>
|
||||
#import <Foundation/NSValue.h>
|
||||
#import "AppKit/NSApplication.h"
|
||||
#import "AppKit/NSEvent.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"
|
||||
|
||||
/*
|
||||
* class variables
|
||||
|
|
|
|||
|
|
@ -26,17 +26,18 @@
|
|||
Boston, MA 02110-1301, USA.
|
||||
*/
|
||||
|
||||
#include "config.h"
|
||||
#include "AppKit/NSApplication.h"
|
||||
#include "AppKit/NSEvent.h"
|
||||
#include "AppKit/NSGraphics.h"
|
||||
#include "AppKit/NSImage.h"
|
||||
#include "AppKit/NSMenu.h"
|
||||
#include "AppKit/NSMenuView.h"
|
||||
#include "AppKit/NSPopUpButton.h"
|
||||
#include "AppKit/NSPopUpButtonCell.h"
|
||||
#include "AppKit/NSWindow.h"
|
||||
#include "GNUstepGUI/GSTheme.h"
|
||||
#import "config.h"
|
||||
#import <Foundation/NSValue.h>
|
||||
#import "AppKit/NSApplication.h"
|
||||
#import "AppKit/NSEvent.h"
|
||||
#import "AppKit/NSGraphics.h"
|
||||
#import "AppKit/NSImage.h"
|
||||
#import "AppKit/NSMenu.h"
|
||||
#import "AppKit/NSMenuView.h"
|
||||
#import "AppKit/NSPopUpButton.h"
|
||||
#import "AppKit/NSPopUpButtonCell.h"
|
||||
#import "AppKit/NSWindow.h"
|
||||
#import "GNUstepGUI/GSTheme.h"
|
||||
|
||||
/* The image to use in a specific popupbutton depends on type and
|
||||
* preferred edge; that is, _pbc_image[0] if it is a
|
||||
|
|
|
|||
|
|
@ -29,23 +29,24 @@
|
|||
Boston, MA 02110-1301, USA.
|
||||
*/
|
||||
|
||||
#include "config.h"
|
||||
#include <Foundation/NSArray.h>
|
||||
#include <Foundation/NSBundle.h>
|
||||
#include <Foundation/NSDictionary.h>
|
||||
#include <Foundation/NSValue.h>
|
||||
#include "AppKit/NSApplication.h"
|
||||
#include "AppKit/NSForm.h"
|
||||
#include "AppKit/NSNibLoading.h"
|
||||
#include "AppKit/NSPrinter.h"
|
||||
#include "AppKit/NSPrintPanel.h"
|
||||
#include "AppKit/NSPrintInfo.h"
|
||||
#include "AppKit/NSPrintOperation.h"
|
||||
#include "AppKit/NSPopUpButton.h"
|
||||
#include "AppKit/NSSavePanel.h"
|
||||
#include "AppKit/NSView.h"
|
||||
#include "GSGuiPrivate.h"
|
||||
#include "GNUstepGUI/GSPrinting.h"
|
||||
#import "config.h"
|
||||
#import <Foundation/NSArray.h>
|
||||
#import <Foundation/NSBundle.h>
|
||||
#import <Foundation/NSDebug.h>
|
||||
#import <Foundation/NSDictionary.h>
|
||||
#import <Foundation/NSValue.h>
|
||||
#import "AppKit/NSApplication.h"
|
||||
#import "AppKit/NSForm.h"
|
||||
#import "AppKit/NSNibLoading.h"
|
||||
#import "AppKit/NSPrinter.h"
|
||||
#import "AppKit/NSPrintPanel.h"
|
||||
#import "AppKit/NSPrintInfo.h"
|
||||
#import "AppKit/NSPrintOperation.h"
|
||||
#import "AppKit/NSPopUpButton.h"
|
||||
#import "AppKit/NSSavePanel.h"
|
||||
#import "AppKit/NSView.h"
|
||||
#import "GSGuiPrivate.h"
|
||||
#import "GNUstepGUI/GSPrinting.h"
|
||||
|
||||
static NSPrintPanel *shared_instance;
|
||||
|
||||
|
|
|
|||
|
|
@ -27,6 +27,7 @@
|
|||
Boston, MA 02110-1301, USA.
|
||||
*/
|
||||
|
||||
#import <Foundation/NSString.h>
|
||||
#import "AppKit/NSShadow.h"
|
||||
#import "AppKit/NSColor.h"
|
||||
|
||||
|
|
|
|||
|
|
@ -32,12 +32,17 @@
|
|||
|
||||
#include "config.h"
|
||||
#import <Foundation/NSArray.h>
|
||||
#import <Foundation/NSSet.h>
|
||||
#import <Foundation/NSDictionary.h>
|
||||
#import <Foundation/NSEnumerator.h>
|
||||
#import <Foundation/NSProxy.h>
|
||||
#import <Foundation/NSBundle.h>
|
||||
#import <Foundation/NSConnection.h>
|
||||
#import <Foundation/NSDictionary.h>
|
||||
#import <Foundation/NSDistantObject.h>
|
||||
#import <Foundation/NSEnumerator.h>
|
||||
#import <Foundation/NSException.h>
|
||||
#import <Foundation/NSNotification.h>
|
||||
#import <Foundation/NSProxy.h>
|
||||
#import <Foundation/NSSet.h>
|
||||
#import <Foundation/NSSpellServer.h>
|
||||
#import <Foundation/NSUserDefaults.h>
|
||||
#import <Foundation/NSValue.h>
|
||||
#import "AppKit/NSNibLoading.h"
|
||||
#import "AppKit/NSEvent.h"
|
||||
|
|
|
|||
|
|
@ -45,10 +45,12 @@
|
|||
Boston, MA 02110-1301, USA.
|
||||
*/
|
||||
|
||||
#include "config.h"
|
||||
#import "config.h"
|
||||
#import <Foundation/NSArchiver.h>
|
||||
#import <Foundation/NSArray.h>
|
||||
#import <Foundation/NSCharacterSet.h>
|
||||
#import <Foundation/NSCoder.h>
|
||||
#import <Foundation/NSData.h>
|
||||
#import <Foundation/NSDebug.h>
|
||||
#import <Foundation/NSEnumerator.h>
|
||||
#import <Foundation/NSException.h>
|
||||
|
|
@ -83,7 +85,7 @@
|
|||
#import "AppKit/NSTextStorage.h"
|
||||
#import "AppKit/NSTextView.h"
|
||||
#import "AppKit/NSWindow.h"
|
||||
#include "GSGuiPrivate.h"
|
||||
#import "GSGuiPrivate.h"
|
||||
|
||||
|
||||
/*
|
||||
|
|
|
|||
Loading…
Reference in a new issue