2008-03-16 Blake Nicholson <blaken@umich.edu>

* EOAdaptors/SQLiteAdaptor/SQLite3Context.m, 
        * EOAdaptors/SQLiteAdaptor/SQLite3Channel.m,
        * EOAdaptors/SQLiteAdaptor/SQLite3Adaptor.m,
        * EOControl/EOPrivate.m,
        * EOControl/EOAggregateEvent.m,
        * EOAccess/EOPrivate.m: Add missing include.
        * EOAccess/EOAdaptor.m: Only use NSProprietaryStringEncoding where
        available.
        * Tools/gsdoc-model.m: Remove unused variables.
        * Tools/Makefile.preamble: Fix NATIVE_LIB_DIRS path.

2008-03-16  Matt Rice  <ratmice@gmail.com

        * EOAccess/EOUtilities.m: Remove NSObjectNotAvailableException.
        Moved to base.
        * EOAccess/EODatabaseDataSource.m: Remove selector caching.




git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gdl2/trunk@26323 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Matt Rice 2008-03-16 22:59:56 +00:00
parent da1d2f0df1
commit 2438352093
12 changed files with 35 additions and 9 deletions

View file

@ -1,3 +1,22 @@
2008-03-16 Blake Nicholson <blaken@umich.edu>
* EOAdaptors/SQLiteAdaptor/SQLite3Context.m,
* EOAdaptors/SQLiteAdaptor/SQLite3Channel.m,
* EOAdaptors/SQLiteAdaptor/SQLite3Adaptor.m,
* EOControl/EOPrivate.m,
* EOControl/EOAggregateEvent.m,
* EOAccess/EOPrivate.m: Add missing include.
* EOAccess/EOAdaptor.m: Only use NSProprietaryStringEncoding where
available.
* Tools/gsdoc-model.m: Remove unused variables.
* Tools/Makefile.preamble: Fix NATIVE_LIB_DIRS path.
2008-03-16 Matt Rice <ratmice@gmail.com
* EOAccess/EOUtilities.m: Remove NSObjectNotAvailableException.
Moved to base.
* EOAccess/EODatabaseDataSource.m: Remove selector caching.
2008-03-16 Blake Nicholson <blaken@umich.edu>
* EOInterface/EOAssociation.m ([+objectDeallocated:]):

View file

@ -114,7 +114,9 @@ static struct { NSString *name; NSStringEncoding encoding; } encodingMap[] = {
{ @"NSWindowsCP1250StringEncoding", NSWindowsCP1250StringEncoding },
{ @"NSISO2022JPStringEncoding", NSISO2022JPStringEncoding },
{ @"NSMacOSRomanStringEncoding", NSMacOSRomanStringEncoding },
#if defined(GNUSTEP_BASE_LIBRARY) || OS_API_VERSION(GS_API_NONE,MAC_OS_X_VERSION_10_5)
{ @"NSProprietaryStringEncoding", NSProprietaryStringEncoding },
#endif
{ @"NSKOI8RStringEncoding", NSKOI8RStringEncoding },
{ @"NSISOLatin3StringEncoding", NSISOLatin3StringEncoding },
{ @"NSISOLatin4StringEncoding", NSISOLatin4StringEncoding },

View file

@ -193,7 +193,6 @@ RCS_ID("$Id$")
{
EOObjectStore *store;
NSString *entityName = [_fetchSpecification entityName];
static SEL modelGroupSel = @selector(modelGroup);
EOModelGroup *modelGroup = nil;
store = [_editingContext rootObjectStore];
@ -219,9 +218,9 @@ RCS_ID("$Id$")
}
return nil;
}
else if ([store respondsToSelector:modelGroupSel])
else if ([store respondsToSelector:@selector(modelGroup:)])
{
modelGroup = [store performSelector:modelGroupSel];
modelGroup = [store performSelector:@selector(modelGroup:)];
}
if (modelGroup != nil)

View file

@ -43,6 +43,7 @@ RCS_ID("$Id$")
#include <EOControl/EOFault.h>
#include <EOControl/EOMutableKnownKeyDictionary.h>
#include <EOAccess/EOAttribute.h>
#include <EOAccess/EODatabaseContext.h>
#include "EOPrivate.h"

View file

@ -76,8 +76,6 @@ RCS_ID("$Id$")
#include "EOPrivate.h"
NSString *EOMoreThanOneException = @"EOMoreThanOneException";
NSString *NSObjectNotAvailableException = @"NSObjectNotAvailableException";
@implementation EOEditingContext (EOUtilities)

View file

@ -25,6 +25,8 @@
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
#include <GNUstepBase/GNUstep.h>
#include "SQLite3Adaptor.h"
#include "SQLite3Context.h"
#include "SQLite3Expression.h"

View file

@ -37,6 +37,8 @@
#include <EOAccess/EOAttribute.h>
#include <GNUstepBase/GNUstep.h>
@interface SQLite3Channel (Private)
-(void) _raise;
- (void) _raiseWith:(id)statement;

View file

@ -25,6 +25,8 @@
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
#include <GNUstepBase/GNUstep.h>
#include "SQLite3Adaptor.h"
#include "SQLite3Context.h"
#include "SQLite3Channel.h"

View file

@ -25,6 +25,8 @@
#include <Foundation/Foundation.h>
#include <GNUstepBase/GNUstep.h>
#include "EOAggregateEvent.h"
@implementation EOAggregateEvent

View file

@ -48,6 +48,7 @@ RCS_ID("$Id$")
#include <EOControl/EOEditingContext.h>
#include <EOControl/EOFault.h>
#include <EOControl/EOMutableKnownKeyDictionary.h>
#include <EOControl/EONull.h>
#include "EOPrivate.h"

View file

@ -54,9 +54,9 @@ ADDITIONAL_TOOL_LIBS += -lgnustep-baseadd
endif
ADDITIONAL_NATIVE_LIBS+=EOControl EOAccess
ADDITIONAL_NATIVE_LIB_DIRS+=EOControl EOAccess
ADDITIONAL_NATIVE_LIB_DIRS+=../EOControl ../EOAccess
# Additional library directories the linker should search
ADDITIONAL_LIB_DIRS += -L../EOAccess/$(GNUSTEP_OBJ_DIR) -L../EOControl/$(GNUSTEP_OBJ_DIR)
ADDITIONAL_LIB_DIRS +=
#

View file

@ -383,7 +383,6 @@ main(int argc, char **argv, char **env)
for (i = 0; goOn && i < [files count]; i++)
{
int xmlId = 0;
NSString *file = [files objectAtIndex: i];
NSAutoreleasePool *arp = [NSAutoreleasePool new];
@ -405,7 +404,6 @@ main(int argc, char **argv, char **env)
if (model)
{
NSString *gsdocModelContent = nil;
NSString *gsdocEntitiesContent = nil;
NSDictionary *entities = nil;
NSLog(@"Model %@ loaded", file);