Skip to content

Commit dc1f22d

Browse files
TakayukiHoshi1984TakayukiHoshi1984
committed
細かいWarningの修正(dConnectBrowserForIOS9以外）
1 parent 09cf313 commit dc1f22d

52 files changed

Lines changed: 118 additions & 120 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎dConnectDevicePlugin/DCMDevicePluginSDK/DCMDevicePluginSDK.xcodeproj/xcshareddata/xcschemes/DCMDevicePluginSDK.xcscheme‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "0900"
3+
LastUpgradeVersion = "0910"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

‎dConnectDevicePlugin/DCMDevicePluginSDK/DCMDevicePluginSDK.xcodeproj/xcshareddata/xcschemes/DCMDevicePluginSDK_framework.xcscheme‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "0900"
3+
LastUpgradeVersion = "0910"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

‎dConnectDevicePlugin/dConnectDeviceAWSIoT/dConnectDeviceAWSIoT.xcodeproj/project.pbxproj‎

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -655,7 +655,7 @@
655655
782989F01D532AF900E9B90B /* Project object */ = {
656656
isa = PBXProject;
657657
attributes = {
658-
LastUpgradeCheck = 0730;
658+
LastUpgradeCheck = 0910;
659659
ORGANIZATIONNAME = "NTT DOCOMO, INC.";
660660
TargetAttributes = {
661661
782989F71D532AF900E9B90B = {
@@ -857,13 +857,21 @@
857857
CLANG_CXX_LIBRARY = "libc++";
858858
CLANG_ENABLE_MODULES = YES;
859859
CLANG_ENABLE_OBJC_ARC = YES;
860+
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
860861
CLANG_WARN_BOOL_CONVERSION = YES;
862+
CLANG_WARN_COMMA = YES;
861863
CLANG_WARN_CONSTANT_CONVERSION = YES;
862864
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
863865
CLANG_WARN_EMPTY_BODY = YES;
864866
CLANG_WARN_ENUM_CONVERSION = YES;
867+
CLANG_WARN_INFINITE_RECURSION = YES;
865868
CLANG_WARN_INT_CONVERSION = YES;
869+
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
870+
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
866871
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
872+
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
873+
CLANG_WARN_STRICT_PROTOTYPES = YES;
874+
CLANG_WARN_SUSPICIOUS_MOVE = YES;
867875
CLANG_WARN_UNREACHABLE_CODE = YES;
868876
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
869877
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
@@ -905,13 +913,21 @@
905913
CLANG_CXX_LIBRARY = "libc++";
906914
CLANG_ENABLE_MODULES = YES;
907915
CLANG_ENABLE_OBJC_ARC = YES;
916+
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
908917
CLANG_WARN_BOOL_CONVERSION = YES;
918+
CLANG_WARN_COMMA = YES;
909919
CLANG_WARN_CONSTANT_CONVERSION = YES;
910920
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
911921
CLANG_WARN_EMPTY_BODY = YES;
912922
CLANG_WARN_ENUM_CONVERSION = YES;
923+
CLANG_WARN_INFINITE_RECURSION = YES;
913924
CLANG_WARN_INT_CONVERSION = YES;
925+
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
926+
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
914927
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
928+
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
929+
CLANG_WARN_STRICT_PROTOTYPES = YES;
930+
CLANG_WARN_SUSPICIOUS_MOVE = YES;
915931
CLANG_WARN_UNREACHABLE_CODE = YES;
916932
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
917933
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";

‎dConnectDevicePlugin/dConnectDeviceAllJoyn/dConnectDeviceAllJoyn.xcodeproj/project.pbxproj‎

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -168,6 +168,7 @@
168168
25F136481B67112600ADD8CB /* DPAllJoynColorUtility.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = DPAllJoynColorUtility.mm; sourceTree = "<group>"; };
169169
AB6F63171D8699A80027A2A2 /* dconnect_icon_off.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = dconnect_icon_off.png; sourceTree = "<group>"; };
170170
AB6F63181D8699A80027A2A2 /* dconnect_icon.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = dconnect_icon.png; sourceTree = "<group>"; };
171+
AB9F67801FBACF98003A8EA0 /* module.modulemap */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.module-map"; path = module.modulemap; sourceTree = "<group>"; };
171172
ABC861A51BDA2B4A00E86FA9 /* libAllJoynFramework_iOS.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libAllJoynFramework_iOS.a; path = deps/AllJoyn/darwin/arm/iphoneos/release/dist/about/lib/libAllJoynFramework_iOS.a; sourceTree = "<group>"; };
172173
D6C860301D3A1D2000232EEF /* DPAllJoynService.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DPAllJoynService.h; sourceTree = "<group>"; };
173174
D6C860311D3A1D2000232EEF /* DPAllJoynService.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = DPAllJoynService.m; sourceTree = "<group>"; };
@@ -372,6 +373,7 @@
372373
25851BF81B57CF3D00CB732E /* Download_on_the_App_Store_Badge_US-UK_135x40@2x.png */,
373374
25851BF91B57CF3D00CB732E /* Download_on_the_App_Store_JP_135x40@2x.png */,
374375
25851BF01B57C47900CB732E /* LIFX_Logo@2.jpg */,
376+
AB9F67801FBACF98003A8EA0 /* module.modulemap */,
375377
);
376378
path = Resources;
377379
sourceTree = "<group>";
@@ -517,7 +519,7 @@
517519
25A06BF31B562C07005B6F8A /* Project object */ = {
518520
isa = PBXProject;
519521
attributes = {
520-
LastUpgradeCheck = 0900;
522+
LastUpgradeCheck = 0910;
521523
ORGANIZATIONNAME = "NTT DOCOMO, INC.";
522524
TargetAttributes = {
523525
25A06BFB1B562C07005B6F8A = {
@@ -759,12 +761,13 @@
759761
"$(PROJECT_DIR)/deps/AllJoyn/darwin/arm/$(PLATFORM_NAME)/$(CONFIGURATION)/dist/about/lib",
760762
"$(PROJECT_DIR)/deps/AllJoyn/darwin/$(CURRENT_ARCH)/$(PLATFORM_NAME)/$(CONFIGURATION)/dist/cpp/lib",
761763
);
764+
MODULEMAP_FILE = dConnectDeviceAllJoyn/Resources/module.modulemap;
762765
MTL_ENABLE_DEBUG_INFO = YES;
763766
ONLY_ACTIVE_ARCH = YES;
764767
SDKROOT = iphoneos;
765768
TARGETED_DEVICE_FAMILY = "1,2";
766769
USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/dConnectDeviceAllJoyn/Headers";
767-
VALID_ARCHS = "arm64 i386 armv7s armv7";
770+
VALID_ARCHS = "arm64 armv7s armv7 i386";
768771
VERSIONING_SYSTEM = "";
769772
VERSION_INFO_PREFIX = "";
770773
};
@@ -830,12 +833,13 @@
830833
"$(PROJECT_DIR)/deps/AllJoyn/darwin/arm/$(PLATFORM_NAME)/$(CONFIGURATION)/dist/about/lib",
831834
"$(PROJECT_DIR)/deps/AllJoyn/darwin/$(CURRENT_ARCH)/$(PLATFORM_NAME)/$(CONFIGURATION)/dist/cpp/lib",
832835
);
836+
MODULEMAP_FILE = dConnectDeviceAllJoyn/Resources/module.modulemap;
833837
MTL_ENABLE_DEBUG_INFO = NO;
834838
SDKROOT = iphoneos;
835839
TARGETED_DEVICE_FAMILY = "1,2";
836840
USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/dConnectDeviceAllJoyn/Headers";
837841
VALIDATE_PRODUCT = YES;
838-
VALID_ARCHS = "arm64 i386 armv7s armv7";
842+
VALID_ARCHS = "arm64 armv7s armv7 i386";
839843
VERSIONING_SYSTEM = "";
840844
VERSION_INFO_PREFIX = "";
841845
};
@@ -872,7 +876,7 @@
872876
PRODUCT_NAME = "$(TARGET_NAME)";
873877
SKIP_INSTALL = YES;
874878
STRIP_STYLE = "non-global";
875-
VALID_ARCHS = "arm64 i386 armv7s armv7";
879+
VALID_ARCHS = "arm64 armv7s armv7 i386";
876880
};
877881
name = Debug;
878882
};
@@ -908,7 +912,7 @@
908912
PRODUCT_NAME = "$(TARGET_NAME)";
909913
SKIP_INSTALL = YES;
910914
STRIP_STYLE = "non-global";
911-
VALID_ARCHS = "arm64 i386 armv7s armv7";
915+
VALID_ARCHS = "arm64 armv7s armv7 i386";
912916
};
913917
name = Release;
914918
};

