aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Source/SPAppController.h2
-rw-r--r--Source/SPConnectionDelegate.m8
-rw-r--r--Source/SPCopyTable.m4
-rw-r--r--Source/SPCustomQuery.m2
-rw-r--r--Source/SPDatabaseDocument.h2
-rw-r--r--Source/SPDatabaseDocument.m6
-rw-r--r--Source/SPDatabaseViewController.m2
-rw-r--r--Source/SPTableContent.m2
-rw-r--r--Source/SPTableContentDelegate.m4
-rw-r--r--Source/SPTextView.m4
-rw-r--r--Source/SPTextViewAdditions.m4
11 files changed, 39 insertions, 1 deletions
diff --git a/Source/SPAppController.h b/Source/SPAppController.h
index 27985be6..b96b1d75 100644
--- a/Source/SPAppController.h
+++ b/Source/SPAppController.h
@@ -24,7 +24,9 @@
// More info at <http://code.google.com/p/sequel-pro/>
#import <Cocoa/Cocoa.h>
+#ifndef SP_REFACTOR
#import <FeedbackReporter/FRFeedbackReporter.h>
+#endif
@class SPPreferenceController, SPAboutController, SPDatabaseDocument, SPBundleEditorController;
diff --git a/Source/SPConnectionDelegate.m b/Source/SPConnectionDelegate.m
index cfb4a8df..0d41a3ac 100644
--- a/Source/SPConnectionDelegate.m
+++ b/Source/SPConnectionDelegate.m
@@ -40,6 +40,7 @@
*/
- (void)willQueryString:(NSString *)query connection:(id)connection
{
+#ifndef SP_REFACTOR
if ([prefs boolForKey:SPConsoleEnableLogging]) {
if ((_queryMode == SPInterfaceQueryMode && [prefs boolForKey:SPConsoleEnableInterfaceLogging])
|| (_queryMode == SPCustomQueryQueryMode && [prefs boolForKey:SPConsoleEnableCustomQueryLogging])
@@ -48,6 +49,7 @@
[[SPQueryController sharedQueryController] showMessageInConsole:query connection:[self name]];
}
}
+#endif
}
/**
@@ -55,9 +57,11 @@
*/
- (void)queryGaveError:(NSString *)error connection:(id)connection
{
+#ifndef SP_REFACTOR
if ([prefs boolForKey:SPConsoleEnableLogging] && [prefs boolForKey:SPConsoleEnableErrorLogging]) {
[[SPQueryController sharedQueryController] showErrorInConsole:error connection:[self name]];
}
+#endif
}
/**
@@ -127,8 +131,10 @@
// Ensure the window isn't miniaturized
if ([[self parentWindow] isMiniaturized]) [[self parentWindow] deminiaturize:self];
+#ifndef SP_REFACTOR
// Ensure the window and tab are frontmost
[self makeKeyDocument];
+#endif
// Display the connection error dialog and wait for the return code
[NSApp beginSheet:connectionErrorDialog modalForWindow:[self parentWindow] modalDelegate:self didEndSelector:nil contextInfo:nil];
@@ -169,6 +175,7 @@
*/
- (void) closeAndDisconnect
{
+#ifndef SP_REFACTOR
NSWindow *theParentWindow = [self parentWindow];
_isConnected = NO;
if ([[[self parentTabViewItem] tabView] numberOfTabViewItems] == 1) {
@@ -180,6 +187,7 @@
[theParentWindow performSelector:@selector(makeKeyAndOrderFront:) withObject:nil afterDelay:0.6];
}
[self parentTabDidClose];
+#endif
}
@end
diff --git a/Source/SPCopyTable.m b/Source/SPCopyTable.m
index 7d03926a..ea0fe720 100644
--- a/Source/SPCopyTable.m
+++ b/Source/SPCopyTable.m
@@ -31,10 +31,14 @@
#import "SPTextAndLinkCell.h"
#import "SPTooltip.h"
#import "SPAlertSheets.h"
+#ifndef SP_REFACTOR /* headers */
#import "SPBundleHTMLOutputController.h"
+#endif
#import "SPGeometryDataView.h"
+#ifndef SP_REFACTOR /* headers */
#import "SPBundleEditorController.h"
#import "SPAppController.h"
+#endif
#import "SPTablesList.h"
#import <SPMySQL/SPMySQL.h>
diff --git a/Source/SPCustomQuery.m b/Source/SPCustomQuery.m
index fd0e78f5..b8ab78e2 100644
--- a/Source/SPCustomQuery.m
+++ b/Source/SPCustomQuery.m
@@ -46,8 +46,10 @@
#import "SPAlertSheets.h"
#import "SPCopyTable.h"
#import "SPGeometryDataView.h"
+#ifndef SP_REFACTOR /* headers */
#import "SPAppController.h"
#import "SPBundleHTMLOutputController.h"
+#endif
#include <pthread.h>
#ifndef SP_REFACTOR /* headers */
diff --git a/Source/SPDatabaseDocument.h b/Source/SPDatabaseDocument.h
index 5616520c..614f66ed 100644
--- a/Source/SPDatabaseDocument.h
+++ b/Source/SPDatabaseDocument.h
@@ -397,9 +397,11 @@ SPDatabaseData, SPTablesList, SPTableStructure, SPTableContent, SPTableData, SPS
- (NSString *)displayName;
#ifndef SP_REFACTOR /* method decls */
- (NSUndoManager *)undoManager;
+#endif
- (NSArray *)allTableNames;
- (SPTablesList *)tablesListInstance;
+#ifndef SP_REFACTOR /* method decls */
// Notification center methods
- (void)willPerformQuery:(NSNotification *)notification;
- (void)hasPerformedQuery:(NSNotification *)notification;
diff --git a/Source/SPDatabaseDocument.m b/Source/SPDatabaseDocument.m
index 93a0d492..37cae9ac 100644
--- a/Source/SPDatabaseDocument.m
+++ b/Source/SPDatabaseDocument.m
@@ -98,8 +98,8 @@ enum {
// Constants
#ifndef SP_REFACTOR
static NSString *SPCreateSyntx = @"SPCreateSyntax";
-static NSString *SPRenameDatabaseAction = @"SPRenameDatabase";
#endif
+static NSString *SPRenameDatabaseAction = @"SPRenameDatabase";
@interface SPDatabaseDocument ()
@@ -110,7 +110,9 @@ static NSString *SPRenameDatabaseAction = @"SPRenameDatabase";
- (void)_renameDatabase;
- (void)_removeDatabase;
- (void)_selectDatabaseAndItem:(NSDictionary *)selectionDetails;
+#ifndef SP_REFACTOR /* method decls */
- (void)_processDatabaseChangedBundleTriggerActions;
+#endif
@end
@@ -6039,6 +6041,7 @@ static NSString *SPRenameDatabaseAction = @"SPRenameDatabase";
[taskPool drain];
}
+#ifndef SP_REFACTOR
- (void)_processDatabaseChangedBundleTriggerActions
{
NSArray *triggeredCommands = [[NSApp delegate] bundleCommandsForTrigger:SPBundleTriggerActionDatabaseChanged];
@@ -6087,5 +6090,6 @@ static NSString *SPRenameDatabaseAction = @"SPRenameDatabase";
}
}
}
+#endif
@end
diff --git a/Source/SPDatabaseViewController.m b/Source/SPDatabaseViewController.m
index 84f94b9a..da20b967 100644
--- a/Source/SPDatabaseViewController.m
+++ b/Source/SPDatabaseViewController.m
@@ -23,8 +23,10 @@
//
// More info at <http://code.google.com/p/sequel-pro/>
+#ifndef SP_REFACTOR /* headers */
#import "SPAppController.h"
#import "SPBundleHTMLOutputController.h"
+#endif
#import "SPCopyTable.h"
#import "SPDatabaseViewController.h"
#import "SPHistoryController.h"
diff --git a/Source/SPTableContent.m b/Source/SPTableContent.m
index 75c286b7..bb86ab15 100644
--- a/Source/SPTableContent.m
+++ b/Source/SPTableContent.m
@@ -51,8 +51,10 @@
#import "SPGeometryDataView.h"
#import "SPTextView.h"
#import "SPDatabaseViewController.h"
+#ifndef SP_REFACTOR /* headers */
#import "SPAppController.h"
#import "SPBundleHTMLOutputController.h"
+#endif
#import "SPCustomQuery.h"
#import <pthread.h>
diff --git a/Source/SPTableContentDelegate.m b/Source/SPTableContentDelegate.m
index 83eb4149..3fdf1232 100644
--- a/Source/SPTableContentDelegate.m
+++ b/Source/SPTableContentDelegate.m
@@ -31,14 +31,18 @@
// More info at <http://code.google.com/p/sequel-pro/>
#import "SPTableContentDelegate.h"
+#ifndef SP_REFACTOR /* headers */
#import "SPAppController.h"
+#endif
#import "SPDatabaseDocument.h"
#import "SPDataStorage.h"
#import "SPGeometryDataView.h"
#import "SPTooltip.h"
#import "SPTablesList.h"
#import <SPMySQL/SPMySQL.h>
+#ifndef SP_REFACTOR /* headers */
#import "SPBundleHTMLOutputController.h"
+#endif
#import "SPCopyTable.h"
#import "SPAlertSheets.h"
#import "SPTableData.h"
diff --git a/Source/SPTextView.m b/Source/SPTextView.m
index 1b1bcf33..5466bd83 100644
--- a/Source/SPTextView.m
+++ b/Source/SPTextView.m
@@ -33,9 +33,13 @@
#import "SPNavigatorController.h"
#import "SPAlertSheets.h"
#import "RegexKitLite.h"
+#ifndef SP_REFACTOR /* headers */
#import "SPBundleHTMLOutputController.h"
+#endif
#import "SPDatabaseViewController.h"
+#ifndef SP_REFACTOR /* headers */
#import "SPAppController.h"
+#endif
#import <SPMySQL/SPMySQL.h>
#import "SPDatabaseStructure.h"
diff --git a/Source/SPTextViewAdditions.m b/Source/SPTextViewAdditions.m
index 97f7138d..8c5043cf 100644
--- a/Source/SPTextViewAdditions.m
+++ b/Source/SPTextViewAdditions.m
@@ -24,9 +24,13 @@
#import "SPAlertSheets.h"
#import "SPTooltip.h"
+#ifndef SP_REFACTOR /* headers */
#import "SPBundleHTMLOutputController.h"
+#endif
#import "SPCustomQuery.h"
+#ifndef SP_REFACTOR /* headers */
#import "SPAppController.h"
+#endif
#import "SPFieldEditorController.h"
#import "SPTextView.h"
#import "SPWindowController.h"
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-20 18:20:47 +0000