diff options
| author | rowanbeentje <rowan@beent.je> | 2010-01-09 01:38:23 +0000 |
|---|---|---|
| committer | rowanbeentje <rowan@beent.je> | 2010-01-09 01:38:23 +0000 |
| commit | 9004533ba1d84d670a77cbfc9eae401b66e9dd0e (patch) | |
| tree | 8d16781c788a964e45102b66ffc04b77fa1fb9e9 /Source/ICUTemplateMatcher.m | |
| parent | fcb6ce6cbb0bd4179e22a3dd17dd12e4a3529cdd (diff) | |
| download | sequelpro-9004533ba1d84d670a77cbfc9eae401b66e9dd0e.tar.gz sequelpro-9004533ba1d84d670a77cbfc9eae401b66e9dd0e.tar.bz2 sequelpro-9004533ba1d84d670a77cbfc9eae401b66e9dd0e.zip | |
- Upgrade Sequel Pro to be compiled as a 3-way PPC/i386/x86_64 binary for release builds, including a large number of 64bit compatibility upgrades and tweaks
- Upgrade RegexKitLite to 3.3
Diffstat (limited to 'Source/ICUTemplateMatcher.m')
| -rw-r--r-- | Source/ICUTemplateMatcher.m | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Source/ICUTemplateMatcher.m b/Source/ICUTemplateMatcher.m index dbeb49aa..8fcdb73c 100644 --- a/Source/ICUTemplateMatcher.m +++ b/Source/ICUTemplateMatcher.m @@ -81,7 +81,7 @@ NSString *matchType = nil; NSRange mrkrSubRange = [matchString rangeOfRegex:regex options:RKLNoOptions inRange:localRange capture:1 error:NULL]; BOOL isMarker = (mrkrSubRange.length > 0); // only matches if match has marker-delimiters - int offset = 0; + NSInteger offset = 0; if (isMarker) { matchType = MARKER_TYPE_MARKER; } else { @@ -99,7 +99,7 @@ NSArray *markerComponents = [self argumentsFromString:markerString]; if (markerComponents && [markerComponents count] > 0) { [markerInfo setObject:[markerComponents objectAtIndex:0] forKey:MARKER_NAME_KEY]; - int count = [markerComponents count]; + NSInteger count = [markerComponents count]; if (count > 1) { [markerInfo setObject:[markerComponents subarrayWithRange:NSMakeRange(1, count - 1)] forKey:MARKER_ARGUMENTS_KEY]; @@ -130,7 +130,7 @@ NSArray *filterComponents = [self argumentsFromString:filterString]; if (filterComponents && [filterComponents count] > 0) { [markerInfo setObject:[filterComponents objectAtIndex:0] forKey:MARKER_FILTER_KEY]; - int count = [filterComponents count]; + NSInteger count = [filterComponents count]; if (count > 1) { [markerInfo setObject:[filterComponents subarrayWithRange:NSMakeRange(1, count - 1)] forKey:MARKER_FILTER_ARGUMENTS_KEY]; @@ -151,7 +151,7 @@ NSString *argsPattern = @"\"(.*?)(?<!\\\\)\"|'(.*?)(?<!\\\\)'|(\\S+)"; NSMutableArray *args = [NSMutableArray array]; - int location = 0; + NSInteger location = 0; while (location != NSNotFound) { NSRange searchRange = NSMakeRange(location, [argString length] - location); NSRange entireRange = [argString rangeOfRegex:argsPattern options:RKLNoOptions |