diff options
-rw-r--r-- | Source/SPDatabaseAction.h (renamed from Source/SPDBActionCommons.h) | 2 | ||||
-rw-r--r-- | Source/SPDatabaseAction.m (renamed from Source/SPDBActionCommons.m) | 4 | ||||
-rw-r--r-- | Source/SPDatabaseCopy.h | 4 | ||||
-rw-r--r-- | Source/SPDatabaseCopy.m | 1 | ||||
-rw-r--r-- | Source/SPDatabaseRename.h | 4 | ||||
-rw-r--r-- | Source/SPDatabaseRename.m | 1 | ||||
-rw-r--r-- | Source/SPTableCopy.h | 4 | ||||
-rw-r--r-- | Source/SPTableCopy.m | 1 | ||||
-rw-r--r-- | Source/SPViewCopy.h | 4 | ||||
-rw-r--r-- | Source/SPViewCopy.m | 1 | ||||
-rw-r--r-- | sequel-pro.xcodeproj/project.pbxproj | 12 |
11 files changed, 18 insertions, 20 deletions
diff --git a/Source/SPDBActionCommons.h b/Source/SPDatabaseAction.h index 5b467e1d..a5d27218 100644 --- a/Source/SPDBActionCommons.h +++ b/Source/SPDatabaseAction.h @@ -26,7 +26,7 @@ @class SPTablesList; -@interface SPDBActionCommons : NSObject +@interface SPDatabaseAction : NSObject { NSWindow *messageWindow; SPTablesList *tablesList; diff --git a/Source/SPDBActionCommons.m b/Source/SPDatabaseAction.m index c12751cf..83509360 100644 --- a/Source/SPDBActionCommons.m +++ b/Source/SPDatabaseAction.m @@ -22,9 +22,9 @@ // // More info at <http://code.google.com/p/sequel-pro/> -#import "SPDBActionCommons.h" +#import "SPDatabaseAction.h" -@implementation SPDBActionCommons +@implementation SPDatabaseAction @synthesize connection; @synthesize messageWindow; diff --git a/Source/SPDatabaseCopy.h b/Source/SPDatabaseCopy.h index 41a22ff0..392c6081 100644 --- a/Source/SPDatabaseCopy.h +++ b/Source/SPDatabaseCopy.h @@ -22,12 +22,12 @@ // // More info at <http://code.google.com/p/sequel-pro/> -#import "SPDBActionCommons.h" +#import "SPDatabaseAction.h" /** * The SPDatabaseCopy class povides functionality to create a copy of a database. */ -@interface SPDatabaseCopy : SPDBActionCommons +@interface SPDatabaseCopy : SPDatabaseAction /** * This method clones an existing database. diff --git a/Source/SPDatabaseCopy.m b/Source/SPDatabaseCopy.m index 130f5d99..1425a4ee 100644 --- a/Source/SPDatabaseCopy.m +++ b/Source/SPDatabaseCopy.m @@ -22,7 +22,6 @@ // // More info at <http://code.google.com/p/sequel-pro/> -#import "SPDBActionCommons.h" #import "SPDatabaseCopy.h" #import "SPTableCopy.h" diff --git a/Source/SPDatabaseRename.h b/Source/SPDatabaseRename.h index e097c741..d81f9618 100644 --- a/Source/SPDatabaseRename.h +++ b/Source/SPDatabaseRename.h @@ -22,12 +22,12 @@ // // More info at <http://code.google.com/p/sequel-pro/> -#import "SPDBActionCommons.h" +#import "SPDatabaseAction.h" /** * The SPDatabaseRename class povides functionality to rename a database. */ -@interface SPDatabaseRename : SPDBActionCommons +@interface SPDatabaseRename : SPDatabaseAction /** * This method renames an existing database. diff --git a/Source/SPDatabaseRename.m b/Source/SPDatabaseRename.m index 85763c7f..83fa7d07 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" #import "SPViewCopy.h" diff --git a/Source/SPTableCopy.h b/Source/SPTableCopy.h index e32560aa..df6aaaa7 100644 --- a/Source/SPTableCopy.h +++ b/Source/SPTableCopy.h @@ -22,12 +22,12 @@ // // More info at <http://code.google.com/p/sequel-pro/> -#import "SPDBActionCommons.h" +#import "SPDatabaseAction.h" /** * The SPTableCopy class povides functionality to copy tables between databases. */ -@interface SPTableCopy : SPDBActionCommons +@interface SPTableCopy : SPDatabaseAction /** * This method copies a table structure from one db to another. diff --git a/Source/SPTableCopy.m b/Source/SPTableCopy.m index e629e481..60869b9b 100644 --- a/Source/SPTableCopy.m +++ b/Source/SPTableCopy.m @@ -22,7 +22,6 @@ // // More info at <http://code.google.com/p/sequel-pro/> -#import "SPDBActionCommons.h" #import "SPTableCopy.h" #import <SPMySQL/SPMySQL.h> diff --git a/Source/SPViewCopy.h b/Source/SPViewCopy.h index 6f1be956..add4af77 100644 --- a/Source/SPViewCopy.h +++ b/Source/SPViewCopy.h @@ -30,7 +30,9 @@ // // More info at <http://code.google.com/p/sequel-pro/> -@interface SPViewCopy : SPDBActionCommons +#import "SPDatabaseAction.h" + +@interface SPViewCopy : SPDatabaseAction - (BOOL)moveView:(NSString *)view from:(NSString *)sourceDatabase to:(NSString *)targetDatabase; diff --git a/Source/SPViewCopy.m b/Source/SPViewCopy.m index b7fde195..b32a08e4 100644 --- a/Source/SPViewCopy.m +++ b/Source/SPViewCopy.m @@ -30,7 +30,6 @@ // // More info at <http://code.google.com/p/sequel-pro/> -#import "SPDBActionCommons.h" #import "SPViewCopy.h" #import <SPMySQL/SPMySQL.h> diff --git a/sequel-pro.xcodeproj/project.pbxproj b/sequel-pro.xcodeproj/project.pbxproj index d06e20dc..ff8abd97 100644 --- a/sequel-pro.xcodeproj/project.pbxproj +++ b/sequel-pro.xcodeproj/project.pbxproj @@ -27,7 +27,7 @@ 1141A38A117BBFF200126A28 /* SPTableCopy.m in Sources */ = {isa = PBXBuildFile; fileRef = 1141A388117BBFF200126A28 /* SPTableCopy.m */; }; 1198F5B31174EDD500670590 /* SPDatabaseCopy.m in Sources */ = {isa = PBXBuildFile; fileRef = 1198F5B21174EDD500670590 /* SPDatabaseCopy.m */; }; 1198F7541174FFCF00670590 /* SPDatabaseCopy.m in Sources */ = {isa = PBXBuildFile; fileRef = 1198F5B21174EDD500670590 /* SPDatabaseCopy.m */; }; - 11B55BFE1189E3B2009EF465 /* SPDBActionCommons.m in Sources */ = {isa = PBXBuildFile; fileRef = 11B55BFD1189E3B2009EF465 /* SPDBActionCommons.m */; }; + 11B55BFE1189E3B2009EF465 /* SPDatabaseAction.m in Sources */ = {isa = PBXBuildFile; fileRef = 11B55BFD1189E3B2009EF465 /* SPDatabaseAction.m */; }; 11C211271180EC0400758039 /* SPDatabaseRename.m in Sources */ = {isa = PBXBuildFile; fileRef = 11C2109D1180E70800758039 /* SPDatabaseRename.m */; }; 11C211301180EC9A00758039 /* SPDatabaseRename.m in Sources */ = {isa = PBXBuildFile; fileRef = 11C2109D1180E70800758039 /* SPDatabaseRename.m */; }; 11D44DF0118F5887002AA43C /* OCMock.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 11D44DEF118F5887002AA43C /* OCMock.framework */; }; @@ -597,8 +597,8 @@ 1198F5B21174EDD500670590 /* SPDatabaseCopy.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SPDatabaseCopy.m; sourceTree = "<group>"; }; 1198F5C21174EF3F00670590 /* SPDatabaseCopyTest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SPDatabaseCopyTest.h; sourceTree = "<group>"; }; 1198F5C31174EF3F00670590 /* SPDatabaseCopyTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SPDatabaseCopyTest.m; sourceTree = "<group>"; }; - 11B55BFC1189E3B2009EF465 /* SPDBActionCommons.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SPDBActionCommons.h; sourceTree = "<group>"; }; - 11B55BFD1189E3B2009EF465 /* SPDBActionCommons.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SPDBActionCommons.m; sourceTree = "<group>"; }; + 11B55BFC1189E3B2009EF465 /* SPDatabaseAction.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SPDatabaseAction.h; sourceTree = "<group>"; }; + 11B55BFD1189E3B2009EF465 /* SPDatabaseAction.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SPDatabaseAction.m; sourceTree = "<group>"; }; 11C2109C1180E70800758039 /* SPDatabaseRename.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SPDatabaseRename.h; sourceTree = "<group>"; }; 11C2109D1180E70800758039 /* SPDatabaseRename.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SPDatabaseRename.m; sourceTree = "<group>"; }; 11C210DD1180E9B800758039 /* SPDatabaseRenameTest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SPDatabaseRenameTest.h; sourceTree = "<group>"; }; @@ -1400,8 +1400,8 @@ 1198F5B21174EDD500670590 /* SPDatabaseCopy.m */, 11C2109C1180E70800758039 /* SPDatabaseRename.h */, 11C2109D1180E70800758039 /* SPDatabaseRename.m */, - 11B55BFC1189E3B2009EF465 /* SPDBActionCommons.h */, - 11B55BFD1189E3B2009EF465 /* SPDBActionCommons.m */, + 11B55BFC1189E3B2009EF465 /* SPDatabaseAction.h */, + 11B55BFD1189E3B2009EF465 /* SPDatabaseAction.m */, ); name = "Database Actions"; sourceTree = "<group>"; @@ -3232,7 +3232,7 @@ 5885CF4A116A63B200A85ACB /* SPFileHandle.m in Sources */, 1198F5B31174EDD500670590 /* SPDatabaseCopy.m in Sources */, 1141A389117BBFF200126A28 /* SPTableCopy.m in Sources */, - 11B55BFE1189E3B2009EF465 /* SPDBActionCommons.m in Sources */, + 11B55BFE1189E3B2009EF465 /* SPDatabaseAction.m in Sources */, 58A8A79111A036C000B95749 /* SPWindowController.m in Sources */, 5806B76411A991EC00813A88 /* SPDocumentController.m in Sources */, 173C837111AAD26E00B8B084 /* SPExportInitializer.m in Sources */, |