From e61e037a20040138777ec0609047bedc9c8bcebf Mon Sep 17 00:00:00 2001 From: Richard Frith-MacDonald Date: Sun, 14 Feb 2010 14:30:02 +0000 Subject: [PATCH] fixup includes git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@29622 72102866-910b-0410-8b05-ffd578937521 --- Tools/AGSHtml.h | 6 +++++- Tools/AGSHtml.m | 7 ++++++- Tools/AGSIndex.h | 8 +++++++- Tools/AGSIndex.m | 5 ++++- Tools/AGSOutput.h | 7 ++++++- Tools/AGSOutput.m | 10 ++++++++++ Tools/AGSParser.h | 10 +++++++++- Tools/AGSParser.m | 12 ++++++++++++ Tools/autogsdoc.m | 13 ++++++++++++- Tools/gdnc.m | 20 ++++++++++++++++++-- Tools/gspath.m | 9 +++++++-- Tools/pl.m | 12 ++++++++++-- Tools/pl2link.m | 20 +++++++++----------- Tools/pldes.m | 21 ++++++++++----------- Tools/plget.m | 21 ++++++++++----------- Tools/plmerge.m | 23 +++++++++++------------ Tools/plparse.m | 19 ++++++++++--------- Tools/plser.m | 21 ++++++++++----------- 18 files changed, 166 insertions(+), 78 deletions(-) diff --git a/Tools/AGSHtml.h b/Tools/AGSHtml.h index cb422b352..e3c7f66c9 100644 --- a/Tools/AGSHtml.h +++ b/Tools/AGSHtml.h @@ -22,7 +22,11 @@ */ -#include "AGSIndex.h" +#import "Foundation/NSObject.h" +#import "AGSIndex.h" + +@class NSMutableString; +@class NSString; @interface AGSHtml : NSObject { diff --git a/Tools/AGSHtml.m b/Tools/AGSHtml.m index 9e27687ec..bdf4cdf81 100644 --- a/Tools/AGSHtml.m +++ b/Tools/AGSHtml.m @@ -20,7 +20,12 @@ */ -#include +#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" #import "GNUstepBase/NSString+GNUstepBase.h" diff --git a/Tools/AGSIndex.h b/Tools/AGSIndex.h index 10c1ebeec..e139a6742 100644 --- a/Tools/AGSIndex.h +++ b/Tools/AGSIndex.h @@ -22,7 +22,13 @@ */ -#include +#import "Foundation/NSObject.h" +#import "GNUstepBase/GSXML.h" + +@class NSDictionary; +@class NSMutableArray; +@class NSMutableDictionary; +@class NSString; @interface AGSIndex : NSObject { diff --git a/Tools/AGSIndex.m b/Tools/AGSIndex.m index 24cb730b9..946f436fb 100644 --- a/Tools/AGSIndex.m +++ b/Tools/AGSIndex.m @@ -20,7 +20,10 @@ */ -#import +#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.h b/Tools/AGSOutput.h index ff53f4a28..cdb438e67 100644 --- a/Tools/AGSOutput.h +++ b/Tools/AGSOutput.h @@ -22,7 +22,12 @@ */ -#include +#include "Foundation/NSObject.h" + +@class NSArray; +@class NSCharacterSet; +@class NSDictionary; +@class NSMutableArray; @interface AGSOutput : NSObject { diff --git a/Tools/AGSOutput.m b/Tools/AGSOutput.m index 33c19ee22..feb3aa7ba 100644 --- a/Tools/AGSOutput.m +++ b/Tools/AGSOutput.m @@ -20,6 +20,16 @@ */ +#import "Foundation/NSArray.h" +#import "Foundation/NSAutoreleasePool.h" +#import "Foundation/NSCharacterSet.h" +#import "Foundation/NSData.h" +#import "Foundation/NSDictionary.h" +#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" #import "GNUstepBase/NSString+GNUstepBase.h" diff --git a/Tools/AGSParser.h b/Tools/AGSParser.h index 42cbf826e..519d5053f 100644 --- a/Tools/AGSParser.h +++ b/Tools/AGSParser.h @@ -29,7 +29,15 @@ */ -#include +#include "Foundation/NSObject.h" +#include "Foundation/NSString.h" + +@class NSArray; +@class NSCharacterSet; +@class NSDictionary; +@class NSMutableArray; +@class NSMutableDictionary; +@class NSString; @interface AGSParser : NSObject { diff --git a/Tools/AGSParser.m b/Tools/AGSParser.m index baf83eb0b..5db04f575 100644 --- a/Tools/AGSParser.m +++ b/Tools/AGSParser.m @@ -18,6 +18,18 @@ */ +#import "Foundation/NSArray.h" +#import "Foundation/NSAutoreleasePool.h" +#import "Foundation/NSCharacterSet.h" +#import "Foundation/NSData.h" +#import "Foundation/NSDictionary.h" +#import "Foundation/NSEnumerator.h" +#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" #import "GNUstepBase/GNUstep.h" #import "GNUstepBase/NSString+GNUstepBase.h" diff --git a/Tools/autogsdoc.m b/Tools/autogsdoc.m index a4cb1c9f6..2530c2b9f 100644 --- a/Tools/autogsdoc.m +++ b/Tools/autogsdoc.m @@ -597,7 +597,18 @@ */ -#include +#import + +#import +#import +#import +#import +#import +#import +#import +#import +#import +#import #import "AGSParser.h" #import "AGSOutput.h" diff --git a/Tools/gdnc.m b/Tools/gdnc.m index 0099ac4c4..7f432914b 100644 --- a/Tools/gdnc.m +++ b/Tools/gdnc.m @@ -18,8 +18,24 @@ */ -#include "config.h" -#include +#import "config.h" +#import "Foundation/NSArray.h" +#import "Foundation/NSAutoreleasePool.h" +#import "Foundation/NSBundle.h" +#import "Foundation/NSConnection.h" +#import "Foundation/NSDistantObject.h" +#import "Foundation/NSDistributedNotificationCenter.h" +#import "Foundation/NSException.h" +#import "Foundation/NSHashTable.h" +#import "Foundation/NSHost.h" +#import "Foundation/NSNotification.h" +#import "Foundation/NSPort.h" +#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 diff --git a/Tools/gspath.m b/Tools/gspath.m index 91a4bdd9d..cbcd79cce 100644 --- a/Tools/gspath.m +++ b/Tools/gspath.m @@ -18,8 +18,13 @@ */ -#include "config.h" -#include +#import "config.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/pl.m b/Tools/pl.m index 4f1fb53e8..c7bbdab1d 100644 --- a/Tools/pl.m +++ b/Tools/pl.m @@ -22,8 +22,16 @@ */ - -#import +#import "Foundation/NSArray.h" +#import "Foundation/NSAutoreleasePool.h" +#import "Foundation/NSData.h" +#import "Foundation/NSException.h" +#import "Foundation/NSFileHandle.h" +#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 89d890a0f..b77bee96b 100644 --- a/Tools/pl2link.m +++ b/Tools/pl2link.m @@ -17,18 +17,16 @@ License along with this program; see the file COPYINGv3. If not, write to the Free Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +*/ - */ - -#include -#include -#include -#include -#include -#include -#include -#include -#include +#import "Foundation/NSArray.h" +#import "Foundation/NSAutoreleasePool.h" +#import "Foundation/NSData.h" +#import "Foundation/NSDictionary.h" +#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 6df1c3da0..f6e68ed02 100644 --- a/Tools/pldes.m +++ b/Tools/pldes.m @@ -18,17 +18,16 @@ */ -#include "config.h" -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#import "config.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" /**

