aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorstuconnolly <stuart02@gmail.com>2010-03-31 18:01:50 +0000
committerstuconnolly <stuart02@gmail.com>2010-03-31 18:01:50 +0000
commitea5088aa123745243ea6d93f684d0471be83b324 (patch)
treefa733fa620b9078753ef903dce36c3337da18e21
parentbb70e8aac1d86585e1cb2ad56c440f0298858c9f (diff)
downloadsequelpro-ea5088aa123745243ea6d93f684d0471be83b324.tar.gz
sequelpro-ea5088aa123745243ea6d93f684d0471be83b324.tar.bz2
sequelpro-ea5088aa123745243ea6d93f684d0471be83b324.zip
Tidy up imports and fix 'Reverse Sort Order' when sorting connection favorites (Thanks Hans).
-rw-r--r--Source/NSNotificationAdditions.h1
-rw-r--r--Source/NSNotificationAdditions.m1
-rw-r--r--Source/NoodleLineNumberView.m1
-rw-r--r--Source/SPAlertSheets.m1
-rw-r--r--Source/SPAppController.m1
-rw-r--r--Source/SPConstants.h2
-rw-r--r--Source/SPDataAdditions.h4
-rw-r--r--Source/SPDataAdditions.m5
-rw-r--r--Source/SPDataStorage.m1
-rw-r--r--Source/SPEditorTokens.l1
-rw-r--r--Source/SPEncodingPopupAccessory.m1
-rw-r--r--Source/SPFavoriteTextFieldCell.h1
-rw-r--r--Source/SPFieldMapperController.h3
-rw-r--r--Source/SPFieldMapperController.m2
-rw-r--r--Source/SPHistoryController.h2
-rw-r--r--Source/SPKeychain.h1
-rw-r--r--Source/SPKeychain.m2
-rw-r--r--Source/SPMainThreadTrampoline.h1
-rw-r--r--Source/SPMainThreadTrampoline.m1
-rw-r--r--Source/SPNavigatorController.h1
-rw-r--r--Source/SPNavigatorOutlineView.h7
-rw-r--r--Source/SPNavigatorOutlineView.m1
-rw-r--r--Source/SPNotLoaded.m2
-rw-r--r--Source/SPOutlineView.h1
-rw-r--r--Source/SPPreferenceController.m5
-rw-r--r--Source/SPProcessListController.h3
-rw-r--r--Source/SPProcessListController.m2
-rw-r--r--Source/SPQueryFavoriteManager.h3
-rw-r--r--Source/SPQueryFavoriteManager.m1
-rw-r--r--Source/SPServerVariablesController.h3
-rw-r--r--Source/SPServerVariablesController.m2
-rw-r--r--Source/SPStringAdditions.m5
-rw-r--r--Source/SPTableData.h1
-rw-r--r--Source/SPTableData.m2
-rw-r--r--Source/SPTableInfo.m2
-rw-r--r--Source/SPTableTextFieldCell.h1
-rw-r--r--Source/SPTextAndLinkCell.h3
-rw-r--r--Source/SPTooltip.m1
-rw-r--r--Source/SPUserManager.h3
-rw-r--r--Source/SPUserManager.m2
-rw-r--r--Source/TableContent.m3
-rw-r--r--Source/TablesList.h3
-rw-r--r--Source/TablesList.m1
-rw-r--r--sequel-pro.xcodeproj/project.pbxproj2
44 files changed, 40 insertions, 52 deletions
diff --git a/Source/NSNotificationAdditions.h b/Source/NSNotificationAdditions.h
index ff303465..d11f6185 100644
--- a/Source/NSNotificationAdditions.h
+++ b/Source/NSNotificationAdditions.h
@@ -7,7 +7,6 @@
// Copied from the Colloquy project; original code available from Trac at
// http://colloquy.info/project/browser/trunk/Additions/NSNotificationAdditions.h
//
-//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation; either version 2 of the License, or
diff --git a/Source/NSNotificationAdditions.m b/Source/NSNotificationAdditions.m
index 3e5e3cc8..78233de4 100644
--- a/Source/NSNotificationAdditions.m
+++ b/Source/NSNotificationAdditions.m
@@ -7,7 +7,6 @@
// Copied from the Colloquy project; original code available from Trac at
// http://colloquy.info/project/browser/trunk/Additions/NSNotificationAdditions.m
//
-//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation; either version 2 of the License, or
diff --git a/Source/NoodleLineNumberView.m b/Source/NoodleLineNumberView.m
index 9be65981..5b13cab2 100644
--- a/Source/NoodleLineNumberView.m
+++ b/Source/NoodleLineNumberView.m
@@ -32,6 +32,7 @@
#import "NoodleLineNumberView.h"
#import "SPArrayAdditions.h"
+
#include <tgmath.h>
#define DEFAULT_THICKNESS 22.0
diff --git a/Source/SPAlertSheets.m b/Source/SPAlertSheets.m
index 9692e848..ccc8f337 100644
--- a/Source/SPAlertSheets.m
+++ b/Source/SPAlertSheets.m
@@ -54,5 +54,6 @@ void SPBeginAlertSheet(
contextInfo,
[msg stringByReplacingOccurrencesOfString:@"%" withString:@"%%"]
);
+
[[docWindow onMainThread] makeKeyWindow];
}
diff --git a/Source/SPAppController.m b/Source/SPAppController.m
index 23379761..9fc4b7b1 100644
--- a/Source/SPAppController.m
+++ b/Source/SPAppController.m
@@ -33,7 +33,6 @@
#import "SPConstants.h"
#import <Sparkle/Sparkle.h>
-#import <FeedbackReporter/FRFeedbackReporter.h>
@implementation SPAppController
diff --git a/Source/SPConstants.h b/Source/SPConstants.h
index c849c3ba..319f107e 100644
--- a/Source/SPConstants.h
+++ b/Source/SPConstants.h
@@ -23,7 +23,7 @@
//
// More info at <http://code.google.com/p/sequel-pro/>
-#import <Cocoa/Cocoa.h>
+#import <Foundation/Foundation.h>
// View modes
typedef enum {
diff --git a/Source/SPDataAdditions.h b/Source/SPDataAdditions.h
index 8c19d572..d37827a2 100644
--- a/Source/SPDataAdditions.h
+++ b/Source/SPDataAdditions.h
@@ -29,8 +29,8 @@
- (NSString *)base64EncodingWithLineLength:(NSUInteger)lineLength;
- (NSString *)dataToFormattedHexString;
- (NSString *)shortStringRepresentationUsingEncoding:(NSStringEncoding)encoding;
-- (NSData*)dataEncryptedWithPassword:(NSString*)password;
-- (NSData*)dataDecryptedWithPassword:(NSString*)password;
+- (NSData *)dataEncryptedWithPassword:(NSString *)password;
+- (NSData *)dataDecryptedWithPassword:(NSString *)password;
- (NSData *)compress;
- (NSData *)decompress;
diff --git a/Source/SPDataAdditions.m b/Source/SPDataAdditions.m
index d50ee631..b8f4ee3a 100644
--- a/Source/SPDataAdditions.m
+++ b/Source/SPDataAdditions.m
@@ -28,6 +28,7 @@
// More info at <http://code.google.com/p/sequel-pro/>
#import "SPDataAdditions.h"
+
#include <zlib.h>
#include <openssl/aes.h>
#include <openssl/sha.h>
@@ -107,7 +108,7 @@ static char base64encodingTable[64] = {
return base64;
}
-- (NSData*)dataEncryptedWithPassword:(NSString*)password
+- (NSData *)dataEncryptedWithPassword:(NSString *)password
{
// Create a random 128-bit initialization vector
srand(time(NULL));
@@ -146,7 +147,7 @@ static char base64encodingTable[64] = {
return [NSData dataWithBytesNoCopy:encryptedBytes length:totalLength];
}
-- (NSData*)dataDecryptedWithPassword:(NSString*)password
+- (NSData *)dataDecryptedWithPassword:(NSString *)password
{
// Create the key from the password hash
diff --git a/Source/SPDataStorage.m b/Source/SPDataStorage.m
index 2da99409..1b2de47e 100644
--- a/Source/SPDataStorage.m
+++ b/Source/SPDataStorage.m
@@ -32,7 +32,6 @@
@end
-
@implementation SPDataStorage
static inline void SPDataStorageEnsureCapacityForAdditionalRowCount(SPDataStorage* self, NSUInteger numExtraRows) {
diff --git a/Source/SPEditorTokens.l b/Source/SPEditorTokens.l
index b0c2dee3..a5726cce 100644
--- a/Source/SPEditorTokens.l
+++ b/Source/SPEditorTokens.l
@@ -37,6 +37,7 @@
*/
#import "SPEditorTokens.h"
+
size_t utf8strlen(const char * _s);
size_t yyuoffset, yyuleng;
diff --git a/Source/SPEncodingPopupAccessory.m b/Source/SPEncodingPopupAccessory.m
index a921e31d..e394602e 100644
--- a/Source/SPEncodingPopupAccessory.m
+++ b/Source/SPEncodingPopupAccessory.m
@@ -24,7 +24,6 @@
#import "SPEncodingPopupAccessory.h"
-
@implementation SPEncodingPopupAccessory
+ (NSView *)encodingAccessory:(NSUInteger)encoding includeDefaultEntry:(BOOL)includeDefaultItem encodingPopUp:(NSPopUpButton **)popup {
diff --git a/Source/SPFavoriteTextFieldCell.h b/Source/SPFavoriteTextFieldCell.h
index e804ba76..a02f7da4 100644
--- a/Source/SPFavoriteTextFieldCell.h
+++ b/Source/SPFavoriteTextFieldCell.h
@@ -24,6 +24,7 @@
// More info at <http://code.google.com/p/sequel-pro/>
#import <Cocoa/Cocoa.h>
+
#import "ImageAndTextCell.h"
@interface SPFavoriteTextFieldCell : ImageAndTextCell
diff --git a/Source/SPFieldMapperController.h b/Source/SPFieldMapperController.h
index 3f94602c..f6187d48 100644
--- a/Source/SPFieldMapperController.h
+++ b/Source/SPFieldMapperController.h
@@ -24,7 +24,8 @@
#import <Cocoa/Cocoa.h>
#import <MCPKit/MCPKit.h>
-#import "CMTextView.h"
+
+@class CMTextView;
@interface SPFieldMapperController : NSWindowController
{
diff --git a/Source/SPFieldMapperController.m b/Source/SPFieldMapperController.m
index 71220dd8..ae935b44 100644
--- a/Source/SPFieldMapperController.m
+++ b/Source/SPFieldMapperController.m
@@ -21,7 +21,6 @@
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
//
// More info at <http://code.google.com/p/sequel-pro/>
-//
#import "SPFieldMapperController.h"
#import "SPTableData.h"
@@ -31,6 +30,7 @@
#import "SPStringAdditions.h"
#import "SPConstants.h"
#import "SPNotLoaded.h"
+#import "CMTextView.h"
@implementation SPFieldMapperController
diff --git a/Source/SPHistoryController.h b/Source/SPHistoryController.h
index 171e8474..1ae1456c 100644
--- a/Source/SPHistoryController.h
+++ b/Source/SPHistoryController.h
@@ -66,4 +66,4 @@
- (NSMenuItem *) menuEntryForHistoryEntryAtIndex:(NSInteger)theIndex;
- (NSString *) nameForHistoryEntryDetails:(NSDictionary *)theEntry;
-@end \ No newline at end of file
+@end
diff --git a/Source/SPKeychain.h b/Source/SPKeychain.h
index 21e6c405..24400938 100644
--- a/Source/SPKeychain.h
+++ b/Source/SPKeychain.h
@@ -24,7 +24,6 @@
// More info at <http://code.google.com/p/sequel-pro/>
#import <Foundation/Foundation.h>
-#import <Cocoa/Cocoa.h>
@interface SPKeychain : NSObject
diff --git a/Source/SPKeychain.m b/Source/SPKeychain.m
index a6550ec6..688091eb 100644
--- a/Source/SPKeychain.m
+++ b/Source/SPKeychain.m
@@ -25,8 +25,8 @@
#import "SPKeychain.h"
-#import <CoreFoundation/CoreFoundation.h>
#import <Security/Security.h>
+#import <CoreFoundation/CoreFoundation.h>
@implementation SPKeychain
diff --git a/Source/SPMainThreadTrampoline.h b/Source/SPMainThreadTrampoline.h
index 9cd4030a..0fa5a9e6 100644
--- a/Source/SPMainThreadTrampoline.h
+++ b/Source/SPMainThreadTrampoline.h
@@ -22,7 +22,6 @@
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
//
// More info at <http://code.google.com/p/sequel-pro/>
-//
#import <Cocoa/Cocoa.h>
diff --git a/Source/SPMainThreadTrampoline.m b/Source/SPMainThreadTrampoline.m
index 381e42ee..5f25e174 100644
--- a/Source/SPMainThreadTrampoline.m
+++ b/Source/SPMainThreadTrampoline.m
@@ -22,7 +22,6 @@
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
//
// More info at <http://code.google.com/p/sequel-pro/>
-//
#import "SPMainThreadTrampoline.h"
diff --git a/Source/SPNavigatorController.h b/Source/SPNavigatorController.h
index 2833cd99..1926a622 100644
--- a/Source/SPNavigatorController.h
+++ b/Source/SPNavigatorController.h
@@ -97,4 +97,5 @@
- (BOOL)schemaPathExistsForConnection:(NSString*)connectionID andDatabase:(NSString*)dbname;
- (void)removeDatabase:(NSString*)db_id forConnectionID:(NSString*)connectionID;
+
@end
diff --git a/Source/SPNavigatorOutlineView.h b/Source/SPNavigatorOutlineView.h
index a87fa195..2ae634fd 100644
--- a/Source/SPNavigatorOutlineView.h
+++ b/Source/SPNavigatorOutlineView.h
@@ -23,12 +23,9 @@
//
// More info at <http://code.google.com/p/sequel-pro/>
-#import <Cocoa/Cocoa.h>
+#import <Foundation/Foundation.h>
-
-@interface SPNavigatorOutlineView : NSOutlineView {
-
-}
+@interface SPNavigatorOutlineView : NSOutlineView
- (id)selectedItem;
diff --git a/Source/SPNavigatorOutlineView.m b/Source/SPNavigatorOutlineView.m
index ee41620f..812d0732 100644
--- a/Source/SPNavigatorOutlineView.m
+++ b/Source/SPNavigatorOutlineView.m
@@ -26,7 +26,6 @@
#import "SPNavigatorOutlineView.h"
#import "SPNavigatorController.h"
-
@implementation SPNavigatorOutlineView
- (BOOL)acceptsFirstResponder
diff --git a/Source/SPNotLoaded.m b/Source/SPNotLoaded.m
index 6814e2e8..9ce0fec2 100644
--- a/Source/SPNotLoaded.m
+++ b/Source/SPNotLoaded.m
@@ -85,4 +85,4 @@ static SPNotLoaded *notLoaded = nil;
return (self == SPNotLoadedForComparison);
}
-@end \ No newline at end of file
+@end
diff --git a/Source/SPOutlineView.h b/Source/SPOutlineView.h
index 8f1b581e..8d1686c1 100644
--- a/Source/SPOutlineView.h
+++ b/Source/SPOutlineView.h
@@ -22,7 +22,6 @@
//
// More info at <http://code.google.com/p/sequel-pro/>
-
#import <Foundation/Foundation.h>
@interface SPOutlineView : NSOutlineView
diff --git a/Source/SPPreferenceController.m b/Source/SPPreferenceController.m
index bdb3ff5e..a960c555 100644
--- a/Source/SPPreferenceController.m
+++ b/Source/SPPreferenceController.m
@@ -29,7 +29,6 @@
#import "SPKeychain.h"
#import "TableDocument.h"
#import "SPConnectionController.h"
-#import "SPConstants.h"
@interface SPPreferenceController (PrivateAPI)
@@ -1303,10 +1302,10 @@
NSSortDescriptor *sortDescriptor = nil;
if (currentSortItem == SPFavoritesSortTypeItem) {
- sortDescriptor = [[[NSSortDescriptor alloc] initWithKey:sortKey ascending:reverseFavoritesSort] autorelease];
+ sortDescriptor = [[[NSSortDescriptor alloc] initWithKey:sortKey ascending:(!reverseFavoritesSort)] autorelease];
}
else {
- sortDescriptor = [[[NSSortDescriptor alloc] initWithKey:sortKey ascending:reverseFavoritesSort selector:@selector(caseInsensitiveCompare:)] autorelease];
+ sortDescriptor = [[[NSSortDescriptor alloc] initWithKey:sortKey ascending:(!reverseFavoritesSort) selector:@selector(caseInsensitiveCompare:)] autorelease];
}
[favoritesController setSortDescriptors:[NSArray arrayWithObject:sortDescriptor]];
diff --git a/Source/SPProcessListController.h b/Source/SPProcessListController.h
index 7832ec65..5283c417 100644
--- a/Source/SPProcessListController.h
+++ b/Source/SPProcessListController.h
@@ -24,8 +24,7 @@
// More info at <http://code.google.com/p/sequel-pro/>
#import <Cocoa/Cocoa.h>
-
-@class MCPConnection;
+#import <MCPKit/MCPKit.h>
@interface SPProcessListController : NSWindowController
{
diff --git a/Source/SPProcessListController.m b/Source/SPProcessListController.m
index 108b48e9..06cd9881 100644
--- a/Source/SPProcessListController.m
+++ b/Source/SPProcessListController.m
@@ -23,8 +23,6 @@
//
// More info at <http://code.google.com/p/sequel-pro/>
-#import <MCPKit/MCPKit.h>
-
#import "SPProcessListController.h"
#import "SPArrayAdditions.h"
#import "TableDocument.h"
diff --git a/Source/SPQueryFavoriteManager.h b/Source/SPQueryFavoriteManager.h
index 42ace9b0..c803e565 100644
--- a/Source/SPQueryFavoriteManager.h
+++ b/Source/SPQueryFavoriteManager.h
@@ -24,9 +24,8 @@
// More info at <http://code.google.com/p/sequel-pro/>
#import <Cocoa/Cocoa.h>
-#import "CMTextView.h"
-@class BWAnchoredButtonBar;
+@class BWAnchoredButtonBar, CMTextView;
@interface NSObject (SPQueryFavoriteManagerDelegate)
diff --git a/Source/SPQueryFavoriteManager.m b/Source/SPQueryFavoriteManager.m
index 2202bfd8..91a8d90e 100644
--- a/Source/SPQueryFavoriteManager.m
+++ b/Source/SPQueryFavoriteManager.m
@@ -30,6 +30,7 @@
#import "SPConstants.h"
#import "SPConnectionController.h"
#import "RegexKitLite.h"
+#import "CMTextView.h"
#define SP_MULTIPLE_SELECTION_PLACEHOLDER_STRING NSLocalizedString(@"[multiple selection]", @"[multiple selection]")
#define SP_NO_SELECTION_PLACEHOLDER_STRING NSLocalizedString(@"[no selection]", @"[no selection]")
diff --git a/Source/SPServerVariablesController.h b/Source/SPServerVariablesController.h
index 3b90ae83..a3894cce 100644
--- a/Source/SPServerVariablesController.h
+++ b/Source/SPServerVariablesController.h
@@ -24,8 +24,7 @@
// More info at <http://code.google.com/p/sequel-pro/>
#import <Cocoa/Cocoa.h>
-
-@class MCPConnection;
+#import <MCPKit/MCPKit.h>
@interface SPServerVariablesController : NSWindowController
{
diff --git a/Source/SPServerVariablesController.m b/Source/SPServerVariablesController.m
index 180fe2be..37868f10 100644
--- a/Source/SPServerVariablesController.m
+++ b/Source/SPServerVariablesController.m
@@ -23,8 +23,6 @@
//
// More info at <http://code.google.com/p/sequel-pro/>
-#import <MCPKit/MCPKit.h>
-
#import "SPServerVariablesController.h"
#import "SPArrayAdditions.h"
#import "TableDocument.h"
diff --git a/Source/SPStringAdditions.m b/Source/SPStringAdditions.m
index 18f62b0b..09d80b9a 100644
--- a/Source/SPStringAdditions.m
+++ b/Source/SPStringAdditions.m
@@ -26,8 +26,10 @@
#import "SPStringAdditions.h"
#import "RegexKitLite.h"
-@interface NSString (Private)
+@interface NSString (PrivateAPI)
+
- (NSInteger)smallestOf:(NSInteger)a andOf:(NSInteger)b andOf:(NSInteger)c;
+
@end
@implementation NSString (SPStringAdditions)
@@ -382,5 +384,4 @@
return min;
}
-
@end
diff --git a/Source/SPTableData.h b/Source/SPTableData.h
index eb1ae6d4..a63f31dc 100644
--- a/Source/SPTableData.h
+++ b/Source/SPTableData.h
@@ -24,6 +24,7 @@
// More info at <http://code.google.com/p/sequel-pro/>
#import <Cocoa/Cocoa.h>
+#import <MCPKit/MCPKit.h>
@interface SPTableData : NSObject
{
diff --git a/Source/SPTableData.m b/Source/SPTableData.m
index 7021ddc2..86cd550e 100644
--- a/Source/SPTableData.m
+++ b/Source/SPTableData.m
@@ -23,8 +23,6 @@
//
// More info at <http://code.google.com/p/sequel-pro/>
-#import <MCPKit/MCPKit.h>
-
#import "SPTableData.h"
#import "SPSQLParser.h"
#import "TableDocument.h"
diff --git a/Source/SPTableInfo.m b/Source/SPTableInfo.m
index 5e01d987..eb8c0b55 100644
--- a/Source/SPTableInfo.m
+++ b/Source/SPTableInfo.m
@@ -22,8 +22,6 @@
//
// More info at <http://code.google.com/p/sequel-pro/>
-#import <MCPKit/MCPKit.h>
-
#import "SPTableInfo.h"
#import "ImageAndTextCell.h"
#import "TableDocument.h"
diff --git a/Source/SPTableTextFieldCell.h b/Source/SPTableTextFieldCell.h
index 51ca62d2..adc2d0da 100644
--- a/Source/SPTableTextFieldCell.h
+++ b/Source/SPTableTextFieldCell.h
@@ -24,6 +24,7 @@
// More info at <http://code.google.com/p/sequel-pro/>
#import <Cocoa/Cocoa.h>
+
#import "ImageAndTextCell.h"
@interface SPTableTextFieldCell : ImageAndTextCell
diff --git a/Source/SPTextAndLinkCell.h b/Source/SPTextAndLinkCell.h
index 75723796..d9f2ea1e 100644
--- a/Source/SPTextAndLinkCell.h
+++ b/Source/SPTextAndLinkCell.h
@@ -31,7 +31,8 @@ enum sptextandlinkcell_drawstates
SP_LINKDRAWSTATE_BACKGROUNDHIGHLIGHT = 2
};
-@interface SPTextAndLinkCell : NSTextFieldCell {
+@interface SPTextAndLinkCell : NSTextFieldCell
+{
BOOL hasLink;
NSButtonCell *linkButton;
diff --git a/Source/SPTooltip.m b/Source/SPTooltip.m
index 07162db8..3f8c2529 100644
--- a/Source/SPTooltip.m
+++ b/Source/SPTooltip.m
@@ -56,6 +56,7 @@
#import "SPTooltip.h"
#import "SPTextViewAdditions.h"
+
#include <tgmath.h>
static NSInteger spTooltipCounter = 0;
diff --git a/Source/SPUserManager.h b/Source/SPUserManager.h
index 86c19664..27590274 100644
--- a/Source/SPUserManager.h
+++ b/Source/SPUserManager.h
@@ -23,8 +23,9 @@
// More info at <http://code.google.com/p/sequel-pro/>
#import <Cocoa/Cocoa.h>
+#import <MCPKit/MCPKit.h>
-@class MCPConnection, BWAnchoredButtonBar;
+@class BWAnchoredButtonBar;
@interface SPUserManager : NSWindowController
{
diff --git a/Source/SPUserManager.m b/Source/SPUserManager.m
index b3fbbc3f..cad74193 100644
--- a/Source/SPUserManager.m
+++ b/Source/SPUserManager.m
@@ -23,9 +23,7 @@
// More info at <http://code.google.com/p/sequel-pro/>
#import "SPUserManager.h"
-#import "MCPConnection.h"
#import "SPUserMO.h"
-#import "MCPResult.h"
#import "ImageAndTextCell.h"
#import "SPArrayAdditions.h"
#import "SPStringAdditions.h"
diff --git a/Source/TableContent.m b/Source/TableContent.m
index 0e2d1d9b..536551c7 100644
--- a/Source/TableContent.m
+++ b/Source/TableContent.m
@@ -25,8 +25,6 @@
//
// More info at <http://code.google.com/p/sequel-pro/>
-#import <MCPKit/MCPKit.h>
-
#import "TableContent.h"
#import "TableDocument.h"
#import "TableSource.h"
@@ -52,6 +50,7 @@
#import "SPDataStorage.h"
#import "SPAlertSheets.h"
#import "SPMainThreadTrampoline.h"
+#import "SPHistoryController.h"
@implementation TableContent
diff --git a/Source/TablesList.h b/Source/TablesList.h
index 5abbddad..12ea61e3 100644
--- a/Source/TablesList.h
+++ b/Source/TablesList.h
@@ -25,7 +25,8 @@
#import <Cocoa/Cocoa.h>
#import <MCPKit/MCPKit.h>
-#import "SPHistoryController.h"
+
+@class SPHistoryController;
@interface NSObject (NSSplitView)
diff --git a/Source/TablesList.m b/Source/TablesList.m
index f67f2983..1644c13d 100644
--- a/Source/TablesList.m
+++ b/Source/TablesList.m
@@ -41,6 +41,7 @@
#import "SPAlertSheets.h"
#import "SPNavigatorController.h"
#import "SPMainThreadTrampoline.h"
+#import "SPHistoryController.h"
@interface TablesList (PrivateAPI)
diff --git a/sequel-pro.xcodeproj/project.pbxproj b/sequel-pro.xcodeproj/project.pbxproj
index a10b3698..78b3de45 100644
--- a/sequel-pro.xcodeproj/project.pbxproj
+++ b/sequel-pro.xcodeproj/project.pbxproj
@@ -1451,8 +1451,8 @@
5822D3081061833C00CE2157 /* SPCSVParser.m */,
179F15040F7C433C00579954 /* SPEditorTokens.h */,
179F15050F7C433C00579954 /* SPEditorTokens.l */,
- BCD0AD480FBBFC340066EA5C /* SPSQLTokenizer.l */,
BCD0AD4A0FBBFC480066EA5C /* SPSQLTokenizer.h */,
+ BCD0AD480FBBFC340066EA5C /* SPSQLTokenizer.l */,
);
name = Parsing;
sourceTree = "<group>";