Merge pull request #1 from wongzigii/warning-fix

Warning fixed
2025-10-14 15:11:00 +00:00 · 2015-08-22 12:28:08 +08:00
parent e8c64e724b 1b0cc47e96
commit 52b38ffb43
13 changed files with 30 additions and 20 deletions
--- a/Leanote/AppDelegate.m
+++ b/Leanote/AppDelegate.m
@@ -142,6 +142,7 @@
 - (BOOL)application:(UIApplication *)application willFinishLaunchingWithOptions:(NSDictionary *)launchOptions
 {
 	[self customizeAppearance];
+    return YES;
 }

 // 全局样式设置
--- a/Leanote/controller/auth/LoginViewController.m
+++ b/Leanote/controller/auth/LoginViewController.m
@@ -42,7 +42,7 @@ static CGPoint const LoginOnePasswordPadding                    = {9.0, 0.0f};
 static NSInteger const LoginVerificationCodeNumberOfLines       = 2;


-@interface LoginViewController ()
+@interface LoginViewController ()<UITextFieldDelegate>

@property (nonatomic, assign) BOOL isFromAddAccount;

--- a/Leanote/controller/note/NoteController.m
+++ b/Leanote/controller/note/NoteController.m
@@ -23,7 +23,7 @@

 #import <SGNavigationProgress/UINavigationController+SGProgress.h>

-@interface NoteController ()
+@interface NoteController ()<SWTableViewCellDelegate>

@property (strong, nonatomic) NSIndexPath *indexPathToBeDeleted;
@property (strong, nonatomic) NSFetchedResultsController *searchedResultsController;
@@ -724,7 +724,10 @@
 		case NSFetchedResultsChangeDelete:
 			[tableView deleteSections:[NSIndexSet indexSetWithIndex:sectionIndex]
 					 withRowAnimation:UITableViewRowAnimationFade];
-			break;
+            break;
+        case NSFetchedResultsChangeUpdate:
+        case NSFetchedResultsChangeMove:
+            break;
 	}
 	
 }
--- a/Leanote/controller/note/NoteSettingsTableViewController.m
+++ b/Leanote/controller/note/NoteSettingsTableViewController.m
@@ -43,7 +43,7 @@ typedef enum {
 } PostSettingsRow;


-@interface NoteSettingsTableViewController ()
+@interface NoteSettingsTableViewController ()<UITextFieldDelegate>

@property (nonatomic, assign) BOOL preIsBlog;

--- a/Leanote/controller/note/NoteViewController.m
+++ b/Leanote/controller/note/NoteViewController.m
@@ -64,7 +64,7 @@ static NSDictionary *EnabledButtonBarStyle;
 static NSInteger const MaximumNumberOfPictures = 10;


-@interface NoteViewController () <CTAssetsPickerControllerDelegate, UINavigationControllerDelegate, UIImagePickerControllerDelegate, UIActionSheetDelegate>
+@interface NoteViewController () <CTAssetsPickerControllerDelegate, UINavigationControllerDelegate, UIImagePickerControllerDelegate, UIActionSheetDelegate, WPMediaPickerViewControllerDelegate>

@property(nonatomic, strong) NSMutableDictionary *mediaAdded;
@property(nonatomic, strong) NSString *selectedMediaID;
@@ -539,7 +539,7 @@ BOOL hiddenBar = NO;
 	}
 	
 	// 得到当前的url
-	int count = [realUrls count];
+	NSUInteger count = [realUrls count];
 	if(count < 1) {
 		return;
 	}
--- a/Leanote/controller/notebook/AddNotebookViewController.m
+++ b/Leanote/controller/notebook/AddNotebookViewController.m
@@ -47,7 +47,7 @@ typedef enum {
@property UIBarButtonItem *doneButton;
@property UIBarButtonItem *cancelButton;

-@property (assign) BOOL *textFieldDidHaveFocusBeforeOrientationChange;
+@property (assign) BOOL textFieldDidHaveFocusBeforeOrientationChange;

@end

--- a/Leanote/controller/notebook/NotebookController.m
+++ b/Leanote/controller/notebook/NotebookController.m
@@ -693,6 +693,9 @@
            [tableView deleteSections:[NSIndexSet indexSetWithIndex:sectionIndex]
                     withRowAnimation:UITableViewRowAnimationFade];
            break;
+        case NSFetchedResultsChangeMove:
+        case NSFetchedResultsChangeUpdate:
+            break;
    }
    
 }
--- a/Leanote/controller/tag/TagController.m
+++ b/Leanote/controller/tag/TagController.m
@@ -17,7 +17,7 @@
 #import "Leas.h"
 #import "NoteController.h"

-@interface TagController ()
+@interface TagController ()<SWTableViewCellDelegate>

 // 从setting过来要用
@property (nonatomic, strong) Note *note;
@@ -573,6 +573,9 @@
            [tableView deleteSections:[NSIndexSet indexSetWithIndex:sectionIndex]
                     withRowAnimation:UITableViewRowAnimationFade];
            break;
+        case NSFetchedResultsChangeMove:
+        case NSFetchedResultsChangeUpdate:
+            break;
    }
    
 }
--- a/Leanote/service/NoteService.m
+++ b/Leanote/service/NoteService.m
@@ -23,7 +23,7 @@
 // 把关于数据库操作的抽出来放到这里

 - (NSFetchedResultsController *) fetchedResultsControllerWithPredicate:(NSString *)predicateStr
