From f30057c85f6bb902980206364ca52854a7907280 Mon Sep 17 00:00:00 2001 From: rfm Date: Fri, 19 Feb 2010 14:21:02 +0000 Subject: [PATCH] More include tweaks git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@29671 72102866-910b-0410-8b05-ffd578937521 --- Headers/Foundation/NSObjCRuntime.h | 1 - Tools/AGSHtml.m | 3 ++- Tools/AGSIndex.m | 3 ++- Tools/AGSOutput.m | 3 ++- Tools/AGSParser.m | 3 ++- Tools/HTMLLinker.m | 5 ++++- Tools/autogsdoc.m | 23 ++++++++++++----------- Tools/cvtenc.m | 6 ++++-- Tools/defaults.m | 27 +++++++++++++-------------- Tools/gdnc.m | 10 ++++++---- Tools/gspath.m | 4 ++-- Tools/locale_alias.m | 5 ++++- Tools/make_strings/StringsFile.m | 10 +++++----- Tools/make_strings/make_strings.m | 14 ++++++++------ Tools/pl.m | 5 ++++- Tools/pl2link.m | 5 ++++- Tools/pldes.m | 7 ++++--- Tools/plget.m | 7 ++++--- Tools/plmerge.m | 8 ++++---- Tools/plparse.m | 7 ++++--- Tools/plser.m | 7 ++++--- Tools/sfparse.m | 9 ++++----- Tools/xmlparse.m | 8 ++------ 23 files changed, 100 insertions(+), 80 deletions(-) diff --git a/Headers/Foundation/NSObjCRuntime.h b/Headers/Foundation/NSObjCRuntime.h index e9335c20b..31eeb506b 100644 --- a/Headers/Foundation/NSObjCRuntime.h +++ b/Headers/Foundation/NSObjCRuntime.h @@ -29,7 +29,6 @@ #ifndef __NSObjCRuntime_h_GNUSTEP_BASE_INCLUDE #define __NSObjCRuntime_h_GNUSTEP_BASE_INCLUDE #import -#import #import /* These typedefs must be in place before GSObjCRuntime.h is imported. diff --git a/Tools/AGSHtml.m b/Tools/AGSHtml.m index bdf4cdf81..b85f95e19 100644 --- a/Tools/AGSHtml.m +++ b/Tools/AGSHtml.m @@ -20,11 +20,12 @@ */ +#import "common.h" + #import "Foundation/NSAutoreleasePool.h" #import "Foundation/NSArray.h" #import "Foundation/NSDictionary.h" #import "Foundation/NSSet.h" -#import "Foundation/NSString.h" #import "Foundation/NSUserDefaults.h" #import "AGSHtml.h" #import "GNUstepBase/GNUstep.h" diff --git a/Tools/AGSIndex.m b/Tools/AGSIndex.m index 946f436fb..0b41a31ea 100644 --- a/Tools/AGSIndex.m +++ b/Tools/AGSIndex.m @@ -20,10 +20,11 @@ */ +#import "common.h" + #import "Foundation/NSArray.h" #import "Foundation/NSAutoreleasePool.h" #import "Foundation/NSDictionary.h" -#import "Foundation/NSString.h" #import "AGSIndex.h" #import "GNUstepBase/GNUstep.h" #import "GNUstepBase/NSString+GNUstepBase.h" diff --git a/Tools/AGSOutput.m b/Tools/AGSOutput.m index feb3aa7ba..f50a5b7b4 100644 --- a/Tools/AGSOutput.m +++ b/Tools/AGSOutput.m @@ -20,6 +20,8 @@ */ +#import "common.h" + #import "Foundation/NSArray.h" #import "Foundation/NSAutoreleasePool.h" #import "Foundation/NSCharacterSet.h" @@ -28,7 +30,6 @@ #import "Foundation/NSEnumerator.h" #import "Foundation/NSFileManager.h" #import "Foundation/NSPathUtilities.h" -#import "Foundation/NSString.h" #import "Foundation/NSUserDefaults.h" #import "AGSOutput.h" #import "GNUstepBase/GNUstep.h" diff --git a/Tools/AGSParser.m b/Tools/AGSParser.m index 5db04f575..d2304f14b 100644 --- a/Tools/AGSParser.m +++ b/Tools/AGSParser.m @@ -18,6 +18,8 @@ */ +#import "common.h" + #import "Foundation/NSArray.h" #import "Foundation/NSAutoreleasePool.h" #import "Foundation/NSCharacterSet.h" @@ -27,7 +29,6 @@ #import "Foundation/NSException.h" #import "Foundation/NSFileManager.h" #import "Foundation/NSSet.h" -#import "Foundation/NSString.h" #import "Foundation/NSUserDefaults.h" #import "Foundation/NSValue.h" #import "AGSParser.h" diff --git a/Tools/HTMLLinker.m b/Tools/HTMLLinker.m index 399040664..3c0bf371e 100644 --- a/Tools/HTMLLinker.m +++ b/Tools/HTMLLinker.m @@ -24,12 +24,15 @@ * See the HTMLLinker.html file for documentation on how to use the tool. */ +#include + +#import "common.h" + #import "Foundation/NSArray.h" #import "Foundation/NSAutoreleasePool.h" #import "Foundation/NSFileManager.h" #import "Foundation/NSPathUtilities.h" #import "Foundation/NSProcessInfo.h" -#import "Foundation/NSString.h" #import "Foundation/NSUserDefaults.h" /* For convenience, cached for the whole tool. */ diff --git a/Tools/autogsdoc.m b/Tools/autogsdoc.m index 864c5327a..ee4dc6fd4 100644 --- a/Tools/autogsdoc.m +++ b/Tools/autogsdoc.m @@ -597,18 +597,19 @@ */ -#import +#include -#import -#import -#import -#import -#import -#import -#import -#import -#import -#import +#import "common.h" + +#import "Foundation/NSArray.h" +#import "Foundation/NSAutoreleasePool.h" +#import "Foundation/NSDictionary.h" +#import "Foundation/NSEnumerator.h" +#import "Foundation/NSFileManager.h" +#import "Foundation/NSPathUtilities.h" +#import "Foundation/NSProcessInfo.h" +#import "Foundation/NSSet.h" +#import "Foundation/NSUserDefaults.h" #import "AGSParser.h" #import "AGSOutput.h" diff --git a/Tools/cvtenc.m b/Tools/cvtenc.m index 9d7ac5067..f1daf63af 100644 --- a/Tools/cvtenc.m +++ b/Tools/cvtenc.m @@ -18,14 +18,16 @@ */ -#import "config.h" +#include + +#import "common.h" + #import "Foundation/NSArray.h" #import "Foundation/NSData.h" #import "Foundation/NSException.h" #import "Foundation/NSString.h" #import "Foundation/NSProcessInfo.h" #import "Foundation/NSUserDefaults.h" -#import "Foundation/NSDebug.h" #import "Foundation/NSFileHandle.h" #import "Foundation/NSAutoreleasePool.h" #ifdef NeXT_Foundation_LIBRARY diff --git a/Tools/defaults.m b/Tools/defaults.m index 4617d0560..0fc1805b6 100644 --- a/Tools/defaults.m +++ b/Tools/defaults.m @@ -18,20 +18,19 @@ */ -#include "config.h" -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include + +#import "common.h" + +#import "Foundation/NSArray.h" +#import "Foundation/NSDictionary.h" +#import "Foundation/NSEnumerator.h" +#import "Foundation/NSException.h" +#import "Foundation/NSProcessInfo.h" +#import "Foundation/NSUserDefaults.h" +#import "Foundation/NSAutoreleasePool.h" +#import "Foundation/NSPathUtilities.h" #define GSEXIT_SUCCESS EXIT_SUCCESS #define GSEXIT_FAILURE EXIT_FAILURE diff --git a/Tools/gdnc.m b/Tools/gdnc.m index 67feef8ba..97105074b 100644 --- a/Tools/gdnc.m +++ b/Tools/gdnc.m @@ -18,7 +18,12 @@ */ -#import "config.h" +#include +#include +#include + +#import "common.h" + #import "Foundation/NSArray.h" #import "Foundation/NSAutoreleasePool.h" #import "Foundation/NSBundle.h" @@ -34,12 +39,9 @@ #import "Foundation/NSPortNameServer.h" #import "Foundation/NSProcessInfo.h" #import "Foundation/NSRunLoop.h" -#import "Foundation/NSString.h" #import "Foundation/NSTask.h" #import "Foundation/NSUserDefaults.h" -#include -#include #if defined(__MINGW32__) #include "process.h" diff --git a/Tools/gspath.m b/Tools/gspath.m index cbcd79cce..a490c7b1d 100644 --- a/Tools/gspath.m +++ b/Tools/gspath.m @@ -18,12 +18,12 @@ */ -#import "config.h" +#import "common.h" + #import "Foundation/NSArray.h" #import "Foundation/NSAutoreleasePool.h" #import "Foundation/NSPathUtilities.h" #import "Foundation/NSProcessInfo.h" -#import "Foundation/NSString.h" #import "Foundation/NSUserDefaults.h" diff --git a/Tools/locale_alias.m b/Tools/locale_alias.m index 085244c3b..bd3973764 100644 --- a/Tools/locale_alias.m +++ b/Tools/locale_alias.m @@ -28,9 +28,12 @@ #include #include #include +#include + +#include + #import "Foundation/NSAutoreleasePool.h" #import "Foundation/NSDictionary.h" -#import "Foundation/NSString.h" #import "GNUstepBase/GSLocale.h" #define MAXSTRING 100 diff --git a/Tools/make_strings/StringsFile.m b/Tools/make_strings/StringsFile.m index 79b32b330..473439d93 100644 --- a/Tools/make_strings/StringsFile.m +++ b/Tools/make_strings/StringsFile.m @@ -19,11 +19,11 @@ */ -#include -#include -#include -#include -#include +#import "common.h" +#import "Foundation/NSString.h" +#import "Foundation/NSArray.h" +#import "Foundation/NSFileManager.h" +#import "Foundation/NSDate.h" #include "StringsFile.h" diff --git a/Tools/make_strings/make_strings.m b/Tools/make_strings/make_strings.m index 90c30d05d..e4864b9bb 100644 --- a/Tools/make_strings/make_strings.m +++ b/Tools/make_strings/make_strings.m @@ -19,12 +19,14 @@ */ -#include -#include -#include -#include -#include -#include +#include + +#import "common.h" +#import "Foundation/NSString.h" +#import "Foundation/NSAutoreleasePool.h" +#import "Foundation/NSDictionary.h" +#import "Foundation/NSEnumerator.h" +#import "Foundation/NSArray.h" #include "make_strings.h" diff --git a/Tools/pl.m b/Tools/pl.m index c7bbdab1d..baf51e37f 100644 --- a/Tools/pl.m +++ b/Tools/pl.m @@ -22,6 +22,10 @@ */ +#include + +#import "common.h" + #import "Foundation/NSArray.h" #import "Foundation/NSAutoreleasePool.h" #import "Foundation/NSData.h" @@ -30,7 +34,6 @@ #import "Foundation/NSFileManager.h" #import "Foundation/NSPathUtilities.h" #import "Foundation/NSProcessInfo.h" -#import "Foundation/NSString.h" #import "Foundation/NSUserDefaults.h" void create_output(id propertyList) diff --git a/Tools/pl2link.m b/Tools/pl2link.m index b77bee96b..bc9b2e87b 100644 --- a/Tools/pl2link.m +++ b/Tools/pl2link.m @@ -19,6 +19,10 @@ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ +#include + +#import "common.h" + #import "Foundation/NSArray.h" #import "Foundation/NSAutoreleasePool.h" #import "Foundation/NSData.h" @@ -26,7 +30,6 @@ #import "Foundation/NSException.h" #import "Foundation/NSFileManager.h" #import "Foundation/NSProcessInfo.h" -#import "Foundation/NSString.h" int main(int argc, char** argv, char **env) diff --git a/Tools/pldes.m b/Tools/pldes.m index f6e68ed02..b137f8786 100644 --- a/Tools/pldes.m +++ b/Tools/pldes.m @@ -18,14 +18,15 @@ */ -#import "config.h" +#include + +#import "common.h" + #import "Foundation/NSArray.h" #import "Foundation/NSData.h" #import "Foundation/NSException.h" -#import "Foundation/NSString.h" #import "Foundation/NSProcessInfo.h" #import "Foundation/NSUserDefaults.h" -#import "Foundation/NSDebug.h" #import "Foundation/NSFileHandle.h" #import "Foundation/NSAutoreleasePool.h" diff --git a/Tools/plget.m b/Tools/plget.m index 527fd70fc..d0d55d32b 100644 --- a/Tools/plget.m +++ b/Tools/plget.m @@ -18,15 +18,16 @@ */ -#import "config.h" +#include + +#import "common.h" + #import "Foundation/NSArray.h" #import "Foundation/NSData.h" #import "Foundation/NSDictionary.h" #import "Foundation/NSException.h" -#import "Foundation/NSString.h" #import "Foundation/NSProcessInfo.h" #import "Foundation/NSUserDefaults.h" -#import "Foundation/NSDebug.h" #import "Foundation/NSFileHandle.h" #import "Foundation/NSAutoreleasePool.h" diff --git a/Tools/plmerge.m b/Tools/plmerge.m index 2e2473ba0..bf1c4d8fd 100644 --- a/Tools/plmerge.m +++ b/Tools/plmerge.m @@ -18,7 +18,10 @@ */ -#import "config.h" +#include + +#import "common.h" + #import "Foundation/NSArray.h" #import "Foundation/NSAutoreleasePool.h" #import "Foundation/NSData.h" @@ -26,10 +29,7 @@ #import "Foundation/NSException.h" #import "Foundation/NSFileManager.h" #import "Foundation/NSProcessInfo.h" -#import "Foundation/NSString.h" -#ifdef NeXT_Foundation_LIBRARY #import "GNUstepBase/Additions.h" -#endif /**