This tool converts a binary serialised property list to a text diff --git a/Tools/plget.m b/Tools/plget.m index 90e08c60a..27a30a173 100644 --- a/Tools/plget.m +++ b/Tools/plget.m @@ -18,17 +18,16 @@ */ -#include "config.h" -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#import "config.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" /**

This tool extracts a string value from a dictionary in a property diff --git a/Tools/plmerge.m b/Tools/plmerge.m index 234c4814f..61b726ff5 100644 --- a/Tools/plmerge.m +++ b/Tools/plmerge.m @@ -18,19 +18,18 @@ */ -#include "config.h" -#include -#include -#include -#include -#include -#include -#include -#include -#include +#import "config.h" +#import "Foundation/NSArray.h" +#import "Foundation/NSAutoreleasePool.h" +#import "Foundation/NSData.h" +#import "Foundation/NSDictionary.h" +#import "Foundation/NSException.h" +#import "Foundation/NSFileManager.h" +#import "Foundation/NSProcessInfo.h" +#import "Foundation/NSString.h" #ifdef NeXT_Foundation_LIBRARY -#include "GNUstepBase/GSCategories.h" -#include "GNUstepBase/GSObjCRuntime.h" +#import "GNUstepBase/GSCategories.h" +#import "GNUstepBase/GSObjCRuntime.h" #endif diff --git a/Tools/plparse.m b/Tools/plparse.m index 78767f394..9f08cd450 100644 --- a/Tools/plparse.m +++ b/Tools/plparse.m @@ -18,15 +18,16 @@ */ -#include "config.h" -#include -#include -#include -#include -#include -#include -#include -#include +#import "config.h" +#import "Foundation/NSArray.h" +#import "Foundation/NSCharacterSet.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/NSAutoreleasePool.h" /* * If there is any non-ascii characrer in the string, diff --git a/Tools/plser.m b/Tools/plser.m index 708304646..a0cd44f37 100644 --- a/Tools/plser.m +++ b/Tools/plser.m @@ -18,17 +18,16 @@ */ -#include "config.h" -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#import "config.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" /**

This tool converts a text property list to a binary serialised