diff --git a/Lemon/Controller/LMMainViewController.m b/Lemon/Controller/LMMainViewController.m index f628fb5b1..9d2a939eb 100644 --- a/Lemon/Controller/LMMainViewController.m +++ b/Lemon/Controller/LMMainViewController.m @@ -17,7 +17,7 @@ @interface LMMainViewController () @implementation LMMainViewController --(id)init{ +-(instancetype)init{ self = [super initWithNibName:NSStringFromClass(self.class) bundle:[NSBundle bundleForClass:self.class]]; if (self) { diff --git a/Lemon/Controller/LMToolViewController.m b/Lemon/Controller/LMToolViewController.m index c5f3da672..e67a339a4 100644 --- a/Lemon/Controller/LMToolViewController.m +++ b/Lemon/Controller/LMToolViewController.m @@ -53,7 +53,7 @@ @interface LMToolViewController () @implementation LemonMainWndController -- (id)init +- (instancetype)init { static dispatch_once_t onceToken; static LemonMainWndController *mainWindow; diff --git a/Lemon/LemonStartUpParams.m b/Lemon/LemonStartUpParams.m index 73618a8fb..5f743d4d2 100644 --- a/Lemon/LemonStartUpParams.m +++ b/Lemon/LemonStartUpParams.m @@ -19,7 +19,7 @@ + (LemonStartUpParams*)sharedInstance }); return instance; } -- (id)init{ +- (instancetype)init{ self = [super init]; if (self) { _paramsCmd = 0; diff --git a/Lemon/MobileNotification/QMMobileConnNotification.m b/Lemon/MobileNotification/QMMobileConnNotification.m index cc029cbec..f51d152fb 100755 --- a/Lemon/MobileNotification/QMMobileConnNotification.m +++ b/Lemon/MobileNotification/QMMobileConnNotification.m @@ -25,7 +25,7 @@ @interface QMMobileConnNotification() @implementation QMMobileConnNotification -- (id)init +- (instancetype)init { if (self = [super init]) { diff --git a/Lemon/MobileNotification/QMUserNotificationCenter.m b/Lemon/MobileNotification/QMUserNotificationCenter.m index 405462167..2c602e5ca 100755 --- a/Lemon/MobileNotification/QMUserNotificationCenter.m +++ b/Lemon/MobileNotification/QMUserNotificationCenter.m @@ -13,7 +13,7 @@ @implementation QMUserNotificationCenter -- (id)init +- (instancetype)init { if (self = [super init]) { diff --git a/Lemon/Preference/PreferenceASViewController.m b/Lemon/Preference/PreferenceASViewController.m index c7dbb4774..b7892e76d 100644 --- a/Lemon/Preference/PreferenceASViewController.m +++ b/Lemon/Preference/PreferenceASViewController.m @@ -69,7 +69,7 @@ @interface PreferenceASViewController () @implementation PreferenceASViewController --(id)init{ +-(instancetype)init{ self = [super initWithNibName:NSStringFromClass(self.class) bundle:[NSBundle bundleForClass:self.class]]; if (self) { diff --git a/Lemon/Preference/PreferenceViewController.h b/Lemon/Preference/PreferenceViewController.h index c4854d8a1..79574f838 100644 --- a/Lemon/Preference/PreferenceViewController.h +++ b/Lemon/Preference/PreferenceViewController.h @@ -17,7 +17,7 @@ @property (weak, nonatomic) PreferenceWindowController* myWC; --(id)initWithPreferenceWindowController:(PreferenceWindowController *)wdControler; +-(instancetype)initWithPreferenceWindowController:(PreferenceWindowController *)wdControler; - (instancetype)init; #define STATUS_TYPE_LOGO 1 diff --git a/Lemon/Preference/PreferenceViewController.m b/Lemon/Preference/PreferenceViewController.m index 81dc0ba5f..5bcdf7fae 100644 --- a/Lemon/Preference/PreferenceViewController.m +++ b/Lemon/Preference/PreferenceViewController.m @@ -61,7 +61,7 @@ @interface PreferenceViewController () @implementation PreferenceViewController --(id)initWithPreferenceWindowController:(PreferenceWindowController *)wdControle{ +-(instancetype)initWithPreferenceWindowController:(PreferenceWindowController *)wdControle{ self = [super init]; if (self) { self.myWC = wdControle; diff --git a/Lemon/Splash/BFPageControl.m b/Lemon/Splash/BFPageControl.m index d576c8555..984f9c9e8 100755 --- a/Lemon/Splash/BFPageControl.m +++ b/Lemon/Splash/BFPageControl.m @@ -78,7 +78,7 @@ @implementation BFPageControl #pragma mark - Init --(id)initWithFrame: (NSRect)frameRect +-(instancetype)initWithFrame: (NSRect)frameRect { if(self = [super initWithFrame: frameRect]) { diff --git a/Lemon/View/Cell/ToolTableCellView.m b/Lemon/View/Cell/ToolTableCellView.m index 7df1ced42..f3142bb34 100644 --- a/Lemon/View/Cell/ToolTableCellView.m +++ b/Lemon/View/Cell/ToolTableCellView.m @@ -43,7 +43,7 @@ @interface ToolTableCellView() @implementation ToolTableCellView --(id)initWithFrame:(NSRect)frameRect{ +-(instancetype)initWithFrame:(NSRect)frameRect{ self = [super initWithFrame:frameRect]; if (self) { [self setupUI]; diff --git a/LemonClener/LemonClener.xcodeproj/project.pbxproj b/LemonClener/LemonClener.xcodeproj/project.pbxproj index d30dc907f..e2b4b46e0 100644 --- a/LemonClener/LemonClener.xcodeproj/project.pbxproj +++ b/LemonClener/LemonClener.xcodeproj/project.pbxproj @@ -1884,8 +1884,8 @@ isa = XCBuildConfiguration; baseConfigurationReference = A9034E812C8560B577617437 /* Pods-LemonClener.debug.xcconfig */; buildSettings = { - CODE_SIGN_IDENTITY = "Developer ID Application: Tencent Technology (Shenzhen) Company Limited (88L2Q4487U)"; - CODE_SIGN_STYLE = Manual; + CODE_SIGN_IDENTITY = "Apple Development"; + CODE_SIGN_STYLE = Automatic; COMBINE_HIDPI_IMAGES = YES; DEFINES_MODULE = YES; DEVELOPMENT_TEAM = ""; @@ -1915,10 +1915,11 @@ isa = XCBuildConfiguration; baseConfigurationReference = E19B365C47E84A9C932F7159 /* Pods-LemonClener.release.xcconfig */; buildSettings = { - CODE_SIGN_IDENTITY = "Developer ID Application: Tencent Technology (Shenzhen) Company Limited (88L2Q4487U)"; - CODE_SIGN_STYLE = Manual; + CODE_SIGN_IDENTITY = "Apple Development"; + CODE_SIGN_STYLE = Automatic; COMBINE_HIDPI_IMAGES = YES; DEFINES_MODULE = YES; + DEVELOPMENT_TEAM = ""; DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; DYLIB_INSTALL_NAME_BASE = "@rpath"; @@ -1935,6 +1936,7 @@ MACOSX_DEPLOYMENT_TARGET = 10.11; PRODUCT_BUNDLE_IDENTIFIER = com.tencent.LemonClener; PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)"; + PROVISIONING_PROFILE_SPECIFIER = ""; SKIP_INSTALL = YES; }; name = Release; diff --git a/LemonClener/LemonClener/Controller/LMCleanBigViewController.m b/LemonClener/LemonClener/Controller/LMCleanBigViewController.m index 1c77bb43a..c20d7f0ce 100644 --- a/LemonClener/LemonClener/Controller/LMCleanBigViewController.m +++ b/LemonClener/LemonClener/Controller/LMCleanBigViewController.m @@ -106,7 +106,7 @@ @interface LMCleanBigViewController () delegate; -- (id)initFilterDict:(NSDictionary *)filerDict; +- (instancetype)initFilterDict:(NSDictionary *)filerDict; - (NSArray *)enumeratorAtFilePath:(QMActionItem *)item; diff --git a/LemonClener/LemonClener/libcleaner/QMFilterParse.m b/LemonClener/LemonClener/libcleaner/QMFilterParse.m index 71d21b6e3..c26c8a9f1 100644 --- a/LemonClener/LemonClener/libcleaner/QMFilterParse.m +++ b/LemonClener/LemonClener/libcleaner/QMFilterParse.m @@ -14,7 +14,7 @@ @implementation QMFilterParse -- (id)initFilterDict:(NSDictionary *)filterDict +- (instancetype)initFilterDict:(NSDictionary *)filterDict { if (self = [super init]) { diff --git a/LemonClener/LemonClener/libcleaner/QMScanCategory.m b/LemonClener/LemonClener/libcleaner/QMScanCategory.m index 1a50ca14f..85d95c3fa 100644 --- a/LemonClener/LemonClener/libcleaner/QMScanCategory.m +++ b/LemonClener/LemonClener/libcleaner/QMScanCategory.m @@ -28,7 +28,7 @@ @implementation QMScanCategory @synthesize delegate; @synthesize isStopScan; -- (id)init +- (instancetype)init { if (self = [super init]) { diff --git a/LemonClener/LemonClener/libcleaner/QMSpecialClean/QMAppLeftScan.m b/LemonClener/LemonClener/libcleaner/QMSpecialClean/QMAppLeftScan.m index 6a8ecadc0..c208f66ae 100644 --- a/LemonClener/LemonClener/libcleaner/QMSpecialClean/QMAppLeftScan.m +++ b/LemonClener/LemonClener/libcleaner/QMSpecialClean/QMAppLeftScan.m @@ -19,7 +19,7 @@ @implementation QMAppLeftScan @synthesize delegate; -- (id)init +- (instancetype)init { if (self = [super init]) { diff --git a/LemonClener/LemonClener/libcleaner/QMSpecialClean/QMAppUnlessFile.m b/LemonClener/LemonClener/libcleaner/QMSpecialClean/QMAppUnlessFile.m index 4140de817..a0eb03f4e 100644 --- a/LemonClener/LemonClener/libcleaner/QMSpecialClean/QMAppUnlessFile.m +++ b/LemonClener/LemonClener/libcleaner/QMSpecialClean/QMAppUnlessFile.m @@ -31,7 +31,7 @@ @implementation QMAppUnlessFile @synthesize delegate; -- (id)init +- (instancetype)init { if (self = [super init]) { diff --git a/LemonClener/LemonClener/libcleaner/QMSpecialClean/QMDirectoryScan.m b/LemonClener/LemonClener/libcleaner/QMSpecialClean/QMDirectoryScan.m index a3075e8e1..b08814966 100644 --- a/LemonClener/LemonClener/libcleaner/QMSpecialClean/QMDirectoryScan.m +++ b/LemonClener/LemonClener/libcleaner/QMSpecialClean/QMDirectoryScan.m @@ -16,7 +16,7 @@ @implementation QMDirectoryScan @synthesize delegate; -- (id)init +- (instancetype)init { if (self = [super init]) { diff --git a/LemonClener/LemonClener/libcleaner/QMXMLItem/QMActionItem.m b/LemonClener/LemonClener/libcleaner/QMXMLItem/QMActionItem.m index dc5ba8152..598a3ede6 100644 --- a/LemonClener/LemonClener/libcleaner/QMXMLItem/QMActionItem.m +++ b/LemonClener/LemonClener/libcleaner/QMXMLItem/QMActionItem.m @@ -13,7 +13,7 @@ @implementation QMActionAtomItem @synthesize resultFilters; --(id)copyWithZone:(NSZone *)zone{ +-(instancetype)copyWithZone:(NSZone *)zone{ QMActionAtomItem *copy = [[QMActionAtomItem alloc] init]; if (copy) { copy.resultFilters = [self.resultFilters copy]; @@ -22,7 +22,7 @@ -(id)copyWithZone:(NSZone *)zone{ return self; } --(id)mutableCopyWithZone:(NSZone *)zone{ +-(instancetype)mutableCopyWithZone:(NSZone *)zone{ QMActionAtomItem *copy = [[QMActionAtomItem alloc] init]; if (copy) { copy.resultFilters = [self.resultFilters copy]; @@ -40,7 +40,7 @@ @implementation QMActionPathItem @synthesize level; @synthesize scanFilters; -- (id)init +- (instancetype)init { if (self = [super init]) { @@ -49,7 +49,7 @@ - (id)init return self; } --(id)copyWithZone:(NSZone *)zone{ +-(instancetype)copyWithZone:(NSZone *)zone{ QMActionPathItem *copy = [[QMActionPathItem alloc] init]; if (copy) { copy.filename = [self.filename mutableCopy]; @@ -63,7 +63,7 @@ -(id)copyWithZone:(NSZone *)zone{ return self; } --(id)mutableCopyWithZone:(NSZone *)zone{ +-(instancetype)mutableCopyWithZone:(NSZone *)zone{ QMActionPathItem *copy = [[QMActionPathItem alloc] init]; if (copy) { copy.filename = [self.filename mutableCopy]; @@ -97,7 +97,7 @@ @implementation QMActionItem @synthesize appVersion; @synthesize buildVersion; -- (id)init +- (instancetype)init { if (self = [super init]) { @@ -114,7 +114,7 @@ - (id)init return self; } --(id)copyWithZone:(NSZone *)zone{ +-(instancetype)copyWithZone:(NSZone *)zone{ QMActionItem *copy = [super copyWithZone:zone]; if (copy) { copy.actionID = [self.actionID mutableCopy]; @@ -143,7 +143,7 @@ -(id)copyWithZone:(NSZone *)zone{ return copy; } --(id)mutableCopyWithZone:(NSZone *)zone{ +-(instancetype)mutableCopyWithZone:(NSZone *)zone{ QMActionItem *copy = [super mutableCopyWithZone:zone]; if (copy) { copy.actionID = [self.actionID mutableCopy]; diff --git a/LemonClener/LemonClener/libcleaner/QMXMLItem/QMBaseItem.m b/LemonClener/LemonClener/libcleaner/QMXMLItem/QMBaseItem.m index 2ce66b911..684d230ce 100644 --- a/LemonClener/LemonClener/libcleaner/QMXMLItem/QMBaseItem.m +++ b/LemonClener/LemonClener/libcleaner/QMXMLItem/QMBaseItem.m @@ -14,7 +14,7 @@ @implementation QMBaseItem @synthesize progressValue; @synthesize state; --(id)copyWithZone:(NSZone *)zone{ +-(instancetype)copyWithZone:(NSZone *)zone{ QMBaseItem *copy = [[[self class] alloc] init]; if (copy) { copy.progressValue = self.progressValue; @@ -26,7 +26,7 @@ -(id)copyWithZone:(NSZone *)zone{ return copy; } --(id)mutableCopyWithZone:(NSZone *)zone{ +-(instancetype)mutableCopyWithZone:(NSZone *)zone{ QMBaseItem *copy = [[[self class] alloc] init]; if (copy) { copy.progressValue = self.progressValue; diff --git a/LemonClener/LemonClener/libcleaner/QMXMLItem/QMCategoryItem.m b/LemonClener/LemonClener/libcleaner/QMXMLItem/QMCategoryItem.m index 453c45bfe..0ea8c7e94 100644 --- a/LemonClener/LemonClener/libcleaner/QMXMLItem/QMCategoryItem.m +++ b/LemonClener/LemonClener/libcleaner/QMXMLItem/QMCategoryItem.m @@ -17,7 +17,7 @@ @implementation QMCategorySubItem @synthesize tips; @synthesize m_actionItemArray; -- (id)init +- (instancetype)init { if (self = [super init]) { @@ -30,7 +30,7 @@ - (id)init return self; } --(id)copyWithZone:(NSZone *)zone{ +-(instancetype)copyWithZone:(NSZone *)zone{ QMCategorySubItem *copy = [super copyWithZone:zone]; if (copy) { copy.subCategoryID = [self.subCategoryID mutableCopy]; @@ -53,7 +53,7 @@ -(id)copyWithZone:(NSZone *)zone{ return copy; } --(id)mutableCopyWithZone:(NSZone *)zone{ +-(instancetype)mutableCopyWithZone:(NSZone *)zone{ QMCategorySubItem *copy = [super mutableCopyWithZone:zone]; if (copy) { copy.subCategoryID = [self.subCategoryID mutableCopy]; @@ -226,7 +226,7 @@ @implementation QMCategoryItem @synthesize m_categorySubItemArray; @synthesize recommend; -- (id)init +- (instancetype)init { if (self = [super init]) { @@ -237,7 +237,7 @@ - (id)init return self; } --(id)copyWithZone:(NSZone *)zone{ +-(instancetype)copyWithZone:(NSZone *)zone{ QMCategoryItem *copy = [super copyWithZone:zone]; if (copy) { copy.categoryID = [self.categoryID mutableCopy]; @@ -258,7 +258,7 @@ -(id)copyWithZone:(NSZone *)zone{ return copy; } --(id)mutableCopyWithZone:(NSZone *)zone{ +-(instancetype)mutableCopyWithZone:(NSZone *)zone{ QMCategoryItem *copy = [super mutableCopyWithZone:zone]; if (copy) { copy.categoryID = [self.categoryID mutableCopy]; diff --git a/LemonClener/LemonClener/libcleaner/QMXMLItem/QMFilterItem.m b/LemonClener/LemonClener/libcleaner/QMXMLItem/QMFilterItem.m index a8768d24a..55966e77c 100644 --- a/LemonClener/LemonClener/libcleaner/QMXMLItem/QMFilterItem.m +++ b/LemonClener/LemonClener/libcleaner/QMXMLItem/QMFilterItem.m @@ -22,7 +22,7 @@ @implementation QMFilterItem @synthesize orFilterItem; @synthesize logicLevel; --(id)copyWithZone:(NSZone *)zone{ +-(instancetype)copyWithZone:(NSZone *)zone{ QMFilterItem *copy = [[QMFilterItem alloc] init]; if (copy) { copy.filterID = [self.filterID mutableCopy]; @@ -38,7 +38,7 @@ -(id)copyWithZone:(NSZone *)zone{ return copy; } --(id)mutableCopyWithZone:(NSZone *)zone{ +-(instancetype)mutableCopyWithZone:(NSZone *)zone{ QMFilterItem *copy = [[QMFilterItem alloc] init]; if (copy) { copy.filterID = [self.filterID mutableCopy]; diff --git a/LemonClener/LemonClener/libcleaner/QMXMLItem/QMResultItem.h b/LemonClener/LemonClener/libcleaner/QMXMLItem/QMResultItem.h index 22c9fe23c..cfa6b35a3 100644 --- a/LemonClener/LemonClener/libcleaner/QMXMLItem/QMResultItem.h +++ b/LemonClener/LemonClener/libcleaner/QMXMLItem/QMResultItem.h @@ -49,9 +49,9 @@ //app macos二进制的架构 @property (nonatomic, assign) AppBinaryType binaryType; -- (id)initWithPath:(NSString *)rpath; +- (instancetype)initWithPath:(NSString *)rpath; -- (id)initWithLanguageKey:(NSString *)key; +- (instancetype)initWithLanguageKey:(NSString *)key; - (void)addResultWithPathArray:(NSArray *)pathArray; - (void)addResultWithPath:(NSString *)rpath; diff --git a/LemonClener/LemonClener/libcleaner/QMXMLItem/QMResultItem.m b/LemonClener/LemonClener/libcleaner/QMXMLItem/QMResultItem.m index e918cf68c..acb1da38d 100644 --- a/LemonClener/LemonClener/libcleaner/QMXMLItem/QMResultItem.m +++ b/LemonClener/LemonClener/libcleaner/QMXMLItem/QMResultItem.m @@ -13,7 +13,7 @@ @implementation QMResultBrowerItem --(id)init{ +-(instancetype)init{ self = [super init]; if (self) { self.isSelect = NO; @@ -33,7 +33,7 @@ @implementation QMResultItem @synthesize languageKey; @synthesize cautionID; -- (id)init +- (instancetype)init { if (self = [super init]) { @@ -45,7 +45,7 @@ - (id)init return self; } -- (id)initWithPath:(NSString *)rpath +- (instancetype)initWithPath:(NSString *)rpath { if (self = [self init]) { @@ -66,7 +66,7 @@ - (id)initWithPath:(NSString *)rpath } -- (id)initWithLanguageKey:(NSString *)key +- (instancetype)initWithLanguageKey:(NSString *)key { if (self = [self init]) { diff --git a/LemonClener/LemonClener/libcleaner/QMXMLParse.m b/LemonClener/LemonClener/libcleaner/QMXMLParse.m index 6b2f91a69..d7dac9532 100644 --- a/LemonClener/LemonClener/libcleaner/QMXMLParse.m +++ b/LemonClener/LemonClener/libcleaner/QMXMLParse.m @@ -20,7 +20,7 @@ @implementation QMXMLParse @synthesize delegagte; -- (id)init +- (instancetype)init { if (self = [super init]) { diff --git a/LemonClener/LemonClener/libcleaner/QMXMLParseManager.m b/LemonClener/LemonClener/libcleaner/QMXMLParseManager.m index 4752ac86b..1f698ffde 100644 --- a/LemonClener/LemonClener/libcleaner/QMXMLParseManager.m +++ b/LemonClener/LemonClener/libcleaner/QMXMLParseManager.m @@ -18,7 +18,7 @@ @implementation QMXMLParseManager -- (id)init +- (instancetype)init { if (self = [super init]) { diff --git a/LemonClener/LemonClener/libcleaner/data/LMCleanResultModel.h b/LemonClener/LemonClener/libcleaner/data/LMCleanResultModel.h index e2026581d..26c78313c 100644 --- a/LemonClener/LemonClener/libcleaner/data/LMCleanResultModel.h +++ b/LemonClener/LemonClener/libcleaner/data/LMCleanResultModel.h @@ -25,8 +25,8 @@ typedef enum { @property (nonatomic, assign) long long oprateTime; @property (nonatomic, assign) long long createTime; --(id)initWithCreateTime:(long long) createTime; +-(instancetype)initWithCreateTime:(long long) createTime; --(id)initWithResultId:(NSInteger) resultId totalSize:(long long) totalSize sysSize:(long long)sysSize appSize:(long long)appSize intSize:(long long)intSize cleanType:(CleanResultType) cleanType fileNum:(NSUInteger) fileNum oprateTime:(long long)oprateTime createTime:(long long) createTime; +-(instancetype)initWithResultId:(NSInteger) resultId totalSize:(long long) totalSize sysSize:(long long)sysSize appSize:(long long)appSize intSize:(long long)intSize cleanType:(CleanResultType) cleanType fileNum:(NSUInteger) fileNum oprateTime:(long long)oprateTime createTime:(long long) createTime; @end diff --git a/LemonClener/LemonClener/libcleaner/data/LMCleanResultModel.m b/LemonClener/LemonClener/libcleaner/data/LMCleanResultModel.m index 5f108a8e0..5aed9b07d 100644 --- a/LemonClener/LemonClener/libcleaner/data/LMCleanResultModel.m +++ b/LemonClener/LemonClener/libcleaner/data/LMCleanResultModel.m @@ -10,7 +10,7 @@ @implementation LMCleanResultModel --(id)initWithCreateTime:(long long) createTime{ +-(instancetype)initWithCreateTime:(long long) createTime{ self = [super init]; if (self) { self.resultId = 0; @@ -27,7 +27,7 @@ -(id)initWithCreateTime:(long long) createTime{ return self; } --(id)initWithResultId:(NSInteger) resultId totalSize:(long long) totalSize sysSize:(long long)sysSize appSize:(long long)appSize intSize:(long long)intSize cleanType:(CleanResultType) cleanType fileNum:(NSUInteger) fileNum oprateTime:(long long)oprateTime createTime:(long long) createTime{ +-(instancetype)initWithResultId:(NSInteger) resultId totalSize:(long long) totalSize sysSize:(long long)sysSize appSize:(long long)appSize intSize:(long long)intSize cleanType:(CleanResultType) cleanType fileNum:(NSUInteger) fileNum oprateTime:(long long)oprateTime createTime:(long long) createTime{ self = [super init]; if(self){ self.resultId = resultId; diff --git a/LemonClener/LemonClener/libcleaner/data/LMCleanShowModel.h b/LemonClener/LemonClener/libcleaner/data/LMCleanShowModel.h index 4fcc063c8..bce83a68f 100644 --- a/LemonClener/LemonClener/libcleaner/data/LMCleanShowModel.h +++ b/LemonClener/LemonClener/libcleaner/data/LMCleanShowModel.h @@ -17,8 +17,8 @@ @property (nonatomic, assign) long long internetJunkSize; @property (nonatomic, strong) NSString *dateTime; --(id)initWithDateTime:(NSString *)dateTime; +-(instancetype)initWithDateTime:(NSString *)dateTime; --(id)initTotalSize:(long long) totalSize sysJunkModel:(long long)systemJunkSize appJunkModel:(long long)appJunkSize interJunkModel:(long long)internetJunkSize dateTime:(NSString *) dateTime; +-(instancetype)initTotalSize:(long long) totalSize sysJunkModel:(long long)systemJunkSize appJunkModel:(long long)appJunkSize interJunkModel:(long long)internetJunkSize dateTime:(NSString *) dateTime; @end diff --git a/LemonClener/LemonClener/libcleaner/data/LMCleanShowModel.m b/LemonClener/LemonClener/libcleaner/data/LMCleanShowModel.m index a5dfda0df..8692e77e6 100644 --- a/LemonClener/LemonClener/libcleaner/data/LMCleanShowModel.m +++ b/LemonClener/LemonClener/libcleaner/data/LMCleanShowModel.m @@ -11,7 +11,7 @@ @implementation LMCleanShowModel --(id)initWithDateTime:(NSString *)dateTime{ +-(instancetype)initWithDateTime:(NSString *)dateTime{ self = [super init]; if (self) { self.totalSize = 0; @@ -24,7 +24,7 @@ -(id)initWithDateTime:(NSString *)dateTime{ return self; } --(id)initTotalSize:(long long) totalSize sysJunkModel:(long long)systemJunkSize appJunkModel:(long long)appJunkSize interJunkModel:(long long)internetJunkSize dateTime:(NSString *) dateTime{ +-(instancetype)initTotalSize:(long long) totalSize sysJunkModel:(long long)systemJunkSize appJunkModel:(long long)appJunkSize interJunkModel:(long long)internetJunkSize dateTime:(NSString *) dateTime{ self = [super init]; if(self){ self.totalSize = totalSize; diff --git a/LemonClener/LemonClener/libcleaner/data/LMCleanerDataCenter.m b/LemonClener/LemonClener/libcleaner/data/LMCleanerDataCenter.m index f2de52a35..1c37b59e4 100644 --- a/LemonClener/LemonClener/libcleaner/data/LMCleanerDataCenter.m +++ b/LemonClener/LemonClener/libcleaner/data/LMCleanerDataCenter.m @@ -34,7 +34,7 @@ +(id)shareInstance{ return instance; } --(id)init{ +-(instancetype)init{ self = [super init]; if (self) { self.m_subCategoryDict = [[NSMutableDictionary alloc] init]; diff --git a/Tools/LemonDaemon/LemonDaemon/LemonBizManager.m b/Tools/LemonDaemon/LemonDaemon/LemonBizManager.m index 3bb95f9d5..91df909f1 100644 --- a/Tools/LemonDaemon/LemonDaemon/LemonBizManager.m +++ b/Tools/LemonDaemon/LemonDaemon/LemonBizManager.m @@ -52,7 +52,7 @@ + (LemonBizManager *)shareInstance{ return instance; } -- (id)init { +- (instancetype)init { self = [super init]; NSLog(@"LemonBizManager init begin"); if (self) { diff --git a/Tools/LemonDaemon/LemonDaemon/Monitor/SMC/McFanInfo.m b/Tools/LemonDaemon/LemonDaemon/Monitor/SMC/McFanInfo.m index fce3523cf..009237c42 100755 --- a/Tools/LemonDaemon/LemonDaemon/Monitor/SMC/McFanInfo.m +++ b/Tools/LemonDaemon/LemonDaemon/Monitor/SMC/McFanInfo.m @@ -19,7 +19,7 @@ @implementation McFanInfo @synthesize fanMinSpeeds; @synthesize fanMaxSpeeds; -- (id) init +- (instancetype) init { if (self = [super init]) { diff --git a/Tools/LemonDaemon/LemonDaemon/Monitor/SMC/McTemperatureInfo.m b/Tools/LemonDaemon/LemonDaemon/Monitor/SMC/McTemperatureInfo.m index 4f822fe13..4ec11c88d 100755 --- a/Tools/LemonDaemon/LemonDaemon/Monitor/SMC/McTemperatureInfo.m +++ b/Tools/LemonDaemon/LemonDaemon/Monitor/SMC/McTemperatureInfo.m @@ -18,7 +18,7 @@ @implementation McTemperatureInfo @synthesize northbgTemp; @synthesize hddTemp; -- (id) init +- (instancetype) init { if (self = [super init]) { diff --git a/Tools/LemonDaemon/LemonDaemon/Owl/AudioProcessStat.h b/Tools/LemonDaemon/LemonDaemon/Owl/AudioProcessStat.h index 6713289bb..702977858 100644 --- a/Tools/LemonDaemon/LemonDaemon/Owl/AudioProcessStat.h +++ b/Tools/LemonDaemon/LemonDaemon/Owl/AudioProcessStat.h @@ -8,7 +8,7 @@ #import @interface AudioProcessStat : NSObject -- (id)initWithWhiteArray:(NSArray*)array; +- (instancetype)initWithWhiteArray:(NSArray*)array; - (NSMutableArray*)gradAudioProcessInfo; - (void)startCollectProcessInfo; - (void)stopCollectProcessInfo; diff --git a/Tools/LemonDaemon/LemonDaemon/Owl/AudioProcessStat.m b/Tools/LemonDaemon/LemonDaemon/Owl/AudioProcessStat.m index 0d9a2199d..97e57f1d5 100644 --- a/Tools/LemonDaemon/LemonDaemon/Owl/AudioProcessStat.m +++ b/Tools/LemonDaemon/LemonDaemon/Owl/AudioProcessStat.m @@ -18,7 +18,7 @@ @interface AudioProcessStat() { @implementation AudioProcessStat -- (id)initWithWhiteArray:(NSArray*)array { +- (instancetype)initWithWhiteArray:(NSArray*)array { self = [super init]; if (self) { _whiteProcessArray = [[NSArray alloc] initWithArray:array]; diff --git a/Tools/LemonDaemon/LemonDaemon/Owl/OwlManageDaemon.m b/Tools/LemonDaemon/LemonDaemon/Owl/OwlManageDaemon.m index 209f2c87c..aeefadcda 100644 --- a/Tools/LemonDaemon/LemonDaemon/Owl/OwlManageDaemon.m +++ b/Tools/LemonDaemon/LemonDaemon/Owl/OwlManageDaemon.m @@ -34,7 +34,7 @@ + (OwlManageDaemon *)shareInstance{ return instance; } -- (id)init { +- (instancetype)init { self = [super init]; NSLog(@"OwlManageDaemon init begin"); if (self) { diff --git a/Tools/LemonDaemon/LemonDaemon/Owl/VideoProcessStat.h b/Tools/LemonDaemon/LemonDaemon/Owl/VideoProcessStat.h index cd76cd57e..c9cf1292d 100644 --- a/Tools/LemonDaemon/LemonDaemon/Owl/VideoProcessStat.h +++ b/Tools/LemonDaemon/LemonDaemon/Owl/VideoProcessStat.h @@ -10,7 +10,7 @@ @interface VideoProcessStat : NSObject -- (id)initWithWhiteArray:(NSArray*)array; +- (instancetype)initWithWhiteArray:(NSArray*)array; - (NSMutableArray*)gradVedioProcessInfo; - (void)startCollectProcessInfo; - (void)stopCollectProcessInfo; diff --git a/Tools/LemonDaemon/LemonDaemon/Owl/VideoProcessStat.m b/Tools/LemonDaemon/LemonDaemon/Owl/VideoProcessStat.m index 8147c7cf4..a92c2d5b7 100644 --- a/Tools/LemonDaemon/LemonDaemon/Owl/VideoProcessStat.m +++ b/Tools/LemonDaemon/LemonDaemon/Owl/VideoProcessStat.m @@ -19,7 +19,7 @@ @interface VideoProcessStat() { @implementation VideoProcessStat -- (id)initWithWhiteArray:(NSArray*)array { +- (instancetype)initWithWhiteArray:(NSArray*)array { self = [super init]; if (self) { _whiteProcessArray = [[NSArray alloc] initWithArray:array]; diff --git a/Tools/LemonDaemon/LemonDaemon/Pipe/McPipeThread.h b/Tools/LemonDaemon/LemonDaemon/Pipe/McPipeThread.h index a2488affe..49036d71c 100755 --- a/Tools/LemonDaemon/LemonDaemon/Pipe/McPipeThread.h +++ b/Tools/LemonDaemon/LemonDaemon/Pipe/McPipeThread.h @@ -23,5 +23,5 @@ sem_t *sem_write; } -- (id)init:(NSString *)path; +- (instancetype)init:(NSString *)path; @end diff --git a/Tools/LemonDaemon/LemonDaemon/Pipe/McPipeThread.m b/Tools/LemonDaemon/LemonDaemon/Pipe/McPipeThread.m index 4f9a0ceeb..7911a3cad 100755 --- a/Tools/LemonDaemon/LemonDaemon/Pipe/McPipeThread.m +++ b/Tools/LemonDaemon/LemonDaemon/Pipe/McPipeThread.m @@ -27,7 +27,7 @@ @implementation McPipeThread -- (id)init:(NSString *)path +- (instancetype)init:(NSString *)path { fd_read = -1; fd_write = -1; diff --git a/Tools/LemonMonitor/LemonMonitor/Monitor/LMMonitorController.m b/Tools/LemonMonitor/LemonMonitor/Monitor/LMMonitorController.m index 72367938d..d2989569c 100644 --- a/Tools/LemonMonitor/LemonMonitor/Monitor/LMMonitorController.m +++ b/Tools/LemonMonitor/LemonMonitor/Monitor/LMMonitorController.m @@ -92,7 +92,7 @@ @interface LMMonitorController () @implementation LMMonitorController -- (id)init +- (instancetype)init { self = [super init]; if (self) { diff --git a/Tools/LemonMonitor/LemonMonitor/Monitor/LMMonitorPoppverController.m b/Tools/LemonMonitor/LemonMonitor/Monitor/LMMonitorPoppverController.m index c456cc563..34fb49c5d 100644 --- a/Tools/LemonMonitor/LemonMonitor/Monitor/LMMonitorPoppverController.m +++ b/Tools/LemonMonitor/LemonMonitor/Monitor/LMMonitorPoppverController.m @@ -36,7 +36,7 @@ @implementation LMMonitorPoppverController -- (id)init +- (instancetype)init { self = [super init]; if (self) diff --git a/Tools/LemonMonitor/LemonMonitor/Monitor/Status/JLNDragEffectManager.m b/Tools/LemonMonitor/LemonMonitor/Monitor/Status/JLNDragEffectManager.m index 7a320c8ed..d2a47a65c 100755 --- a/Tools/LemonMonitor/LemonMonitor/Monitor/Status/JLNDragEffectManager.m +++ b/Tools/LemonMonitor/LemonMonitor/Monitor/Status/JLNDragEffectManager.m @@ -74,7 +74,7 @@ + (id)sharedDragEffectManager #pragma mark Constructors / Destructors -- (id)initWithWindow:(NSWindow *)window +- (instancetype)initWithWindow:(NSWindow *)window { // Create the window first (ignore any we're sent, create our own) window = [[NSWindow alloc] initWithContentRect:NSMakeRect(0, 0, 64, 64) diff --git a/Tools/LemonMonitor/LemonMonitor/Monitor/Status/QMStatusCircleView.m b/Tools/LemonMonitor/LemonMonitor/Monitor/Status/QMStatusCircleView.m index b55b048c7..fc9a79158 100755 --- a/Tools/LemonMonitor/LemonMonitor/Monitor/Status/QMStatusCircleView.m +++ b/Tools/LemonMonitor/LemonMonitor/Monitor/Status/QMStatusCircleView.m @@ -31,7 +31,7 @@ @implementation QMStatusCircleView @synthesize progress; @synthesize actionBlock; -- (id)initWithFrame:(NSRect)frameRect +- (instancetype)initWithFrame:(NSRect)frameRect { self = [super initWithFrame:frameRect]; if (self) diff --git a/Tools/LemonMonitor/LemonMonitor/QMEarlyWarning.m b/Tools/LemonMonitor/LemonMonitor/QMEarlyWarning.m index 3f26eb169..02c924ebd 100755 --- a/Tools/LemonMonitor/LemonMonitor/QMEarlyWarning.m +++ b/Tools/LemonMonitor/LemonMonitor/QMEarlyWarning.m @@ -42,7 +42,7 @@ + (id)sharedInstance return instance; } -- (id)init +- (instancetype)init { self = [super init]; if (self) diff --git a/Tools/LemonMonitor/LemonMonitor/notification/QMUserNotificationCenter.m b/Tools/LemonMonitor/LemonMonitor/notification/QMUserNotificationCenter.m index 638619cc9..580f7cc04 100755 --- a/Tools/LemonMonitor/LemonMonitor/notification/QMUserNotificationCenter.m +++ b/Tools/LemonMonitor/LemonMonitor/notification/QMUserNotificationCenter.m @@ -12,7 +12,7 @@ @implementation QMUserNotificationCenter -- (id)init +- (instancetype)init { if (self = [super init]) { diff --git a/Tools/PrivacyProtect/PrivacyProtect/PrivacyProtect/Owl/Controller/OwlCollectionViewItem.m b/Tools/PrivacyProtect/PrivacyProtect/PrivacyProtect/Owl/Controller/OwlCollectionViewItem.m index 28a5289cb..b9dac4ee9 100644 --- a/Tools/PrivacyProtect/PrivacyProtect/PrivacyProtect/Owl/Controller/OwlCollectionViewItem.m +++ b/Tools/PrivacyProtect/PrivacyProtect/PrivacyProtect/Owl/Controller/OwlCollectionViewItem.m @@ -16,7 +16,7 @@ @interface OwlCollectionViewItem (){ @implementation OwlCollectionViewItem -- (id)init +- (instancetype)init { NSBundle *bundle = [NSBundle bundleForClass:[self class]]; self = [super initWithNibName:NSStringFromClass(self.class) bundle:bundle]; diff --git a/Tools/PrivacyProtect/PrivacyProtect/PrivacyProtect/Owl/Controller/OwlTableRowView.m b/Tools/PrivacyProtect/PrivacyProtect/PrivacyProtect/Owl/Controller/OwlTableRowView.m index 99ac390d0..b21960008 100644 --- a/Tools/PrivacyProtect/PrivacyProtect/PrivacyProtect/Owl/Controller/OwlTableRowView.m +++ b/Tools/PrivacyProtect/PrivacyProtect/PrivacyProtect/Owl/Controller/OwlTableRowView.m @@ -11,7 +11,7 @@ #import @implementation OwlTableRowView -- (id)initWithFrame:(NSRect)frameRect +- (instancetype)initWithFrame:(NSRect)frameRect { if (self = [super initWithFrame:frameRect]) { diff --git a/Tools/PrivacyProtect/PrivacyProtect/PrivacyProtect/Owl/Observer/AudioDeviceModel.m b/Tools/PrivacyProtect/PrivacyProtect/PrivacyProtect/Owl/Observer/AudioDeviceModel.m index 0e83d6cf3..172c1d9a5 100644 --- a/Tools/PrivacyProtect/PrivacyProtect/PrivacyProtect/Owl/Observer/AudioDeviceModel.m +++ b/Tools/PrivacyProtect/PrivacyProtect/PrivacyProtect/Owl/Observer/AudioDeviceModel.m @@ -22,7 +22,7 @@ @interface AudioDeviceModel() { @implementation AudioDeviceModel -- (id)init{ +- (instancetype)init{ self = [super init]; if (self) { _isAudioActive = NO; diff --git a/Tools/PrivacyProtect/PrivacyProtect/PrivacyProtect/Owl/Observer/AudioObserver.m b/Tools/PrivacyProtect/PrivacyProtect/PrivacyProtect/Owl/Observer/AudioObserver.m index 1f07d83b5..eb986d8a8 100644 --- a/Tools/PrivacyProtect/PrivacyProtect/PrivacyProtect/Owl/Observer/AudioObserver.m +++ b/Tools/PrivacyProtect/PrivacyProtect/PrivacyProtect/Owl/Observer/AudioObserver.m @@ -20,7 +20,7 @@ @interface AudioObserver() { @implementation AudioObserver -- (id)init{ +- (instancetype)init{ self = [super init]; if (self) { _audioDevices = [[NSMutableArray alloc] init]; diff --git a/Tools/PrivacyProtect/PrivacyProtect/PrivacyProtect/Owl/Observer/CameraDeviceModel.m b/Tools/PrivacyProtect/PrivacyProtect/PrivacyProtect/Owl/Observer/CameraDeviceModel.m index 8c90bfaf6..8a2b8fdb0 100644 --- a/Tools/PrivacyProtect/PrivacyProtect/PrivacyProtect/Owl/Observer/CameraDeviceModel.m +++ b/Tools/PrivacyProtect/PrivacyProtect/PrivacyProtect/Owl/Observer/CameraDeviceModel.m @@ -25,7 +25,7 @@ @interface CameraDeviceModel() { @implementation CameraDeviceModel -- (id)init{ +- (instancetype)init{ self = [super init]; if (self) { _isCameraActive = NO; diff --git a/Tools/PrivacyProtect/PrivacyProtect/PrivacyProtect/Owl/Observer/CameraObserver.m b/Tools/PrivacyProtect/PrivacyProtect/PrivacyProtect/Owl/Observer/CameraObserver.m index 29ccf4b81..0a11155d2 100644 --- a/Tools/PrivacyProtect/PrivacyProtect/PrivacyProtect/Owl/Observer/CameraObserver.m +++ b/Tools/PrivacyProtect/PrivacyProtect/PrivacyProtect/Owl/Observer/CameraObserver.m @@ -22,7 +22,7 @@ @interface CameraObserver() { @implementation CameraObserver -- (id)init{ +- (instancetype)init{ self = [super init]; if (self) { _cameraDevices = [[NSMutableArray alloc] init]; diff --git a/Tools/PrivacyProtect/PrivacyProtect/PrivacyProtect/Owl2/AVMonitor.m b/Tools/PrivacyProtect/PrivacyProtect/PrivacyProtect/Owl2/AVMonitor.m index 85e833477..5b22587b3 100644 --- a/Tools/PrivacyProtect/PrivacyProtect/PrivacyProtect/Owl2/AVMonitor.m +++ b/Tools/PrivacyProtect/PrivacyProtect/PrivacyProtect/Owl2/AVMonitor.m @@ -27,7 +27,7 @@ @implementation AVMonitor //init // create XPC connection & set remote obj interface --(id)init +-(instancetype)init { self = [super init]; if (nil != self) diff --git a/Tools/PrivacyProtect/PrivacyProtect/PrivacyProtect/Owl2/Event.h b/Tools/PrivacyProtect/PrivacyProtect/PrivacyProtect/Owl2/Event.h index 124651d8f..2a54326c6 100644 --- a/Tools/PrivacyProtect/PrivacyProtect/PrivacyProtect/Owl2/Event.h +++ b/Tools/PrivacyProtect/PrivacyProtect/PrivacyProtect/Owl2/Event.h @@ -16,7 +16,7 @@ /* METHODS */ //init --(id)init:(Client*)client device:(int)device state:(NSControlStateValue)state; +-(instancetype)init:(Client*)client device:(int)device state:(NSControlStateValue)state; /* PROPERTIES */ diff --git a/Tools/PrivacyProtect/PrivacyProtect/PrivacyProtect/Owl2/Event.m b/Tools/PrivacyProtect/PrivacyProtect/PrivacyProtect/Owl2/Event.m index c95479ffd..c46cebc88 100644 --- a/Tools/PrivacyProtect/PrivacyProtect/PrivacyProtect/Owl2/Event.m +++ b/Tools/PrivacyProtect/PrivacyProtect/PrivacyProtect/Owl2/Event.m @@ -11,7 +11,7 @@ @implementation Event //init --(id)init:(Client*)client device:(int)device state:(NSControlStateValue)state +-(instancetype)init:(Client*)client device:(int)device state:(NSControlStateValue)state { //super self = [super init]; diff --git a/Tools/PrivacyProtect/PrivacyProtect/PrivacyProtect/Owl2/LogMonitor.m b/Tools/PrivacyProtect/PrivacyProtect/PrivacyProtect/Owl2/LogMonitor.m index 11fdf0720..ea61db0dd 100644 --- a/Tools/PrivacyProtect/PrivacyProtect/PrivacyProtect/Owl2/LogMonitor.m +++ b/Tools/PrivacyProtect/PrivacyProtect/PrivacyProtect/Owl2/LogMonitor.m @@ -42,7 +42,7 @@ @implementation LogMonitor //init // load private framework, etc --(id)init +-(instancetype)init { //error NSError* error = nil; diff --git a/localPod/LemonBigOldFile/LemonBigOldFile/Classes/BigOldFile/LMBigFileScanManager.m b/localPod/LemonBigOldFile/LemonBigOldFile/Classes/BigOldFile/LMBigFileScanManager.m index 66b4f5984..40306c79a 100644 --- a/localPod/LemonBigOldFile/LemonBigOldFile/Classes/BigOldFile/LMBigFileScanManager.m +++ b/localPod/LemonBigOldFile/LemonBigOldFile/Classes/BigOldFile/LMBigFileScanManager.m @@ -50,7 +50,7 @@ @implementation LMBigFileScanManager #define kProtectArray @[[@"~/Library/" stringByExpandingTildeInPath], @"/Library", @"/System", @"/Applications", @"/bin", @"/cores", @"/sbin", @"/usr", @"~/.Trash/",[@"~/.Trash/" stringByExpandingTildeInPath]] -- (id)init +- (instancetype)init { if (self = [super init]) { diff --git a/localPod/LemonBigOldFile/LemonBigOldFile/Classes/BigOldFile/QMLargeOldScanner.m b/localPod/LemonBigOldFile/LemonBigOldFile/Classes/BigOldFile/QMLargeOldScanner.m index c7d435722..ecf0b6e88 100644 --- a/localPod/LemonBigOldFile/LemonBigOldFile/Classes/BigOldFile/QMLargeOldScanner.m +++ b/localPod/LemonBigOldFile/LemonBigOldFile/Classes/BigOldFile/QMLargeOldScanner.m @@ -22,7 +22,7 @@ @interface QMLargeOldItem() @implementation QMLargeOldItem -- (id)initWithFileItem:(LMBigFileItem *)item +- (instancetype)initWithFileItem:(LMBigFileItem *)item { if (self = [super init]) { @@ -89,7 +89,7 @@ @interface QMLargeOldScanner() @implementation QMLargeOldScanner -- (id)init +- (instancetype)init { if (self = [super init]) { diff --git a/localPod/LemonBigOldFile/LemonBigOldFile/Classes/CustomView/LMBigResultTableRowView.m b/localPod/LemonBigOldFile/LemonBigOldFile/Classes/CustomView/LMBigResultTableRowView.m index 73aa9c9a5..3ea71a11d 100644 --- a/localPod/LemonBigOldFile/LemonBigOldFile/Classes/CustomView/LMBigResultTableRowView.m +++ b/localPod/LemonBigOldFile/LemonBigOldFile/Classes/CustomView/LMBigResultTableRowView.m @@ -17,7 +17,7 @@ @implementation LMBigResultTableRowView NSView *_aView; } -- (id)initWithFrame:(NSRect)frameRect +- (instancetype)initWithFrame:(NSRect)frameRect { if (self = [super initWithFrame:frameRect]) { diff --git a/localPod/LemonBigOldFile/LemonBigOldFile/Classes/Manager/QMLargeOldManager.m b/localPod/LemonBigOldFile/LemonBigOldFile/Classes/Manager/QMLargeOldManager.m index 3327be508..d29420ee4 100644 --- a/localPod/LemonBigOldFile/LemonBigOldFile/Classes/Manager/QMLargeOldManager.m +++ b/localPod/LemonBigOldFile/LemonBigOldFile/Classes/Manager/QMLargeOldManager.m @@ -102,7 +102,7 @@ - (void)dealloc } -- (id)init +- (instancetype)init { if (self = [super init]) { diff --git a/localPod/LemonDuplicateFile/LemonDuplicateFile/Classes/DuplicateFileScan/QMDuplicateFileScanManager.m b/localPod/LemonDuplicateFile/LemonDuplicateFile/Classes/DuplicateFileScan/QMDuplicateFileScanManager.m index e680ad29d..8094627df 100644 --- a/localPod/LemonDuplicateFile/LemonDuplicateFile/Classes/DuplicateFileScan/QMDuplicateFileScanManager.m +++ b/localPod/LemonDuplicateFile/LemonDuplicateFile/Classes/DuplicateFileScan/QMDuplicateFileScanManager.m @@ -57,7 +57,7 @@ @implementation QMDuplicateFileScanManager -- (id)init { +- (instancetype)init { if (self = [super init]) { _excludeArray = @[[@"~/Library/" stringByExpandingTildeInPathIgnoreSandbox], @"/Library", @"/System", @"/Applications", @"/bin", @"/cores", @"/sbin", @"/usr", @"~/.Trash/", diff --git a/localPod/LemonFileMove/LemonFileMove/Classes/Scan/Disk.m b/localPod/LemonFileMove/LemonFileMove/Classes/Scan/Disk.m index 3e031d49d..7bcbec615 100644 --- a/localPod/LemonFileMove/LemonFileMove/Classes/Scan/Disk.m +++ b/localPod/LemonFileMove/LemonFileMove/Classes/Scan/Disk.m @@ -80,7 +80,7 @@ + (id)uniqueDiskForDADisk:(DADiskRef)diskRef create:(BOOL)create return create ? [[self.class alloc] initWithDADisk:diskRef shouldCreateParent:YES] : nil; } -- (id)initWithDADisk:(DADiskRef)diskRef shouldCreateParent:(BOOL)shouldCreateParent +- (instancetype)initWithDADisk:(DADiskRef)diskRef shouldCreateParent:(BOOL)shouldCreateParent { NSAssert(diskRef, @"No Disk Arbitration disk provided to initializer."); diff --git a/localPod/LemonFileMove/LemonFileMove/Classes/Scan/DiskArbitrationPrivateFunctions.h b/localPod/LemonFileMove/LemonFileMove/Classes/Scan/DiskArbitrationPrivateFunctions.h index af7e5af88..a2f376a1a 100644 --- a/localPod/LemonFileMove/LemonFileMove/Classes/Scan/DiskArbitrationPrivateFunctions.h +++ b/localPod/LemonFileMove/LemonFileMove/Classes/Scan/DiskArbitrationPrivateFunctions.h @@ -22,7 +22,7 @@ void DiskDescriptionChangedCallback(DADiskRef diskRef, CFArrayRef keys, void *co + (id)uniqueDiskForDADisk:(DADiskRef)diskRef create:(BOOL)create; -- (id)initWithDADisk:(DADiskRef)diskRef shouldCreateParent:(BOOL)shouldCreateParent; +- (instancetype)initWithDADisk:(DADiskRef)diskRef shouldCreateParent:(BOOL)shouldCreateParent; - (void)refreshFromDescription; - (void)diskDidDisappear; @end diff --git a/localPod/LemonFileMove/LemonFileMove/Classes/View/LMFileMoveBaseCell.m b/localPod/LemonFileMove/LemonFileMove/Classes/View/LMFileMoveBaseCell.m index a3f53c7d9..7d4338460 100644 --- a/localPod/LemonFileMove/LemonFileMove/Classes/View/LMFileMoveBaseCell.m +++ b/localPod/LemonFileMove/LemonFileMove/Classes/View/LMFileMoveBaseCell.m @@ -20,7 +20,7 @@ @interface LMFileMoveBaseCell(){ @implementation LMFileMoveBaseCell -- (id)initWithCoder:(NSCoder *)decoder { +- (instancetype)initWithCoder:(NSCoder *)decoder { self = [super initWithCoder:decoder]; if (self) { diff --git a/localPod/LemonFileMove/LemonFileMove/Classes/View/LMFileMoveResultFailureRowView.m b/localPod/LemonFileMove/LemonFileMove/Classes/View/LMFileMoveResultFailureRowView.m index f4d2a81a4..c9792a09e 100644 --- a/localPod/LemonFileMove/LemonFileMove/Classes/View/LMFileMoveResultFailureRowView.m +++ b/localPod/LemonFileMove/LemonFileMove/Classes/View/LMFileMoveResultFailureRowView.m @@ -14,7 +14,7 @@ @implementation LMFileMoveResultFailureRowView -- (id)initWithFrame:(NSRect)frameRect { +- (instancetype)initWithFrame:(NSRect)frameRect { if (self = [super initWithFrame:frameRect]) { m_selectedColor = [LMAppThemeHelper getTableViewRowSelectedColor]; } diff --git a/localPod/LemonFileMove/LemonFileMove/Classes/View/LMFileMoveRowView.m b/localPod/LemonFileMove/LemonFileMove/Classes/View/LMFileMoveRowView.m index 2b79f194c..f62d50f9f 100644 --- a/localPod/LemonFileMove/LemonFileMove/Classes/View/LMFileMoveRowView.m +++ b/localPod/LemonFileMove/LemonFileMove/Classes/View/LMFileMoveRowView.m @@ -15,7 +15,7 @@ @implementation LMFileMoveRowView -- (id)initWithFrame:(NSRect)frameRect +- (instancetype)initWithFrame:(NSRect)frameRect { if (self = [super initWithFrame:frameRect]) { diff --git a/localPod/LemonHardware/LemonHardware/Classes/Controller/LemonHardwareViewController.m b/localPod/LemonHardware/LemonHardware/Classes/Controller/LemonHardwareViewController.m index 1344a5146..c6835e592 100644 --- a/localPod/LemonHardware/LemonHardware/Classes/Controller/LemonHardwareViewController.m +++ b/localPod/LemonHardware/LemonHardware/Classes/Controller/LemonHardwareViewController.m @@ -41,7 +41,7 @@ @interface LemonHardwareViewController () @implementation LemonHardwareWindowController -- (id)init +- (instancetype)init { self = [super initWithWindowNibName:NSStringFromClass(self.class)]; diff --git a/localPod/LemonHardware/LemonHardware/Classes/View/HardwareCellView.m b/localPod/LemonHardware/LemonHardware/Classes/View/HardwareCellView.m index 21af617ab..c56650923 100644 --- a/localPod/LemonHardware/LemonHardware/Classes/View/HardwareCellView.m +++ b/localPod/LemonHardware/LemonHardware/Classes/View/HardwareCellView.m @@ -20,7 +20,7 @@ @interface HardwareCellView() @implementation HardwareCellView --(id)initWithFrame:(NSRect)frameRect{ +-(instancetype)initWithFrame:(NSRect)frameRect{ self = [super initWithFrame:frameRect]; if (self) { [self setupUI]; diff --git a/localPod/LemonHardware/LemonHardware/Classes/View/HardwareTableRowView.m b/localPod/LemonHardware/LemonHardware/Classes/View/HardwareTableRowView.m index e67f7a195..5e39aed72 100644 --- a/localPod/LemonHardware/LemonHardware/Classes/View/HardwareTableRowView.m +++ b/localPod/LemonHardware/LemonHardware/Classes/View/HardwareTableRowView.m @@ -16,7 +16,7 @@ @implementation HardwareTableRowView -- (id)initWithFrame:(NSRect)frameRect +- (instancetype)initWithFrame:(NSRect)frameRect { if (self = [super initWithFrame:frameRect]) { diff --git a/localPod/LemonNetSpeed/LemonNetSpeed/Classes/Controller/LMPortStatViewController.m b/localPod/LemonNetSpeed/LemonNetSpeed/Classes/Controller/LMPortStatViewController.m index 5dc14f5b8..5e09244a2 100644 --- a/localPod/LemonNetSpeed/LemonNetSpeed/Classes/Controller/LMPortStatViewController.m +++ b/localPod/LemonNetSpeed/LemonNetSpeed/Classes/Controller/LMPortStatViewController.m @@ -164,7 +164,7 @@ @interface LMPortTableRowView : NSTableRowView @end @implementation LMPortTableRowView -- (id)initWithFrame:(NSRect)frameRect +- (instancetype)initWithFrame:(NSRect)frameRect { if (self = [super initWithFrame:frameRect]) { diff --git a/localPod/LemonNetSpeed/LemonNetSpeed/Classes/View/LMNetProcRowView.m b/localPod/LemonNetSpeed/LemonNetSpeed/Classes/View/LMNetProcRowView.m index aa15d0665..9cb7291bf 100644 --- a/localPod/LemonNetSpeed/LemonNetSpeed/Classes/View/LMNetProcRowView.m +++ b/localPod/LemonNetSpeed/LemonNetSpeed/Classes/View/LMNetProcRowView.m @@ -12,7 +12,7 @@ @implementation LMNetProcRowView -- (id)initWithFrame:(NSRect)frameRect +- (instancetype)initWithFrame:(NSRect)frameRect { if (self = [super initWithFrame:frameRect]) { diff --git a/localPod/LemonPhotoClean/LemonPhotoClean/Classes/LMPhotoFileScanManager.m b/localPod/LemonPhotoClean/LemonPhotoClean/Classes/LMPhotoFileScanManager.m index 229d027d2..5020134a6 100644 --- a/localPod/LemonPhotoClean/LemonPhotoClean/Classes/LMPhotoFileScanManager.m +++ b/localPod/LemonPhotoClean/LemonPhotoClean/Classes/LMPhotoFileScanManager.m @@ -48,7 +48,7 @@ @implementation LMPhotoFileScanManager #define kProtectArray @[[@"~/Library/" stringByExpandingTildeInPath], @"/Library", @"/System", @"/Applications", @"/bin", @"/cores", @"/sbin", @"/usr", @"~/.Trash/",[@"~/.Trash/" stringByExpandingTildeInPath]] -- (id)init +- (instancetype)init { if (self = [super init]) { diff --git a/localPod/LemonSpaceAnalyse/LemonSpaceAnalyse/Classes/Model/LMSpaceModelManager.m b/localPod/LemonSpaceAnalyse/LemonSpaceAnalyse/Classes/Model/LMSpaceModelManager.m index 4b9f3fb6e..ebba932d1 100644 --- a/localPod/LemonSpaceAnalyse/LemonSpaceAnalyse/Classes/Model/LMSpaceModelManager.m +++ b/localPod/LemonSpaceAnalyse/LemonSpaceAnalyse/Classes/Model/LMSpaceModelManager.m @@ -18,7 +18,7 @@ + (LMSpaceModelManager *)sharedManger { return instance; } -- (id)init { +- (instancetype)init { self = [super init]; if (self) { [self itemModelNeedInit]; diff --git a/localPod/LemonSpaceAnalyse/LemonSpaceAnalyse/Classes/ScanManager/LMFileScanManager.m b/localPod/LemonSpaceAnalyse/LemonSpaceAnalyse/Classes/ScanManager/LMFileScanManager.m index e564d573b..1f7e9579f 100644 --- a/localPod/LemonSpaceAnalyse/LemonSpaceAnalyse/Classes/ScanManager/LMFileScanManager.m +++ b/localPod/LemonSpaceAnalyse/LemonSpaceAnalyse/Classes/ScanManager/LMFileScanManager.m @@ -43,7 +43,7 @@ @interface LMFileScanManager () @implementation LMFileScanManager -- (id)init{ +- (instancetype)init{ self = [super init]; if (self) { _concurrentQueue = dispatch_queue_create("com.tencent.lemonFileScan", DISPATCH_QUEUE_CONCURRENT); diff --git a/localPod/LemonSpaceAnalyse/LemonSpaceAnalyse/Classes/ScanManager/LMFileScanTask.h b/localPod/LemonSpaceAnalyse/LemonSpaceAnalyse/Classes/ScanManager/LMFileScanTask.h index db45b45c3..d14f2da4b 100644 --- a/localPod/LemonSpaceAnalyse/LemonSpaceAnalyse/Classes/ScanManager/LMFileScanTask.h +++ b/localPod/LemonSpaceAnalyse/LemonSpaceAnalyse/Classes/ScanManager/LMFileScanTask.h @@ -24,7 +24,7 @@ typedef void(^LMFileScanTaskBlock)(LMItem*); @property(retain, nonatomic) LMItem *dirItem; @property (nonatomic, weak) id delegate; -- (id)initWithRootDirItem:(LMItem *)dirItem; +- (instancetype)initWithRootDirItem:(LMItem *)dirItem; -(void)starTaskWithBlock:(LMFileScanTaskBlock)block; @end diff --git a/localPod/LemonSpaceAnalyse/LemonSpaceAnalyse/Classes/ScanManager/LMFileScanTask.m b/localPod/LemonSpaceAnalyse/LemonSpaceAnalyse/Classes/ScanManager/LMFileScanTask.m index 5fb926f1d..f6da64dc9 100644 --- a/localPod/LemonSpaceAnalyse/LemonSpaceAnalyse/Classes/ScanManager/LMFileScanTask.m +++ b/localPod/LemonSpaceAnalyse/LemonSpaceAnalyse/Classes/ScanManager/LMFileScanTask.m @@ -38,7 +38,7 @@ @interface LMFileScanTask () @implementation LMFileScanTask -- (id)initWithRootDirItem:(LMItem *)dirItem{ +- (instancetype)initWithRootDirItem:(LMItem *)dirItem{ self = [super init]; if (self) { diff --git a/localPod/LemonSpaceAnalyse/LemonSpaceAnalyse/Classes/ScanManager/LMItem.h b/localPod/LemonSpaceAnalyse/LemonSpaceAnalyse/Classes/ScanManager/LMItem.h index d44b45695..a55663dac 100644 --- a/localPod/LemonSpaceAnalyse/LemonSpaceAnalyse/Classes/ScanManager/LMItem.h +++ b/localPod/LemonSpaceAnalyse/LemonSpaceAnalyse/Classes/ScanManager/LMItem.h @@ -21,7 +21,7 @@ -(void)compareChild; - (long long)calculateSizeInBytesRecursively; -- (id)initWithFullPath:(id)arg1; -- (id)init; +- (instancetype)initWithFullPath:(id)arg1; +- (instancetype)init; @end diff --git a/localPod/LemonSpaceAnalyse/LemonSpaceAnalyse/Classes/ScanManager/LMItem.m b/localPod/LemonSpaceAnalyse/LemonSpaceAnalyse/Classes/ScanManager/LMItem.m index 7191aa89f..57a2d2eaa 100644 --- a/localPod/LemonSpaceAnalyse/LemonSpaceAnalyse/Classes/ScanManager/LMItem.m +++ b/localPod/LemonSpaceAnalyse/LemonSpaceAnalyse/Classes/ScanManager/LMItem.m @@ -11,7 +11,7 @@ @implementation LMItem -- (id)init { +- (instancetype)init { self = [super init]; if (self) { _childItems = [NSMutableArray array]; @@ -24,7 +24,7 @@ - (id)init { return self; } -- (id)initWithFullPath:(NSString *)path { +- (instancetype)initWithFullPath:(NSString *)path { self = [self init]; if (self) { self.fullPath = path; diff --git a/localPod/LemonSpaceAnalyse/LemonSpaceAnalyse/Classes/View/LMSpacePathView.m b/localPod/LemonSpaceAnalyse/LemonSpaceAnalyse/Classes/View/LMSpacePathView.m index 9dce1a01b..2ab57492e 100644 --- a/localPod/LemonSpaceAnalyse/LemonSpaceAnalyse/Classes/View/LMSpacePathView.m +++ b/localPod/LemonSpaceAnalyse/LemonSpaceAnalyse/Classes/View/LMSpacePathView.m @@ -29,7 +29,7 @@ @interface LMSpacePathView () @implementation LMSpacePathView -- (id)initWithFrame:(NSRect)frame { +- (instancetype)initWithFrame:(NSRect)frame { self = [super initWithFrame:frame]; if (self) { _rightAlignment = YES; diff --git a/localPod/LemonSpaceAnalyse/LemonSpaceAnalyse/Classes/View/LMSpaceView.m b/localPod/LemonSpaceAnalyse/LemonSpaceAnalyse/Classes/View/LMSpaceView.m index 211f24bf3..18ba68b4f 100644 --- a/localPod/LemonSpaceAnalyse/LemonSpaceAnalyse/Classes/View/LMSpaceView.m +++ b/localPod/LemonSpaceAnalyse/LemonSpaceAnalyse/Classes/View/LMSpaceView.m @@ -32,7 +32,7 @@ @interface LMSpaceView () @implementation LMSpaceView -- (id)initWithFrame:(NSRect)frameRect { +- (instancetype)initWithFrame:(NSRect)frameRect { self = [super initWithFrame:frameRect]; if (self) { [self setupUI:frameRect]; diff --git a/localPod/LemonStat/LemonStat/Classes/src/McBatteryInfo.m b/localPod/LemonStat/LemonStat/Classes/src/McBatteryInfo.m index b0f792003..d8abceeff 100755 --- a/localPod/LemonStat/LemonStat/Classes/src/McBatteryInfo.m +++ b/localPod/LemonStat/LemonStat/Classes/src/McBatteryInfo.m @@ -28,7 +28,7 @@ @implementation McBatteryInfo @synthesize MovieRemainTime; @synthesize StandbyRemainTime; -- (id) init +- (instancetype) init { if (self = [super init]) { diff --git a/localPod/LemonStat/LemonStat/Classes/src/McCpuInfo.m b/localPod/LemonStat/LemonStat/Classes/src/McCpuInfo.m index 620420689..6e89386e8 100755 --- a/localPod/LemonStat/LemonStat/Classes/src/McCpuInfo.m +++ b/localPod/LemonStat/LemonStat/Classes/src/McCpuInfo.m @@ -20,7 +20,7 @@ @implementation McCpuInfo @synthesize cpuCount; @synthesize cpuBrandStr; -- (id) init +- (instancetype) init { if (self = [super init]) { diff --git a/localPod/LemonStat/LemonStat/Classes/src/McDiskInfo.m b/localPod/LemonStat/LemonStat/Classes/src/McDiskInfo.m index 04c65c006..21c24f505 100755 --- a/localPod/LemonStat/LemonStat/Classes/src/McDiskInfo.m +++ b/localPod/LemonStat/LemonStat/Classes/src/McDiskInfo.m @@ -25,7 +25,7 @@ @implementation McVolumeInfo @synthesize networkDevice; @synthesize writeble; -- (id) init +- (instancetype) init { if (self = [super init]) { @@ -58,7 +58,7 @@ - (void)encodeWithCoder:(NSCoder *)encoder [encoder encodeBool:internalDevice forKey:@"internalDevice"]; [encoder encodeBool:networkDevice forKey:@"networkDevice"]; } -- (id)initWithCoder:(NSCoder *)aCoder +- (instancetype)initWithCoder:(NSCoder *)aCoder { self = [super init]; if (self != nil) @@ -86,7 +86,7 @@ @implementation McDiskInfo @synthesize bytesRead; @synthesize bytesWrite; -- (id) init +- (instancetype) init { if (self = [super init]) { diff --git a/localPod/LemonStat/LemonStat/Classes/src/McMemoryInfo.m b/localPod/LemonStat/LemonStat/Classes/src/McMemoryInfo.m index ca04f3295..0df611753 100755 --- a/localPod/LemonStat/LemonStat/Classes/src/McMemoryInfo.m +++ b/localPod/LemonStat/LemonStat/Classes/src/McMemoryInfo.m @@ -19,7 +19,7 @@ @implementation McMemoryInfo @synthesize memType; @synthesize pageInfo; -- (id) init +- (instancetype) init { if (self = [super init]) { diff --git a/localPod/LemonStat/LemonStat/Classes/src/McNetInfo.m b/localPod/LemonStat/LemonStat/Classes/src/McNetInfo.m index 6f0ecebf3..d9d99ece5 100755 --- a/localPod/LemonStat/LemonStat/Classes/src/McNetInfo.m +++ b/localPod/LemonStat/LemonStat/Classes/src/McNetInfo.m @@ -29,7 +29,7 @@ @implementation McNetInfo @synthesize interfaceType; @synthesize displayName; -- (id) init +- (instancetype) init { if (self = [super init]) { diff --git a/localPod/LemonStat/LemonStat/Classes/src/McSystemInfo.m b/localPod/LemonStat/LemonStat/Classes/src/McSystemInfo.m index d9f7d7afd..3d4d357c2 100755 --- a/localPod/LemonStat/LemonStat/Classes/src/McSystemInfo.m +++ b/localPod/LemonStat/LemonStat/Classes/src/McSystemInfo.m @@ -21,7 +21,7 @@ @implementation McSystemInfo @synthesize purchCountry; @synthesize covEndData; -- (id) init +- (instancetype) init { if (self = [super init]) { diff --git a/localPod/LemonUninstaller/LemonUninstaller/Classes/Manager/LMLocalAppListManager.m b/localPod/LemonUninstaller/LemonUninstaller/Classes/Manager/LMLocalAppListManager.m index b95e2e415..a56fb6407 100644 --- a/localPod/LemonUninstaller/LemonUninstaller/Classes/Manager/LMLocalAppListManager.m +++ b/localPod/LemonUninstaller/LemonUninstaller/Classes/Manager/LMLocalAppListManager.m @@ -46,7 +46,7 @@ + (id)defaultManager return instance; } -- (id)init +- (instancetype)init { self = [super init]; if (self) diff --git a/localPod/LemonUninstaller/LemonUninstaller/Classes/Manager/McUninstallSoftManager.m b/localPod/LemonUninstaller/LemonUninstaller/Classes/Manager/McUninstallSoftManager.m index a08ce3c8a..fc5923711 100644 --- a/localPod/LemonUninstaller/LemonUninstaller/Classes/Manager/McUninstallSoftManager.m +++ b/localPod/LemonUninstaller/LemonUninstaller/Classes/Manager/McUninstallSoftManager.m @@ -48,7 +48,7 @@ + (McUninstallSoftManager *)sharedManager return instance; } -- (id)init +- (instancetype)init { self = [super init]; if (self) diff --git a/localPod/LemonUninstaller/LemonUninstaller/Classes/Manager/ParseXml/LMASRecentProjectsXMLParse.m b/localPod/LemonUninstaller/LemonUninstaller/Classes/Manager/ParseXml/LMASRecentProjectsXMLParse.m index 9ea160b56..7705880fe 100644 --- a/localPod/LemonUninstaller/LemonUninstaller/Classes/Manager/ParseXml/LMASRecentProjectsXMLParse.m +++ b/localPod/LemonUninstaller/LemonUninstaller/Classes/Manager/ParseXml/LMASRecentProjectsXMLParse.m @@ -23,7 +23,7 @@ @interface LMASRecentProjectsXMLParse () { @implementation LMASRecentProjectsXMLParse -- (id)init +- (instancetype)init { if (self = [super init]) { diff --git a/localPod/LemonUninstaller/LemonUninstaller/Classes/Manager/Pkg/PkgUninstallProvider.h b/localPod/LemonUninstaller/LemonUninstaller/Classes/Manager/Pkg/PkgUninstallProvider.h index cad332aa9..44c94e547 100644 --- a/localPod/LemonUninstaller/LemonUninstaller/Classes/Manager/Pkg/PkgUninstallProvider.h +++ b/localPod/LemonUninstaller/LemonUninstaller/Classes/Manager/Pkg/PkgUninstallProvider.h @@ -12,7 +12,7 @@ NS_ASSUME_NONNULL_BEGIN @interface PkgUninstallProvider : NSObject -- (id)initWithPkgBundleId:(NSString *)pkgBundleId withKeyWording:(NSString *)keyWord; +- (instancetype)initWithPkgBundleId:(NSString *)pkgBundleId withKeyWording:(NSString *)keyWord; - (void)searchAllItems; diff --git a/localPod/LemonUninstaller/LemonUninstaller/Classes/Manager/Pkg/PkgUninstallProvider.m b/localPod/LemonUninstaller/LemonUninstaller/Classes/Manager/Pkg/PkgUninstallProvider.m index 92c9d8a81..924ff1337 100644 --- a/localPod/LemonUninstaller/LemonUninstaller/Classes/Manager/Pkg/PkgUninstallProvider.m +++ b/localPod/LemonUninstaller/LemonUninstaller/Classes/Manager/Pkg/PkgUninstallProvider.m @@ -36,7 +36,7 @@ @implementation PkgUninstallProvider { NSDictionary *_categoryDict; } -- (id)initWithPkgBundleId:(NSString *)pkgBundleId withKeyWording:(NSString *)keyWord { +- (instancetype)initWithPkgBundleId:(NSString *)pkgBundleId withKeyWording:(NSString *)keyWord { self = [super init]; if (self) { _fileManager = NSFileManager.defaultManager; diff --git a/localPod/LemonUninstaller/LemonUninstaller/Classes/TrashWatch/McUninstall/LmTrashWatchUninstallWindowController.m b/localPod/LemonUninstaller/LemonUninstaller/Classes/TrashWatch/McUninstall/LmTrashWatchUninstallWindowController.m index fbab1c062..ba97b9f32 100755 --- a/localPod/LemonUninstaller/LemonUninstaller/Classes/TrashWatch/McUninstall/LmTrashWatchUninstallWindowController.m +++ b/localPod/LemonUninstaller/LemonUninstaller/Classes/TrashWatch/McUninstall/LmTrashWatchUninstallWindowController.m @@ -73,7 +73,7 @@ @interface LmTrashWatchUninstallWindowController () @implementation LmTrashWatchUninstallWindowController @synthesize delegate; -- (id)init +- (instancetype)init { //hook 多语言 NSString *languageString = [LanguageHelper getCurrentUserLanguageByReadFile]; diff --git a/localPod/LemonUninstaller/LemonUninstaller/Classes/TrashWatch/McUninstall/McUninstallSelectedViewController.m b/localPod/LemonUninstaller/LemonUninstaller/Classes/TrashWatch/McUninstall/McUninstallSelectedViewController.m index 1688f894c..f483b86b7 100755 --- a/localPod/LemonUninstaller/LemonUninstaller/Classes/TrashWatch/McUninstall/McUninstallSelectedViewController.m +++ b/localPod/LemonUninstaller/LemonUninstaller/Classes/TrashWatch/McUninstall/McUninstallSelectedViewController.m @@ -31,7 +31,7 @@ @interface McUninstallSelectedCellView : NSTableCellView @implementation McUninstallSelectedCellView @synthesize cellRow; -- (id)initWithCoder:(NSCoder *)aDecoder +- (instancetype)initWithCoder:(NSCoder *)aDecoder { self = [super initWithCoder:aDecoder]; if (self) @@ -41,7 +41,7 @@ - (id)initWithCoder:(NSCoder *)aDecoder return self; } -- (id)initWithFrame:(NSRect)frameRect +- (instancetype)initWithFrame:(NSRect)frameRect { self = [super initWithFrame:frameRect]; if (self) @@ -107,7 +107,7 @@ @implementation McUninstallSelectedViewController @synthesize delegate; @synthesize soft; -- (id)initWithNibName:(NSString *)nibNameOrNil bundle:(NSBundle *)nibBundleOrNil +- (instancetype)initWithNibName:(NSString *)nibNameOrNil bundle:(NSBundle *)nibBundleOrNil { self = [super initWithNibName:nibNameOrNil bundle:nibBundleOrNil]; if (self) { @@ -116,7 +116,7 @@ - (id)initWithNibName:(NSString *)nibNameOrNil bundle:(NSBundle *)nibBundleOrNil return self; } -- (id)init +- (instancetype)init { self = [super initWithNibName:@"McUninstallSelectedViewController" bundle:[NSBundle bundleForClass:self.class]]; if (self) diff --git a/localPod/LemonUninstaller/LemonUninstaller/Classes/View/LMOutlineRowView.m b/localPod/LemonUninstaller/LemonUninstaller/Classes/View/LMOutlineRowView.m index 5a04051dd..945b5a67a 100644 --- a/localPod/LemonUninstaller/LemonUninstaller/Classes/View/LMOutlineRowView.m +++ b/localPod/LemonUninstaller/LemonUninstaller/Classes/View/LMOutlineRowView.m @@ -16,7 +16,7 @@ @implementation LMOutlineRowView NSView *_aView; } -- (id)initWithFrame:(NSRect)frameRect +- (instancetype)initWithFrame:(NSRect)frameRect { if (self = [super initWithFrame:frameRect]) { diff --git a/localPod/QMCoreFunction/QMCoreFunction/Classes/CoreFunctionData/McFileEvent.m b/localPod/QMCoreFunction/QMCoreFunction/Classes/CoreFunctionData/McFileEvent.m index aa4c20433..4b1a5e1e2 100755 --- a/localPod/QMCoreFunction/QMCoreFunction/Classes/CoreFunctionData/McFileEvent.m +++ b/localPod/QMCoreFunction/QMCoreFunction/Classes/CoreFunctionData/McFileEvent.m @@ -18,7 +18,7 @@ @implementation McFileEventData @synthesize fsindex; @synthesize renamedPath; -- (id)init +- (instancetype)init { if (self = [super init]) { @@ -35,7 +35,7 @@ - (id)init @implementation McFileEvent -- (id)init +- (instancetype)init { if (self = [super init]) { diff --git a/localPod/QMCoreFunction/QMCoreFunction/Classes/CoreFunctionData/McProcessInfo.m b/localPod/QMCoreFunction/QMCoreFunction/Classes/CoreFunctionData/McProcessInfo.m index c9cabb0e7..c2be9575a 100755 --- a/localPod/QMCoreFunction/QMCoreFunction/Classes/CoreFunctionData/McProcessInfo.m +++ b/localPod/QMCoreFunction/QMCoreFunction/Classes/CoreFunctionData/McProcessInfo.m @@ -34,7 +34,7 @@ @implementation McProcessInfo // return 0; //} -- (id)init +- (instancetype)init { if(self = [super init]) { diff --git a/localPod/QMCoreFunction/QMCoreFunction/Classes/CoreFunctionData/McProcessInfoData.m b/localPod/QMCoreFunction/QMCoreFunction/Classes/CoreFunctionData/McProcessInfoData.m index cba1b1f49..50c9c8652 100755 --- a/localPod/QMCoreFunction/QMCoreFunction/Classes/CoreFunctionData/McProcessInfoData.m +++ b/localPod/QMCoreFunction/QMCoreFunction/Classes/CoreFunctionData/McProcessInfoData.m @@ -17,7 +17,7 @@ @implementation McProcessInfoData @synthesize cpuUsage; @synthesize iconImage; @synthesize upSpeed, downSpeed; --(id)init +-(instancetype)init { if(self = [super init]) { @@ -51,7 +51,7 @@ - (void)encodeWithCoder:(NSCoder *)aCoder //NSLog(@"process encode"); } -- (id)initWithCoder:(NSCoder *)aDecoder +- (instancetype)initWithCoder:(NSCoder *)aDecoder { self = [super init]; if (self != nil) diff --git a/localPod/QMCoreFunction/QMCoreFunction/Classes/LMKeyChain/LMKeychain.m b/localPod/QMCoreFunction/QMCoreFunction/Classes/LMKeyChain/LMKeychain.m index 76335b004..120d4a8fa 100644 --- a/localPod/QMCoreFunction/QMCoreFunction/Classes/LMKeyChain/LMKeychain.m +++ b/localPod/QMCoreFunction/QMCoreFunction/Classes/LMKeyChain/LMKeychain.m @@ -39,7 +39,7 @@ +(BOOL)deleteKeychainItem:(LMKeychainItem*)kcItem error:(NSError**)error { } } -- (id)initWithCoreKeychainItem:(SecKeychainItemRef)item username:(NSString *)username password:(NSString *)password { +- (instancetype)initWithCoreKeychainItem:(SecKeychainItemRef)item username:(NSString *)username password:(NSString *)password { if (self = [super init]) { coreKeychainItem = item; [self setValue:username forKey:@"myUsername"]; @@ -215,7 +215,7 @@ + (NSString*) passwordForUsername:(NSString*)username service:(NSString*)service return [[LMGenericKeychainItem genericKeychainItemForService:serviceName withUsername:username] password]; } -- (id)initWithCoreKeychainItem:(SecKeychainItemRef)item serviceName:(NSString *)serviceName username:(NSString *)username password:(NSString *)password { +- (instancetype)initWithCoreKeychainItem:(SecKeychainItemRef)item serviceName:(NSString *)serviceName username:(NSString *)username password:(NSString *)password { if (self = [super initWithCoreKeychainItem:item username:username password:password]) { [self setValue:serviceName forKey:@"myServiceName"]; } @@ -303,7 +303,7 @@ + (LMInternetKeychainItem *)addInternetKeychainItemForServer:(NSString *)serverS return [LMInternetKeychainItem internetKeychainItem:item forServer:serverString username:usernameString password:passwordString path:pathString port:port protocol:protocol]; } -- (id)initWithCoreKeychainItem:(SecKeychainItemRef)item server:(NSString *)server username:(NSString *)username password:(NSString *)password path:(NSString *)path port:(int)port protocol:(SecProtocolType)protocol { +- (instancetype)initWithCoreKeychainItem:(SecKeychainItemRef)item server:(NSString *)server username:(NSString *)username password:(NSString *)password path:(NSString *)path port:(int)port protocol:(SecProtocolType)protocol { if (self = [super initWithCoreKeychainItem:item username:username password:password]) { [self setValue:server forKey:@"myServer"]; [self setValue:path forKey:@"myPath"]; diff --git a/localPod/QMCoreFunction/QMCoreFunction/Classes/LMMonitor/McStatMonitor.m b/localPod/QMCoreFunction/QMCoreFunction/Classes/LMMonitor/McStatMonitor.m index a7fec2f9c..52226603b 100755 --- a/localPod/QMCoreFunction/QMCoreFunction/Classes/LMMonitor/McStatMonitor.m +++ b/localPod/QMCoreFunction/QMCoreFunction/Classes/LMMonitor/McStatMonitor.m @@ -40,7 +40,7 @@ @interface McStatMonitor() @implementation McStatMonitor -- (id)init +- (instancetype)init { if (self = [super init]) { diff --git a/localPod/QMCoreFunction/QMCoreFunction/Classes/LMMonitor/QMValueHistory.h b/localPod/QMCoreFunction/QMCoreFunction/Classes/LMMonitor/QMValueHistory.h index 9583a259b..d60847d04 100755 --- a/localPod/QMCoreFunction/QMCoreFunction/Classes/LMMonitor/QMValueHistory.h +++ b/localPod/QMCoreFunction/QMCoreFunction/Classes/LMMonitor/QMValueHistory.h @@ -15,7 +15,7 @@ @interface QMValueHistory : NSObject @property (readonly) NSArray *items; -- (id)initWithCapacity:(NSUInteger)capacity; +- (instancetype)initWithCapacity:(NSUInteger)capacity; - (void)feed:(NSValue *)value; - (void)clear; - (NSArray *)valueArray; diff --git a/localPod/QMCoreFunction/QMCoreFunction/Classes/LMMonitor/QMValueHistory.m b/localPod/QMCoreFunction/QMCoreFunction/Classes/LMMonitor/QMValueHistory.m index 636fee18a..603a8bf79 100755 --- a/localPod/QMCoreFunction/QMCoreFunction/Classes/LMMonitor/QMValueHistory.m +++ b/localPod/QMCoreFunction/QMCoreFunction/Classes/LMMonitor/QMValueHistory.m @@ -14,7 +14,7 @@ @implementation QMValueHistory NSUInteger _capacity; } @synthesize items = _items; -- (id)initWithCapacity:(NSUInteger)capacity +- (instancetype)initWithCapacity:(NSUInteger)capacity { self = [super init]; if (self) { diff --git a/localPod/QMCoreFunction/QMCoreFunction/Classes/LMXpcClient/LMDaemonStartupHelper.m b/localPod/QMCoreFunction/QMCoreFunction/Classes/LMXpcClient/LMDaemonStartupHelper.m index e03c1ee29..841f28bfe 100644 --- a/localPod/QMCoreFunction/QMCoreFunction/Classes/LMXpcClient/LMDaemonStartupHelper.m +++ b/localPod/QMCoreFunction/QMCoreFunction/Classes/LMXpcClient/LMDaemonStartupHelper.m @@ -33,7 +33,7 @@ + (LMDaemonStartupHelper *)shareInstance{ return instance; } -- (id)init { +- (instancetype)init { self = [super init]; if (self) { diff --git a/localPod/QMCoreFunction/QMCoreFunction/Classes/LMXpcClient/LMXpcClientManager.m b/localPod/QMCoreFunction/QMCoreFunction/Classes/LMXpcClient/LMXpcClientManager.m index 4cf7fd9fe..64b083d1d 100644 --- a/localPod/QMCoreFunction/QMCoreFunction/Classes/LMXpcClient/LMXpcClientManager.m +++ b/localPod/QMCoreFunction/QMCoreFunction/Classes/LMXpcClient/LMXpcClientManager.m @@ -35,7 +35,7 @@ + (LMXpcClientManager*)sharedInstance return instance; } -- (id)init +- (instancetype)init { self = [super init]; if (self) diff --git a/localPod/QMCoreFunction/QMCoreFunction/Classes/McCoreFunction.m b/localPod/QMCoreFunction/QMCoreFunction/Classes/McCoreFunction.m index 4f3c9be87..40e1c9d29 100644 --- a/localPod/QMCoreFunction/QMCoreFunction/Classes/McCoreFunction.m +++ b/localPod/QMCoreFunction/QMCoreFunction/Classes/McCoreFunction.m @@ -22,7 +22,7 @@ + (void)initialize init_xpc(); } -- (id)init +- (instancetype)init { self = [super init]; if (self) diff --git a/localPod/QMCoreFunction/QMCoreFunction/Classes/McLocalSoft/McLocalSoftManager.m b/localPod/QMCoreFunction/QMCoreFunction/Classes/McLocalSoft/McLocalSoftManager.m index 171dd1a54..4893a24ac 100755 --- a/localPod/QMCoreFunction/QMCoreFunction/Classes/McLocalSoft/McLocalSoftManager.m +++ b/localPod/QMCoreFunction/QMCoreFunction/Classes/McLocalSoft/McLocalSoftManager.m @@ -44,7 +44,7 @@ + (id)sharedManager return instance; } -- (id)init +- (instancetype)init { self = [super init]; if (self) diff --git a/localPod/QMCoreFunction/QMCoreFunction/Classes/McLocalSoft/McScanner/McScanner.m b/localPod/QMCoreFunction/QMCoreFunction/Classes/McLocalSoft/McScanner/McScanner.m index 64fc9af72..26a2a9a8b 100755 --- a/localPod/QMCoreFunction/QMCoreFunction/Classes/McLocalSoft/McScanner/McScanner.m +++ b/localPod/QMCoreFunction/QMCoreFunction/Classes/McLocalSoft/McScanner/McScanner.m @@ -32,7 +32,7 @@ + (id)scanner return [[self alloc] init]; } -- (id)init +- (instancetype)init { self = [super init]; if (self) diff --git a/localPod/QMCoreFunction/QMCoreFunction/Classes/McUninstaller/McUninstallSoft.m b/localPod/QMCoreFunction/QMCoreFunction/Classes/McUninstaller/McUninstallSoft.m index 0c2928791..979f8bc02 100644 --- a/localPod/QMCoreFunction/QMCoreFunction/Classes/McUninstaller/McUninstallSoft.m +++ b/localPod/QMCoreFunction/QMCoreFunction/Classes/McUninstaller/McUninstallSoft.m @@ -556,7 +556,7 @@ @interface McUninstallSoftGroup () @implementation McUninstallSoftGroup @synthesize groupInfo; -- (id)init +- (instancetype)init { self = [super init]; if (self) diff --git a/localPod/QMCoreFunction/QMCoreFunction/Classes/McWebService/McWebService.m b/localPod/QMCoreFunction/QMCoreFunction/Classes/McWebService/McWebService.m index a16b2478d..c36d325e1 100755 --- a/localPod/QMCoreFunction/QMCoreFunction/Classes/McWebService/McWebService.m +++ b/localPod/QMCoreFunction/QMCoreFunction/Classes/McWebService/McWebService.m @@ -29,7 +29,7 @@ + (void)serviceWithURL:(NSURL *)url handler:(McWebServiceBlock)block [service startWithHandler:block]; } -- (id)init +- (instancetype)init { self = [super init]; if (self) { diff --git a/localPod/QMCoreFunction/QMCoreFunction/Classes/NetworkClock/AsyncUdpSocket.h b/localPod/QMCoreFunction/QMCoreFunction/Classes/NetworkClock/AsyncUdpSocket.h index 15389de89..b95c0f30c 100755 --- a/localPod/QMCoreFunction/QMCoreFunction/Classes/NetworkClock/AsyncUdpSocket.h +++ b/localPod/QMCoreFunction/QMCoreFunction/Classes/NetworkClock/AsyncUdpSocket.h @@ -64,17 +64,17 @@ typedef enum AsyncUdpSocketError AsyncUdpSocketError; /** * Creates new instances of AsyncUdpSocket. **/ -- (id)init; -- (id)initWithDelegate:(id)delegate; -- (id)initWithDelegate:(id)delegate userData:(long)userData; +- (instancetype)init; +- (instancetype)initWithDelegate:(id)delegate; +- (instancetype)initWithDelegate:(id)delegate userData:(long)userData; /** * Creates new instances of AsyncUdpSocket that support only IPv4 or IPv6. * The other init methods will support both, unless specifically binded or connected to one protocol. * If you know you'll only be using one protocol, these init methods may be a bit more efficient. **/ -- (id)initIPv4; -- (id)initIPv6; +- (instancetype)initIPv4; +- (instancetype)initIPv6; - (id)delegate; - (void)setDelegate:(id)delegate; @@ -367,4 +367,4 @@ typedef enum AsyncUdpSocketError AsyncUdpSocketError; **/ - (void)onUdpSocketDidClose:(AsyncUdpSocket *)sock; -@end \ No newline at end of file +@end diff --git a/localPod/QMCoreFunction/QMCoreFunction/Classes/NetworkClock/AsyncUdpSocket.m b/localPod/QMCoreFunction/QMCoreFunction/Classes/NetworkClock/AsyncUdpSocket.m index 9a626bbb9..157ef4b39 100755 --- a/localPod/QMCoreFunction/QMCoreFunction/Classes/NetworkClock/AsyncUdpSocket.m +++ b/localPod/QMCoreFunction/QMCoreFunction/Classes/NetworkClock/AsyncUdpSocket.m @@ -132,12 +132,12 @@ @interface AsyncSendPacket : NSObject NSTimeInterval timeout; long tag; } -- (id)initWithData:(NSData *)d address:(NSData *)a timeout:(NSTimeInterval)t tag:(long)i; +- (instancetype)initWithData:(NSData *)d address:(NSData *)a timeout:(NSTimeInterval)t tag:(long)i; @end @implementation AsyncSendPacket -- (id)initWithData:(NSData *)d address:(NSData *)a timeout:(NSTimeInterval)t tag:(long)i +- (instancetype)initWithData:(NSData *)d address:(NSData *)a timeout:(NSTimeInterval)t tag:(long)i { if((self = [super init])) { @@ -167,12 +167,12 @@ @interface AsyncReceivePacket : NSObject NSString *host; UInt16 port; } -- (id)initWithTimeout:(NSTimeInterval)t tag:(long)i; +- (instancetype)initWithTimeout:(NSTimeInterval)t tag:(long)i; @end @implementation AsyncReceivePacket -- (id)initWithTimeout:(NSTimeInterval)t tag:(long)i +- (instancetype)initWithTimeout:(NSTimeInterval)t tag:(long)i { if((self = [super init])) { @@ -194,7 +194,7 @@ - (id)initWithTimeout:(NSTimeInterval)t tag:(long)i @implementation AsyncUdpSocket -- (id)initWithDelegate:(id)delegate userData:(long)userData enableIPv4:(BOOL)enableIPv4 enableIPv6:(BOOL)enableIPv6 +- (instancetype)initWithDelegate:(id)delegate userData:(long)userData enableIPv4:(BOOL)enableIPv4 enableIPv6:(BOOL)enableIPv6 { if((self = [super init])) { @@ -293,27 +293,27 @@ - (id)initWithDelegate:(id)delegate userData:(long)userData enableIPv4:(BOOL)ena return self; } -- (id)init +- (instancetype)init { return [self initWithDelegate:nil userData:0 enableIPv4:YES enableIPv6:YES]; } -- (id)initWithDelegate:(id)delegate +- (instancetype)initWithDelegate:(id)delegate { return [self initWithDelegate:delegate userData:0 enableIPv4:YES enableIPv6:YES]; } -- (id)initWithDelegate:(id)delegate userData:(long)userData +- (instancetype)initWithDelegate:(id)delegate userData:(long)userData { return [self initWithDelegate:delegate userData:userData enableIPv4:YES enableIPv6:YES]; } -- (id)initIPv4 +- (instancetype)initIPv4 { return [self initWithDelegate:nil userData:0 enableIPv4:YES enableIPv6:NO]; } -- (id)initIPv6 +- (instancetype)initIPv6 { return [self initWithDelegate:nil userData:0 enableIPv4:NO enableIPv6:YES]; } @@ -2310,4 +2310,4 @@ static void MyCFSocketCallback(CFSocketRef sref, CFSocketCallBackType type, CFDa } } -@end \ No newline at end of file +@end diff --git a/localPod/QMCoreFunction/QMCoreFunction/Classes/NetworkClock/QMNetworkClock.m b/localPod/QMCoreFunction/QMCoreFunction/Classes/NetworkClock/QMNetworkClock.m index 0c3e62a3e..0952a4af4 100755 --- a/localPod/QMCoreFunction/QMCoreFunction/Classes/NetworkClock/QMNetworkClock.m +++ b/localPod/QMCoreFunction/QMCoreFunction/Classes/NetworkClock/QMNetworkClock.m @@ -81,7 +81,7 @@ - (NSData *) createPacket { return [NSData dataWithBytes:wireData length:48]; } -- (id)init +- (instancetype)init { if (self = [super init]) { diff --git a/localPod/QMCoreFunction/QMCoreFunction/Classes/QMDownload/QMDownloadManager.m b/localPod/QMCoreFunction/QMCoreFunction/Classes/QMDownload/QMDownloadManager.m index e2071b481..347e143a0 100755 --- a/localPod/QMCoreFunction/QMCoreFunction/Classes/QMDownload/QMDownloadManager.m +++ b/localPod/QMCoreFunction/QMCoreFunction/Classes/QMDownload/QMDownloadManager.m @@ -34,7 +34,7 @@ + (id)sharedManager return instance; } -- (id)init +- (instancetype)init { self = [super init]; if (self) diff --git a/localPod/QMCoreFunction/QMCoreFunction/Classes/QMDownload/QMDownloadTask.h b/localPod/QMCoreFunction/QMCoreFunction/Classes/QMDownload/QMDownloadTask.h index 6954b42ba..252ef996e 100755 --- a/localPod/QMCoreFunction/QMCoreFunction/Classes/QMDownload/QMDownloadTask.h +++ b/localPod/QMCoreFunction/QMCoreFunction/Classes/QMDownload/QMDownloadTask.h @@ -20,6 +20,6 @@ @property (nonatomic, assign) id delegate; @property (nonatomic, copy) NSString *downloadDirectory; -- (id)initWithItem:(QMDownloadItem *)item; +- (instancetype)initWithItem:(QMDownloadItem *)item; @end diff --git a/localPod/QMCoreFunction/QMCoreFunction/Classes/QMDownload/QMDownloadTask.m b/localPod/QMCoreFunction/QMCoreFunction/Classes/QMDownload/QMDownloadTask.m index 6bd50463a..fe7699516 100755 --- a/localPod/QMCoreFunction/QMCoreFunction/Classes/QMDownload/QMDownloadTask.m +++ b/localPod/QMCoreFunction/QMCoreFunction/Classes/QMDownload/QMDownloadTask.m @@ -46,7 +46,7 @@ @implementation QMDownloadTask @synthesize isExecuting,isCancelled,isFinished; @synthesize item,delegate,downloadDirectory; -- (id)initWithItem:(QMDownloadItem *)aItem +- (instancetype)initWithItem:(QMDownloadItem *)aItem { self = [super init]; if (self) diff --git a/localPod/QMCoreFunction/QMCoreFunction/Classes/QMDownload/QMHeaderResponse.m b/localPod/QMCoreFunction/QMCoreFunction/Classes/QMDownload/QMHeaderResponse.m index 1302f3910..e006a3075 100755 --- a/localPod/QMCoreFunction/QMCoreFunction/Classes/QMDownload/QMHeaderResponse.m +++ b/localPod/QMCoreFunction/QMCoreFunction/Classes/QMDownload/QMHeaderResponse.m @@ -30,7 +30,7 @@ + (NSHTTPURLResponse *)headerResponse:(NSURL *)url error:(NSError **)error return [headerResponse headerResponse:error]; } -- (id)initWithURL:(NSURL *)aURL +- (instancetype)initWithURL:(NSURL *)aURL { self = [super init]; if (self) diff --git a/localPod/QMCoreFunction/QMCoreFunction/Classes/QMProcessWatcher/QMProcessWatcher.m b/localPod/QMCoreFunction/QMCoreFunction/Classes/QMProcessWatcher/QMProcessWatcher.m index 5b9ce83f5..d74cdb610 100755 --- a/localPod/QMCoreFunction/QMCoreFunction/Classes/QMProcessWatcher/QMProcessWatcher.m +++ b/localPod/QMCoreFunction/QMCoreFunction/Classes/QMProcessWatcher/QMProcessWatcher.m @@ -18,7 +18,7 @@ @interface QMProcessWatcher () @implementation QMProcessWatcher -- (id)init +- (instancetype)init { self = [super init]; if (self) diff --git a/localPod/QMCoreFunction/QMCoreFunction/Classes/ThreadSafe/QMConditionLock.m b/localPod/QMCoreFunction/QMCoreFunction/Classes/ThreadSafe/QMConditionLock.m index cb5924b36..280fe807d 100755 --- a/localPod/QMCoreFunction/QMCoreFunction/Classes/ThreadSafe/QMConditionLock.m +++ b/localPod/QMCoreFunction/QMCoreFunction/Classes/ThreadSafe/QMConditionLock.m @@ -34,7 +34,7 @@ + (QMConditionLock *)sharedLock return instance; } -- (id)init +- (instancetype)init { self = [super init]; if (self) diff --git a/localPod/QMCoreFunction/QMCoreFunction/Classes/ThreadSafe/QMSafeMutableArray.m b/localPod/QMCoreFunction/QMCoreFunction/Classes/ThreadSafe/QMSafeMutableArray.m index b3cc5c603..2a3abb259 100755 --- a/localPod/QMCoreFunction/QMCoreFunction/Classes/ThreadSafe/QMSafeMutableArray.m +++ b/localPod/QMCoreFunction/QMCoreFunction/Classes/ThreadSafe/QMSafeMutableArray.m @@ -16,7 +16,7 @@ @interface QMSafeMutableArray() @implementation QMSafeMutableArray -- (id)init +- (instancetype)init { self = [super init]; if (self) { @@ -26,7 +26,7 @@ - (id)init return self; } -- (id)initWithCapacity:(NSUInteger)numItems +- (instancetype)initWithCapacity:(NSUInteger)numItems { self = [super init]; if (self) diff --git a/localPod/QMCoreFunction/QMCoreFunction/Classes/ThreadSafe/QMSafeMutableDictionary.m b/localPod/QMCoreFunction/QMCoreFunction/Classes/ThreadSafe/QMSafeMutableDictionary.m index 0b37937c5..64328dcd2 100755 --- a/localPod/QMCoreFunction/QMCoreFunction/Classes/ThreadSafe/QMSafeMutableDictionary.m +++ b/localPod/QMCoreFunction/QMCoreFunction/Classes/ThreadSafe/QMSafeMutableDictionary.m @@ -16,7 +16,7 @@ @interface QMSafeMutableDictionary () @implementation QMSafeMutableDictionary -- (id)init +- (instancetype)init { self = [super init]; if (self) { @@ -28,7 +28,7 @@ - (id)init return self; } -- (id)initWithCapacity:(NSUInteger)numItems +- (instancetype)initWithCapacity:(NSUInteger)numItems { self = [super init]; if (self) @@ -41,7 +41,7 @@ - (id)initWithCapacity:(NSUInteger)numItems return self; } -- (id)initWithObjects:(const id [])objects forKeys:(const id [])keys count:(NSUInteger)cnt +- (instancetype)initWithObjects:(const id [])objects forKeys:(const id [])keys count:(NSUInteger)cnt { self = [self init]; if (self) diff --git a/localPod/QMCoreFunction/QMCoreFunction/Classes/Utility/QMDataCache.m b/localPod/QMCoreFunction/QMCoreFunction/Classes/Utility/QMDataCache.m index 331634370..e13f75f4b 100755 --- a/localPod/QMCoreFunction/QMCoreFunction/Classes/Utility/QMDataCache.m +++ b/localPod/QMCoreFunction/QMCoreFunction/Classes/Utility/QMDataCache.m @@ -27,7 +27,7 @@ + (QMDataCache *)sharedCache return instance; } -- (id)init +- (instancetype)init { self = [super init]; if (self) diff --git a/localPod/QMCoreFunction/QMCoreFunction/Classes/Utility/QMDataCenter.m b/localPod/QMCoreFunction/QMCoreFunction/Classes/Utility/QMDataCenter.m index 09a3cb9de..193552334 100755 --- a/localPod/QMCoreFunction/QMCoreFunction/Classes/Utility/QMDataCenter.m +++ b/localPod/QMCoreFunction/QMCoreFunction/Classes/Utility/QMDataCenter.m @@ -31,7 +31,7 @@ + (QMDataCenter *)defaultCenter return instance; } -- (id)init +- (instancetype)init { self = [super init]; if (self) diff --git a/localPod/QMCoreFunction/QMCoreFunction/Classes/Utility/STPrivilegedTask.h b/localPod/QMCoreFunction/QMCoreFunction/Classes/Utility/STPrivilegedTask.h index e89a80d2a..3ebdff709 100755 --- a/localPod/QMCoreFunction/QMCoreFunction/Classes/Utility/STPrivilegedTask.h +++ b/localPod/QMCoreFunction/QMCoreFunction/Classes/Utility/STPrivilegedTask.h @@ -53,8 +53,8 @@ enum NSFileHandle *outputFileHandle; NSTimer *checkStatusTimer; } --(id)initWithLaunchPath: (NSString *)path; --(id)initWithLaunchPath: (NSString *)path arguments: (NSArray *)args; +-(instancetype)initWithLaunchPath: (NSString *)path; +-(instancetype)initWithLaunchPath: (NSString *)path arguments: (NSArray *)args; +(STPrivilegedTask *)launchedPrivilegedTaskWithLaunchPath:(NSString *)path; +(STPrivilegedTask *)launchedPrivilegedTaskWithLaunchPath:(NSString *)path arguments:(NSArray *)arguments; -(NSArray *)arguments; diff --git a/localPod/QMCoreFunction/QMCoreFunction/Classes/Utility/STPrivilegedTask.m b/localPod/QMCoreFunction/QMCoreFunction/Classes/Utility/STPrivilegedTask.m index dc60462f6..c24f52cdc 100755 --- a/localPod/QMCoreFunction/QMCoreFunction/Classes/Utility/STPrivilegedTask.m +++ b/localPod/QMCoreFunction/QMCoreFunction/Classes/Utility/STPrivilegedTask.m @@ -34,7 +34,7 @@ @implementation STPrivilegedTask -- (id)init +- (instancetype)init { if ((self = [super init])) { @@ -48,7 +48,7 @@ - (id)init return self; } --(id)initWithLaunchPath: (NSString *)path arguments: (NSArray *)args +-(instancetype)initWithLaunchPath: (NSString *)path arguments: (NSArray *)args { if ((self = [self initWithLaunchPath: path])) { @@ -57,7 +57,7 @@ -(id)initWithLaunchPath: (NSString *)path arguments: (NSArray *)args return self; } --(id)initWithLaunchPath: (NSString *)path +-(instancetype)initWithLaunchPath: (NSString *)path { if ((self = [self init])) { @@ -440,4 +440,4 @@ - (NSString *)description NSLog(@"AuthExecNew function over"); return noErr; -}*/ \ No newline at end of file +}*/ diff --git a/localPod/QMUICommon/QMUICommon/Classes/COSwitch.m b/localPod/QMUICommon/QMUICommon/Classes/COSwitch.m index fc93f639d..c6ba03279 100755 --- a/localPod/QMUICommon/QMUICommon/Classes/COSwitch.m +++ b/localPod/QMUICommon/QMUICommon/Classes/COSwitch.m @@ -23,7 +23,7 @@ @interface COSwitch (){ @implementation COSwitch -- (id)initWithFrame:(NSRect)frameRect +- (instancetype)initWithFrame:(NSRect)frameRect { self = [super initWithFrame:frameRect]; if (self) { @@ -32,7 +32,7 @@ - (id)initWithFrame:(NSRect)frameRect return self; } -- (id)initWithCoder:(NSCoder *)coder +- (instancetype)initWithCoder:(NSCoder *)coder { self = [super initWithCoder:coder]; if (self) { diff --git a/localPod/QMUICommon/QMUICommon/Classes/FloderSelectorDropView/LMSelectorDropView.m b/localPod/QMUICommon/QMUICommon/Classes/FloderSelectorDropView/LMSelectorDropView.m index fd216344c..c6ba96c50 100644 --- a/localPod/QMUICommon/QMUICommon/Classes/FloderSelectorDropView/LMSelectorDropView.m +++ b/localPod/QMUICommon/QMUICommon/Classes/FloderSelectorDropView/LMSelectorDropView.m @@ -22,7 +22,7 @@ @interface QMDuplicateBackLayer : CALayer } -- (id)initWithFrame:(NSRect)rect; +- (instancetype)initWithFrame:(NSRect)rect; - (void)setProgressValue:(CGFloat)progressValue animation:(BOOL)animation; @@ -30,7 +30,7 @@ - (void)setProgressValue:(CGFloat)progressValue animation:(BOOL)animation; @implementation QMDuplicateBackLayer -- (id)initWithFrame:(NSRect)rect +- (instancetype)initWithFrame:(NSRect)rect { if (self = [super init]) { diff --git a/localPod/QMUICommon/QMUICommon/Classes/FloderSelectorDropView/QMDuplicateCoverLayer.h b/localPod/QMUICommon/QMUICommon/Classes/FloderSelectorDropView/QMDuplicateCoverLayer.h index f76ee1cca..a0b58ae61 100644 --- a/localPod/QMUICommon/QMUICommon/Classes/FloderSelectorDropView/QMDuplicateCoverLayer.h +++ b/localPod/QMUICommon/QMUICommon/Classes/FloderSelectorDropView/QMDuplicateCoverLayer.h @@ -24,7 +24,7 @@ CALayer * _addIconLayer; } -- (id)initWithFrame:(NSRect)rect addTips:(NSString *)tips; +- (instancetype)initWithFrame:(NSRect)rect addTips:(NSString *)tips; - (void)showNormalState:(BOOL)animation; - (void)showCompleteState:(BOOL)animation; diff --git a/localPod/QMUICommon/QMUICommon/Classes/FloderSelectorDropView/QMDuplicateCoverLayer.m b/localPod/QMUICommon/QMUICommon/Classes/FloderSelectorDropView/QMDuplicateCoverLayer.m index 0d95063a1..92bf55b61 100644 --- a/localPod/QMUICommon/QMUICommon/Classes/FloderSelectorDropView/QMDuplicateCoverLayer.m +++ b/localPod/QMUICommon/QMUICommon/Classes/FloderSelectorDropView/QMDuplicateCoverLayer.m @@ -14,7 +14,7 @@ // 加号 , 拖拽语句, 背景色 的 Layer. @implementation QMDuplicateCoverLayer -- (id)initWithFrame:(NSRect)rect addTips:(NSString *)tips{ +- (instancetype)initWithFrame:(NSRect)rect addTips:(NSString *)tips{ if (self = [super init]) { [self setFrame:rect]; diff --git a/localPod/QMUICommon/QMUICommon/Classes/FloderSelectorDropView/QMDuplicateDropLayer.h b/localPod/QMUICommon/QMUICommon/Classes/FloderSelectorDropView/QMDuplicateDropLayer.h index f24fb25bb..8e1b5f733 100644 --- a/localPod/QMUICommon/QMUICommon/Classes/FloderSelectorDropView/QMDuplicateDropLayer.h +++ b/localPod/QMUICommon/QMUICommon/Classes/FloderSelectorDropView/QMDuplicateDropLayer.h @@ -35,7 +35,7 @@ } @property (assign) id dropDelegate; -- (id)initWithFrame:(NSRect)rect; +- (instancetype)initWithFrame:(NSRect)rect; - (void)addPathItem:(NSArray *)pathArray; diff --git a/localPod/QMUICommon/QMUICommon/Classes/FloderSelectorDropView/QMDuplicateDropLayer.m b/localPod/QMUICommon/QMUICommon/Classes/FloderSelectorDropView/QMDuplicateDropLayer.m index 6aa5a7725..d72bdd065 100644 --- a/localPod/QMUICommon/QMUICommon/Classes/FloderSelectorDropView/QMDuplicateDropLayer.m +++ b/localPod/QMUICommon/QMUICommon/Classes/FloderSelectorDropView/QMDuplicateDropLayer.m @@ -18,7 +18,7 @@ @implementation QMDuplicateDropLayer -- (id)initWithFrame:(NSRect)rect +- (instancetype)initWithFrame:(NSRect)rect { if (self = [super init]) { diff --git a/localPod/QMUICommon/QMUICommon/Classes/FloderSelectorDropView/QMDuplicateProgressLayer.h b/localPod/QMUICommon/QMUICommon/Classes/FloderSelectorDropView/QMDuplicateProgressLayer.h index 330d66e9c..d7ffa1b71 100644 --- a/localPod/QMUICommon/QMUICommon/Classes/FloderSelectorDropView/QMDuplicateProgressLayer.h +++ b/localPod/QMUICommon/QMUICommon/Classes/FloderSelectorDropView/QMDuplicateProgressLayer.h @@ -16,7 +16,7 @@ CALayer * _backLayer; CGFloat _value; } -- (id)initWithFrame:(NSRect)rect; +- (instancetype)initWithFrame:(NSRect)rect; - (void)setProgressImagePostion:(CGPoint)point; - (CGPoint)progressImagePostion; diff --git a/localPod/QMUICommon/QMUICommon/Classes/FloderSelectorDropView/QMDuplicateProgressLayer.m b/localPod/QMUICommon/QMUICommon/Classes/FloderSelectorDropView/QMDuplicateProgressLayer.m index bf742cf4c..2196e66ba 100644 --- a/localPod/QMUICommon/QMUICommon/Classes/FloderSelectorDropView/QMDuplicateProgressLayer.m +++ b/localPod/QMUICommon/QMUICommon/Classes/FloderSelectorDropView/QMDuplicateProgressLayer.m @@ -10,7 +10,7 @@ @implementation QMDuplicateProgressLayer -- (id)initWithFrame:(NSRect)rect +- (instancetype)initWithFrame:(NSRect)rect { if (self = [super init]) { diff --git a/localPod/QMUICommon/QMUICommon/Classes/INAppStoreWindow/INAppStoreWindow.m b/localPod/QMUICommon/QMUICommon/Classes/INAppStoreWindow/INAppStoreWindow.m index 3932eb90d..33ff9bbd3 100755 --- a/localPod/QMUICommon/QMUICommon/Classes/INAppStoreWindow/INAppStoreWindow.m +++ b/localPod/QMUICommon/QMUICommon/Classes/INAppStoreWindow/INAppStoreWindow.m @@ -29,7 +29,7 @@ #if __MAC_OS_X_VERSION_MAX_ALLOWED < 1090 @interface NSData (INBase64BackwardCompatibility) -- (id)initWithBase64Encoding:(NSString *)base64String; +- (instancetype)initWithBase64Encoding:(NSString *)base64String; @end #endif @@ -522,7 +522,7 @@ @implementation INAppStoreWindow { #pragma mark - #pragma mark Initialization -- (id)initWithContentRect:(NSRect)contentRect styleMask:(NSUInteger)aStyle backing:(NSBackingStoreType)bufferingType defer:(BOOL)flag +- (instancetype)initWithContentRect:(NSRect)contentRect styleMask:(NSUInteger)aStyle backing:(NSBackingStoreType)bufferingType defer:(BOOL)flag { if ((self = [super initWithContentRect:contentRect styleMask:aStyle backing:bufferingType defer:flag])) { [self _doInitialWindowSetup]; @@ -530,7 +530,7 @@ - (id)initWithContentRect:(NSRect)contentRect styleMask:(NSUInteger)aStyle backi return self; } -- (id)initWithContentRect:(NSRect)contentRect styleMask:(NSUInteger)aStyle backing:(NSBackingStoreType)bufferingType defer:(BOOL)flag screen:(NSScreen *)screen +- (instancetype)initWithContentRect:(NSRect)contentRect styleMask:(NSUInteger)aStyle backing:(NSBackingStoreType)bufferingType defer:(BOOL)flag screen:(NSScreen *)screen { if ((self = [super initWithContentRect:contentRect styleMask:aStyle backing:bufferingType defer:flag screen:screen])) { [self _doInitialWindowSetup]; diff --git a/localPod/QMUICommon/QMUICommon/Classes/LMButton/LMButtonCell.m b/localPod/QMUICommon/QMUICommon/Classes/LMButton/LMButtonCell.m index 812691266..b830351fe 100644 --- a/localPod/QMUICommon/QMUICommon/Classes/LMButton/LMButtonCell.m +++ b/localPod/QMUICommon/QMUICommon/Classes/LMButton/LMButtonCell.m @@ -10,20 +10,20 @@ @implementation LMButtonCell --(id) init { +-(instancetype) init { self = [super init]; if (self) { } return self; } --(id) initWithCoder:(NSCoder *)decoder { +-(instancetype) initWithCoder:(NSCoder *)decoder { return [super initWithCoder:decoder]; } --(id) initImageCell:(NSImage *)image { +-(instancetype) initImageCell:(NSImage *)image { return [super initImageCell:image]; } --(id) initTextCell:(NSString *)string { +-(instancetype) initTextCell:(NSString *)string { return [super initTextCell:string]; } diff --git a/localPod/QMUICommon/QMUICommon/Classes/LMButton/LMCheckboxButton.m b/localPod/QMUICommon/QMUICommon/Classes/LMButton/LMCheckboxButton.m index fb13bfbb2..a570af17b 100644 --- a/localPod/QMUICommon/QMUICommon/Classes/LMButton/LMCheckboxButton.m +++ b/localPod/QMUICommon/QMUICommon/Classes/LMButton/LMCheckboxButton.m @@ -35,7 +35,7 @@ @interface LMCheckboxButton () @implementation LMCheckboxButton -- (id)initWithCoder:(NSCoder *)aDecoder +- (instancetype)initWithCoder:(NSCoder *)aDecoder { self = [super initWithCoder:aDecoder]; if (self) @@ -45,7 +45,7 @@ - (id)initWithCoder:(NSCoder *)aDecoder return self; } -- (id)initWithFrame:(NSRect)frame +- (instancetype)initWithFrame:(NSRect)frame { self = [super initWithFrame:frame]; if (self) diff --git a/localPod/QMUICommon/QMUICommon/Classes/LMButton/LMTitleButton.m b/localPod/QMUICommon/QMUICommon/Classes/LMButton/LMTitleButton.m index aabd8ab9c..48d987569 100644 --- a/localPod/QMUICommon/QMUICommon/Classes/LMButton/LMTitleButton.m +++ b/localPod/QMUICommon/QMUICommon/Classes/LMButton/LMTitleButton.m @@ -10,7 +10,7 @@ @implementation LMTitleButton -- (id)initWithFrame:(NSRect)frame +- (instancetype)initWithFrame:(NSRect)frame { self = [super initWithFrame:frame]; if (self) { @@ -19,7 +19,7 @@ - (id)initWithFrame:(NSRect)frame return self; } -- (id)initWithCoder:(NSCoder *)aDecoder +- (instancetype)initWithCoder:(NSCoder *)aDecoder { if (self = [super initWithCoder:aDecoder]) { diff --git a/localPod/QMUICommon/QMUICommon/Classes/LMPathBarView.m b/localPod/QMUICommon/QMUICommon/Classes/LMPathBarView.m index 69178bf88..df20a1df2 100644 --- a/localPod/QMUICommon/QMUICommon/Classes/LMPathBarView.m +++ b/localPod/QMUICommon/QMUICommon/Classes/LMPathBarView.m @@ -13,7 +13,7 @@ @implementation LMPathBarView{ NSTrackingArea *trackingArea; } -- (id)initWithFrame:(NSRect)frame +- (instancetype)initWithFrame:(NSRect)frame { self = [super initWithFrame:frame]; if (self) { diff --git a/localPod/QMUICommon/QMUICommon/Classes/MMScroller/MMScroller.m b/localPod/QMUICommon/QMUICommon/Classes/MMScroller/MMScroller.m index c517a3e72..c02aefe8d 100755 --- a/localPod/QMUICommon/QMUICommon/Classes/MMScroller/MMScroller.m +++ b/localPod/QMUICommon/QMUICommon/Classes/MMScroller/MMScroller.m @@ -28,7 +28,7 @@ @implementation MMScroller #define FRAME_COUNT 10 #define DISAPPERA_DELAY 0.3 -- (id) initWithFrame:(NSRect)frameRect +- (instancetype) initWithFrame:(NSRect)frameRect { self = [super initWithFrame:frameRect]; if (self) { diff --git a/localPod/QMUICommon/QMUICommon/Classes/McFlyWindow.m b/localPod/QMUICommon/QMUICommon/Classes/McFlyWindow.m index 0b5278d86..25ea6e266 100755 --- a/localPod/QMUICommon/QMUICommon/Classes/McFlyWindow.m +++ b/localPod/QMUICommon/QMUICommon/Classes/McFlyWindow.m @@ -18,7 +18,7 @@ @implementation McFlyWindow @synthesize flyEffect; @synthesize completionHandler; -- (id)init +- (instancetype)init { self = [super initWithContentRect:NSMakeRect(0, 0, 64, 64) styleMask:NSBorderlessWindowMask diff --git a/localPod/QMUICommon/QMUICommon/Classes/PopView/GetFullDiskPopViewController.h b/localPod/QMUICommon/QMUICommon/Classes/PopView/GetFullDiskPopViewController.h index 7eb7040b9..be5283bee 100644 --- a/localPod/QMUICommon/QMUICommon/Classes/PopView/GetFullDiskPopViewController.h +++ b/localPod/QMUICommon/QMUICommon/Classes/PopView/GetFullDiskPopViewController.h @@ -15,6 +15,6 @@ typedef void(^CLoseBLock)(void); @property (nonatomic, assign) BOOL isLemonMonitor; --(id)initWithCLoseSetting:(CLoseBLock) closeBlock; +-(instancetype)initWithCLoseSetting:(CLoseBLock) closeBlock; @end diff --git a/localPod/QMUICommon/QMUICommon/Classes/PopView/GetFullDiskPopViewController.m b/localPod/QMUICommon/QMUICommon/Classes/PopView/GetFullDiskPopViewController.m index f11b64496..968f69d5f 100644 --- a/localPod/QMUICommon/QMUICommon/Classes/PopView/GetFullDiskPopViewController.m +++ b/localPod/QMUICommon/QMUICommon/Classes/PopView/GetFullDiskPopViewController.m @@ -39,7 +39,7 @@ @interface GetFullDiskPopViewController () @implementation GetFullDiskPopViewController --(id)initWithCLoseSetting:(CLoseBLock) closeBlock{ +-(instancetype)initWithCLoseSetting:(CLoseBLock) closeBlock{ self = [super init]; if (self) { self.closeBlock = closeBlock; diff --git a/localPod/QMUICommon/QMUICommon/Classes/PopView/LMPermissionGuideWndController.h b/localPod/QMUICommon/QMUICommon/Classes/PopView/LMPermissionGuideWndController.h index d79a32a61..ee20e3e1c 100644 --- a/localPod/QMUICommon/QMUICommon/Classes/PopView/LMPermissionGuideWndController.h +++ b/localPod/QMUICommon/QMUICommon/Classes/PopView/LMPermissionGuideWndController.h @@ -48,12 +48,12 @@ typedef void(^FinishButtonEvent)(void); //(1) @property(nonatomic) NSString *confirmTitle; //授权后的确认按钮 @property BOOL needCheckMonitorFullDiskAuthorizationStatus; --(id)initWithParaentCenterPos:(CGPoint)centerPos title:(NSString *)title descText:(NSString *) desc image:(NSImage *) image; +-(instancetype)initWithParaentCenterPos:(CGPoint)centerPos title:(NSString *)title descText:(NSString *) desc image:(NSImage *) image; -(void)closeWindow; -(void)loadWindow; --(id)initWithParaentCenterPos:(CGPoint)centerPos title:(NSString *)title descText:(NSString *) desc image:(NSImage *) image guideImageViewHeight: (NSInteger) height; +-(instancetype)initWithParaentCenterPos:(CGPoint)centerPos title:(NSString *)title descText:(NSString *) desc image:(NSImage *) image guideImageViewHeight: (NSInteger) height; @end NS_ASSUME_NONNULL_END diff --git a/localPod/QMUICommon/QMUICommon/Classes/PopView/LMPermissionGuideWndController.m b/localPod/QMUICommon/QMUICommon/Classes/PopView/LMPermissionGuideWndController.m index ca52dad8d..00b853015 100644 --- a/localPod/QMUICommon/QMUICommon/Classes/PopView/LMPermissionGuideWndController.m +++ b/localPod/QMUICommon/QMUICommon/Classes/PopView/LMPermissionGuideWndController.m @@ -18,11 +18,11 @@ @interface LMPermissionGuideWndController () @implementation LMPermissionGuideWndController --(id)initWithParaentCenterPos:(CGPoint)centerPos title:(NSString *)title descText:(NSString *) desc image:(NSImage *) image{ +-(instancetype)initWithParaentCenterPos:(CGPoint)centerPos title:(NSString *)title descText:(NSString *) desc image:(NSImage *) image{ return [self initWithParaentCenterPos:centerPos title:title descText:desc image:image guideImageViewHeight:410]; } --(id)initWithParaentCenterPos:(CGPoint)centerPos title:(NSString *)title descText:(NSString *) desc image:(NSImage *) image guideImageViewHeight: (NSInteger) height{ +-(instancetype)initWithParaentCenterPos:(CGPoint)centerPos title:(NSString *)title descText:(NSString *) desc image:(NSImage *) image guideImageViewHeight: (NSInteger) height{ self = [super init]; if (self) { self.centerPoint = centerPos; diff --git a/localPod/QMUICommon/QMUICommon/Classes/QMBadgeView.m b/localPod/QMUICommon/QMUICommon/Classes/QMBadgeView.m index 937df4739..867f8dd75 100755 --- a/localPod/QMUICommon/QMUICommon/Classes/QMBadgeView.m +++ b/localPod/QMUICommon/QMUICommon/Classes/QMBadgeView.m @@ -11,7 +11,7 @@ @implementation QMBadgeView @synthesize textColor,borderColor,backgroundColor,text; -- (id)initWithFrame:(NSRect)frame +- (instancetype)initWithFrame:(NSRect)frame { self = [super initWithFrame:frame]; if (self) @@ -21,7 +21,7 @@ - (id)initWithFrame:(NSRect)frame return self; } -- (id)initWithCoder:(NSCoder *)aDecoder +- (instancetype)initWithCoder:(NSCoder *)aDecoder { self = [super initWithCoder:aDecoder]; if (self) diff --git a/localPod/QMUICommon/QMUICommon/Classes/QMBaseButton.m b/localPod/QMUICommon/QMUICommon/Classes/QMBaseButton.m index f8d91d5e1..c062bfd20 100755 --- a/localPod/QMUICommon/QMUICommon/Classes/QMBaseButton.m +++ b/localPod/QMUICommon/QMUICommon/Classes/QMBaseButton.m @@ -11,7 +11,7 @@ @implementation QMBaseButton -- (id)initWithCoder:(NSCoder *)aDecoder +- (instancetype)initWithCoder:(NSCoder *)aDecoder { self = [super initWithCoder:aDecoder]; if (self) @@ -22,7 +22,7 @@ - (id)initWithCoder:(NSCoder *)aDecoder return self; } -- (id)initWithFrame:(NSRect)frame +- (instancetype)initWithFrame:(NSRect)frame { self = [super initWithFrame:frame]; if (self) diff --git a/localPod/QMUICommon/QMUICommon/Classes/QMBubble/QMBubble.m b/localPod/QMUICommon/QMUICommon/Classes/QMBubble/QMBubble.m index dfc026693..8ea53bbf5 100755 --- a/localPod/QMUICommon/QMUICommon/Classes/QMBubble/QMBubble.m +++ b/localPod/QMUICommon/QMUICommon/Classes/QMBubble/QMBubble.m @@ -46,7 +46,7 @@ @implementation QMBubble @dynamic borderWidth, borderColor, backgroudColor; @dynamic draggable, titleMode, distance; -- (id)init +- (instancetype)init { self = [super init]; if (self) diff --git a/localPod/QMUICommon/QMUICommon/Classes/QMBubble/QMBubbleView.m b/localPod/QMUICommon/QMUICommon/Classes/QMBubble/QMBubbleView.m index 0f07372f6..e6d4a2159 100755 --- a/localPod/QMUICommon/QMUICommon/Classes/QMBubble/QMBubbleView.m +++ b/localPod/QMUICommon/QMUICommon/Classes/QMBubble/QMBubbleView.m @@ -21,7 +21,7 @@ @implementation QMBubbleView @synthesize direction,drawArrow,arrowHeight,arrowWidth,arrowDistance,cornerRadius; @synthesize borderWidth,borderColor,backgroudColor; -- (id)initWithFrame:(NSRect)frameRect +- (instancetype)initWithFrame:(NSRect)frameRect { self = [super initWithFrame:frameRect]; if (self) @@ -31,7 +31,7 @@ - (id)initWithFrame:(NSRect)frameRect return self; } -- (id)initWithCoder:(NSCoder *)aDecoder +- (instancetype)initWithCoder:(NSCoder *)aDecoder { self = [super initWithCoder:aDecoder]; if (self) diff --git a/localPod/QMUICommon/QMUICommon/Classes/QMBubble/QMBubbleWindow.h b/localPod/QMUICommon/QMUICommon/Classes/QMBubble/QMBubbleWindow.h index d5fcd96b0..afa7d54e6 100755 --- a/localPod/QMUICommon/QMUICommon/Classes/QMBubble/QMBubbleWindow.h +++ b/localPod/QMUICommon/QMUICommon/Classes/QMBubble/QMBubbleWindow.h @@ -13,6 +13,6 @@ @property (nonatomic, assign) BOOL keyWindowMode; -- (id)initWithContentRect:(NSRect)contentRect; +- (instancetype)initWithContentRect:(NSRect)contentRect; @end diff --git a/localPod/QMUICommon/QMUICommon/Classes/QMBubble/QMBubbleWindow.m b/localPod/QMUICommon/QMUICommon/Classes/QMBubble/QMBubbleWindow.m index e8ff18bdc..e01dbc03d 100755 --- a/localPod/QMUICommon/QMUICommon/Classes/QMBubble/QMBubbleWindow.m +++ b/localPod/QMUICommon/QMUICommon/Classes/QMBubble/QMBubbleWindow.m @@ -10,7 +10,7 @@ @implementation QMBubbleWindow -- (id)initWithContentRect:(NSRect)contentRect +- (instancetype)initWithContentRect:(NSRect)contentRect { self = [super initWithContentRect:contentRect styleMask:NSBorderlessWindowMask backing:NSBackingStoreBuffered defer:YES]; if (self) @@ -24,7 +24,7 @@ - (id)initWithContentRect:(NSRect)contentRect return self; } -- (id)initWithContentRect:(NSRect)contentRect styleMask:(NSUInteger)aStyle backing:(NSBackingStoreType)bufferingType defer:(BOOL)flag +- (instancetype)initWithContentRect:(NSRect)contentRect styleMask:(NSUInteger)aStyle backing:(NSBackingStoreType)bufferingType defer:(BOOL)flag { return [self initWithContentRect:contentRect]; } diff --git a/localPod/QMUICommon/QMUICommon/Classes/QMButton.m b/localPod/QMUICommon/QMUICommon/Classes/QMButton.m index 64bbfa36f..58ff39796 100755 --- a/localPod/QMUICommon/QMUICommon/Classes/QMButton.m +++ b/localPod/QMUICommon/QMUICommon/Classes/QMButton.m @@ -21,7 +21,7 @@ @implementation QMButton @synthesize borderType; @synthesize borderButtonColor; -- (id)initWithFrame:(NSRect)frameRect +- (instancetype)initWithFrame:(NSRect)frameRect { self = [super initWithFrame:frameRect]; if (self) @@ -32,7 +32,7 @@ - (id)initWithFrame:(NSRect)frameRect return self; } -- (id)initWithCoder:(NSCoder *)aDecoder +- (instancetype)initWithCoder:(NSCoder *)aDecoder { self = [super initWithCoder:aDecoder]; if (self) diff --git a/localPod/QMUICommon/QMUICommon/Classes/QMCheckboxButton/QMCheckboxButton.m b/localPod/QMUICommon/QMUICommon/Classes/QMCheckboxButton/QMCheckboxButton.m index 971ab9333..47019d41a 100755 --- a/localPod/QMUICommon/QMUICommon/Classes/QMCheckboxButton/QMCheckboxButton.m +++ b/localPod/QMUICommon/QMUICommon/Classes/QMCheckboxButton/QMCheckboxButton.m @@ -35,7 +35,7 @@ @interface QMCheckboxButton () @implementation QMCheckboxButton -- (id)initWithCoder:(NSCoder *)aDecoder +- (instancetype)initWithCoder:(NSCoder *)aDecoder { self = [super initWithCoder:aDecoder]; if (self) @@ -45,7 +45,7 @@ - (id)initWithCoder:(NSCoder *)aDecoder return self; } -- (id)initWithFrame:(NSRect)frame +- (instancetype)initWithFrame:(NSRect)frame { self = [super initWithFrame:frame]; if (self) diff --git a/localPod/QMUICommon/QMUICommon/Classes/QMLoadingView/QMLoadingView.m b/localPod/QMUICommon/QMUICommon/Classes/QMLoadingView/QMLoadingView.m index fb916548e..7533ccf5f 100755 --- a/localPod/QMUICommon/QMUICommon/Classes/QMLoadingView/QMLoadingView.m +++ b/localPod/QMUICommon/QMUICommon/Classes/QMLoadingView/QMLoadingView.m @@ -17,7 +17,7 @@ @interface QMLoadingView() @implementation QMLoadingView -- (id)initWithFrame:(NSRect)frameRect +- (instancetype)initWithFrame:(NSRect)frameRect { if (self = [super initWithFrame:frameRect]) { diff --git a/localPod/QMUICommon/QMUICommon/Classes/QMProgressView.m b/localPod/QMUICommon/QMUICommon/Classes/QMProgressView.m index 597d9ca03..ecd2877b1 100644 --- a/localPod/QMUICommon/QMUICommon/Classes/QMProgressView.m +++ b/localPod/QMUICommon/QMUICommon/Classes/QMProgressView.m @@ -100,7 +100,7 @@ - (instancetype)initWithCoder:(NSCoder *)coder return self; } -- (id)initWithFrame:(NSRect)frame +- (instancetype)initWithFrame:(NSRect)frame { self = [super initWithFrame:frame]; if (self) { @@ -111,7 +111,7 @@ - (id)initWithFrame:(NSRect)frame return self; } -- (id)initWithFrame:(NSRect)frame progressViewType:(QMProgressViewType) progressViewType +- (instancetype)initWithFrame:(NSRect)frame progressViewType:(QMProgressViewType) progressViewType { self = [super initWithFrame:frame]; if (self) { diff --git a/localPod/QMUICommon/QMUICommon/Classes/QMRenderLayerView.h b/localPod/QMUICommon/QMUICommon/Classes/QMRenderLayerView.h index 14706a41a..eb510eaa6 100755 --- a/localPod/QMUICommon/QMUICommon/Classes/QMRenderLayerView.h +++ b/localPod/QMUICommon/QMUICommon/Classes/QMRenderLayerView.h @@ -12,6 +12,6 @@ @interface QMRenderLayerView : NSView @property (nonatomic, assign) BOOL staticMode; -- (id)initWithLayer:(CALayer *)layer; +- (instancetype)initWithLayer:(CALayer *)layer; @end diff --git a/localPod/QMUICommon/QMUICommon/Classes/QMRenderLayerView.m b/localPod/QMUICommon/QMUICommon/Classes/QMRenderLayerView.m index 802173a95..a72238620 100755 --- a/localPod/QMUICommon/QMUICommon/Classes/QMRenderLayerView.m +++ b/localPod/QMUICommon/QMUICommon/Classes/QMRenderLayerView.m @@ -20,7 +20,7 @@ @interface QMRenderLayerView () @implementation QMRenderLayerView @synthesize staticMode; -- (id)initWithCoder:(NSCoder *)aDecoder +- (instancetype)initWithCoder:(NSCoder *)aDecoder { self = [super initWithCoder:aDecoder]; if (self) @@ -30,7 +30,7 @@ - (id)initWithCoder:(NSCoder *)aDecoder return self; } -- (id)initWithFrame:(NSRect)frameRect +- (instancetype)initWithFrame:(NSRect)frameRect { self = [super initWithFrame:frameRect]; if (self) @@ -40,7 +40,7 @@ - (id)initWithFrame:(NSRect)frameRect return self; } -- (id)initWithLayer:(CALayer *)layer +- (instancetype)initWithLayer:(CALayer *)layer { self = [self initWithFrame:layer.bounds]; if (self) diff --git a/localPod/QMUICommon/QMUICommon/Classes/QMSimpleWindow/QMSimpleWindow.m b/localPod/QMUICommon/QMUICommon/Classes/QMSimpleWindow/QMSimpleWindow.m index 54d7a8e17..f35fe9b22 100755 --- a/localPod/QMUICommon/QMUICommon/Classes/QMSimpleWindow/QMSimpleWindow.m +++ b/localPod/QMUICommon/QMUICommon/Classes/QMSimpleWindow/QMSimpleWindow.m @@ -84,7 +84,7 @@ @interface QMSimpleWindow () @implementation QMSimpleWindow -- (id)initWithContentRect:(NSRect)contentRect styleMask:(NSUInteger)aStyle backing:(NSBackingStoreType)bufferingType defer:(BOOL)flag +- (instancetype)initWithContentRect:(NSRect)contentRect styleMask:(NSUInteger)aStyle backing:(NSBackingStoreType)bufferingType defer:(BOOL)flag { self = [super initWithContentRect:contentRect styleMask:aStyle backing:bufferingType defer:flag]; if (self) diff --git a/localPod/QMUICommon/QMUICommon/Classes/QMStaticField.m b/localPod/QMUICommon/QMUICommon/Classes/QMStaticField.m index 470cc14de..1192e7618 100755 --- a/localPod/QMUICommon/QMUICommon/Classes/QMStaticField.m +++ b/localPod/QMUICommon/QMUICommon/Classes/QMStaticField.m @@ -10,7 +10,7 @@ @implementation QMStaticField -- (id)initWithFrame:(NSRect)frame +- (instancetype)initWithFrame:(NSRect)frame { self = [super initWithFrame:frame]; if (self) diff --git a/localPod/QMUICommon/QMUICommon/Classes/QMTrackOutlineView/QMTrackOutlineView.m b/localPod/QMUICommon/QMUICommon/Classes/QMTrackOutlineView/QMTrackOutlineView.m index 771ebe8c0..7fc45d7ae 100755 --- a/localPod/QMUICommon/QMUICommon/Classes/QMTrackOutlineView/QMTrackOutlineView.m +++ b/localPod/QMUICommon/QMUICommon/Classes/QMTrackOutlineView/QMTrackOutlineView.m @@ -20,7 +20,7 @@ @implementation QMTrackOutlineView @synthesize overView; @synthesize showLevel; -- (id)initWithFrame:(NSRect)frameRect +- (instancetype)initWithFrame:(NSRect)frameRect { self = [super initWithFrame:frameRect]; if (self) @@ -30,7 +30,7 @@ - (id)initWithFrame:(NSRect)frameRect return self; } -- (id)initWithCoder:(NSCoder *)aDecoder +- (instancetype)initWithCoder:(NSCoder *)aDecoder { self = [super initWithCoder:aDecoder]; if (self) diff --git a/localPod/QMUICommon/QMUICommon/Classes/SheetWindow/QMColorBackgroundView.m b/localPod/QMUICommon/QMUICommon/Classes/SheetWindow/QMColorBackgroundView.m index 4e3cd692b..406d60fe0 100755 --- a/localPod/QMUICommon/QMUICommon/Classes/SheetWindow/QMColorBackgroundView.m +++ b/localPod/QMUICommon/QMUICommon/Classes/SheetWindow/QMColorBackgroundView.m @@ -10,7 +10,7 @@ @implementation QMColorBackgroundView -- (id)initWithFrame:(NSRect)frameRect +- (instancetype)initWithFrame:(NSRect)frameRect { if (self = [super initWithFrame:frameRect]) { diff --git a/localPod/QMUICommon/QMUICommon/Classes/SheetWindow/QMTransparentWindow.h b/localPod/QMUICommon/QMUICommon/Classes/SheetWindow/QMTransparentWindow.h index 9aeba55a2..8b2fcfe8b 100755 --- a/localPod/QMUICommon/QMUICommon/Classes/SheetWindow/QMTransparentWindow.h +++ b/localPod/QMUICommon/QMUICommon/Classes/SheetWindow/QMTransparentWindow.h @@ -14,7 +14,7 @@ QMColorBackgroundView * m_backgroundView; } -- (id)initWithContentRect:(NSRect)contentRect +- (instancetype)initWithContentRect:(NSRect)contentRect styleMask:(NSUInteger)aStyle backing:(NSBackingStoreType)bufferingType defer:(BOOL)flag diff --git a/localPod/QMUICommon/QMUICommon/Classes/SheetWindow/QMTransparentWindow.m b/localPod/QMUICommon/QMUICommon/Classes/SheetWindow/QMTransparentWindow.m index ab5f072ca..90e84270e 100755 --- a/localPod/QMUICommon/QMUICommon/Classes/SheetWindow/QMTransparentWindow.m +++ b/localPod/QMUICommon/QMUICommon/Classes/SheetWindow/QMTransparentWindow.m @@ -11,7 +11,7 @@ @implementation QMTransparentWindow -- (id)initWithContentRect:(NSRect)contentRect +- (instancetype)initWithContentRect:(NSRect)contentRect styleMask:(NSUInteger)aStyle backing:(NSBackingStoreType)bufferingType defer:(BOOL)flag { @@ -27,7 +27,7 @@ - (id)initWithContentRect:(NSRect)contentRect return self; } -- (id)initWithContentRect:(NSRect)contentRect +- (instancetype)initWithContentRect:(NSRect)contentRect styleMask:(NSUInteger)aStyle backing:(NSBackingStoreType)bufferingType defer:(BOOL)flag diff --git a/localPod/QMUICommon/QMUICommon/Classes/YRKSpinningProgressIndicator.m b/localPod/QMUICommon/QMUICommon/Classes/YRKSpinningProgressIndicator.m index b7d629f9b..ddae01db3 100755 --- a/localPod/QMUICommon/QMUICommon/Classes/YRKSpinningProgressIndicator.m +++ b/localPod/QMUICommon/QMUICommon/Classes/YRKSpinningProgressIndicator.m @@ -37,7 +37,7 @@ @implementation YRKSpinningProgressIndicator #pragma mark Init -- (id)initWithFrame:(NSRect)frame +- (instancetype)initWithFrame:(NSRect)frame { self = [super initWithFrame:frame]; if (self) {