From 8b4a8820a8b380d455fd83088476f3fb9e601374 Mon Sep 17 00:00:00 2001 From: rfm Date: Mon, 30 Oct 2023 14:30:06 +0000 Subject: [PATCH] Fix to ensure correct version of mheader fiel is imported --- Source/GSInvocation.h | 2 +- Source/GSPrivate.h | 6 +++--- Source/NSAppleEventDescriptor.m | 2 +- Source/NSAppleEventManager.m | 2 +- Source/NSAppleScript.m | 2 +- Source/NSCallBacks.h | 4 ++-- Source/NSDateComponentsFormatter.m | 12 ++++++------ Source/NSDateInterval.m | 8 ++++---- Source/NSDateIntervalFormatter.m | 14 +++++++------- Source/NSExtensionContext.m | 11 ++++++----- Source/NSExtensionItem.m | 8 ++++---- Source/NSFileVersion.m | 20 ++++++++++---------- Source/NSHFSFileTypes.m | 2 +- Source/NSItemProviderReadingWriting.m | 2 +- Source/NSMetadataAttributes.m | 4 ++-- Source/NSObjectScripting.m | 2 +- Source/NSScriptClassDescription.m | 2 +- Source/NSScriptCoercionHandler.m | 2 +- Source/NSScriptCommand.m | 2 +- Source/NSScriptCommandDescription.m | 2 +- Source/NSScriptExecutionContext.m | 2 +- Source/NSScriptKeyValueCoding.m | 2 +- Source/NSScriptObjectSpecifiers.m | 2 +- Source/NSScriptStandardSuiteCommands.m | 2 +- Source/NSScriptSuiteRegistry.m | 2 +- Source/NSUserActivity.m | 2 +- Source/NSUserScriptTask.m | 2 +- Source/objc-load.h | 2 +- 28 files changed, 63 insertions(+), 62 deletions(-) diff --git a/Source/GSInvocation.h b/Source/GSInvocation.h index e75240183..090eab41e 100644 --- a/Source/GSInvocation.h +++ b/Source/GSInvocation.h @@ -25,7 +25,7 @@ #ifndef __GSInvocation_h_GNUSTEP_BASE_INCLUDE #define __GSInvocation_h_GNUSTEP_BASE_INCLUDE -#include +#import "Foundation/NSInvocation.h" @class NSMutableData; diff --git a/Source/GSPrivate.h b/Source/GSPrivate.h index 8f88eafbb..3fff7dfc6 100644 --- a/Source/GSPrivate.h +++ b/Source/GSPrivate.h @@ -54,9 +54,9 @@ NSTimeInterval GSPrivateTimeNow() GS_ATTRIB_PRIVATE; -#include "GNUstepBase/GSObjCRuntime.h" +#import "GNUstepBase/GSObjCRuntime.h" -#include "Foundation/NSArray.h" +#import "Foundation/NSArray.h" #ifdef __GNUSTEP_RUNTIME__ struct objc_category; @@ -87,7 +87,7 @@ typedef struct objc_category* Category; } @end -#include "Foundation/NSString.h" +#import "Foundation/NSString.h" /** * Macro to manage memory for chunks of code that need to work with diff --git a/Source/NSAppleEventDescriptor.m b/Source/NSAppleEventDescriptor.m index 89eb955f9..1758b038b 100644 --- a/Source/NSAppleEventDescriptor.m +++ b/Source/NSAppleEventDescriptor.m @@ -22,7 +22,7 @@ Boston, MA 02110 USA. */ -#include +#import "Foundation/NSAppleEventDescriptor.h" @implementation NSAppleEventDescriptor diff --git a/Source/NSAppleEventManager.m b/Source/NSAppleEventManager.m index 3d8f395c6..84fcb591e 100644 --- a/Source/NSAppleEventManager.m +++ b/Source/NSAppleEventManager.m @@ -22,7 +22,7 @@ Boston, MA 02110 USA. */ -#include +#import "Foundation/NSAppleEventManager.h" @implementation NSAppleEventManager diff --git a/Source/NSAppleScript.m b/Source/NSAppleScript.m index 9fda710e3..314833a3b 100644 --- a/Source/NSAppleScript.m +++ b/Source/NSAppleScript.m @@ -23,7 +23,7 @@ Boston, MA 02110 USA. */ -#include +#import "Foundation/NSAppleScript.h" @implementation NSAppleScript diff --git a/Source/NSCallBacks.h b/Source/NSCallBacks.h index 91f6cb9bb..234cf729e 100644 --- a/Source/NSCallBacks.h +++ b/Source/NSCallBacks.h @@ -29,8 +29,8 @@ /**** Included Headers *******************************************************/ -#include "Foundation/NSObject.h" -#include "Foundation/NSString.h" +#import "Foundation/NSObject.h" +#import "Foundation/NSString.h" #if ( (__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 3) ) && HAVE_VISIBILITY_ATTRIBUTE ) diff --git a/Source/NSDateComponentsFormatter.m b/Source/NSDateComponentsFormatter.m index 7b7666f7a..123241f3d 100644 --- a/Source/NSDateComponentsFormatter.m +++ b/Source/NSDateComponentsFormatter.m @@ -22,12 +22,12 @@ Boston, MA 02110 USA. */ -#include -#include -#include -#include -#include -#include +#import "Foundation/NSDateComponentsFormatter.h" +#import "Foundation/NSDate.h" +#import "Foundation/NSString.h" +#import "Foundation/NSValue.h" +#import "Foundation/NSException.h" +#import "Foundation/NSNumberFormatter.h" @implementation NSDateComponentsFormatter diff --git a/Source/NSDateInterval.m b/Source/NSDateInterval.m index 28e1972b0..448a560b0 100644 --- a/Source/NSDateInterval.m +++ b/Source/NSDateInterval.m @@ -22,10 +22,10 @@ Boston, MA 02110 USA. */ -#include -#include -#include -#include +#import "Foundation/NSDateInterval.h" +#import "Foundation/NSDate.h" +#import "Foundation/NSArray.h" +#import "Foundation/NSException.h" @implementation NSDateInterval diff --git a/Source/NSDateIntervalFormatter.m b/Source/NSDateIntervalFormatter.m index 5a4060f5f..9ffb8bd65 100644 --- a/Source/NSDateIntervalFormatter.m +++ b/Source/NSDateIntervalFormatter.m @@ -22,13 +22,13 @@ Boston, MA 02110 USA. */ -#include -#include -#include -#include -#include -#include -#include +#import "Foundation/NSDateIntervalFormatter.h" +#import "Foundation/NSLocale.h" +#import "Foundation/NSCalendar.h" +#import "Foundation/NSTimeZone.h" +#import "Foundation/NSString.h" +#import "Foundation/NSDate.h" +#import "Foundation/NSDateInterval.h" @implementation NSDateIntervalFormatter // Properties diff --git a/Source/NSExtensionContext.m b/Source/NSExtensionContext.m index 76532f932..a01ac582c 100644 --- a/Source/NSExtensionContext.m +++ b/Source/NSExtensionContext.m @@ -22,11 +22,12 @@ Boston, MA 02110 USA. */ -#include -#include -#include -#include -#include +#import "Foundation/NSExtensionContext.h" +#import "Foundation/NSError.h" +#import "Foundation/NSArray.h" +#import "Foundation/NSURL.h" +#import "Foundation/NSString.h" +#import "GNUstepBase/NSObject+GNUstepBase.h" @implementation NSExtensionContext diff --git a/Source/NSExtensionItem.m b/Source/NSExtensionItem.m index be3a5aa53..f3374a1a9 100644 --- a/Source/NSExtensionItem.m +++ b/Source/NSExtensionItem.m @@ -22,10 +22,10 @@ Boston, MA 02110 USA. */ -#include -#include -#include -#include +#import "Foundation/NSExtensionItem.h" +#import "Foundation/NSAttributedString.h" +#import "Foundation/NSDictionary.h" +#import "Foundation/NSArray.h" @implementation NSExtensionItem diff --git a/Source/NSFileVersion.m b/Source/NSFileVersion.m index 6ca63427b..c6439d872 100644 --- a/Source/NSFileVersion.m +++ b/Source/NSFileVersion.m @@ -23,16 +23,16 @@ Boston, MA 02110 USA. */ -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#import "Foundation/NSFileVersion.h" +#import "Foundation/NSArray.h" +#import "Foundation/NSDictionary.h" +#import "Foundation/NSDate.h" +#import "Foundation/NSError.h" +#import "Foundation/NSString.h" +#import "Foundation/NSURL.h" +#import "Foundation/NSPersonNameComponents.h" +#import "Foundation/NSFileManager.h" +#import "Foundation/NSData.h" @interface NSFileVersion (Private) - (void) _setURL: (NSURL *)u; diff --git a/Source/NSHFSFileTypes.m b/Source/NSHFSFileTypes.m index 03217581a..b57ceb282 100644 --- a/Source/NSHFSFileTypes.m +++ b/Source/NSHFSFileTypes.m @@ -22,7 +22,7 @@ Boston, MA 02110 USA. */ -#include +#import "Foundation/NSHFSFileTypes.h" GS_DECLARE NSString *NSFileTypeForHFSTypeCode(NSUInteger hfsFileTypeCode) { diff --git a/Source/NSItemProviderReadingWriting.m b/Source/NSItemProviderReadingWriting.m index 4832b5630..89bf8cd47 100644 --- a/Source/NSItemProviderReadingWriting.m +++ b/Source/NSItemProviderReadingWriting.m @@ -22,7 +22,7 @@ Boston, MA 02110 USA. */ -#include +#import "Foundation/NSItemProviderReadingWriting.h" @implementation NSItemProviderReadingWriting diff --git a/Source/NSMetadataAttributes.m b/Source/NSMetadataAttributes.m index 73ae9b97f..0d3a21a5d 100644 --- a/Source/NSMetadataAttributes.m +++ b/Source/NSMetadataAttributes.m @@ -22,8 +22,8 @@ Boston, MA 02110 USA. */ -#include -#include +#import "Foundation/NSMetadataAttributes.h" +#import "Foundation/NSString.h" GS_DECLARE NSString *const NSMetadataItemAcquisitionMakeKey = @"NSMetadataItemAcquisitionMakeKey"; GS_DECLARE NSString *const NSMetadataItemAcquisitionModelKey = @"NSMetadataItemAcquisitionModelKey"; diff --git a/Source/NSObjectScripting.m b/Source/NSObjectScripting.m index 87dccd606..5c1fb89e1 100644 --- a/Source/NSObjectScripting.m +++ b/Source/NSObjectScripting.m @@ -22,7 +22,7 @@ Boston, MA 02110 USA. */ -#include +#import "Foundation/NSObjectScripting.h" @implementation NSObjectScripting diff --git a/Source/NSScriptClassDescription.m b/Source/NSScriptClassDescription.m index 1dfef91de..478fb18bb 100644 --- a/Source/NSScriptClassDescription.m +++ b/Source/NSScriptClassDescription.m @@ -23,7 +23,7 @@ Boston, MA 02110 USA. */ -#include +#import "Foundation/NSScriptClassDescription.h" @implementation NSScriptClassDescription diff --git a/Source/NSScriptCoercionHandler.m b/Source/NSScriptCoercionHandler.m index 7b427864b..b844a2529 100644 --- a/Source/NSScriptCoercionHandler.m +++ b/Source/NSScriptCoercionHandler.m @@ -23,7 +23,7 @@ Boston, MA 02110 USA. */ -#include +#import "Foundation/NSScriptCoercionHandler.h" @implementation NSScriptCoercionHandler diff --git a/Source/NSScriptCommand.m b/Source/NSScriptCommand.m index 75c5f41da..d26174252 100644 --- a/Source/NSScriptCommand.m +++ b/Source/NSScriptCommand.m @@ -23,7 +23,7 @@ Boston, MA 02110 USA. */ -#include +#import "Foundation/NSScriptCommand.h" @implementation NSScriptCommand diff --git a/Source/NSScriptCommandDescription.m b/Source/NSScriptCommandDescription.m index 6db8f5172..a6941074b 100644 --- a/Source/NSScriptCommandDescription.m +++ b/Source/NSScriptCommandDescription.m @@ -23,7 +23,7 @@ Boston, MA 02110 USA. */ -#include +#import "Foundation/NSScriptCommandDescription.h" @implementation NSScriptCommandDescription diff --git a/Source/NSScriptExecutionContext.m b/Source/NSScriptExecutionContext.m index 99b14e270..a68ad2fe0 100644 --- a/Source/NSScriptExecutionContext.m +++ b/Source/NSScriptExecutionContext.m @@ -23,7 +23,7 @@ Boston, MA 02110 USA. */ -#include +#import "Foundation/NSScriptExecutionContext.h" @implementation NSScriptExecutionContext diff --git a/Source/NSScriptKeyValueCoding.m b/Source/NSScriptKeyValueCoding.m index 6edd9fb04..c0d38e875 100644 --- a/Source/NSScriptKeyValueCoding.m +++ b/Source/NSScriptKeyValueCoding.m @@ -23,7 +23,7 @@ Boston, MA 02110 USA. */ -#include +#import "Foundation/NSScriptKeyValueCoding.h" @implementation NSScriptKeyValueCoding diff --git a/Source/NSScriptObjectSpecifiers.m b/Source/NSScriptObjectSpecifiers.m index 96573d14f..42229f62c 100644 --- a/Source/NSScriptObjectSpecifiers.m +++ b/Source/NSScriptObjectSpecifiers.m @@ -23,7 +23,7 @@ Boston, MA 02110 USA. */ -#include +#import "Foundation/NSScriptObjectSpecifiers.h" @implementation NSScriptObjectSpecifiers diff --git a/Source/NSScriptStandardSuiteCommands.m b/Source/NSScriptStandardSuiteCommands.m index 29465a33d..dbee65987 100644 --- a/Source/NSScriptStandardSuiteCommands.m +++ b/Source/NSScriptStandardSuiteCommands.m @@ -23,7 +23,7 @@ Boston, MA 02110 USA. */ -#include +#import "Foundation/NSScriptStandardSuiteCommands.h" @implementation NSScriptStandardSuiteCommands diff --git a/Source/NSScriptSuiteRegistry.m b/Source/NSScriptSuiteRegistry.m index ff7917697..14366a1c9 100644 --- a/Source/NSScriptSuiteRegistry.m +++ b/Source/NSScriptSuiteRegistry.m @@ -23,7 +23,7 @@ Boston, MA 02110 USA. */ -#include +#import "Foundation/NSScriptSuiteRegistry.h" @implementation NSScriptSuiteRegistry diff --git a/Source/NSUserActivity.m b/Source/NSUserActivity.m index 7fc7a9457..c3be01c49 100644 --- a/Source/NSUserActivity.m +++ b/Source/NSUserActivity.m @@ -22,7 +22,7 @@ Boston, MA 02110 USA. */ -#include +#import "Foundation/NSUserActivity.h" @implementation NSUserActivity diff --git a/Source/NSUserScriptTask.m b/Source/NSUserScriptTask.m index adddd9478..62c1a7178 100644 --- a/Source/NSUserScriptTask.m +++ b/Source/NSUserScriptTask.m @@ -23,7 +23,7 @@ Boston, MA 02110 USA. */ -#include +#import "Foundation/NSUserScriptTask.h" @implementation NSUserScriptTask diff --git a/Source/objc-load.h b/Source/objc-load.h index c00d8f487..bfb6ab0a9 100644 --- a/Source/objc-load.h +++ b/Source/objc-load.h @@ -31,7 +31,7 @@ #define __objc_load_h_INCLUDE #include -#include +#include "Foundation/NSString.h" #ifdef HAVE_DLADDR #define LINKER_GETSYMBOL 1