Fixed accented characters replacement

elasticthreads · elasticthreads · commit 7e186ff82b10 · 2014-06-20T13:08:41.000-04:00
and a few more compiler/static analyzer flags.
diff --git a/BlorPasswordRetriever.m b/BlorPasswordRetriever.m
@@ -169,7 +169,7 @@ - (void)dealloc {
 @implementation BlorNoteEnumerator
 
 - (id)initWithBlor:(NSString*)blorPath passwordHashData:(NSData*)passwordHashData {
-	if ([super init]) {
+	if (self=[super init]) {
 		path = [blorPath retain];
 		
 		if (!(keyData = [passwordHashData retain]))
@@ -189,9 +189,10 @@ - (id)initWithBlor:(NSString*)blorPath passwordHashData:(NSData*)passwordHashDat
 			
 		currentByteOffset = 24;
 		//read past the # of notes marker--we're just going to read as many notes as possible
+        return self;
 	}
+    return nil;
 	
-	return self;
 }
 
 - (void)dealloc {
diff --git a/BookmarksController.m b/BookmarksController.m
@@ -29,20 +29,17 @@
 @implementation NoteBookmark
 
 - (id)initWithDictionary:(NSDictionary*)aDict {
-    if (self=[super init]) {
         if (aDict) {
             NSString *uuidString = [aDict objectForKey:BMNoteUUIDStringKey];
             if (uuidString) {
-                [self initWithNoteUUIDBytes:[uuidString uuidBytes] searchString:[aDict objectForKey:BMSearchStringKey]];
+                return (self=[self initWithNoteUUIDBytes:[uuidString uuidBytes] searchString:[aDict objectForKey:BMSearchStringKey]]);
             } else {
                 NSLog(@"NoteBookmark init: supplied nil uuidString");
             }
         } else {
             NSLog(@"NoteBookmark init: supplied nil dictionary; couldn't init");
-            return nil;
+            
         }
-        return self;
-    }
     return nil;
 }
 
@@ -57,23 +54,19 @@ - (id)initWithNoteUUIDBytes:(CFUUIDBytes)bytes searchString:(NSString*)aString {
 }
 
 - (id)initWithNoteObject:(NoteObject*)aNote searchString:(NSString*)aString {
-	if(self=[super init]){
-        if (aNote) {
+	
+    if (aNote) {
+        
+        CFUUIDBytes *bytes = [aNote uniqueNoteIDBytes];
+        if (!bytes) {
+            NSLog(@"NoteBookmark init: no cfuuidbytes pointer from note %@", titleOfNote(aNote));
+        }else if(self=[self initWithNoteUUIDBytes:*bytes searchString:aString]){
             noteObject = [aNote retain];
-            searchString = [aString copy];
-            
-            CFUUIDBytes *bytes = [aNote uniqueNoteIDBytes];
-            if (!bytes) {
-                NSLog(@"NoteBookmark init: no cfuuidbytes pointer from note %@", titleOfNote(aNote));
-                return nil;
-            }
-            uuidBytes = *bytes;
-        } else {
-            NSLog(@"NoteBookmark init: supplied nil note");
-            return nil;
+            return self;
         }
-        return self;
     }
+    NSLog(@"NoteBookmark init: supplied nil note");
+    [self release];
     return nil;
 }
 
@@ -538,11 +531,11 @@ - (void)addBookmark:(id)sender {
 		NSString *newString = [[appController fieldSearchString] stringByTrimmingCharactersInSet:[NSCharacterSet whitespaceAndNewlineCharacterSet]];		
 		
 		NoteBookmark *bookmark = [[NoteBookmark alloc] initWithNoteObject:[appController selectedNoteObject] searchString:newString];
-		if (bookmark) {
-			
+		if (bookmark!=nil) {
 			NSUInteger existingIndex = [bookmarks indexOfObject:bookmark];
 			if (existingIndex != NSNotFound) {
 				//show them what they've already got
+                
 				NoteBookmark *existingBookmark = [bookmarks objectAtIndex:existingIndex];
 				if ([window isVisible]) [self selectBookmarkInTableView:existingBookmark];
 			} else {
@@ -551,8 +544,8 @@ - (void)addBookmark:(id)sender {
 				[self updateBookmarksUI];
 				if ([window isVisible]) [self selectBookmarkInTableView:bookmark];
 			}
-		}
-		[bookmark release];
+        }
+        [bookmark release];
 	} else {
 		//there are only so many numbers and modifiers
 		NSRunAlertPanel(NSLocalizedString(@"Too many bookmarks.",nil), NSLocalizedString(@"You cannot create more than 26 bookmarks. Try removing some first.",nil), NSLocalizedString(@"OK",nil), nil, NULL);
diff --git a/DiskUUIDEntry.m b/DiskUUIDEntry.m
@@ -22,12 +22,13 @@
 @implementation DiskUUIDEntry
 
 - (id)initWithUUIDRef:(CFUUIDRef)aUUIDRef {
-	if ([super init]) {
+	if (self=[super init]) {
 		NSAssert(aUUIDRef != nil, @"need a real UUID");
 		uuidRef = CFRetain(aUUIDRef);
 		lastAccessed = [[NSDate date] retain];
+        return self;
 	}
-	return self;
+    return nil;
 }
 
 - (void)dealloc {
@@ -48,7 +49,7 @@ - (void)encodeWithCoder:(NSCoder *)coder {
 - (id)initWithCoder:(NSCoder*)decoder {
 	NSAssert([decoder allowsKeyedCoding], @"keyed-decoding only!");
 	
-    if ([super init]) {
+    if (self=[super init]) {
 
 		lastAccessed = [[decoder decodeObjectForKey:VAR_STR(lastAccessed)] retain];
 		
@@ -59,8 +60,11 @@ - (id)initWithCoder:(NSCoder*)decoder {
 		}
 		
 		if (!uuidRef) return nil;
+        
+        
+        return self;
 	}
-	return self;
+    return nil;
 }
 
 - (void)see {
diff --git a/EmptyView.h b/EmptyView.h
@@ -18,10 +18,10 @@
 {
     IBOutlet NSTextField *labelText;
 	NSInteger lastNotesNumber;
-	NSColor *bgCol;
+//	NSColor *bgCol;
 }
 
 - (void)setLabelStatus:(NSInteger)notesNumber;
-- (void)setBackgroundColor:(NSColor *)inColor;
+//- (void)setBackgroundColor:(NSColor *)inColor;
 
 @end
diff --git a/ExternalEditorListController.m b/ExternalEditorListController.m
@@ -42,11 +42,13 @@ - (id)initWithBundleID:(NSString*)aBundleIdentifier resolvedURL:(NSURL*)aURL {
 		if (!bundleIdentifier) {
 			if (!(bundleIdentifier = [[[NSBundle bundleWithPath:[aURL path]] bundleIdentifier] copy])) {
 				NSLog(@"initWithBundleID:resolvedURL: URL does not seem to point to a valid bundle");
+                [self dealloc];
 				return nil;
 			}
 		}
         return self;
 	}
+    [self dealloc];
 	return nil;
 }
 
diff --git a/FrozenNotation.m b/FrozenNotation.m
@@ -75,12 +75,14 @@ - (id)initWithNotes:(NSMutableArray*)notes deletedNotes:(NSMutableSet*)antiNotes
 			
 			if (![prefs encryptDataInNewSession:notesData]) {
 				NSLog(@"Couldn't encrypt data!");
+                [self dealloc];
 				return nil;
 			}
 		}
 		
 		if (![notesData length]) {
 			NSLog(@"%@: empty notesData; returning nil", NSStringFromSelector(_cmd));
+            [self dealloc];
 			return nil;
 		}
         return self;
diff --git a/GlobalPrefs.h b/GlobalPrefs.h
@@ -147,7 +147,7 @@ BOOL ColorsEqualWith8BitChannels(NSColor *c1, NSColor *c2);
 - (void)setSoftTabs:(BOOL)value sender:(id)sender;
 - (BOOL)softTabs;
 
-- (int)numberOfSpacesInTab;
+- (NSInteger)numberOfSpacesInTab;
 
 - (float)tableFontSize;
 - (void)setTableFontSize:(float)fontSize sender:(id)sender;
diff --git a/GlobalPrefs.m b/GlobalPrefs.m
@@ -128,7 +128,7 @@ - (id)init {
 			[NSNumber numberWithBool:YES], AutoIndentsNewLinesKey, 
 			[NSNumber numberWithBool:YES], AutoFormatsListBulletsKey,
 			[NSNumber numberWithBool:NO], UseSoftTabsKey,
-			[NSNumber numberWithInt:4], NumberOfSpacesInTabKey,
+			[NSNumber numberWithInteger:4], NumberOfSpacesInTabKey,
 			[NSNumber numberWithBool:YES], PastePreservesStyleKey,
 			[NSNumber numberWithBool:YES], TabKeyIndentsKey,
 			[NSNumber numberWithBool:YES], ConfirmNoteDeletionKey,
@@ -547,8 +547,8 @@ - (BOOL)softTabs {
 	return [defaults boolForKey:UseSoftTabsKey];
 }
 
-- (int)numberOfSpacesInTab {
-	return (int)[defaults integerForKey:NumberOfSpacesInTabKey];
+- (NSInteger)numberOfSpacesInTab {
+	return [defaults integerForKey:NumberOfSpacesInTabKey];
 }
 
 BOOL ColorsEqualWith8BitChannels(NSColor *c1, NSColor *c2) {
@@ -683,7 +683,7 @@ - (NSParagraphStyle*)noteBodyParagraphStyle {
 	NSFont *bodyFont = [self noteBodyFont];
 
 	if (!noteBodyParagraphStyle && bodyFont) {
-		int numberOfSpaces = [self numberOfSpacesInTab];
+		NSInteger numberOfSpaces = [self numberOfSpacesInTab];
 		NSMutableString *sizeString = [[NSMutableString alloc] initWithCapacity:numberOfSpaces];
 		while (numberOfSpaces--) {
 			[sizeString appendString:@" "];
diff --git a/Info.plist b/Info.plist
@@ -162,7 +162,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>114</string>
+	<string>115</string>
 	<key>LSApplicationCategoryType</key>
 	<string>public.app-category.productivity</string>
 	<key>LSArchitecturePriority</key>
diff --git a/LabelsListController.m b/LabelsListController.m
@@ -104,12 +104,6 @@ - (NSArray*)labelTitlesPrefixedByString:(NSString*)prefixString indexOfSelectedI
 	return titles;
 }
 
-#if MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_5
-static CGRect NSRectToCGRect(NSRect nsrect) {
-    union _ {NSRect ns; CGRect cg;};
-    return ((union _ *)&nsrect)->cg;
-}
-#endif
 
 - (void)invalidateCachedLabelImages {
 	//used when the list font size changes
diff --git a/LinkingEditor.m b/LinkingEditor.m
@@ -1799,11 +1799,16 @@ - (void)insertText:(id)string {
     if([prefsController useAutoPairing]){
         NSString *oppositeAppend;
         NSInteger pairCode;
-        if((pairCode=[string isPairedCharacterWithMatchString:&oppositeAppend])>=0){
-            //             NSLog(@"oppositeAppend:>%@< code:%ld",oppositeAppend,pairCode);
+        NSString *insertString;
+        if([string isKindOfClass:[NSAttributedString class]]){
+            insertString=[(NSAttributedString *)string string];
+        }else{
+            insertString=(NSString *)string;
+        }
+        if((pairCode=[insertString isPairedCharacterWithMatchString:&oppositeAppend])>=0){
             NSString *appendString = string;
             NSRange selRange = [self selectedRange];
-            NSString *postString = self.activeParagraphPastCursor;//[NSString stringWithString:self.activeParagraphPastCursor];
+            NSString *postString = self.activeParagraphPastCursor;
             
             NSInteger autoPair=-1;
             if ((postString.length==0)||(selRange.length>0)||![[NSCharacterSet alphanumericCharacterSet]characterIsMember:[postString characterAtIndex:0]]) {
diff --git a/NSString_NV.h b/NSString_NV.h
@@ -31,9 +31,7 @@ CFDateFormatterRef simplenoteDateFormatter(int lowPrecision);
 + (NSString*)customPasteboardTypeOfCode:(int)code;
 - (NSString*)stringAsSafePathExtension;
 - (NSString*)filenameExpectingAdditionalCharCount:(NSUInteger)charCount;
-#if MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_5
-- (NSString*)stringByReplacingOccurrencesOfString:(NSString*)stringToReplace withString:(NSString*)replacementString;
-#endif
+
 - (NSString*)fourCharTypeString;
 - (BOOL)isAMachineDirective;
 - (void)copyItemToPasteboard:(id)sender;
@@ -69,7 +67,7 @@ CFDateFormatterRef simplenoteDateFormatter(int lowPrecision);
 @end
 
 @interface NSMutableString (NV)
-- (void)replaceTabsWithSpacesOfWidth:(int)tabWidth;
+- (void)replaceTabsWithSpacesOfWidth:(NSInteger)tabWidth;
 + (NSMutableString*)newShortLivedStringFromFile:(NSString*)filename;
 + (NSMutableString*)newShortLivedStringFromData:(NSMutableData*)data ofGuessedEncoding:(NSStringEncoding*)encoding 
 									   withPath:(const char*)aPath orWithFSRef:(const FSRef*)fsRef;
@@ -83,9 +81,6 @@ CFDateFormatterRef simplenoteDateFormatter(int lowPrecision);
 + (NSCharacterSet*)labelSeparatorCharacterSet;
 + (NSCharacterSet*)listBulletsCharacterSet;
 
-#if MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_5
-+ (id)newlineCharacterSet;
-#endif
 
 @end
 
diff --git a/NSString_NV.m b/NSString_NV.m
@@ -272,15 +272,6 @@ - (BOOL)isAMachineDirective {
 	
 }
 
-#if MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_5
-- (NSString*)stringByReplacingOccurrencesOfString:(NSString*)stringToReplace withString:(NSString*)replacementString {
-	//NSLog(@"NSString_NV: %s", _cmd);
-	NSMutableString *sanitizedName = [[self mutableCopy] autorelease];
-	[sanitizedName replaceOccurrencesOfString:stringToReplace withString:replacementString options:NSLiteralSearch range:NSMakeRange(0, [sanitizedName length])];
-
-	return sanitizedName;
-}
-#endif
 
 - (NSString*)fourCharTypeString {
 	if ([[self dataUsingEncoding:NSMacOSRomanStringEncoding allowLossyConversion:YES] length] >= 4) {
@@ -619,13 +610,20 @@ - (NSInteger)isPairedCharacterWithMatchString:(NSString **)matchString{
     if (self.length==1) {
         unichar ch=[self characterAtIndex:0];
         NSInteger chNum=(NSInteger)ch;
-//        NSLog(@"ch :%ld Is(:%d >%@<",chNum,(unsigned int)ch==40,self);
-        if (chNum==34){//[@"\"" isEqualToString:self]) {
+        if (chNum==34){
              *matchString=@"\"";
             return 1;
         }
-//         NSLog(@"ch is ]:%d",ch==[@"]" characterAtIndex:0]);
-        if ([[NSCharacterSet characterSetWithCharactersInString:@"([{"]characterIsMember:ch]){
+        static NSCharacterSet *leftSidePairCharacterSet;
+        if(!leftSidePairCharacterSet){
+            leftSidePairCharacterSet=[[NSCharacterSet characterSetWithCharactersInString:@"([{"] retain];
+        }
+        static NSCharacterSet *rightSidePairCharacterSet;
+        if(!rightSidePairCharacterSet){
+            rightSidePairCharacterSet=[[NSCharacterSet characterSetWithCharactersInString:@")]}"] retain];
+        }
+        
+        if ([leftSidePairCharacterSet characterIsMember:ch]){
             if (chNum==91){//[@"[" isEqualToString:self]) {
                 *matchString=@"]";
     //            return @"]";
@@ -637,7 +635,7 @@ - (NSInteger)isPairedCharacterWithMatchString:(NSString **)matchString{
     //            return @"}";
             }
             return 2;
-        }else if ([[NSCharacterSet characterSetWithCharactersInString:@")]}"]characterIsMember:ch]) {
+        }else if ([rightSidePairCharacterSet characterIsMember:ch]) {
              if (chNum==93){//if ([@"]" isEqualToString:self]) {
                 *matchString=@"[";
             }else  if (chNum==41){//if ([@")" isEqualToString:self]) {
@@ -657,17 +655,17 @@ - (NSInteger)isPairedCharacterWithMatchString:(NSString **)matchString{
 
 @implementation NSMutableString (NV)
 
-- (void)replaceTabsWithSpacesOfWidth:(int)tabWidth {
+- (void)replaceTabsWithSpacesOfWidth:(NSInteger)tabWidth {
 	NSAssert(tabWidth < 50 && tabWidth > 0, @"that's a ridiculous tab width");
 	
 	@try {
 		NSRange tabRange, nextRange = NSMakeRange(0, [self length]);
 		while ((tabRange = [self rangeOfString:@"\t" options:NSLiteralSearch range:nextRange]).location != NSNotFound) {
 			
-			int numberOfSpacesPerTab = tabWidth;
-			int locationOnLine = tabRange.location - [self lineRangeForRange:tabRange].location;
+			NSInteger numberOfSpacesPerTab = tabWidth;
+			NSUInteger locationOnLine = tabRange.location - [self lineRangeForRange:tabRange].location;
 			if (numberOfSpacesPerTab != 0) {
-				int numberOfSpacesLess = locationOnLine % numberOfSpacesPerTab;
+				NSUInteger numberOfSpacesLess = locationOnLine % numberOfSpacesPerTab;
 				numberOfSpacesPerTab = numberOfSpacesPerTab - numberOfSpacesLess;
 			}
 			//NSLog(@"loc on line: %d, numberOfSpacesPerTab: %d", locationOnLine, numberOfSpacesPerTab);
@@ -810,11 +808,6 @@ + (NSCharacterSet*)listBulletsCharacterSet {
 	
 }
 
-#if MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_5
-+ (id)newlineCharacterSet {
-	return [NSCharacterSet characterSetWithCharactersInString:[NSString stringWithFormat:@"%C%C%C",0x000A,0x000D,0x0085]];
-}
-#endif
 
 @end
 
diff --git a/NoteObject.m b/NoteObject.m
@@ -1756,11 +1756,8 @@ -(void)odbEditor:(ODBEditor *)editor didModifyFile:(NSString *)path newFileLocat
 }
 -(void)odbEditor:(ODBEditor *)editor didClosefile:(NSString *)path context:(NSDictionary *)context {
 	//remove the temp file	
-#if MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_5
 	[[NSFileManager defaultManager] removeItemAtPath:path error:NULL];
-#else
-	[[NSFileManager defaultManager] removeFileAtPath:path handler:nil];
-#endif
+
 }
 
 - (NSRange)nextRangeForWords:(NSArray*)words options:(unsigned)opts range:(NSRange)inRange {

Original file line number	Diff line number	Diff line change
`@@ -22,12 +22,13 @@`
`22`	`22`	`@implementation DiskUUIDEntry`
`23`	`23`
`24`	`24`	`- (id)initWithUUIDRef:(CFUUIDRef)aUUIDRef {`
`25`		`- if ([super init]) {`
	`25`	`+ if (self=[super init]) {`
`26`	`26`	`NSAssert(aUUIDRef != nil, @"need a real UUID");`
`27`	`27`	`uuidRef = CFRetain(aUUIDRef);`
`28`	`28`	`lastAccessed = [[NSDate date] retain];`
	`29`	`+ return self;`
`29`	`30`	`}`
`30`		`- return self;`
	`31`	`+ return nil;`
`31`	`32`	`}`
`32`	`33`
`33`	`34`	`- (void)dealloc {`
`@@ -48,7 +49,7 @@ - (void)encodeWithCoder:(NSCoder *)coder {`
`48`	`49`	`- (id)initWithCoder:(NSCoder*)decoder {`
`49`	`50`	`NSAssert([decoder allowsKeyedCoding], @"keyed-decoding only!");`
`50`	`51`
`51`		`- if ([super init]) {`
	`52`	`+ if (self=[super init]) {`
`52`	`53`
`53`	`54`	`lastAccessed = [[decoder decodeObjectForKey:VAR_STR(lastAccessed)] retain];`
`54`	`55`
`@@ -59,8 +60,11 @@ - (id)initWithCoder:(NSCoder*)decoder {`
`59`	`60`	`}`
`60`	`61`
`61`	`62`	`if (!uuidRef) return nil;`
	`63`	`+`
	`64`	`+`
	`65`	`+ return self;`
`62`	`66`	`}`
`63`		`- return self;`
	`67`	`+ return nil;`
`64`	`68`	`}`
`65`	`69`
`66`	`70`	`- (void)see {`
Original file line number	Diff line number	Diff line change
`@@ -18,10 +18,10 @@`
`18`	`18`	`{`
`19`	`19`	`IBOutlet NSTextField *labelText;`
`20`	`20`	`NSInteger lastNotesNumber;`
`21`		`- NSColor *bgCol;`
	`21`	`+// NSColor *bgCol;`
`22`	`22`	`}`
`23`	`23`
`24`	`24`	`- (void)setLabelStatus:(NSInteger)notesNumber;`
`25`		`-- (void)setBackgroundColor:(NSColor *)inColor;`
	`25`	`+//- (void)setBackgroundColor:(NSColor *)inColor;`
`26`	`26`
`27`	`27`	`@end`
Original file line number	Diff line number	Diff line change
`@@ -42,11 +42,13 @@ - (id)initWithBundleID:(NSString)aBundleIdentifier resolvedURL:(NSURL)aURL {`
`42`	`42`	`if (!bundleIdentifier) {`
`43`	`43`	`if (!(bundleIdentifier = [[[NSBundle bundleWithPath:[aURL path]] bundleIdentifier] copy])) {`
`44`	`44`	`NSLog(@"initWithBundleID:resolvedURL: URL does not seem to point to a valid bundle");`
	`45`	`+ [self dealloc];`
`45`	`46`	`return nil;`
`46`	`47`	`}`
`47`	`48`	`}`
`48`	`49`	`return self;`
`49`	`50`	`}`
	`51`	`+ [self dealloc];`
`50`	`52`	`return nil;`
`51`	`53`	`}`
`52`	`54`
Original file line number	Diff line number	Diff line change
`@@ -75,12 +75,14 @@ - (id)initWithNotes:(NSMutableArray)notes deletedNotes:(NSMutableSet)antiNotes`
`75`	`75`
`76`	`76`	`if (![prefs encryptDataInNewSession:notesData]) {`
`77`	`77`	`NSLog(@"Couldn't encrypt data!");`
	`78`	`+ [self dealloc];`
`78`	`79`	`return nil;`
`79`	`80`	`}`
`80`	`81`	`}`
`81`	`82`
`82`	`83`	`if (![notesData length]) {`
`83`	`84`	`NSLog(@"%@: empty notesData; returning nil", NSStringFromSelector(_cmd));`
	`85`	`+ [self dealloc];`
`84`	`86`	`return nil;`
`85`	`87`	`}`
`86`	`88`	`return self;`