From 5459c4a47b53e395b7a1b9e6959376eafc1a968a Mon Sep 17 00:00:00 2001 From: rowanbeentje Date: Tue, 27 Mar 2012 23:41:01 +0000 Subject: - Clean up SPMySQL and QueryKit inclusion and search methods, which should fix nightly builds - Fix warnings --- .../QueryKit/QueryKit.xcodeproj/project.pbxproj | 37 ++++++++++++--------- Frameworks/SPMySQLFramework/Resources/Info.plist | 10 ++---- .../SPMySQLFramework.xcodeproj/project.pbxproj | 3 +- Resources/English.lproj/Localizable.strings | Bin 227904 -> 228930 bytes Source/SPCSVExporter.m | 2 +- Source/SPConnectionController.h | 3 +- Source/SPConnectionController.m | 4 --- Source/SPConnectionDelegate.h | 6 +--- Source/SPConnectionDelegate.m | 2 +- Source/SPCopyTable.m | 4 --- Source/SPCustomQuery.m | 4 +-- Source/SPDataImport.m | 2 +- Source/SPDatabaseCopy.m | 2 +- Source/SPDatabaseData.m | 4 --- Source/SPDatabaseDocument.m | 4 --- Source/SPDatabaseInfo.m | 4 --- Source/SPDatabaseRename.m | 4 --- Source/SPDatabaseStructure.h | 5 ++- Source/SPDatabaseStructure.m | 4 --- Source/SPDatabaseViewController.m | 4 +-- Source/SPExportController.m | 2 +- Source/SPExportFileUtilities.m | 2 +- Source/SPExportInitializer.m | 2 +- Source/SPExtendedTableInfo.m | 2 +- Source/SPFieldEditorController.m | 4 --- Source/SPFieldMapperController.m | 4 --- Source/SPIndexesController.m | 4 --- Source/SPNavigatorController.m | 2 +- Source/SPProcessListController.m | 2 +- Source/SPSQLExporter.m | 2 +- Source/SPSSHTunnel.h | 5 --- Source/SPSSHTunnel.m | 4 --- Source/SPServerVariablesController.m | 2 +- Source/SPTableContent.m | 4 +-- Source/SPTableContentDataSource.m | 3 +- Source/SPTableContentDelegate.m | 2 +- Source/SPTableCopy.m | 4 --- Source/SPTableData.m | 4 --- Source/SPTableRelations.m | 2 +- Source/SPTableStructure.m | 4 --- Source/SPTableStructureDelegate.m | 4 --- Source/SPTableTriggers.m | 2 +- Source/SPTablesList.m | 4 --- Source/SPTextView.m | 4 --- Source/SPXMLExporter.m | 2 +- Source/SPXMLExporterDelegate.m | 2 +- sequel-pro.xcodeproj/project.pbxproj | 22 +++++++----- 47 files changed, 66 insertions(+), 142 deletions(-) diff --git a/Frameworks/QueryKit/QueryKit.xcodeproj/project.pbxproj b/Frameworks/QueryKit/QueryKit.xcodeproj/project.pbxproj index dfbaadcd..1c4b9205 100644 --- a/Frameworks/QueryKit/QueryKit.xcodeproj/project.pbxproj +++ b/Frameworks/QueryKit/QueryKit.xcodeproj/project.pbxproj @@ -360,7 +360,11 @@ 17E5952D14F302740054EE08 /* Distribution */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = "$(ARCHS_STANDARD_32_64_BIT)"; + ARCHS = ( + i386, + ppc, + x86_64, + ); GCC_C_LANGUAGE_STANDARD = gnu99; GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = "Source/QueryKit-Prefix.pch"; @@ -370,8 +374,8 @@ INFOPLIST_FILE = Resources/Info.plist; INFOPLIST_PREFIX_HEADER = ""; PREBINDING = NO; - SDKROOT = macosx10.6; - VALID_ARCHS = "i386 x86_64"; + SDKROOT = macosx10.5; + VALID_ARCHS = "i386 ppc x86_64"; }; name = Distribution; }; @@ -540,11 +544,6 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; - ARCHS = ( - i386, - x86_64, - ppc, - ); DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; FRAMEWORK_VERSION = A; GCC_GENERATE_DEBUGGING_SYMBOLS = NO; @@ -576,8 +575,6 @@ INFOPLIST_FILE = Resources/Info.plist; INSTALL_PATH = "@executable_path/../Frameworks"; PRODUCT_NAME = QueryKit; - SDKROOT = macosx10.5; - VALID_ARCHS = "ppc i386 x86_64"; WRAPPER_EXTENSION = framework; }; name = Release; @@ -585,7 +582,11 @@ 1DEB91B208733DA50010E9CD /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = "$(ARCHS_STANDARD_32_64_BIT)"; + ARCHS = ( + i386, + ppc, + x86_64, + ); GCC_C_LANGUAGE_STANDARD = gnu99; GCC_OPTIMIZATION_LEVEL = 0; GCC_PRECOMPILE_PREFIX_HEADER = YES; @@ -597,15 +598,19 @@ INFOPLIST_PREFIX_HEADER = ""; ONLY_ACTIVE_ARCH = YES; PREBINDING = NO; - SDKROOT = macosx10.6; - VALID_ARCHS = "i386 x86_64"; + SDKROOT = macosx10.5; + VALID_ARCHS = "i386 ppc x86_64"; }; name = Debug; }; 1DEB91B308733DA50010E9CD /* Release */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = "$(ARCHS_STANDARD_32_64_BIT)"; + ARCHS = ( + i386, + ppc, + x86_64, + ); GCC_C_LANGUAGE_STANDARD = gnu99; GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = "Source/QueryKit-Prefix.pch"; @@ -615,8 +620,8 @@ INFOPLIST_FILE = Resources/Info.plist; INFOPLIST_PREFIX_HEADER = ""; PREBINDING = NO; - SDKROOT = macosx10.6; - VALID_ARCHS = "i386 x86_64"; + SDKROOT = macosx10.5; + VALID_ARCHS = "i386 ppc x86_64"; }; name = Release; }; diff --git a/Frameworks/SPMySQLFramework/Resources/Info.plist b/Frameworks/SPMySQLFramework/Resources/Info.plist index 392b428f..84b64d04 100644 --- a/Frameworks/SPMySQLFramework/Resources/Info.plist +++ b/Frameworks/SPMySQLFramework/Resources/Info.plist @@ -5,15 +5,11 @@ CFBundleDevelopmentRegion English CFBundleExecutable - ${EXECUTABLE_NAME} - CFBundleIconFile - + SPMySQL CFBundleIdentifier - com.yourcompany.${PRODUCT_NAME:rfc1034Identifier} + com.sequelpro.spmysql CFBundleInfoDictionaryVersion 6.0 - CFBundleName - ${PRODUCT_NAME} CFBundlePackageType FMWK CFBundleShortVersionString @@ -22,7 +18,5 @@ SPDT CFBundleVersion 1 - NSPrincipalClass - diff --git a/Frameworks/SPMySQLFramework/SPMySQLFramework.xcodeproj/project.pbxproj b/Frameworks/SPMySQLFramework/SPMySQLFramework.xcodeproj/project.pbxproj index 2f8d300c..ef6d538c 100644 --- a/Frameworks/SPMySQLFramework/SPMySQLFramework.xcodeproj/project.pbxproj +++ b/Frameworks/SPMySQLFramework/SPMySQLFramework.xcodeproj/project.pbxproj @@ -49,7 +49,7 @@ 5884165614D2306A0078027F /* SPMySQLResult.m in Sources */ = {isa = PBXBuildFile; fileRef = 5884165414D2306A0078027F /* SPMySQLResult.m */; }; 58C006C814E0B18A00AC489A /* SPMySQLUtilities.h in Headers */ = {isa = PBXBuildFile; fileRef = 58C006C714E0B18A00AC489A /* SPMySQLUtilities.h */; }; 58C008CD14E2AC7D00AC489A /* SPMySQLConnectionProxy.h in Headers */ = {isa = PBXBuildFile; fileRef = 58C008CC14E2AC7D00AC489A /* SPMySQLConnectionProxy.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 58C009D514E31D3800AC489A /* SPMySQLStringAdditions.h in Headers */ = {isa = PBXBuildFile; fileRef = 58C009D314E31D3800AC489A /* SPMySQLStringAdditions.h */; }; + 58C009D514E31D3800AC489A /* SPMySQLStringAdditions.h in Headers */ = {isa = PBXBuildFile; fileRef = 58C009D314E31D3800AC489A /* SPMySQLStringAdditions.h */; settings = {ATTRIBUTES = (Public, ); }; }; 58C009D614E31D3800AC489A /* SPMySQLStringAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = 58C009D414E31D3800AC489A /* SPMySQLStringAdditions.m */; }; 58C00AA914E4869C00AC489A /* Max Packet Size.h in Headers */ = {isa = PBXBuildFile; fileRef = 58C00AA714E4869C00AC489A /* Max Packet Size.h */; settings = {ATTRIBUTES = (Public, ); }; }; 58C00AAA14E4869C00AC489A /* Max Packet Size.m in Sources */ = {isa = PBXBuildFile; fileRef = 58C00AA814E4869C00AC489A /* Max Packet Size.m */; }; @@ -516,6 +516,7 @@ GCC_MODEL_TUNING = G5; GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = Source/SPMySQLFramework_Prefix.pch; + GENERATE_PKGINFO_FILE = YES; INFOPLIST_FILE = Resources/Info.plist; INSTALL_PATH = "@executable_path/../Frameworks"; LD_DYLIB_INSTALL_NAME = "$(DYLIB_INSTALL_NAME_BASE:standardizepath)/$(EXECUTABLE_PATH)"; diff --git a/Resources/English.lproj/Localizable.strings b/Resources/English.lproj/Localizable.strings index 15865f90..8001d7ae 100644 Binary files a/Resources/English.lproj/Localizable.strings and b/Resources/English.lproj/Localizable.strings differ diff --git a/Source/SPCSVExporter.m b/Source/SPCSVExporter.m index c40bc8f0..aa5268c1 100644 --- a/Source/SPCSVExporter.m +++ b/Source/SPCSVExporter.m @@ -28,7 +28,7 @@ #import "SPTableData.h" #import "SPExportUtilities.h" #import "SPExportFile.h" -#import "SPMySQL.h" +#import @implementation SPCSVExporter diff --git a/Source/SPConnectionController.h b/Source/SPConnectionController.h index a6b63b41..bc593685 100644 --- a/Source/SPConnectionController.h +++ b/Source/SPConnectionController.h @@ -24,6 +24,7 @@ // More info at #import "SPConnectionControllerDelegateProtocol.h" +#import #ifndef SP_REFACTOR /* headers */ #import "SPFavoritesOutlineView.h" @@ -50,7 +51,7 @@ @end #endif -@interface SPConnectionController : NSViewController +@interface SPConnectionController : NSViewController { id delegate; diff --git a/Source/SPConnectionController.m b/Source/SPConnectionController.m index 43dc8004..eea43ba9 100644 --- a/Source/SPConnectionController.m +++ b/Source/SPConnectionController.m @@ -25,11 +25,7 @@ #import "SPConnectionController.h" #import "SPDatabaseDocument.h" -#ifndef SP_REFACTOR -#import "SPMySQL.h" -#else #import -#endif #ifndef SP_REFACTOR /* headers */ #import "SPAppController.h" diff --git a/Source/SPConnectionDelegate.h b/Source/SPConnectionDelegate.h index f06bbc08..923f5a97 100644 --- a/Source/SPConnectionDelegate.h +++ b/Source/SPConnectionDelegate.h @@ -25,11 +25,7 @@ #import "SPDatabaseDocument.h" -#ifndef SP_REFACTOR -#import "SPMySQLConnectionDelegate.h" -#else -#import -#endif +#import @interface SPDatabaseDocument (SPConnectionDelegate) diff --git a/Source/SPConnectionDelegate.m b/Source/SPConnectionDelegate.m index 2936ba82..cfb4a8df 100644 --- a/Source/SPConnectionDelegate.m +++ b/Source/SPConnectionDelegate.m @@ -28,7 +28,7 @@ #import "SPQueryController.h" #import "SPKeychain.h" #import "SPAlertSheets.h" -#import "SPMySQLConstants.h" +#import @implementation SPDatabaseDocument (SPConnectionDelegate) diff --git a/Source/SPCopyTable.m b/Source/SPCopyTable.m index 637c3913..7d03926a 100644 --- a/Source/SPCopyTable.m +++ b/Source/SPCopyTable.m @@ -36,11 +36,7 @@ #import "SPBundleEditorController.h" #import "SPAppController.h" #import "SPTablesList.h" -#ifndef SP_REFACTOR -#import "SPMySQL.h" -#else #import -#endif NSInteger SPEditMenuCopy = 2001; NSInteger SPEditMenuCopyWithColumns = 2002; diff --git a/Source/SPCustomQuery.m b/Source/SPCustomQuery.m index b7f105eb..fd0e78f5 100644 --- a/Source/SPCustomQuery.m +++ b/Source/SPCustomQuery.m @@ -26,11 +26,9 @@ #import "SPCustomQuery.h" #import "SPSQLParser.h" #ifndef SP_REFACTOR /* headers */ -#import "SPMySQL.h" #import "SPGrowlController.h" -#else -#import #endif +#import #import "SPDataCellFormatter.h" #import "SPDatabaseDocument.h" #import "SPTablesList.h" diff --git a/Source/SPDataImport.m b/Source/SPDataImport.m index 7272948b..89c5b86e 100644 --- a/Source/SPDataImport.m +++ b/Source/SPDataImport.m @@ -39,8 +39,8 @@ #import "SPFieldMapperController.h" #import "SPFileHandle.h" #import "SPEncodingPopupAccessory.h" -#import "SPMySQL.h" +#import #import #define SP_FILE_READ_ERROR_STRING NSLocalizedString(@"File read error", @"File read error title (Import Dialog)") diff --git a/Source/SPDatabaseCopy.m b/Source/SPDatabaseCopy.m index 61412f76..ea45c4af 100644 --- a/Source/SPDatabaseCopy.m +++ b/Source/SPDatabaseCopy.m @@ -25,7 +25,7 @@ #import "SPDBActionCommons.h" #import "SPDatabaseCopy.h" #import "SPTableCopy.h" -#import "SPMySQL.h" +#import @implementation SPDatabaseCopy diff --git a/Source/SPDatabaseData.m b/Source/SPDatabaseData.m index 1ff4afa6..d7fa2eb8 100644 --- a/Source/SPDatabaseData.m +++ b/Source/SPDatabaseData.m @@ -26,11 +26,7 @@ #import "SPDatabaseData.h" #import "SPServerSupport.h" #import "SPDatabaseCharacterSets.h" -#ifndef SP_REFACTOR -#import "SPMySQL.h" -#else #import -#endif @interface SPDatabaseData (PrivateAPI) diff --git a/Source/SPDatabaseDocument.m b/Source/SPDatabaseDocument.m index a9365b52..ec7ada92 100644 --- a/Source/SPDatabaseDocument.m +++ b/Source/SPDatabaseDocument.m @@ -35,11 +35,7 @@ enum { #import "SPDatabaseDocument.h" #import "SPConnectionController.h" -#ifndef SP_REFACTOR -#import "SPMySQL.h" -#else #import -#endif #import "SPTablesList.h" #import "SPTableStructure.h" diff --git a/Source/SPDatabaseInfo.m b/Source/SPDatabaseInfo.m index 71dd489c..ea43f403 100644 --- a/Source/SPDatabaseInfo.m +++ b/Source/SPDatabaseInfo.m @@ -24,11 +24,7 @@ #import "SPDBActionCommons.h" #import "SPDatabaseInfo.h" -#ifndef SP_REFACTOR -#import "SPMySQL.h" -#else #import -#endif @implementation SPDatabaseInfo diff --git a/Source/SPDatabaseRename.m b/Source/SPDatabaseRename.m index 23ed2593..61186678 100644 --- a/Source/SPDatabaseRename.m +++ b/Source/SPDatabaseRename.m @@ -26,11 +26,7 @@ #import "SPDatabaseRename.h" #import "SPTableCopy.h" #import "SPDatabaseInfo.h" -#ifndef SP_REFACTOR -#import "SPMySQL.h" -#else #import -#endif @implementation SPDatabaseRename diff --git a/Source/SPDatabaseStructure.h b/Source/SPDatabaseStructure.h index 52e43ec8..32435a01 100644 --- a/Source/SPDatabaseStructure.h +++ b/Source/SPDatabaseStructure.h @@ -23,9 +23,12 @@ // // More info at + +#import + @class SPMySQLConnection, SPDatabaseDocument; -@interface SPDatabaseStructure : NSObject { +@interface SPDatabaseStructure : NSObject { SPDatabaseDocument *delegate; SPMySQLConnection *mySQLConnection; diff --git a/Source/SPDatabaseStructure.m b/Source/SPDatabaseStructure.m index f6174ab8..79e2cc5d 100644 --- a/Source/SPDatabaseStructure.m +++ b/Source/SPDatabaseStructure.m @@ -28,11 +28,7 @@ #import "SPConnectionDelegate.h" #import "SPTablesList.h" #import "RegexKitLite.h" -#ifndef SP_REFACTOR -#import "SPMySQL.h" -#else #import -#endif #import @interface SPDatabaseStructure (Private_API) diff --git a/Source/SPDatabaseViewController.m b/Source/SPDatabaseViewController.m index 4c1c6cac..84f94b9a 100644 --- a/Source/SPDatabaseViewController.m +++ b/Source/SPDatabaseViewController.m @@ -32,11 +32,9 @@ #import "SPTableData.h" #import "SPTablesList.h" #import "SPTableTriggers.h" -#ifdef SP_REFACTOR /* headers */ #import +#ifdef SP_REFACTOR /* headers */ #import "SPTableStructure.h" -#else -#import "SPMySQL.h" #endif @interface SPDatabaseDocument (SPDatabaseViewControllerPrivateAPI) diff --git a/Source/SPExportController.m b/Source/SPExportController.m index 95076ef2..0223386a 100644 --- a/Source/SPExportController.m +++ b/Source/SPExportController.m @@ -34,7 +34,7 @@ #import "SPExportFilenameUtilities.h" #import "SPExportFileNameTokenObject.h" #import "SPDatabaseDocument.h" -#import "SPMySQL.h" +#import // Constants static const NSUInteger SPExportUIPadding = 20; diff --git a/Source/SPExportFileUtilities.m b/Source/SPExportFileUtilities.m index 986c1a23..c14fd7e0 100644 --- a/Source/SPExportFileUtilities.m +++ b/Source/SPExportFileUtilities.m @@ -29,7 +29,7 @@ #import "SPExportFile.h" #import "SPDatabaseDocument.h" #import "SPCustomQuery.h" -#import "SPMySQL.h" +#import typedef enum { diff --git a/Source/SPExportInitializer.m b/Source/SPExportInitializer.m index 7751ddc5..b02ef927 100644 --- a/Source/SPExportInitializer.m +++ b/Source/SPExportInitializer.m @@ -42,7 +42,7 @@ #import "SPExportFileUtilities.h" #import "SPExportFilenameUtilities.h" #import "SPExportFileNameTokenObject.h" -#import "SPMySQL.h" +#import @implementation SPExportController (SPExportInitializer) diff --git a/Source/SPExtendedTableInfo.m b/Source/SPExtendedTableInfo.m index 52c7cff6..89403615 100644 --- a/Source/SPExtendedTableInfo.m +++ b/Source/SPExtendedTableInfo.m @@ -33,7 +33,7 @@ #import "SPAlertSheets.h" #import "SPTableStructure.h" #import "SPServerSupport.h" -#import "SPMySQL.h" +#import static NSString *SPUpdateTableTypeCurrentType = @"SPUpdateTableTypeCurrentType"; static NSString *SPUpdateTableTypeNewType = @"SPUpdateTableTypeNewType"; diff --git a/Source/SPFieldEditorController.m b/Source/SPFieldEditorController.m index d994e35b..3a4ee14c 100644 --- a/Source/SPFieldEditorController.m +++ b/Source/SPFieldEditorController.m @@ -35,11 +35,7 @@ #include #import "SPCustomQuery.h" #import "SPTableContent.h" -#ifndef SP_REFACTOR -#import "SPMySQLGeometryData.h" -#else #import -#endif @interface SPFieldEditorController (SPFieldEditorControllerDelegate) diff --git a/Source/SPFieldMapperController.m b/Source/SPFieldMapperController.m index 538b50eb..374bd3dd 100644 --- a/Source/SPFieldMapperController.m +++ b/Source/SPFieldMapperController.m @@ -31,11 +31,7 @@ #import "SPCategoryAdditions.h" #import "RegexKitLite.h" #import "SPDatabaseData.h" -#ifndef SP_REFACTOR -#import "SPMySQL.h" -#else #import -#endif #define SP_NUMBER_OF_RECORDS_STRING NSLocalizedString(@"%ld of %@%lu records", @"Label showing the index of the selected CSV row") diff --git a/Source/SPIndexesController.m b/Source/SPIndexesController.m index 20f22dd0..c3ef394e 100644 --- a/Source/SPIndexesController.m +++ b/Source/SPIndexesController.m @@ -28,11 +28,7 @@ #import "SPServerSupport.h" #import "SPTableContent.h" #import "SPTableData.h" -#ifndef SP_REFACTOR -#import "SPMySQL.h" -#else #import -#endif #import "SPDatabaseDocument.h" #import "SPTablesList.h" #import "SPTableView.h" diff --git a/Source/SPNavigatorController.m b/Source/SPNavigatorController.m index 2b27a598..359d7b17 100644 --- a/Source/SPNavigatorController.m +++ b/Source/SPNavigatorController.m @@ -33,7 +33,7 @@ #import "SPTooltip.h" #import "SPAppController.h" #import "SPDatabaseViewController.h" -#import "SPMySQL.h" +#import #import "SPDatabaseStructure.h" #import diff --git a/Source/SPProcessListController.m b/Source/SPProcessListController.m index 18263bb4..e2b1d471 100644 --- a/Source/SPProcessListController.m +++ b/Source/SPProcessListController.m @@ -27,7 +27,7 @@ #import "SPDatabaseDocument.h" #import "SPAlertSheets.h" #import "SPAppController.h" -#import "SPMySQL.h" +#import static const NSString *SPTableViewIDColumnIdentifier = @"Id"; diff --git a/Source/SPSQLExporter.m b/Source/SPSQLExporter.m index 8ba6c160..81e7756e 100644 --- a/Source/SPSQLExporter.m +++ b/Source/SPSQLExporter.m @@ -30,7 +30,7 @@ #import "SPExportFile.h" #import "SPTableData.h" #import "RegexKitLite.h" -#import "SPMySQL.h" +#import @interface SPSQLExporter () diff --git a/Source/SPSSHTunnel.h b/Source/SPSSHTunnel.h index 64edd3a2..0984cd43 100644 --- a/Source/SPSSHTunnel.h +++ b/Source/SPSSHTunnel.h @@ -23,13 +23,8 @@ // // More info at -#ifndef SP_REFACTOR -#import "SPMySQLConnectionProxy.h" -#import "SPMySQLConstants.h" -#else #import #import -#endif @interface SPSSHTunnel : NSObject { diff --git a/Source/SPSSHTunnel.m b/Source/SPSSHTunnel.m index 2820d1fd..aae71891 100644 --- a/Source/SPSSHTunnel.m +++ b/Source/SPSSHTunnel.m @@ -27,11 +27,7 @@ #import "RegexKitLite.h" #import "SPKeychain.h" #import "SPAlertSheets.h" -#ifndef SP_REFACTOR -#import "SPMySQL.h" -#else #import -#endif #import diff --git a/Source/SPServerVariablesController.m b/Source/SPServerVariablesController.m index 50f03e31..4cb85e5c 100644 --- a/Source/SPServerVariablesController.m +++ b/Source/SPServerVariablesController.m @@ -26,7 +26,7 @@ #import "SPServerVariablesController.h" #import "SPDatabaseDocument.h" #import "SPAppController.h" -#import "SPMySQL.h" +#import @interface SPServerVariablesController (PrivateAPI) diff --git a/Source/SPTableContent.m b/Source/SPTableContent.m index 23bac322..75c286b7 100644 --- a/Source/SPTableContent.m +++ b/Source/SPTableContent.m @@ -38,11 +38,9 @@ #import "SPQueryDocumentsController.h" #import "SPTextAndLinkCell.h" #ifndef SP_REFACTOR -#import "SPMySQL.h" #import "QLPreviewPanel.h" -#else -#import #endif +#import #import "SPFieldEditorController.h" #import "SPTooltip.h" #import "RegexKitLite.h" diff --git a/Source/SPTableContentDataSource.m b/Source/SPTableContentDataSource.m index 4289ade4..a833add7 100644 --- a/Source/SPTableContentDataSource.m +++ b/Source/SPTableContentDataSource.m @@ -31,12 +31,11 @@ // More info at #import "SPTableContentDataSource.h" -#import "SPMySQLGeometryData.h" #import "SPDataStorage.h" -#import "SPMySQL.h" #import "SPCopyTable.h" #import "SPTablesList.h" +#import #import @implementation SPTableContent (SPTableContentDataSource) diff --git a/Source/SPTableContentDelegate.m b/Source/SPTableContentDelegate.m index 96c7bbec..83eb4149 100644 --- a/Source/SPTableContentDelegate.m +++ b/Source/SPTableContentDelegate.m @@ -37,7 +37,7 @@ #import "SPGeometryDataView.h" #import "SPTooltip.h" #import "SPTablesList.h" -#import "SPMySQL.h" +#import #import "SPBundleHTMLOutputController.h" #import "SPCopyTable.h" #import "SPAlertSheets.h" diff --git a/Source/SPTableCopy.m b/Source/SPTableCopy.m index 5efc91c0..47c425a7 100644 --- a/Source/SPTableCopy.m +++ b/Source/SPTableCopy.m @@ -24,11 +24,7 @@ #import "SPDBActionCommons.h" #import "SPTableCopy.h" -#ifndef SP_REFACTOR -#import "SPMySQL.h" -#else #import -#endif @implementation SPTableCopy diff --git a/Source/SPTableData.m b/Source/SPTableData.m index ac40d94e..262b2d3c 100644 --- a/Source/SPTableData.m +++ b/Source/SPTableData.m @@ -30,11 +30,7 @@ #import "SPAlertSheets.h" #import "RegexKitLite.h" #import "SPServerSupport.h" -#ifndef SP_REFACTOR -#import "SPMySQL.h" -#else #import -#endif #include @interface SPTableData (PrivateAPI) diff --git a/Source/SPTableRelations.m b/Source/SPTableRelations.m index 44d05ee7..2cc3c9d2 100644 --- a/Source/SPTableRelations.m +++ b/Source/SPTableRelations.m @@ -30,7 +30,7 @@ #import "SPTableView.h" #import "SPAlertSheets.h" #import "RegexKitLite.h" -#import "SPMySQL.h" +#import static NSString *SPRemoveRelation = @"SPRemoveRelation"; diff --git a/Source/SPTableStructure.m b/Source/SPTableStructure.m index 6fbc6aac..e443710c 100644 --- a/Source/SPTableStructure.m +++ b/Source/SPTableStructure.m @@ -36,11 +36,7 @@ #import "SPIndexesController.h" #import "RegexKitLite.h" #import "SPTableFieldValidation.h" -#ifndef SP_REFACTOR -#import "SPMySQL.h" -#else #import -#endif @interface SPTableStructure (PrivateAPI) diff --git a/Source/SPTableStructureDelegate.m b/Source/SPTableStructureDelegate.m index b77c70f4..383a7474 100644 --- a/Source/SPTableStructureDelegate.m +++ b/Source/SPTableStructureDelegate.m @@ -30,11 +30,7 @@ #import "SPTableData.h" #import "SPTableView.h" #import "SPTableFieldValidation.h" -#ifndef SP_REFACTOR -#import "SPMySQL.h" -#else #import -#endif @implementation SPTableStructure (SPTableStructureDelegate) diff --git a/Source/SPTableTriggers.m b/Source/SPTableTriggers.m index 393b0568..ad412061 100644 --- a/Source/SPTableTriggers.m +++ b/Source/SPTableTriggers.m @@ -30,7 +30,7 @@ #import "SPTableView.h" #import "SPAlertSheets.h" #import "SPServerSupport.h" -#import "SPMySQL.h" +#import // Constants static const NSString *SPTriggerName = @"TriggerName"; diff --git a/Source/SPTablesList.m b/Source/SPTablesList.m index 8e2e8316..b863f3fb 100644 --- a/Source/SPTablesList.m +++ b/Source/SPTablesList.m @@ -27,11 +27,7 @@ #import "SPDatabaseDocument.h" #import "SPTableStructure.h" #import "SPDatabaseViewController.h" -#ifndef SP_REFACTOR -#import "SPMySQL.h" -#else #import -#endif #ifndef SP_REFACTOR /* headers */ #import "SPTableContent.h" diff --git a/Source/SPTextView.m b/Source/SPTextView.m index 2b2e5e04..1b1bcf33 100644 --- a/Source/SPTextView.m +++ b/Source/SPTextView.m @@ -36,11 +36,7 @@ #import "SPBundleHTMLOutputController.h" #import "SPDatabaseViewController.h" #import "SPAppController.h" -#ifndef SP_REFACTOR -#import "SPMySQL.h" -#else #import -#endif #import "SPDatabaseStructure.h" #pragma mark - diff --git a/Source/SPXMLExporter.m b/Source/SPXMLExporter.m index 8393b937..1fc29c6f 100644 --- a/Source/SPXMLExporter.m +++ b/Source/SPXMLExporter.m @@ -27,7 +27,7 @@ #import "SPExportFile.h" #import "SPFileHandle.h" #import "SPExportUtilities.h" -#import "SPMySQL.h" +#import @implementation SPXMLExporter diff --git a/Source/SPXMLExporterDelegate.m b/Source/SPXMLExporterDelegate.m index 013019b2..8b1d9e73 100644 --- a/Source/SPXMLExporterDelegate.m +++ b/Source/SPXMLExporterDelegate.m @@ -27,7 +27,7 @@ #import "SPXMLExporter.h" #import "SPDatabaseDocument.h" #import "SPExportFile.h" -#import "SPMySQL.h" +#import @implementation SPExportController (SPXMLExporterDelegate) diff --git a/sequel-pro.xcodeproj/project.pbxproj b/sequel-pro.xcodeproj/project.pbxproj index aec86ca7..c5ef6664 100644 --- a/sequel-pro.xcodeproj/project.pbxproj +++ b/sequel-pro.xcodeproj/project.pbxproj @@ -4092,7 +4092,8 @@ ALWAYS_SEARCH_USER_PATHS = NO; COPY_PHASE_STRIP = NO; FRAMEWORK_SEARCH_PATHS = ( - "\"$(CONFIGURATION_BUILD_DIR)/$(CONTENTS_FOLDER_PATH)/Frameworks\"", + "\"$(SRCROOT)/Frameworks/SPMySQLFramework/build/Debug\"", + "\"$(SRCROOT)/Frameworks/QueryKit/build/Debug\"", "\"$(SRCROOT)/Frameworks\"", "\"$(SRCROOT)\"", ); @@ -4100,7 +4101,6 @@ GCC_MODEL_TUNING = G5; GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = "Source/Sequel-Pro.pch"; - HEADER_SEARCH_PATHS = "${PROJECT_DIR}/Frameworks/SPMySQLFramework/**"; INFOPLIST_FILE = Resources/Plists/Info.plist; INSTALL_PATH = "$(HOME)/Applications"; LIBRARY_SEARCH_PATHS = "\"$(SRCROOT)/Frameworks/zlib\""; @@ -4244,13 +4244,14 @@ buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; COPY_PHASE_STRIP = NO; + FRAMEWORK_SEARCH_PATHS = "\"$(SRCROOT)/Frameworks/SPMySQLFramework/build/Debug\""; GCC_DYNAMIC_NO_PIC = NO; GCC_ENABLE_FIX_AND_CONTINUE = YES; GCC_MODEL_TUNING = G5; GCC_OPTIMIZATION_LEVEL = 0; GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = "Source/Sequel-Pro.pch"; - HEADER_SEARCH_PATHS = "${PROJECT_DIR}/Frameworks/SPMySQLFramework/**"; + HEADER_SEARCH_PATHS = ""; INSTALL_PATH = /usr/local/bin; OTHER_LDFLAGS = ( "-framework", @@ -4269,11 +4270,12 @@ ALWAYS_SEARCH_USER_PATHS = NO; COPY_PHASE_STRIP = YES; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; + FRAMEWORK_SEARCH_PATHS = "\"$(SRCROOT)/Frameworks/SPMySQLFramework/build/Debug\""; GCC_ENABLE_FIX_AND_CONTINUE = NO; GCC_MODEL_TUNING = G5; GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = "Source/Sequel-Pro.pch"; - HEADER_SEARCH_PATHS = "${PROJECT_DIR}/Frameworks/SPMySQLFramework/**"; + HEADER_SEARCH_PATHS = ""; INSTALL_PATH = /usr/local/bin; OTHER_LDFLAGS = ( "-framework", @@ -4291,11 +4293,11 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; + FRAMEWORK_SEARCH_PATHS = "\"$(SRCROOT)/Frameworks/SPMySQLFramework/build/Debug\""; GCC_ENABLE_FIX_AND_CONTINUE = YES; GCC_MODEL_TUNING = G5; GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = "Source/Sequel-Pro.pch"; - HEADER_SEARCH_PATHS = "${PROJECT_DIR}/Frameworks/SPMySQLFramework/**"; INSTALL_PATH = /usr/local/bin; OTHER_LDFLAGS = ( "-framework", @@ -4314,7 +4316,8 @@ ALWAYS_SEARCH_USER_PATHS = NO; COPY_PHASE_STRIP = NO; FRAMEWORK_SEARCH_PATHS = ( - "\"$(CONFIGURATION_BUILD_DIR)/$(CONTENTS_FOLDER_PATH)/Frameworks\"", + "\"$(SRCROOT)/Frameworks/QueryKit/build/Debug\"", + "\"$(SRCROOT)/Frameworks/SPMySQLFramework/build/Debug\"", "\"$(SRCROOT)/Frameworks\"", "\"$(SRCROOT)\"", ); @@ -4324,7 +4327,7 @@ GCC_OPTIMIZATION_LEVEL = 0; GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = "Source/Sequel-Pro.pch"; - HEADER_SEARCH_PATHS = "${PROJECT_DIR}/Frameworks/SPMySQLFramework/**"; + HEADER_SEARCH_PATHS = ""; INFOPLIST_FILE = Resources/Plists/Info.plist; INSTALL_PATH = "$(HOME)/Applications"; LIBRARY_SEARCH_PATHS = "\"$(SRCROOT)/Frameworks/zlib\""; @@ -4344,7 +4347,8 @@ COPY_PHASE_STRIP = NO; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; FRAMEWORK_SEARCH_PATHS = ( - "\"$(CONFIGURATION_BUILD_DIR)/$(CONTENTS_FOLDER_PATH)/Frameworks\"", + "\"$(SRCROOT)/Frameworks/SPMySQLFramework/build/Debug\"", + "\"$(SRCROOT)/Frameworks/QueryKit/build/Debug\"", "\"$(SRCROOT)/Frameworks\"", "\"$(SRCROOT)\"", ); @@ -4352,7 +4356,7 @@ GCC_MODEL_TUNING = G5; GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = "Source/Sequel-Pro.pch"; - HEADER_SEARCH_PATHS = "${PROJECT_DIR}/Frameworks/SPMySQLFramework/**"; + HEADER_SEARCH_PATHS = ""; INFOPLIST_FILE = Resources/Plists/Info.plist; INSTALL_PATH = "$(HOME)/Applications"; LIBRARY_SEARCH_PATHS = "\"$(SRCROOT)/Frameworks/zlib\""; -- cgit v1.2.3