‎dConnectDevicePlugin/dConnectDeviceAllJoyn/dConnectDeviceAllJoyn.xcodeproj/xcshareddata/xcschemes/dConnectDeviceAllJoyn_framework.xcscheme‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "0900"
3+
LastUpgradeVersion = "0910"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

‎dConnectDevicePlugin/dConnectDeviceAllJoyn/dConnectDeviceAllJoyn/Resources/module.modulemap‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
module dConnectDeviceAllJoyn {
2+
umbrella ""
3+
explicit module * {
4+
export *
5+
}
6+
}

‎dConnectDevicePlugin/dConnectDeviceHitoe/bin/dConnectDeviceHitoe_resources.bundle/Hitoe_iPad.storyboardc/UIViewController-slV-06-R6j.nib‎

0 Bytes
Binary file not shown.

‎dConnectDevicePlugin/dConnectDeviceHitoe/dConnectDeviceHitoe.xcodeproj/project.pbxproj‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@
137137
ABD3345F1D45C97000D05903 /* HitoeShirtDialog_iPad.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = ABD3345A1D45B67F00D05903 /* HitoeShirtDialog_iPad.storyboard */; };
138138
ABDDDF821D485153002EFF57 /* DPHitoeService.m in Sources */ = {isa = PBXBuildFile; fileRef = ABDDDF811D485153002EFF57 /* DPHitoeService.m */; };
139139
ABDDDF871D487799002EFF57 /* DPHitoeEventDispatcher.m in Sources */ = {isa = PBXBuildFile; fileRef = ABDDDF861D487799002EFF57 /* DPHitoeEventDispatcher.m */; };
140-
ABDDDF8A1D487A74002EFF57 /* DPHItoeImmediateEventDispatcher.m in Sources */ = {isa = PBXBuildFile; fileRef = ABDDDF891D487A74002EFF57 /* DPHItoeImmediateEventDispatcher.m */; };
140+
ABDDDF8A1D487A74002EFF57 /* DPHitoeImmediateEventDispatcher.m in Sources */ = {isa = PBXBuildFile; fileRef = ABDDDF891D487A74002EFF57 /* DPHitoeImmediateEventDispatcher.m */; };
141141
ABDDDF8D1D487B1E002EFF57 /* DPHitoeIntervalEventDispatcher.m in Sources */ = {isa = PBXBuildFile; fileRef = ABDDDF8C1D487B1E002EFF57 /* DPHitoeIntervalEventDispatcher.m */; };
142142
ABDDDF901D48802E002EFF57 /* DPHitoeEventDispatcherFactory.m in Sources */ = {isa = PBXBuildFile; fileRef = ABDDDF8F1D48802E002EFF57 /* DPHitoeEventDispatcherFactory.m */; };
143143
ABDDDF931D488399002EFF57 /* DPHitoeEventDispatcherManager.m in Sources */ = {isa = PBXBuildFile; fileRef = ABDDDF921D488399002EFF57 /* DPHitoeEventDispatcherManager.m */; };
@@ -308,8 +308,8 @@
308308
ABDDDF811D485153002EFF57 /* DPHitoeService.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = DPHitoeService.m; sourceTree = "<group>"; };
309309
ABDDDF851D487799002EFF57 /* DPHitoeEventDispatcher.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DPHitoeEventDispatcher.h; sourceTree = "<group>"; };
310310
ABDDDF861D487799002EFF57 /* DPHitoeEventDispatcher.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = DPHitoeEventDispatcher.m; sourceTree = "<group>"; };
311-
ABDDDF881D487A74002EFF57 /* DPHItoeImmediateEventDispatcher.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DPHItoeImmediateEventDispatcher.h; sourceTree = "<group>"; };
312-
ABDDDF891D487A74002EFF57 /* DPHItoeImmediateEventDispatcher.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = DPHItoeImmediateEventDispatcher.m; sourceTree = "<group>"; };
311+
ABDDDF881D487A74002EFF57 /* DPHitoeImmediateEventDispatcher.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DPHitoeImmediateEventDispatcher.h; sourceTree = "<group>"; };
312+
ABDDDF891D487A74002EFF57 /* DPHitoeImmediateEventDispatcher.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = DPHitoeImmediateEventDispatcher.m; sourceTree = "<group>"; };
313313
ABDDDF8B1D487B1E002EFF57 /* DPHitoeIntervalEventDispatcher.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DPHitoeIntervalEventDispatcher.h; sourceTree = "<group>"; };
314314
ABDDDF8C1D487B1E002EFF57 /* DPHitoeIntervalEventDispatcher.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = DPHitoeIntervalEventDispatcher.m; sourceTree = "<group>"; };
315315
ABDDDF8E1D48802E002EFF57 /* DPHitoeEventDispatcherFactory.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DPHitoeEventDispatcherFactory.h; sourceTree = "<group>"; };
@@ -527,8 +527,8 @@
527527
children = (
528528
ABDDDF851D487799002EFF57 /* DPHitoeEventDispatcher.h */,
529529
ABDDDF861D487799002EFF57 /* DPHitoeEventDispatcher.m */,
530-
ABDDDF881D487A74002EFF57 /* DPHItoeImmediateEventDispatcher.h */,
531-
ABDDDF891D487A74002EFF57 /* DPHItoeImmediateEventDispatcher.m */,
530+
ABDDDF881D487A74002EFF57 /* DPHitoeImmediateEventDispatcher.h */,
531+
ABDDDF891D487A74002EFF57 /* DPHitoeImmediateEventDispatcher.m */,
532532
ABDDDF8B1D487B1E002EFF57 /* DPHitoeIntervalEventDispatcher.h */,
533533
ABDDDF8C1D487B1E002EFF57 /* DPHitoeIntervalEventDispatcher.m */,
534534
ABDDDF8E1D48802E002EFF57 /* DPHitoeEventDispatcherFactory.h */,
@@ -909,7 +909,7 @@
909909
AB507EEB1D31EB920014C504 /* DPHitoeAccelerationData.m in Sources */,
910910
ABDDDF8D1D487B1E002EFF57 /* DPHitoeIntervalEventDispatcher.m in Sources */,
911911
ABDDDF901D48802E002EFF57 /* DPHitoeEventDispatcherFactory.m in Sources */,
912-
ABDDDF8A1D487A74002EFF57 /* DPHItoeImmediateEventDispatcher.m in Sources */,
912+
ABDDDF8A1D487A74002EFF57 /* DPHitoeImmediateEventDispatcher.m in Sources */,
913913
AB2E14EE1D2F64D300564A5E /* DPHitoeDialog.m in Sources */,
914914
ABC25ABD1D33627000CD9DA0 /* DPHitoeAddDeviceCell.m in Sources */,
915915
AB507EEE1D31EE530014C504 /* DPHitoeHeartData.m in Sources */,

