Tencent · cntrump · Jul 27, 2022 · Jul 27, 2022
diff --git 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
@@ -53,7 +53,7 @@ @interface LMToolViewController ()<NSTableViewDelegate, NSTableViewDataSource, Q
 
 @implementation LMToolViewController
 
--(id)init{
+-(instancetype)init{
     self = [super initWithNibName:NSStringFromClass(self.class) bundle:[NSBundle bundleForClass:self.class]];
     if (self) {
 

diff --git a/Lemon/LemonMainWndController.m b/Lemon/LemonMainWndController.m
@@ -52,7 +52,7 @@ @interface LemonMainWndController ()<NSWindowDelegate>
 
 @implementation LemonMainWndController
 
-- (id)init
+- (instancetype)init
 {
     static dispatch_once_t onceToken;
     static LemonMainWndController *mainWindow;

diff --git 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/MASMonitor/MasLoginItemManager.h b/Lemon/MASMonitor/MasLoginItemManager.h
@@ -15,7 +15,7 @@
 
 @interface MasLoginItemManager : NSObject<MASXPCAgent>
 
-+ (id)sharedManager;
++ (instancetype)sharedManager;
 
 -(BOOL) enableLoginItemAndXpcAtGuidePage;
 //通知托盘自动退出

diff --git a/Lemon/MASMonitor/MasLoginItemManager.m b/Lemon/MASMonitor/MasLoginItemManager.m
@@ -48,7 +48,7 @@ -(void)dealloc{
     [[NSDistributedNotificationCenter defaultCenter] removeObserver:self];
 }
 
-+ (id)sharedManager
++ (instancetype)sharedManager
 {
     static dispatch_once_t onceToken = 0;
     __strong static id instance = nil;

diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -43,7 +43,7 @@ @interface ToolTableCellView()<MyAnimateCellViewDelegate>
 
 @implementation ToolTableCellView
 
--(id)initWithFrame:(NSRect)frameRect{
+-(instancetype)initWithFrame:(NSRect)frameRect{
     self = [super initWithFrame:frameRect];
     if (self) {
         [self setupUI];

diff --git a/LemonClener/LemonClener/Controller/LMCleanBigViewController.m b/LemonClener/LemonClener/Controller/LMCleanBigViewController.m
@@ -106,7 +106,7 @@ @interface LMCleanBigViewController ()<NSOutlineViewDelegate, NSOutlineViewDataS
 
 @implementation LMCleanBigViewController
 
--(id)init{
+-(instancetype)init{
     self = [super initWithNibName:NSStringFromClass(self.class) bundle:[NSBundle bundleForClass:self.class]];
     if (self) {
 

diff --git a/LemonClener/LemonClener/Controller/LMCleanResultViewController.m b/LemonClener/LemonClener/Controller/LMCleanResultViewController.m
@@ -46,7 +46,7 @@ @interface LMCleanResultViewController ()<NSTableViewDelegate, NSTableViewDataSo
 
 @implementation LMCleanResultViewController
 
--(id)init{
+-(instancetype)init{
     self = [super initWithNibName:NSStringFromClass(self.class) bundle:[NSBundle bundleForClass:self.class]];
     if (self) {
 

diff --git a/LemonClener/LemonClener/Controller/LMCleanScanViewController.m b/LemonClener/LemonClener/Controller/LMCleanScanViewController.m
@@ -232,7 +232,7 @@ @interface LMCleanScanViewController ()<QMCleanManagerDelegate, CategoryProgress
 
 @implementation LMCleanScanViewController
 
--(id)init{
+-(instancetype)init{
     self = [super initWithNibName:NSStringFromClass(self.class) bundle:[NSBundle bundleForClass:self.class]];
     if (self) {
 

diff --git a/LemonClener/LemonClener/Model/ToolModel.h b/LemonClener/LemonClener/Model/ToolModel.h
@@ -17,6 +17,6 @@
 @property (strong, nonatomic) NSString *toolDesc;
 @property (assign, nonatomic) NSInteger reportId;
 
--(id)initWithToolId:(NSString *)toolId toolPicName:(NSString *)toolPicName className:(NSString *)className toolName:(NSString *)toolName toolDesc:(NSString *)toolDesc reportId:(NSInteger)reportId;
+-(instancetype)initWithToolId:(NSString *)toolId toolPicName:(NSString *)toolPicName className:(NSString *)className toolName:(NSString *)toolName toolDesc:(NSString *)toolDesc reportId:(NSInteger)reportId;
 
 @end
diff --git a/LemonClener/LemonClener/Model/ToolModel.m b/LemonClener/LemonClener/Model/ToolModel.m
@@ -10,7 +10,7 @@
 
 @implementation ToolModel
 
--(id)initWithToolId:(NSString *)toolId toolPicName:(NSString *)toolPicName className:(NSString *)className toolName:(NSString *)toolName toolDesc:(NSString *)toolDesc reportId:(NSInteger)reportId{
+-(instancetype)initWithToolId:(NSString *)toolId toolPicName:(NSString *)toolPicName className:(NSString *)className toolName:(NSString *)toolName toolDesc:(NSString *)toolDesc reportId:(NSInteger)reportId{
     self = [super init];
     if (self) {
         self.toolId = toolId;

diff --git a/LemonClener/LemonClener/QMCleanerManager/QMCleanManager.m b/LemonClener/LemonClener/QMCleanerManager/QMCleanManager.m
@@ -39,7 +39,7 @@ @interface QMCleanManager()
 @end
 
 @implementation QMCleanManager
-- (id)init
+- (instancetype)init
 {
     if (self = [super init])
     {

diff --git a/LemonClener/LemonClener/QMCleanerManager/QMLiteCleanerManager.m b/LemonClener/LemonClener/QMCleanerManager/QMLiteCleanerManager.m
@@ -42,7 +42,7 @@ @interface QMLiteCleanerManager()
 
 @implementation QMLiteCleanerManager
 
-- (id)init
+- (instancetype)init
 {
     if (self = [super init])
     {

diff --git a/LemonClener/LemonClener/QMCleanerManager/QMRemoveManager.m b/LemonClener/LemonClener/QMCleanerManager/QMRemoveManager.m
@@ -28,7 +28,7 @@ + (QMRemoveManager *)getInstance
     return instance;
 }
 
-- (id)init
+- (instancetype)init
 {
     if (self = [super init])
     {

diff --git a/LemonClener/LemonClener/QMCleanerManager/QMWarnReultItem.h b/LemonClener/LemonClener/QMCleanerManager/QMWarnReultItem.h
@@ -21,7 +21,7 @@
 @property (nonatomic, assign) NSUInteger resultSize;
 @property (nonatomic, assign) BOOL selected;
 
-- (id)initWithPath:(NSString *)path;
+- (instancetype)initWithPath:(NSString *)path;
 
 - (void)addResultPathArray:(NSArray *)pathArray cleanType:(QMCleanType)type;
 - (NSDictionary *)resultPathDict;

diff --git a/LemonClener/LemonClener/QMCleanerManager/QMWarnReultItem.m b/LemonClener/LemonClener/QMCleanerManager/QMWarnReultItem.m
@@ -16,7 +16,7 @@ @implementation QMWarnReultItem
 @synthesize iconImage;
 @synthesize resultSize;
 
-- (id)initWithPath:(NSString *)path
+- (instancetype)initWithPath:(NSString *)path
 {
     if (self = [super init])
     {

diff --git a/LemonClener/LemonClener/View/CleanBigViewCell/BigCleanParaentCellView.m b/LemonClener/LemonClener/View/CleanBigViewCell/BigCleanParaentCellView.m
@@ -19,7 +19,7 @@ @interface BigCleanParaentCellView(){
 
 @implementation BigCleanParaentCellView
 
--(id)initWithCoder:(NSCoder *)decoder{
+-(instancetype)initWithCoder:(NSCoder *)decoder{
     self = [super initWithCoder:decoder];
     if (self) {
 

diff --git a/LemonClener/LemonClener/View/CleanBigViewCell/QMResultTableRowView.m b/LemonClener/LemonClener/View/CleanBigViewCell/QMResultTableRowView.m
@@ -16,7 +16,7 @@
 
 @implementation QMResultTableRowView
 
-- (id)initWithFrame:(NSRect)frameRect
+- (instancetype)initWithFrame:(NSRect)frameRect
 {
     if (self = [super initWithFrame:frameRect])
     {

diff --git a/LemonClener/LemonClener/View/CustomView/CategorySmallProgressView.m b/LemonClener/LemonClener/View/CustomView/CategorySmallProgressView.m
@@ -10,7 +10,7 @@
 
 @implementation CategorySmallProgressView
 
--(id)initWithCoder:(NSCoder *)decoder{
+-(instancetype)initWithCoder:(NSCoder *)decoder{
     self = [super initWithCoder:decoder];
     if (self) {
         [self setWantsLayer:YES];

diff --git a/LemonClener/LemonClener/View/CustomView/LMActivityCard.m b/LemonClener/LemonClener/View/CustomView/LMActivityCard.m
@@ -10,7 +10,7 @@
 
 @implementation LMActivityCard
 
-- (id)init {
+- (instancetype)init {
     self = [super init];
     if (self) {
 

diff --git a/LemonClener/LemonClener/libcleaner/QMFilterParse.h b/LemonClener/LemonClener/libcleaner/QMFilterParse.h
@@ -20,7 +20,7 @@
 }
 @property (assign) id<QMScanDelegate> 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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;