diff options
| -rw-r--r-- | Source/GeneratePreviewForURL.m | 2 | ||||
| -rw-r--r-- | Source/SPAppController.m | 2 | ||||
| -rw-r--r-- | Source/SPCustomQuery.m | 4 | ||||
| -rw-r--r-- | Source/SPGrowlController.m | 1 | ||||
| -rw-r--r-- | Source/SPStringAdditions.m | 15 | ||||
| -rw-r--r-- | sequel-pro.xcodeproj/project.pbxproj | 1 |
6 files changed, 21 insertions, 4 deletions
diff --git a/Source/GeneratePreviewForURL.m b/Source/GeneratePreviewForURL.m index 3bc5de43..91bd65e6 100644 --- a/Source/GeneratePreviewForURL.m +++ b/Source/GeneratePreviewForURL.m @@ -256,7 +256,7 @@ OSStatus GeneratePreviewForURL(void *thisInterface, QLPreviewRequestRef preview, } // Get info.plist data as dictionary NSDictionary *sessionSpf; - NSData *pData = [NSData dataWithContentsOfFile:spfPath options:NSUncachedRead error:&readError]; + pData = [NSData dataWithContentsOfFile:spfPath options:NSUncachedRead error:&readError]; sessionSpf = [[NSPropertyListSerialization propertyListFromData:pData mutabilityOption:NSPropertyListImmutable format:&format errorDescription:&convError] retain]; diff --git a/Source/SPAppController.m b/Source/SPAppController.m index c0209fca..2f77b533 100644 --- a/Source/SPAppController.m +++ b/Source/SPAppController.m @@ -1852,7 +1852,7 @@ YY_BUFFER_STATE yy_scan_string (const char *); NSLocalizedString(@"Data Table", @"data table menu item label"), NSLocalizedString(@"General", @"general menu item label"),nil]; - NSInteger k = 0; + NSUInteger k = 0; BOOL bundleOtherThanGeneralFound = NO; for(NSString* scope in scopes) { diff --git a/Source/SPCustomQuery.m b/Source/SPCustomQuery.m index c3e83ff4..3ee7dc4f 100644 --- a/Source/SPCustomQuery.m +++ b/Source/SPCustomQuery.m @@ -534,7 +534,7 @@ SEL callbackMethod = NULL; NSString *taskButtonString; - NSInteger i, totalQueriesRun = 0, totalAffectedRows = 0; + NSUInteger i, totalQueriesRun = 0, totalAffectedRows = 0; double executionTime = 0; NSInteger firstErrorOccuredInQuery = -1; BOOL suppressErrorSheet = NO; @@ -3641,7 +3641,7 @@ */ - (IBAction)filterQueryFavorites:(id)sender { - NSUInteger i; + NSInteger i; NSMenu *menu = [queryFavoritesButton menu]; NSString *searchPattern = [queryFavoritesSearchField stringValue]; diff --git a/Source/SPGrowlController.m b/Source/SPGrowlController.m index 4b256de0..a3d42526 100644 --- a/Source/SPGrowlController.m +++ b/Source/SPGrowlController.m @@ -25,6 +25,7 @@ #import "SPGrowlController.h" #import "SPDatabaseDocument.h" +#import "SPWindowController.h" #include <mach/mach_time.h> diff --git a/Source/SPStringAdditions.m b/Source/SPStringAdditions.m index 421ef4c1..517875f7 100644 --- a/Source/SPStringAdditions.m +++ b/Source/SPStringAdditions.m @@ -27,6 +27,21 @@ #import "RegexKitLite.h" #import "SPDatabaseDocument.h" +// Defined to suppress warnings +@interface NSObject (SPBundleMethods) + +- (NSString *)lastBundleBlobFilesDirectory; +- (void)setLastBundleBlobFilesDirectory:(NSString *)path; + +@end + +// Defined to suppress warnings +@interface NSObject (SPWindowControllerTabMethods) + +- (id)selectedTableDocument; + +@end + @interface NSString (PrivateAPI) - (NSInteger)smallestOf:(NSInteger)a andOf:(NSInteger)b andOf:(NSInteger)c; diff --git a/sequel-pro.xcodeproj/project.pbxproj b/sequel-pro.xcodeproj/project.pbxproj index 3538339b..802f9cf2 100644 --- a/sequel-pro.xcodeproj/project.pbxproj +++ b/sequel-pro.xcodeproj/project.pbxproj @@ -2717,6 +2717,7 @@ isa = PBXProject; buildConfigurationList = C05733CB08A9546B00998B17 /* Build configuration list for PBXProject "sequel-pro" */; compatibilityVersion = "Xcode 3.1"; + developmentRegion = English; hasScannedForEncodings = 1; knownRegions = ( English, |