- 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

1 files changed, 18 insertions, 18 deletions

diff --git a/Source/SPSQLParser.h b/Source/SPSQLParser.h
index 9625f8a4..a3ae4224 100644
--- a/Source/SPSQLParser.h
+++ b/Source/SPSQLParser.h
@@ -61,11 +61,11 @@
 	id string;
 	unichar *stringCharCache;
 	unichar parsedToChar;
-	long parsedToPosition;
-	long charCacheStart;
-	long charCacheEnd;
+	NSInteger parsedToPosition;
+	NSInteger charCacheStart;
+	NSInteger charCacheEnd;
 	NSString *delimiter;
-	int delimiterLength;
+	NSInteger delimiterLength;
 	BOOL charIsDelimiter;
 	BOOL isDelimiterCommand;
 	BOOL ignoreCommentStrings;
@@ -223,17 +223,17 @@ typedef enum _SPCommentTypes {
 /*
  * Methods used internally by this class to power the methods above:
  */
-- (long) firstOccurrenceOfCharacter:(unichar)character ignoringQuotedStrings:(BOOL)ignoreQuotedStrings;
-- (long) firstOccurrenceOfCharacter:(unichar)character afterIndex:(long)startIndex ignoringQuotedStrings:(BOOL)ignoreQuotedStrings;
-- (long) firstOccurrenceOfCharacter:(unichar)character afterIndex:(long)startIndex skippingBrackets:(BOOL)skipBrackets ignoringQuotedStrings:(BOOL)ignoreQuotedStrings;
-- (long) firstOccurrenceInSqlOfCharacter:(unichar)character afterIndex:(long)startIndex skippingBrackets:(BOOL)skipBrackets ignoringQuotedStrings:(BOOL)ignoreQuotedStrings;
-- (long) endIndexOfStringQuotedByCharacter:(unichar)quoteCharacter startingAtIndex:(long)index;
-- (long) endIndexOfCommentOfType:(SPCommentType)commentType startingAtIndex:(long)index;
+- (NSUInteger) firstOccurrenceOfCharacter:(unichar)character ignoringQuotedStrings:(BOOL)ignoreQuotedStrings;
+- (NSUInteger) firstOccurrenceOfCharacter:(unichar)character afterIndex:(NSInteger)startIndex ignoringQuotedStrings:(BOOL)ignoreQuotedStrings;
+- (NSUInteger) firstOccurrenceOfCharacter:(unichar)character afterIndex:(NSInteger)startIndex skippingBrackets:(BOOL)skipBrackets ignoringQuotedStrings:(BOOL)ignoreQuotedStrings;
+- (NSUInteger) firstOccurrenceInSqlOfCharacter:(unichar)character afterIndex:(NSInteger)startIndex skippingBrackets:(BOOL)skipBrackets ignoringQuotedStrings:(BOOL)ignoreQuotedStrings;
+- (NSUInteger) endIndexOfStringQuotedByCharacter:(unichar)quoteCharacter startingAtIndex:(NSInteger)index;
+- (NSUInteger) endIndexOfCommentOfType:(SPCommentType)commentType startingAtIndex:(NSInteger)index;
 
 /*
  * Cacheing methods to enable a faster alternative to characterAtIndex: when walking strings, and overrides to update.
  */
-- (unichar) charAtIndex:(long)index;
+- (unichar) charAtIndex:(NSInteger)index;
 - (void) clearCharCache;
 - (void) deleteCharactersInRange:(NSRange)aRange;
 - (void) insertString:(NSString *)aString atIndex:(NSUInteger)anIndex;
@@ -241,19 +241,19 @@ typedef enum _SPCommentTypes {
 /* Required and primitive methods to allow subclassing class cluster */
 #pragma mark -
 - (id) init;
-- (id) initWithBytes:(const void *)bytes length:(unsigned int)length encoding:(NSStringEncoding)encoding;
-- (id) initWithBytesNoCopy:(void *)bytes length:(unsigned int)length encoding:(NSStringEncoding)encoding freeWhenDone:(BOOL)flag;
-- (id) initWithCapacity:(unsigned int)capacity;
-- (id) initWithCharactersNoCopy:(unichar *)chars length:(unsigned int)length freeWhenDone:(BOOL)flag;
+- (id) initWithBytes:(const void *)bytes length:(NSUInteger)length encoding:(NSStringEncoding)encoding;
+- (id) initWithBytesNoCopy:(void *)bytes length:(NSUInteger)length encoding:(NSStringEncoding)encoding freeWhenDone:(BOOL)flag;
+- (id) initWithCapacity:(NSUInteger)capacity;
+- (id) initWithCharactersNoCopy:(unichar *)chars length:(NSUInteger)length freeWhenDone:(BOOL)flag;
 - (id) initWithContentsOfFile:(id)path;
 - (id) initWithContentsOfFile:(NSString *)path encoding:(NSStringEncoding)enc error:(NSError **)error;
 - (id) initWithCString:(const char *)nullTerminatedCString encoding:(NSStringEncoding)encoding;
 - (id) initWithFormat:(NSString *)format, ...;
 - (id) initWithFormat:(NSString *)format arguments:(va_list)argList;
-- (unsigned int) length;
-- (unichar) characterAtIndex:(unsigned int)index;
+- (NSUInteger) length;
+- (unichar) characterAtIndex:(NSUInteger)index;
 - (id) description;
-- (unsigned int) replaceOccurrencesOfString:(NSString *)target withString:(NSString *)replacement options:(unsigned)opts range:(NSRange)searchRange;
+- (NSUInteger) replaceOccurrencesOfString:(NSString *)target withString:(NSString *)replacement options:(NSUInteger)opts range:(NSRange)searchRange;
 - (void) setString:(NSString *)string;
 - (void) replaceCharactersInRange:(NSRange)range withString:(NSString *)string;
 - (void) dealloc;