Merge pull request #109 from ethoms/clang-warnings-stage2
Stage 2 of clang compiler warning patches.pull/101/head^2
commit
d805cdfef4
|
@ -267,7 +267,7 @@
|
||||||
- (BOOL)isEqual:(id)_other {
|
- (BOOL)isEqual:(id)_other {
|
||||||
if(_other == nil)
|
if(_other == nil)
|
||||||
return NO;
|
return NO;
|
||||||
if([_other class] != self->isa)
|
if([_other class] != object_getClass(self))
|
||||||
return NO;
|
return NO;
|
||||||
if([_other hash] != [self hash])
|
if([_other hash] != [self hash])
|
||||||
return NO;
|
return NO;
|
||||||
|
|
|
@ -697,7 +697,7 @@
|
||||||
BOOL otherIsPersonal;
|
BOOL otherIsPersonal;
|
||||||
|
|
||||||
otherIsPersonal = ([otherFolder isKindOfClass: [SOGoContactGCSFolder class]]
|
otherIsPersonal = ([otherFolder isKindOfClass: [SOGoContactGCSFolder class]]
|
||||||
|| ([otherFolder isKindOfClass: isa] && [otherFolder isPersonalSource]));
|
|| ([otherFolder isKindOfClass: object_getClass(self)] && [otherFolder isPersonalSource]));
|
||||||
|
|
||||||
if (isPersonalSource)
|
if (isPersonalSource)
|
||||||
{
|
{
|
||||||
|
|
|
@ -364,7 +364,7 @@ Class SOGoCacheGCSObjectK = Nil;
|
||||||
if (record)
|
if (record)
|
||||||
{
|
{
|
||||||
if ([[record objectForKey: @"c_type"] intValue] == MAPIFolderCacheObject)
|
if ([[record objectForKey: @"c_type"] intValue] == MAPIFolderCacheObject)
|
||||||
objectClass = isa;
|
objectClass = object_getClass(self);
|
||||||
else
|
else
|
||||||
objectClass = SOGoCacheGCSObjectK;
|
objectClass = SOGoCacheGCSObjectK;
|
||||||
|
|
||||||
|
|
|
@ -880,7 +880,7 @@
|
||||||
|
|
||||||
reason = [NSString stringWithFormat: @"method '%@' is not available"
|
reason = [NSString stringWithFormat: @"method '%@' is not available"
|
||||||
@" for class '%@'", NSStringFromSelector (_cmd),
|
@" for class '%@'", NSStringFromSelector (_cmd),
|
||||||
NSStringFromClass (isa)];
|
NSStringFromClass (object_getClass(self))];
|
||||||
|
|
||||||
return [NSException exceptionWithName: @"SQLSourceIOException"
|
return [NSException exceptionWithName: @"SQLSourceIOException"
|
||||||
reason: reason
|
reason: reason
|
||||||
|
@ -893,7 +893,7 @@
|
||||||
|
|
||||||
reason = [NSString stringWithFormat: @"method '%@' is not available"
|
reason = [NSString stringWithFormat: @"method '%@' is not available"
|
||||||
@" for class '%@'", NSStringFromSelector (_cmd),
|
@" for class '%@'", NSStringFromSelector (_cmd),
|
||||||
NSStringFromClass (isa)];
|
NSStringFromClass (object_getClass(self))];
|
||||||
|
|
||||||
return [NSException exceptionWithName: @"SQLSourceIOException"
|
return [NSException exceptionWithName: @"SQLSourceIOException"
|
||||||
reason: reason
|
reason: reason
|
||||||
|
@ -906,7 +906,7 @@
|
||||||
|
|
||||||
reason = [NSString stringWithFormat: @"method '%@' is not available"
|
reason = [NSString stringWithFormat: @"method '%@' is not available"
|
||||||
@" for class '%@'", NSStringFromSelector (_cmd),
|
@" for class '%@'", NSStringFromSelector (_cmd),
|
||||||
NSStringFromClass (isa)];
|
NSStringFromClass (object_getClass(self))];
|
||||||
|
|
||||||
return [NSException exceptionWithName: @"SQLSourceIOException"
|
return [NSException exceptionWithName: @"SQLSourceIOException"
|
||||||
reason: reason
|
reason: reason
|
||||||
|
@ -932,7 +932,7 @@
|
||||||
|
|
||||||
reason = [NSString stringWithFormat: @"method '%@' is not available"
|
reason = [NSString stringWithFormat: @"method '%@' is not available"
|
||||||
@" for class '%@'", NSStringFromSelector (_cmd),
|
@" for class '%@'", NSStringFromSelector (_cmd),
|
||||||
NSStringFromClass (isa)];
|
NSStringFromClass (object_getClass(self))];
|
||||||
|
|
||||||
return [NSException exceptionWithName: @"SQLSourceIOException"
|
return [NSException exceptionWithName: @"SQLSourceIOException"
|
||||||
reason: reason
|
reason: reason
|
||||||
|
@ -947,7 +947,7 @@
|
||||||
|
|
||||||
reason = [NSString stringWithFormat: @"method '%@' is not available"
|
reason = [NSString stringWithFormat: @"method '%@' is not available"
|
||||||
@" for class '%@'", NSStringFromSelector (_cmd),
|
@" for class '%@'", NSStringFromSelector (_cmd),
|
||||||
NSStringFromClass (isa)];
|
NSStringFromClass (object_getClass(self))];
|
||||||
|
|
||||||
return [NSException exceptionWithName: @"SQLSourceIOException"
|
return [NSException exceptionWithName: @"SQLSourceIOException"
|
||||||
reason: reason
|
reason: reason
|
||||||
|
@ -961,7 +961,7 @@
|
||||||
|
|
||||||
reason = [NSString stringWithFormat: @"method '%@' is not available"
|
reason = [NSString stringWithFormat: @"method '%@' is not available"
|
||||||
@" for class '%@'", NSStringFromSelector (_cmd),
|
@" for class '%@'", NSStringFromSelector (_cmd),
|
||||||
NSStringFromClass (isa)];
|
NSStringFromClass (object_getClass(self))];
|
||||||
|
|
||||||
return [NSException exceptionWithName: @"SQLSourceIOException"
|
return [NSException exceptionWithName: @"SQLSourceIOException"
|
||||||
reason: reason
|
reason: reason
|
||||||
|
|
Loading…
Reference in New Issue