‎dConnectDevicePlugin/dConnectDeviceHitoe/dConnectDeviceHitoe/Classes/db/DPHitoeDBManager.m‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ - (void) loadManagedObjectContext {
5656

5757
NSPersistentStoreCoordinator *aCoodinator = [self coordinator];
5858
if (aCoodinator != nil) {
59-
_managedObjectContext = [[NSManagedObjectContext alloc] init];
59+
_managedObjectContext = [[NSManagedObjectContext alloc] initWithConcurrencyType:NSPrivateQueueConcurrencyType];
6060
[_managedObjectContext setPersistentStoreCoordinator:aCoodinator];
6161
}
6262
}

‎dConnectDevicePlugin/dConnectDeviceHitoe/dConnectDeviceHitoe/Classes/event/DPHitoeEventDispatcherFactory.m‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ + (DPHitoeEventDispatcher*)createIntervalEventDispatcherForDevicePlugin:(DConnec
2626
return [[DPHitoeIntervalEventDispatcher alloc] initWithDevicePlugin:devicePlugin firstPeriodTime:periodTime periodTime:periodTime];
2727
}
2828
+ (DPHitoeEventDispatcher*)createImmediateEventDispatcherForDevicePlugin:(DConnectDevicePlugin*)devicePlugin {
29-
return [[DPHItoeImmediateEventDispatcher alloc] initWithDevicePlugin:devicePlugin];
29+
return [[DPHitoeImmediateEventDispatcher alloc] initWithDevicePlugin:devicePlugin];
3030
}
3131

3232
+ (int)getInterval:(DConnectRequestMessage*)request {

0 commit comments

Comments
 (0)