From 9004533ba1d84d670a77cbfc9eae401b66e9dd0e Mon Sep 17 00:00:00 2001 From: rowanbeentje Date: Sat, 9 Jan 2010 01:38:23 +0000 Subject: - 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 --- Source/SPCSVParser.h | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) (limited to 'Source/SPCSVParser.h') diff --git a/Source/SPCSVParser.h b/Source/SPCSVParser.h index 0f1a8a20..63f7fef5 100644 --- a/Source/SPCSVParser.h +++ b/Source/SPCSVParser.h @@ -52,11 +52,11 @@ { NSMutableString *csvString; - long trimPosition; - long parserPosition; - long totalLengthParsed; - long csvStringLength; - int fieldCount; + NSUInteger trimPosition; + NSUInteger parserPosition; + NSUInteger totalLengthParsed; + NSUInteger csvStringLength; + NSInteger fieldCount; NSString *nullReplacementString; NSString *fieldEndString; @@ -67,10 +67,10 @@ NSString *escapedLineEndString; NSString *escapedFieldQuoteString; NSString *escapedEscapeString; - int fieldEndLength; - int lineEndLength; - int fieldQuoteLength; - int escapeLength; + NSInteger fieldEndLength; + NSInteger lineEndLength; + NSInteger fieldQuoteLength; + NSInteger escapeLength; NSCharacterSet *skipCharacterSet; NSScanner *csvScanner; @@ -89,8 +89,8 @@ /* Basic information */ - (NSUInteger) length; - (NSString *) string; -- (long) parserPosition; -- (long) totalLengthParsed; +- (NSUInteger) parserPosition; +- (NSUInteger) totalLengthParsed; /* Setting the terminator, quote, escape and null character replacement strings */ - (void) setFieldTerminatorString:(NSString *)theString convertDisplayStrings:(BOOL)convertString; @@ -102,7 +102,7 @@ /* Init and internal update methods */ - (void) _initialiseCSVParserDefaults; - (void) _moveParserPastSkippableCharacters; -- (long) _getDistanceToString:(NSString *)theString; +- (NSUInteger) _getDistanceToString:(NSString *)theString; - (void) _updateState; - (NSString *) _convertDisplayString:(NSString *)theString; - (void) _updateSkipCharacterSet; -- cgit v1.2.3