aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Source/SPDBActionCommons.h10
-rw-r--r--Source/SPDBActionCommons.m3
-rw-r--r--Source/SPDatabaseCopy.h4
-rw-r--r--Source/SPDatabaseInfo.h3
-rw-r--r--Source/SPDatabaseRename.h4
-rw-r--r--Source/SPDatabaseRename.m1
-rw-r--r--Source/SPTableCopy.h3
-rw-r--r--Source/SPTableCopy.m1
8 files changed, 9 insertions, 20 deletions
diff --git a/Source/SPDBActionCommons.h b/Source/SPDBActionCommons.h
index 334b0c78..1b7185bd 100644
--- a/Source/SPDBActionCommons.h
+++ b/Source/SPDBActionCommons.h
@@ -22,15 +22,11 @@
//
// More info at <http://code.google.com/p/sequel-pro/>
-#import <Foundation/Foundation.h>
-#import <Cocoa/Cocoa.h>
-#import <MCPKit/MCPConnection.h>
-#import <MCPKit/MCPResult.h>
+#import <MCPKit/MCPKit.h>
#import "SPAlertSheets.h"
-#import "SPStringAdditions.h"
-#import "Sequel-Pro.pch"
-@interface SPDBActionCommons : NSObject {
+@interface SPDBActionCommons : NSObject
+{
MCPConnection *connection;
NSWindow *messageWindow;
}
diff --git a/Source/SPDBActionCommons.m b/Source/SPDBActionCommons.m
index 977b3b5d..969ee0ad 100644
--- a/Source/SPDBActionCommons.m
+++ b/Source/SPDBActionCommons.m
@@ -23,9 +23,6 @@
// More info at <http://code.google.com/p/sequel-pro/>
#import "SPDBActionCommons.h"
-#import "SPAlertSheets.h"
-#import "SPStringAdditions.h"
-#import "Sequel-Pro.pch"
@implementation SPDBActionCommons
diff --git a/Source/SPDatabaseCopy.h b/Source/SPDatabaseCopy.h
index 3776d5a1..a146bbf4 100644
--- a/Source/SPDatabaseCopy.h
+++ b/Source/SPDatabaseCopy.h
@@ -22,14 +22,14 @@
//
// More info at <http://code.google.com/p/sequel-pro/>
-
#import "SPDBActionCommons.h"
#import "SPDatabaseInfo.h"
/**
* The SPDatabaseCopy class povides functionality to create a copy of a database.
*/
-@interface SPDatabaseCopy : SPDBActionCommons {
+@interface SPDatabaseCopy : SPDBActionCommons
+{
SPDatabaseInfo *dbInfo;
}
diff --git a/Source/SPDatabaseInfo.h b/Source/SPDatabaseInfo.h
index 3f68b773..3ae0319a 100644
--- a/Source/SPDatabaseInfo.h
+++ b/Source/SPDatabaseInfo.h
@@ -27,8 +27,7 @@
/*
* The SPDatabaseInfo class provides means of retrieving a list of database names
*/
-@interface SPDatabaseInfo : SPDBActionCommons {
-}
+@interface SPDatabaseInfo : SPDBActionCommons
/**
* This method checks, whether a database exists.
diff --git a/Source/SPDatabaseRename.h b/Source/SPDatabaseRename.h
index bd52a86f..6273c4dd 100644
--- a/Source/SPDatabaseRename.h
+++ b/Source/SPDatabaseRename.h
@@ -22,14 +22,14 @@
//
// More info at <http://code.google.com/p/sequel-pro/>
-
#import "SPDBActionCommons.h"
#import "SPDatabaseInfo.h"
/**
* The SPDatabaseRename class povides functionality to rename a database.
*/
-@interface SPDatabaseRename : SPDBActionCommons {
+@interface SPDatabaseRename : SPDBActionCommons
+{
SPDatabaseInfo *dbInfo;
}
diff --git a/Source/SPDatabaseRename.m b/Source/SPDatabaseRename.m
index abae5867..33d01724 100644
--- a/Source/SPDatabaseRename.m
+++ b/Source/SPDatabaseRename.m
@@ -22,7 +22,6 @@
//
// More info at <http://code.google.com/p/sequel-pro/>
-
#import "SPDBActionCommons.h"
#import "SPDatabaseRename.h"
#import "SPTableCopy.h"
diff --git a/Source/SPTableCopy.h b/Source/SPTableCopy.h
index 37ed452a..32eadcfc 100644
--- a/Source/SPTableCopy.h
+++ b/Source/SPTableCopy.h
@@ -27,8 +27,7 @@
/**
* The SPTableCopy class povides functionality to copy tables between databases.
*/
-@interface SPTableCopy : SPDBActionCommons {
-}
+@interface SPTableCopy : SPDBActionCommons
/**
* This method copies a table structure from one db to another.
diff --git a/Source/SPTableCopy.m b/Source/SPTableCopy.m
index bb819371..514eaeb1 100644
--- a/Source/SPTableCopy.m
+++ b/Source/SPTableCopy.m
@@ -129,5 +129,4 @@
return YES;
}
-
@end