gnustep/libs-gsweb
0
0
Fork 0
mirror of https://github.com/gnustep/libs-gsweb.git synced 2025-02-22 19:21:23 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

* GSWeb.framework/GSWDisplayGroup.h (HAVE_GDL2):

Browse source 
Remove fallback to obsolete gnustep-db and default
	to GDL2 headers.
	([GSWDisplayGroup-undoManager]): Expect GDL2 class.
	
	* GSWeb.framework/GSWUtils.m (GSWInitializeAllMisc)
	(NSStringWithObject): Remove special NSNull handling as
	EONull must always map to NSNull anyway.


git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gsweb/trunk@26958 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
ayers 2008-10-24 07:26:20 +00:00
parent e282e327bb
commit aaf9e3a406
3 changed files with 14 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
ChangeLog
View file

@ -1,3 +1,14 @@
2008-10-24 David Ayers <ayers@fsfe.org>
* GSWeb.framework/GSWDisplayGroup.h (HAVE_GDL2):
Remove fallback to obsolete gnustep-db and default
to GDL2 headers.
([GSWDisplayGroup-undoManager]): Expect GDL2 class.
* GSWeb.framework/GSWUtils.m (GSWInitializeAllMisc)
(NSStringWithObject): Remove special NSNull handling as
EONull must always map to NSNull anyway.
2008-08-28 David Wetzel <dave@turbocat.de> 2008-08-28 David Wetzel <dave@turbocat.de>
* bug #24006 keep-alive is not implemented. * bug #24006 keep-alive is not implemented.

37
GSWeb.framework/GSWDisplayGroup.h
View file

@ -32,36 +32,9 @@
#ifndef _GSWDisplayGroup_h__ #ifndef _GSWDisplayGroup_h__
#define _GSWDisplayGroup_h__ #define _GSWDisplayGroup_h__
#if !HAVE_GDL2 #ifdef TCSDB
#ifdef TCSDB #include <TCSimpleDB/TCSimpleDB.h>
#include <TCSimpleDB/TCSimpleDB.h> #include <TCSimpleDB/EODefines.h>
#include <TCSimpleDB/EODefines.h>
#else // TCSDB
#include <eoaccess/EOModel.h>
#include <eoaccess/EOEntity.h>
#include <eoaccess/EOAttribute.h>
#include <eoaccess/EOAttributeOrdering.h>
#include <eoaccess/EORelationship.h>
#include <eoaccess/EOQualifier.h>
#include <eoaccess/EOAdaptor.h>
#include <eoaccess/EOAdaptorContext.h>
#include <eoaccess/EOAdaptorChannel.h>
#include <eoaccess/EODatabase.h>
#include <eoaccess/EODatabaseContext.h>
#include <eoaccess/EODatabaseChannel.h>
#include <eoaccess/EODataSources.h>
#include <eoaccess/EODatabaseDataSource.h>
#include <eoaccess/EOGenericRecord.h>
#include <eoaccess/EONull.h>
#include <eoaccess/EOSQLExpression.h>
@class EOKeyValueUnarchiver;
#define EODataSource EODatabaseDataSource
#endif
#else #else
#include <EOControl/EOQualifier.h> #include <EOControl/EOQualifier.h>
#include <EOControl/EOEditingContext.h> #include <EOControl/EOEditingContext.h>
@ -141,11 +114,7 @@
}; };
+ (GSWDisplayGroup* )displayGroup; + (GSWDisplayGroup* )displayGroup;
#if HAVE_GDL2
- (EOUndoManager*)undoManager; - (EOUndoManager*)undoManager;
#else
- (id)undoManager;
#endif
- (NSArray *)allObjects; - (NSArray *)allObjects;
- (NSArray *)allQualifierOperators; - (NSArray *)allQualifierOperators;
- (unsigned)batchCount; - (unsigned)batchCount;

7
GSWeb.framework/GSWUtils.m
View file

@ -64,7 +64,6 @@ static Class nsNumberClass=Nil;
static Class nsStringClass=Nil; static Class nsStringClass=Nil;
static Class nsMutableStringClass=Nil; static Class nsMutableStringClass=Nil;
static Class eoNullClass=Nil; static Class eoNullClass=Nil;
static Class nsNullClass=Nil;
static NSMapTable* encodingsByName=NULL; static NSMapTable* encodingsByName=NULL;
@ -93,7 +92,6 @@ void GSWInitializeAllMisc()
ASSIGN(nsStringClass,[NSString class]); ASSIGN(nsStringClass,[NSString class]);
ASSIGN(nsMutableStringClass,[NSMutableString class]); ASSIGN(nsMutableStringClass,[NSMutableString class]);
ASSIGN(eoNullClass,[EONull class]); ASSIGN(eoNullClass,[EONull class]);
ASSIGN(nsNullClass,[NSNull class]);
stringWithStringSEL = @selector(stringWithString:); stringWithStringSEL = @selector(stringWithString:);
NSCAssert(stringWithStringSEL,@"No SEL for stringWithString:"); NSCAssert(stringWithStringSEL,@"No SEL for stringWithString:");
@ -2121,13 +2119,8 @@ NSString* NSStringWithObject(id object)
string=(NSString*)object; string=(NSString*)object;
else if ([object isKindOfClass:nsStringClass]) else if ([object isKindOfClass:nsStringClass])
string=(NSString*)object; string=(NSString*)object;
#ifdef HAVE_GDL2
else if ([object isKindOfClass:eoNullClass]) else if ([object isKindOfClass:eoNullClass])
string=@""; string=@"";
#else
else if ([object isKindOfClass:nsNullClass])
string=@"";
#endif
else if ([object respondsToSelector:@selector(stringValue)]) else if ([object respondsToSelector:@selector(stringValue)])
string=[object stringValue]; string=[object stringValue];
else if ([object respondsToSelector:@selector(description)]) else if ([object respondsToSelector:@selector(description)])