merge back reorganisation branch

git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@29615 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
rfm 2010-02-14 10:48:10 +00:00
parent d0b66e510d
commit f13d56d8ec
263 changed files with 5577 additions and 4170 deletions

View file

@ -21,9 +21,10 @@
*/
#include <Foundation/Foundation.h>
#include "AGSHtml.h"
#include "GNUstepBase/GNUstep.h"
#include "GNUstepBase/GSCategories.h"
#import "AGSHtml.h"
#import "GNUstepBase/GNUstep.h"
#import "GNUstepBase/NSString+GNUstepBase.h"
#import "GNUstepBase/NSMutableString+GNUstepBase.h"
/*
* Define constants for use if we are built with apple Foundation

View file

@ -20,10 +20,11 @@
*/
#include <Foundation/Foundation.h>
#include "AGSIndex.h"
#include "GNUstepBase/GNUstep.h"
#include "GNUstepBase/GSCategories.h"
#import <Foundation/Foundation.h>
#import "AGSIndex.h"
#import "GNUstepBase/GNUstep.h"
#import "GNUstepBase/NSString+GNUstepBase.h"
#import "GNUstepBase/NSMutableString+GNUstepBase.h"
static int XML_ELEMENT_NODE;
static int XML_TEXT_NODE;

View file

@ -20,9 +20,10 @@
*/
#include "AGSOutput.h"
#include "GNUstepBase/GNUstep.h"
#include "GNUstepBase/GSCategories.h"
#import "AGSOutput.h"
#import "GNUstepBase/GNUstep.h"
#import "GNUstepBase/NSString+GNUstepBase.h"
#import "GNUstepBase/NSMutableString+GNUstepBase.h"
@interface AGSOutput (Private)
- (NSString*) mergeMarkup: (NSString*)markup

View file

@ -18,9 +18,10 @@
*/
#include "AGSParser.h"
#include "GNUstepBase/GNUstep.h"
#include "GNUstepBase/GSCategories.h"
#import "AGSParser.h"
#import "GNUstepBase/GNUstep.h"
#import "GNUstepBase/NSString+GNUstepBase.h"
#import "GNUstepBase/NSMutableString+GNUstepBase.h"
/**
* The AGSParser class parses Objective-C header and source files

View file

@ -599,14 +599,13 @@
#include <config.h>
#include "AGSParser.h"
#include "AGSOutput.h"
#include "AGSIndex.h"
#include "AGSHtml.h"
#include "GNUstepBase/GNUstep.h"
#ifdef NeXT_Foundation_LIBRARY
#include "GNUstepBase/GSCategories.h"
#endif
#import "AGSParser.h"
#import "AGSOutput.h"
#import "AGSIndex.h"
#import "AGSHtml.h"
#import "GNUstepBase/GNUstep.h"
#import "GNUstepBase/NSString+GNUstepBase.h"
#import "GNUstepBase/NSMutableString+GNUstepBase.h"
/** Invokes the autogsdoc tool. */
int

View file

@ -518,7 +518,7 @@ ihandler(int sig)
NSConnection *connection;
if (debugging)
NSLog(@"Adding observer %lu for %@ %@",
NSLog(@"Adding observer %llu for %@ %@",
anObserver, notificationName, anObject);
connection = [(NSDistantObject*)client connectionForProxy];
@ -801,7 +801,7 @@ ihandler(int sig)
{
[obs->queue removeObjectAtIndex: 0];
if (debugging)
NSLog(@"Posting to observer %lu with %@", obs->observer, n);
NSLog(@"Posting to observer %llu with %@", obs->observer, n);
[obs->client->client postNotificationName: n->name
object: n->object
userInfo: n->info
@ -824,7 +824,7 @@ ihandler(int sig)
- (void) removeObserver: (GDNCObserver*)observer
{
if (debugging)
NSLog(@"Removing observer %lu for %@ %@",
NSLog(@"Removing observer %llu for %@ %@",
observer->observer, observer->notificationName,
observer->notificationObject);