diff --git a/ChangeLog b/ChangeLog index cb46095..e2f3dec 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,22 @@ +2008-03-16 Blake Nicholson + + * 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 * EOInterface/EOAssociation.m ([+objectDeallocated:]): diff --git a/EOAccess/EOAdaptor.m b/EOAccess/EOAdaptor.m index ad244ed..dd3a2ef 100644 --- a/EOAccess/EOAdaptor.m +++ b/EOAccess/EOAdaptor.m @@ -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 }, diff --git a/EOAccess/EODatabaseDataSource.m b/EOAccess/EODatabaseDataSource.m index ffc58b5..88c3bec 100644 --- a/EOAccess/EODatabaseDataSource.m +++ b/EOAccess/EODatabaseDataSource.m @@ -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) diff --git a/EOAccess/EOPrivate.m b/EOAccess/EOPrivate.m index 2e93528..2329dac 100644 --- a/EOAccess/EOPrivate.m +++ b/EOAccess/EOPrivate.m @@ -43,6 +43,7 @@ RCS_ID("$Id$") #include #include +#include #include #include "EOPrivate.h" diff --git a/EOAccess/EOUtilities.m b/EOAccess/EOUtilities.m index 203df83..6eec720 100644 --- a/EOAccess/EOUtilities.m +++ b/EOAccess/EOUtilities.m @@ -76,8 +76,6 @@ RCS_ID("$Id$") #include "EOPrivate.h" NSString *EOMoreThanOneException = @"EOMoreThanOneException"; -NSString *NSObjectNotAvailableException = @"NSObjectNotAvailableException"; - @implementation EOEditingContext (EOUtilities) diff --git a/EOAdaptors/SQLiteAdaptor/SQLite3Adaptor.m b/EOAdaptors/SQLiteAdaptor/SQLite3Adaptor.m index 96e6156..c5172ba 100644 --- a/EOAdaptors/SQLiteAdaptor/SQLite3Adaptor.m +++ b/EOAdaptors/SQLiteAdaptor/SQLite3Adaptor.m @@ -25,6 +25,8 @@ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ +#include + #include "SQLite3Adaptor.h" #include "SQLite3Context.h" #include "SQLite3Expression.h" diff --git a/EOAdaptors/SQLiteAdaptor/SQLite3Channel.m b/EOAdaptors/SQLiteAdaptor/SQLite3Channel.m index 7d3072c..16877fa 100644 --- a/EOAdaptors/SQLiteAdaptor/SQLite3Channel.m +++ b/EOAdaptors/SQLiteAdaptor/SQLite3Channel.m @@ -37,6 +37,8 @@ #include +#include + @interface SQLite3Channel (Private) -(void) _raise; - (void) _raiseWith:(id)statement; diff --git a/EOAdaptors/SQLiteAdaptor/SQLite3Context.m b/EOAdaptors/SQLiteAdaptor/SQLite3Context.m index 7fd7c43..0c16588 100644 --- a/EOAdaptors/SQLiteAdaptor/SQLite3Context.m +++ b/EOAdaptors/SQLiteAdaptor/SQLite3Context.m @@ -25,6 +25,8 @@ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ +#include + #include "SQLite3Adaptor.h" #include "SQLite3Context.h" #include "SQLite3Channel.h" diff --git a/EOControl/EOAggregateEvent.m b/EOControl/EOAggregateEvent.m index 4f7506f..7fca971 100644 --- a/EOControl/EOAggregateEvent.m +++ b/EOControl/EOAggregateEvent.m @@ -25,6 +25,8 @@ #include +#include + #include "EOAggregateEvent.h" @implementation EOAggregateEvent diff --git a/EOControl/EOPrivate.m b/EOControl/EOPrivate.m index b0cd492..35c4849 100644 --- a/EOControl/EOPrivate.m +++ b/EOControl/EOPrivate.m @@ -48,6 +48,7 @@ RCS_ID("$Id$") #include #include #include +#include #include "EOPrivate.h" diff --git a/Tools/Makefile.preamble b/Tools/Makefile.preamble index 8b1b68e..6dd6781 100644 --- a/Tools/Makefile.preamble +++ b/Tools/Makefile.preamble @@ -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 += # diff --git a/Tools/gsdoc-model.m b/Tools/gsdoc-model.m index 8e02391..7b9290f 100644 --- a/Tools/gsdoc-model.m +++ b/Tools/gsdoc-model.m @@ -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);