This tool merges text property lists into a single property list. diff --git a/Tools/plparse.m b/Tools/plparse.m index cb18c67da..12c01c8c4 100644 --- a/Tools/plparse.m +++ b/Tools/plparse.m @@ -18,16 +18,17 @@ */ -#import "config.h" +#include + +#import "common.h" + #import "Foundation/NSArray.h" #import "Foundation/NSCharacterSet.h" #import "Foundation/NSData.h" #import "Foundation/NSDictionary.h" #import "Foundation/NSException.h" -#import "Foundation/NSString.h" #import "Foundation/NSProcessInfo.h" #import "Foundation/NSUserDefaults.h" -#import "Foundation/NSDebug.h" #import "Foundation/NSAutoreleasePool.h" /* diff --git a/Tools/plser.m b/Tools/plser.m index a0cd44f37..eca478a98 100644 --- a/Tools/plser.m +++ b/Tools/plser.m @@ -18,14 +18,15 @@ */ -#import "config.h" +#include + +#import "common.h" + #import "Foundation/NSArray.h" #import "Foundation/NSData.h" #import "Foundation/NSException.h" -#import "Foundation/NSString.h" #import "Foundation/NSProcessInfo.h" #import "Foundation/NSUserDefaults.h" -#import "Foundation/NSDebug.h" #import "Foundation/NSFileHandle.h" #import "Foundation/NSAutoreleasePool.h" diff --git a/Tools/sfparse.m b/Tools/sfparse.m index 97d5aeefb..61125714e 100644 --- a/Tools/sfparse.m +++ b/Tools/sfparse.m @@ -18,19 +18,18 @@ */ -#import "config.h" +#include + +#import "common.h" + #import "Foundation/NSArray.h" #import "Foundation/NSData.h" #import "Foundation/NSDictionary.h" #import "Foundation/NSException.h" -#import "Foundation/NSString.h" #import "Foundation/NSProcessInfo.h" #import "Foundation/NSUserDefaults.h" -#import "Foundation/NSDebug.h" #import "Foundation/NSAutoreleasePool.h" -#ifdef NeXT_Foundation_LIBRARY #import "GNUstepBase/Additions.h" -#endif int convert_unicode(NSArray *args) diff --git a/Tools/xmlparse.m b/Tools/xmlparse.m index 9c39a7143..ca436c6fc 100644 --- a/Tools/xmlparse.m +++ b/Tools/xmlparse.m @@ -20,20 +20,16 @@ */ +#include #include -#import "config.h" +#import "common.h" #import "Foundation/NSArray.h" #import "Foundation/NSAutoreleasePool.h" #import "Foundation/NSPathUtilities.h" #import "Foundation/NSProcessInfo.h" -#import "Foundation/NSString.h" #import "Foundation/NSUserDefaults.h" -#ifdef NeXT_Foundation_LIBRARY #import "GNUstepBase/Additions.h" -#else -#import "GNUstepBase/GSXML.h" -#endif @interface GSXMLParser (Loader) + (NSString*) loadEntity: (NSString*)publicId