* EOAccess/EOAdaptor.m

* EOAccess/EORelationship.m
        * EOControl/EONSAddOns.m
          get rid of some warnings about tautological compares


git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gdl2/trunk@36242 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
buzzdee 2013-03-02 18:48:29 +00:00
parent b1f89a8a35
commit 69260dd37e
4 changed files with 15 additions and 10 deletions

View file

@ -43,6 +43,10 @@
* GDL2Palette/ConnectionInspector.m
* GDL2Palette/DisplayGroupInspector.m
Fix warnings about conflicting return types or paramters
* EOAccess/EOAdaptor.m
* EOAccess/EORelationship.m
* EOControl/EONSAddOns.m
get rid of some warnings about tautological compares
2013-03-01: Sebastian Reitenbach <sebastia@l00-bugdead-prods.de>
* EOControl/EODebug.m

View file

@ -706,9 +706,9 @@ NSString *EOAdministrativeConnectionDictionaryKey
- (void)handleDroppedConnection
{
NSDictionary *newConnectionDictionary = nil;
unsigned i;
NSUInteger i;
for (i = [_contexts count] - 1; i >= 0; i--)
for (i = 0; i < [_contexts count]; i++)
{
EOAdaptorContext *ctx = [[_contexts objectAtIndex:i]
nonretainedObjectValue];
@ -969,13 +969,14 @@ NSString *EOAdministrativeConnectionDictionaryKey
- (void) _unregisterAdaptorContext: (EOAdaptorContext*)adaptorContext
{
unsigned i = 0;
NSUInteger i = 0;
for (i = [_contexts count] - 1; i >= 0; i--)
for (i = 0; i < [_contexts count]; i++)
{
if ([[_contexts objectAtIndex: i] nonretainedObjectValue]
== adaptorContext)
{
// this works, since it breaks out on first find
[_contexts removeObjectAtIndex: i];
break;
}

View file

@ -279,7 +279,7 @@ RCS_ID("$Id$")
[(EOEntity*)owner name],
relationshipName,
(int)deleteRule);
NSAssert2(deleteRule >= 0 && deleteRule < 4,
NSAssert2(deleteRule >= 0 && deleteRule <= 3,
@"Bad deleteRule numeric value: %@ (%d)",
deleteRuleString,
deleteRule);
@ -1685,7 +1685,7 @@ becomes "name", and "FIRST_NAME" becomes "firstName".*/
- (void)setDeleteRule: (EODeleteRule)deleteRule
{
NSAssert1(deleteRule >= 0 && deleteRule < 4,
NSAssert1(deleteRule >= 0 && deleteRule <= 3,
@"Bad deleteRule numeric value: %d",
deleteRule);

View file

@ -413,13 +413,13 @@ GDL2_Activate(Class sup, Class cls)
return result;
}
- (NSArray *)arrayExcludingObject: (id)object
- (NSArray *)arrayExcludingObject: (id)_object
{
//Verify: mutable/non mutable,..
NSArray *result = nil;
unsigned int selfCount = [self count];
NSUInteger selfCount = [self count];
if (selfCount > 0 && object) //else return nil
if (selfCount > 0 && _object) //else return nil
{
int i;
@ -427,7 +427,7 @@ GDL2_Activate(Class sup, Class cls)
{
id object = [self objectAtIndex: i];
if (object != object)
if (object != _object)
{
if (result)
[(NSMutableArray *)result addObject: object];