Skip to content

Commit

Permalink
fixed warnings + updated code style
Browse files Browse the repository at this point in the history
  • Loading branch information
pro100andrey committed Apr 19, 2018
1 parent 4f5553b commit ae1263c
Show file tree
Hide file tree
Showing 22 changed files with 107 additions and 60 deletions.
6 changes: 5 additions & 1 deletion QMAuthService/QMAuthService.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@
55C276DF1A0917AF005A0C38 /* Project object */ = {
isa = PBXProject;
attributes = {
LastUpgradeCheck = 0900;
LastUpgradeCheck = 0930;
TargetAttributes = {
55B2F0931A091C17008C2272 = {
CreatedOnToolsVersion = 6.1;
Expand Down Expand Up @@ -218,11 +218,13 @@
CLANG_WARN_BOOL_CONVERSION = YES;
CLANG_WARN_COMMA = YES;
CLANG_WARN_CONSTANT_CONVERSION = YES;
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
CLANG_WARN_EMPTY_BODY = YES;
CLANG_WARN_ENUM_CONVERSION = YES;
CLANG_WARN_INFINITE_RECURSION = YES;
CLANG_WARN_INT_CONVERSION = YES;
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
CLANG_WARN_STRICT_PROTOTYPES = YES;
Expand Down Expand Up @@ -250,11 +252,13 @@
CLANG_WARN_BOOL_CONVERSION = YES;
CLANG_WARN_COMMA = YES;
CLANG_WARN_CONSTANT_CONVERSION = YES;
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
CLANG_WARN_EMPTY_BODY = YES;
CLANG_WARN_ENUM_CONVERSION = YES;
CLANG_WARN_INFINITE_RECURSION = YES;
CLANG_WARN_INT_CONVERSION = YES;
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
CLANG_WARN_STRICT_PROTOTYPES = YES;
Expand Down
6 changes: 5 additions & 1 deletion QMBaseService/QMBaseService.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@
55B2F0E51A091CBA008C2272 /* Project object */ = {
isa = PBXProject;
attributes = {
LastUpgradeCheck = 0900;
LastUpgradeCheck = 0930;
TargetAttributes = {
55B2F1031A091CC9008C2272 = {
CreatedOnToolsVersion = 6.1;
Expand Down Expand Up @@ -137,11 +137,13 @@
CLANG_WARN_BOOL_CONVERSION = YES;
CLANG_WARN_COMMA = YES;
CLANG_WARN_CONSTANT_CONVERSION = YES;
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
CLANG_WARN_EMPTY_BODY = YES;
CLANG_WARN_ENUM_CONVERSION = YES;
CLANG_WARN_INFINITE_RECURSION = YES;
CLANG_WARN_INT_CONVERSION = YES;
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
CLANG_WARN_STRICT_PROTOTYPES = YES;
Expand Down Expand Up @@ -169,11 +171,13 @@
CLANG_WARN_BOOL_CONVERSION = YES;
CLANG_WARN_COMMA = YES;
CLANG_WARN_CONSTANT_CONVERSION = YES;
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
CLANG_WARN_EMPTY_BODY = YES;
CLANG_WARN_ENUM_CONVERSION = YES;
CLANG_WARN_INFINITE_RECURSION = YES;
CLANG_WARN_INT_CONVERSION = YES;
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
CLANG_WARN_STRICT_PROTOTYPES = YES;
Expand Down
8 changes: 7 additions & 1 deletion QMChatCache/QMChatCache.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -217,7 +217,7 @@
5590F2651A0B8C0500C5044F /* Project object */ = {
isa = PBXProject;
attributes = {
LastUpgradeCheck = 0900;
LastUpgradeCheck = 0930;
TargetAttributes = {
1402B6441B1383DA0069E3A4 = {
CreatedOnToolsVersion = 6.3.2;
Expand Down Expand Up @@ -332,13 +332,15 @@
1402B6451B1383DA0069E3A4 /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
CLANG_ENABLE_OBJC_WEAK = YES;
PRODUCT_NAME = "$(TARGET_NAME)";
};
name = Debug;
};
1402B6461B1383DA0069E3A4 /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
CLANG_ENABLE_OBJC_WEAK = YES;
PRODUCT_NAME = "$(TARGET_NAME)";
};
name = Release;
Expand Down Expand Up @@ -436,11 +438,13 @@
CLANG_WARN_BOOL_CONVERSION = YES;
CLANG_WARN_COMMA = YES;
CLANG_WARN_CONSTANT_CONVERSION = YES;
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
CLANG_WARN_EMPTY_BODY = YES;
CLANG_WARN_ENUM_CONVERSION = YES;
CLANG_WARN_INFINITE_RECURSION = YES;
CLANG_WARN_INT_CONVERSION = YES;
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
CLANG_WARN_STRICT_PROTOTYPES = YES;
Expand Down Expand Up @@ -469,11 +473,13 @@
CLANG_WARN_BOOL_CONVERSION = YES;
CLANG_WARN_COMMA = YES;
CLANG_WARN_CONSTANT_CONVERSION = YES;
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
CLANG_WARN_EMPTY_BODY = YES;
CLANG_WARN_ENUM_CONVERSION = YES;
CLANG_WARN_INFINITE_RECURSION = YES;
CLANG_WARN_INT_CONVERSION = YES;
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
CLANG_WARN_STRICT_PROTOTYPES = YES;
Expand Down
15 changes: 2 additions & 13 deletions QMChatCache/QMChatCache/QMChatCache.m
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,8 @@ + (void)setupDBWithStoreNamed:(NSString *)storeName
[[QMChatCache alloc] initWithStoreNamed:storeName
model:model
applicationGroupIdentifier:appGroupIdentifier];

_chatCacheInstance.messagesLimitPerDialog = NSNotFound;
}

+ (void)cleanDBWithStoreName:(NSString *)name {
Expand All @@ -54,19 +56,6 @@ + (void)cleanDBWithStoreName:(NSString *)name {
[super cleanDBWithStoreName:name];
}

//MARK: - Init

- (instancetype)init {

self = [super init];

if (self) {
_messagesLimitPerDialog = NSNotFound;
}

return self;
}

//MARK: - Fetch Dialogs
//MARK: Main queue

Expand Down
Binary file modified QMChatCache/QMChatCacheModel.bundle/Info.plist
Binary file not shown.
6 changes: 5 additions & 1 deletion QMChatService/QMChatService.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -272,7 +272,7 @@
55C276C11A0916BF005A0C38 /* Project object */ = {
isa = PBXProject;
attributes = {
LastUpgradeCheck = 0900;
LastUpgradeCheck = 0930;
TargetAttributes = {
55B2F0CB1A091C68008C2272 = {
CreatedOnToolsVersion = 6.1;
Expand Down Expand Up @@ -429,11 +429,13 @@
CLANG_WARN_BOOL_CONVERSION = YES;
CLANG_WARN_COMMA = YES;
CLANG_WARN_CONSTANT_CONVERSION = YES;
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
CLANG_WARN_EMPTY_BODY = YES;
CLANG_WARN_ENUM_CONVERSION = YES;
CLANG_WARN_INFINITE_RECURSION = YES;
CLANG_WARN_INT_CONVERSION = YES;
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
CLANG_WARN_STRICT_PROTOTYPES = YES;
Expand Down Expand Up @@ -461,11 +463,13 @@
CLANG_WARN_BOOL_CONVERSION = YES;
CLANG_WARN_COMMA = YES;
CLANG_WARN_CONSTANT_CONVERSION = YES;
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
CLANG_WARN_EMPTY_BODY = YES;
CLANG_WARN_ENUM_CONVERSION = YES;
CLANG_WARN_INFINITE_RECURSION = YES;
CLANG_WARN_INT_CONVERSION = YES;
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
CLANG_WARN_STRICT_PROTOTYPES = YES;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -255,11 +255,11 @@ - (void)clearCacheForType:(QMAttachmentCacheType)cacheType

dispatch_async(self.storeServiceQueue, ^{

[_fileManager removeItemAtPath:self.diskMediaCachePath error:nil];
[_fileManager createDirectoryAtPath:self.diskMediaCachePath
withIntermediateDirectories:YES
attributes:nil
error:NULL];
[self.fileManager removeItemAtPath:self.diskMediaCachePath error:nil];
[self.fileManager createDirectoryAtPath:self.diskMediaCachePath
withIntermediateDirectories:YES
attributes:nil
error:NULL];

dispatch_async(dispatch_get_main_queue(), ^{
clearMemoryBlock();
Expand Down Expand Up @@ -302,13 +302,13 @@ - (void)clearCacheForMessagesWithIDs:(NSArray <NSString *> *)messagesIDs

dispatch_async(self.storeServiceQueue, ^{

NSString *dialogPath = [_diskMediaCachePath stringByAppendingPathComponent:dialogID];
NSString *dialogPath = [self.diskMediaCachePath stringByAppendingPathComponent:dialogID];

for (NSString *messageID in messagesIDs) {

NSString *messagePath = [dialogPath stringByAppendingPathComponent:messageID];
[_fileManager removeItemAtPath:messagePath
error:nil];
[self.fileManager removeItemAtPath:messagePath
error:nil];
}

if (completion) {
Expand All @@ -330,8 +330,6 @@ - (void)clearCacheForMessageWithID:(NSString *)messageID
completion:completion];
}



//MARK: - Helpers
- (NSURL *)fileURLForAttachment:(QBChatAttachment *)attachment
messageID:(NSString *)messageID
Expand All @@ -340,7 +338,7 @@ - (NSURL *)fileURLForAttachment:(QBChatAttachment *)attachment
__block NSURL *fileURL = nil;
dispatch_sync(self.storeServiceQueue, ^{
NSString *path = mediaPath(dialogID, messageID, attachment);
if ([_fileManager fileExistsAtPath:path]) {
if ([self.fileManager fileExistsAtPath:path]) {
fileURL = [NSURL fileURLWithPath:path];
}
});
Expand Down Expand Up @@ -432,7 +430,7 @@ - (void)cancelAllOperations {
- (NSUInteger)sizeForPath:(NSString *)path {
__block NSUInteger size = 0;
dispatch_sync(self.storeServiceQueue, ^{
NSDirectoryEnumerator *fileEnumerator = [_fileManager enumeratorAtPath:self.diskMediaCachePath];
NSDirectoryEnumerator *fileEnumerator = [self.fileManager enumeratorAtPath:self.diskMediaCachePath];
for (NSString *fileName in fileEnumerator) {
NSString *filePath = [self.diskMediaCachePath stringByAppendingPathComponent:fileName];
NSDictionary<NSString *, id> *attrs = [[NSFileManager defaultManager] attributesOfItemAtPath:filePath error:nil];
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -208,7 +208,7 @@
5590F29D1A0B8D2900C5044F /* Project object */ = {
isa = PBXProject;
attributes = {
LastUpgradeCheck = 0900;
LastUpgradeCheck = 0930;
ORGANIZATIONNAME = Quickblox;
TargetAttributes = {
1402B64D1B1384430069E3A4 = {
Expand Down Expand Up @@ -320,13 +320,15 @@
1402B64E1B1384430069E3A4 /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
CLANG_ENABLE_OBJC_WEAK = YES;
PRODUCT_NAME = "$(TARGET_NAME)";
};
name = Debug;
};
1402B64F1B1384430069E3A4 /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
CLANG_ENABLE_OBJC_WEAK = YES;
PRODUCT_NAME = "$(TARGET_NAME)";
};
name = Release;
Expand Down Expand Up @@ -429,11 +431,13 @@
CLANG_WARN_BOOL_CONVERSION = YES;
CLANG_WARN_COMMA = YES;
CLANG_WARN_CONSTANT_CONVERSION = YES;
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
CLANG_WARN_EMPTY_BODY = YES;
CLANG_WARN_ENUM_CONVERSION = YES;
CLANG_WARN_INFINITE_RECURSION = YES;
CLANG_WARN_INT_CONVERSION = YES;
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
CLANG_WARN_STRICT_PROTOTYPES = YES;
Expand Down Expand Up @@ -461,11 +465,13 @@
CLANG_WARN_BOOL_CONVERSION = YES;
CLANG_WARN_COMMA = YES;
CLANG_WARN_CONSTANT_CONVERSION = YES;
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
CLANG_WARN_EMPTY_BODY = YES;
CLANG_WARN_ENUM_CONVERSION = YES;
CLANG_WARN_INFINITE_RECURSION = YES;
CLANG_WARN_INT_CONVERSION = YES;
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
CLANG_WARN_STRICT_PROTOTYPES = YES;
Expand Down
Binary file modified QMContactListCache/QMContactListCacheModel.bundle/Info.plist
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@
55C276D51A091739005A0C38 /* Project object */ = {
isa = PBXProject;
attributes = {
LastUpgradeCheck = 0900;
LastUpgradeCheck = 0930;
TargetAttributes = {
55B2F0AF1A091C38008C2272 = {
CreatedOnToolsVersion = 6.1;
Expand Down Expand Up @@ -231,11 +231,13 @@
CLANG_WARN_BOOL_CONVERSION = YES;
CLANG_WARN_COMMA = YES;
CLANG_WARN_CONSTANT_CONVERSION = YES;
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
CLANG_WARN_EMPTY_BODY = YES;
CLANG_WARN_ENUM_CONVERSION = YES;
CLANG_WARN_INFINITE_RECURSION = YES;
CLANG_WARN_INT_CONVERSION = YES;
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
CLANG_WARN_STRICT_PROTOTYPES = YES;
Expand Down Expand Up @@ -263,11 +265,13 @@
CLANG_WARN_BOOL_CONVERSION = YES;
CLANG_WARN_COMMA = YES;
CLANG_WARN_CONSTANT_CONVERSION = YES;
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
CLANG_WARN_EMPTY_BODY = YES;
CLANG_WARN_ENUM_CONVERSION = YES;
CLANG_WARN_INFINITE_RECURSION = YES;
CLANG_WARN_INT_CONVERSION = YES;
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
CLANG_WARN_STRICT_PROTOTYPES = YES;
Expand Down
6 changes: 5 additions & 1 deletion QMDBStorage/QMDBStorage.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -252,7 +252,7 @@
5590F2261A0B876F00C5044F /* Project object */ = {
isa = PBXProject;
attributes = {
LastUpgradeCheck = 0900;
LastUpgradeCheck = 0930;
TargetAttributes = {
5590F2361A0B87AB00C5044F = {
CreatedOnToolsVersion = 6.1;
Expand Down Expand Up @@ -313,11 +313,13 @@
CLANG_WARN_BOOL_CONVERSION = YES;
CLANG_WARN_COMMA = YES;
CLANG_WARN_CONSTANT_CONVERSION = YES;
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
CLANG_WARN_EMPTY_BODY = YES;
CLANG_WARN_ENUM_CONVERSION = YES;
CLANG_WARN_INFINITE_RECURSION = YES;
CLANG_WARN_INT_CONVERSION = YES;
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
CLANG_WARN_STRICT_PROTOTYPES = YES;
Expand All @@ -344,11 +346,13 @@
CLANG_WARN_BOOL_CONVERSION = YES;
CLANG_WARN_COMMA = YES;
CLANG_WARN_CONSTANT_CONVERSION = YES;
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
CLANG_WARN_EMPTY_BODY = YES;
CLANG_WARN_ENUM_CONVERSION = YES;
CLANG_WARN_INFINITE_RECURSION = YES;
CLANG_WARN_INT_CONVERSION = YES;
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
CLANG_WARN_STRICT_PROTOTYPES = YES;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
NSString *summary = [errorCodes objectForKey:@(errorCode)];
if (summary == nil)
{
summary = [NSString stringWithFormat:@"Unknown Core Data Error Code (%zd)", errorCode];
summary = [NSString stringWithFormat:@"Unknown Core Data Error Code (%tu)", errorCode];
}
return summary;
}
Expand Down Expand Up @@ -82,7 +82,7 @@ - (NSString *)QM_summaryDescription;
{
return [[self userInfo] valueForKey:@"conflictList"];
}
return [NSString stringWithFormat:@"(%zd) %@ [%@]", errorCode, QM_errorSummaryFromErrorCode(errorCode), [self QM_validationErrorObject] ?: [[self userInfo] valueForKey:@"reason"]];
return [NSString stringWithFormat:@"(%tu) %@ [%@]", errorCode, QM_errorSummaryFromErrorCode(errorCode), [self QM_validationErrorObject] ?: [[self userInfo] valueForKey:@"reason"]];
}

- (NSString *)QM_coreDataDescription;
Expand Down
Loading

0 comments on commit ae1263c

Please sign in to comment.