-														withController:(UIViewController *)controller
+														withController:(UIViewController<NSFetchedResultsControllerDelegate> *)controller
 															  notebook:(Notebook *)notebook
 																   tag:(Tag *)tag
 																isBlog:(BOOL)isBlog
--- a/Leanote/service/SyncService.m
+++ b/Leanote/service/SyncService.m
@@ -92,7 +92,7 @@ BOOL inSyncing = NO;
 // 同步笔记本
 - (void) syncNotebook:(NSNumber *)afterUsn callback:(void (^)(BOOL))callback
 {
-	NSNumber *maxEntry = [NSNumber numberWithInt:maxEntryInt];
+	NSNumber *maxEntry = [NSNumber numberWithUnsignedInteger:maxEntryInt];
 	[ApiService getSyncNotebooks:afterUsn maxEntry:maxEntry success:^(NSArray * notebookObjs) {
 		if(self.canceled) {
 			return;
@@ -100,7 +100,7 @@ BOOL inSyncing = NO;
 		[self syncNotebookToLocal:notebookObjs];
 		
 		// 如果一样, 表示很可能还有笔记本, 得到最大的usn, 递归调用之
-		int count = [notebookObjs count];
+		NSUInteger count = [notebookObjs count];
 		if (count == maxEntryInt) {
 			NSNumber *maxUsn = notebookObjs[count-1][@"Usn"];
 			[self syncNotebook:maxUsn callback:callback];
@@ -186,7 +186,7 @@ BOOL inSyncing = NO;
 // 同步笔记
 - (void) syncNote:(NSNumber *)afterUsn callback:(void (^)(BOOL))callback
 {
-	NSNumber *maxEntry = [NSNumber numberWithInt:maxEntryInt];
+	NSNumber *maxEntry = [NSNumber numberWithUnsignedInteger:maxEntryInt];
 	[ApiService getSyncNotes:afterUsn maxEntry:maxEntry success:^(NSArray * noteObjs) {
 		if(self.canceled) {
 			return;
@@ -194,7 +194,7 @@ BOOL inSyncing = NO;
 		[self syncNoteToLocal:noteObjs];
 		
 		// 如果一样, 表示很可能还有笔记本, 得到最大的usn, 递归调用之
-		int count = [noteObjs count];
+		NSUInteger count = [noteObjs count];
 		if (count == maxEntryInt) {
 			NSNumber *maxUsn = noteObjs[count-1][@"Usn"];
 			[self syncNote:maxUsn callback:callback];
@@ -244,7 +244,7 @@ BOOL inSyncing = NO;
 // 同步标签
 - (void) syncTag:(NSNumber *)afterUsn callback:(void (^)(BOOL))callback
 {
-	NSNumber *maxEntry = [NSNumber numberWithInt:maxEntryInt];
+	NSNumber *maxEntry = [NSNumber numberWithUnsignedInteger:maxEntryInt];
 	[ApiService getSyncTags:afterUsn maxEntry:maxEntry success:^(NSArray * tagObjs) {
 		if(self.canceled) {
 			return;
@@ -252,7 +252,7 @@ BOOL inSyncing = NO;
 		[self syncTagToLocal:tagObjs];
 		
 		// 如果一样, 表示很可能还有Tag, 得到最大的usn, 递归调用之
-		int count = [tagObjs count];
+		NSUInteger count = [tagObjs count];
 		if (count == maxEntryInt) {
 			NSNumber *maxUsn = tagObjs[count-1][@"Usn"];
 			[self syncTag:maxUsn callback:callback];
--- a/Leanote/util/LeaURLRequest.m
+++ b/Leanote/util/LeaURLRequest.m
@@ -39,7 +39,7 @@
    request.HTTPBody = [requestBody dataUsingEncoding:NSUTF8StringEncoding];
    
    // Auth Headers
-    [request setValue:[NSString stringWithFormat:@"%d", requestBody.length] forHTTPHeaderField:@"Content-Length"];
+    [request setValue:[NSString stringWithFormat:@"%lu", requestBody.length] forHTTPHeaderField:@"Content-Length"];
    [request addValue:@"*/*" forHTTPHeaderField:@"Accept"];
    
    // Bearer Token
--- a/Leanote/view/LeaImageSliderViewController.h
+++ b/Leanote/view/LeaImageSliderViewController.h
@@ -16,6 +16,6 @@

@property (strong, nonatomic) NSArray *urlArr;
@property (strong, nonatomic) NSString *curUrl;
-@property int curIndex;
+@property NSUInteger curIndex;

@end
--- a/Leanote/view/LeaImageSliderViewController.m
+++ b/Leanote/view/LeaImageSliderViewController.m
@@ -13,14 +13,14 @@

 #import "Common.h"

-@interface LeaImageSliderViewController ()
+@interface LeaImageSliderViewController ()<UIPageViewControllerDelegate>
 {
 	UILabel *_label;
 }

@property (nonatomic, strong) UIButton *saveBtn;

-@property int count;
+@property NSUInteger count;
@property (strong, nonatomic) NSMutableArray *views;
@end

@@ -222,7 +222,7 @@
 }
 -(void)setIndexLabel
 {
-	_label.text = [NSString stringWithFormat:@"%i/%i", self.curIndex + 1, self.count];
+	_label.text = [NSString stringWithFormat:@"%lu/%lu", self.curIndex + 1, self.count];
 }

@end