Rename Keychain class.

10 files changed, 22 insertions, 22 deletions

diff --git a/Source/MainController.m b/Source/MainController.m
index 3f297574..a712e481 100644
--- a/Source/MainController.m
+++ b/Source/MainController.m
@@ -23,7 +23,7 @@
 //
 //  More info at <http://code.google.com/p/sequel-pro/>
 
-#import "KeyChain.h"
+#import "SPKeychain.h"
 #import "MainController.h"
 #import "TableDocument.h"
 #import "SPPreferenceController.h"
diff --git a/Source/SPConnectionController.h b/Source/SPConnectionController.h
index f9af5894..d9e83410 100644
--- a/Source/SPConnectionController.h
+++ b/Source/SPConnectionController.h
@@ -27,7 +27,7 @@
 #import <MCPKit/MCPKit.h>
 
 #import "TableDocument.h"
-#import "KeyChain.h"
+#import "SPKeychain.h"
 #import "SPSSHTunnel.h"
 
 enum spconnection_types
@@ -48,7 +48,7 @@ enum spconnection_types
 	TableDocument *tableDocument;
 	NSWindow *documentWindow;
 	NSSplitView *contentView;
-	KeyChain *keychain;
+	SPKeychain *keychain;
 	NSUserDefaults *prefs;
 	NSMutableArray *favorites;
 	SPSSHTunnel *sshTunnel;
diff --git a/Source/SPConnectionController.m b/Source/SPConnectionController.m
index e5a0a473..baef9691 100644
--- a/Source/SPConnectionController.m
+++ b/Source/SPConnectionController.m
@@ -80,7 +80,7 @@
 		for (int i = 0; i < [toolbarItems count]; i++) [[toolbarItems objectAtIndex:i] setEnabled:NO];
 		
 		// Set up a keychain instance and preferences reference, and create the initial favorites list
-		keychain = [[KeyChain alloc] init];
+		keychain = [[SPKeychain alloc] init];
 		prefs = [[NSUserDefaults standardUserDefaults] retain];
 		favorites = nil;
 		[self updateFavorites];
diff --git a/Source/KeyChain.h b/Source/SPKeychain.h
index ca95d09f..21e6c405 100644
--- a/Source/KeyChain.h
+++ b/Source/SPKeychain.h
@@ -1,7 +1,7 @@
 //
 //  $Id$
 //
-//  KeyChain.h
+//  SPKeychain.h
 //  sequel-pro
 //
 //  Created by lorenz textor (lorenz@textor.ch) on Wed Dec 25 2002.
@@ -26,7 +26,7 @@
 #import <Foundation/Foundation.h>
 #import <Cocoa/Cocoa.h>
 
-@interface KeyChain : NSObject
+@interface SPKeychain : NSObject
 
 - (void)addPassword:(NSString *)password forName:(NSString *)name account:(NSString *)account;
 - (void)addPassword:(NSString *)password forName:(NSString *)name account:(NSString *)account withLabel:(NSString *)label;
diff --git a/Source/KeyChain.m b/Source/SPKeychain.m
index 483eeceb..9aea5248 100644
--- a/Source/KeyChain.m
+++ b/Source/SPKeychain.m
@@ -1,7 +1,7 @@
 //
 //  $Id$
 //
-//  KeyChain.m
+//  SPKeychain.m
 //  sequel-pro
 //
 //  Created by lorenz textor (lorenz@textor.ch) on Wed Dec 25 2002.
@@ -23,12 +23,12 @@
 //
 //  More info at <http://code.google.com/p/sequel-pro/>
 
-#import "KeyChain.h"
+#import "SPKeychain.h"
 
 #import <CoreFoundation/CoreFoundation.h>
 #import <Security/Security.h>
 
-@implementation KeyChain
+@implementation SPKeychain
 
 /**
  * Add the supplied password to the user's Keychain using the supplied name and account.
diff --git a/Source/SPPreferenceController.h b/Source/SPPreferenceController.h
index 515221e9..4e4eed5a 100644
--- a/Source/SPPreferenceController.h
+++ b/Source/SPPreferenceController.h
@@ -25,7 +25,7 @@
 
 #import <Cocoa/Cocoa.h>
 
-@class KeyChain;
+@class SPKeychain;
 
 @interface SPPreferenceController : NSWindowController
 {
@@ -56,7 +56,7 @@
 	IBOutlet NSTextField *favoriteUserTextFieldSSH;
 	IBOutlet NSTextField *favoriteHostTextFieldSSH;
 
-	KeyChain *keychain;
+	SPKeychain *keychain;
 	NSDictionary *currentFavorite;
 
 	IBOutlet NSTextField *editorFontName;
diff --git a/Source/SPPreferenceController.m b/Source/SPPreferenceController.m
index ca7c6562..f9618249 100644
--- a/Source/SPPreferenceController.m
+++ b/Source/SPPreferenceController.m
@@ -26,7 +26,7 @@
 #import "SPPreferenceController.h"
 #import "SPWindowAdditions.h"
 #import "SPFavoriteTextFieldCell.h"
-#import "KeyChain.h"
+#import "SPKeychain.h"
 #import "TableDocument.h"
 
 #define FAVORITES_PB_DRAG_TYPE @"SequelProPreferencesPasteboard"
@@ -78,7 +78,7 @@
 {	
 	[self _setupToolbar];
 	
-	keychain = [[KeyChain alloc] init];
+	keychain = [[SPKeychain alloc] init];
 	
 	SPFavoriteTextFieldCell *tableCell = [[[SPFavoriteTextFieldCell alloc] init] autorelease];
 	
@@ -206,7 +206,7 @@
 		NSMutableArray *favoritesArray = [NSMutableArray arrayWithArray:[prefs objectForKey:@"favorites"]];
 		NSMutableDictionary *favorite;
 		NSString *password, *keychainName, *keychainAccount;
-		KeyChain *upgradeKeychain = [[KeyChain alloc] init];
+		SPKeychain *upgradeKeychain = [[SPKeychain alloc] init];
 
 		// Cycle through the favorites, generating a timestamp-derived ID for each and renaming associated keychain items.
 		for (i = 0; i < [favoritesArray count]; i++) {
diff --git a/Source/SPSSHTunnel.m b/Source/SPSSHTunnel.m
index d086c8ce..01ab721d 100644
--- a/Source/SPSSHTunnel.m
+++ b/Source/SPSSHTunnel.m
@@ -25,7 +25,7 @@
 
 #import "SPSSHTunnel.h"
 #import "RegexKitLite.h"
-#import "KeyChain.h"
+#import "SPKeychain.h"
 #import <netinet/in.h>
 
 @implementation SPSSHTunnel
@@ -510,7 +510,7 @@
 	NSSize queryTextSize;
 	NSRect windowFrameRect;
 	NSString *thePassword;
-	KeyChain *keychain;
+	SPKeychain *keychain;
 
 	// Work out whether a passphrase is being requested, extracting the key name
 	NSString *keyName = [theQuery stringByMatching:@"^\\s*Enter passphrase for key \\'(.*)\\':\\s*$" capture:1L];
@@ -543,7 +543,7 @@
 			
 			// Add to keychain if appropriate
 			if (keyName && [sshPasswordKeychainCheckbox state] == NSOnState) {
-				keychain = [[KeyChain alloc] init];
+				keychain = [[SPKeychain alloc] init];
 				[keychain addPassword:thePassword forName:@"SSH" account:keyName withLabel:[NSString stringWithFormat:@"SSH: %@", keyName]];
 				[keychain release];
 			}
diff --git a/Source/SequelProTunnelAssistant.m b/Source/SequelProTunnelAssistant.m
index 462d9a6d..0d9138a1 100644
--- a/Source/SequelProTunnelAssistant.m
+++ b/Source/SequelProTunnelAssistant.m
@@ -23,7 +23,7 @@
 //  More info at <http://code.google.com/p/sequel-pro/>
 
 #import <Cocoa/Cocoa.h>
-#import "KeyChain.h"
+#import "SPKeychain.h"
 #import "SPSSHTunnel.h"
 #import "RegexKitLite.h"
 
@@ -69,7 +69,7 @@ int main(int argc, const char *argv[])
 		// If the password method is set to use the keychain, use the supplied keychain name to
 		// request the password
 		if ([[environment objectForKey:@"SP_PASSWORD_METHOD"] intValue] == SPSSH_PASSWORD_USES_KEYCHAIN) {
-			KeyChain *keychain;
+			SPKeychain *keychain;
 			NSString *keychainName = [environment objectForKey:@"SP_KEYCHAIN_ITEM_NAME"];
 			NSString *keychainAccount = [environment objectForKey:@"SP_KEYCHAIN_ITEM_ACCOUNT"];
 
@@ -79,7 +79,7 @@ int main(int argc, const char *argv[])
 				return 1;
 			}
 
-			keychain = [[KeyChain alloc] init];
+			keychain = [[SPKeychain alloc] init];
 			if (![keychain passwordExistsForName:keychainName account:keychainAccount]) {
 				NSLog(@"SSH Tunnel: specified keychain password not found");
 				[keychain release];
@@ -131,7 +131,7 @@ int main(int argc, const char *argv[])
 		if (keyName) {
 		
 			// Check whether the passphrase is in the keychain, using standard OS X sshagent name and account
-			KeyChain *keychain = [[KeyChain alloc] init];
+			SPKeychain *keychain = [[SPKeychain alloc] init];
 			if ([keychain passwordExistsForName:@"SSH" account:keyName]) {
 				printf("%s\n", [[keychain getPasswordForName:@"SSH" account:keyName] UTF8String]);
 				[keychain release];
diff --git a/Source/TableDocument.m b/Source/TableDocument.m
index 4670740c..1063070b 100644
--- a/Source/TableDocument.m
+++ b/Source/TableDocument.m
@@ -2401,7 +2401,7 @@
  */
 - (NSString *)keychainPasswordForConnection:(MCPConnection *)connection
 {	
-	KeyChain *keychain = [[KeyChain alloc] init];
+	SPKeychain *keychain = [[SPKeychain alloc] init];
 	
 	NSString *password = [keychain getPasswordForName:[connectionController connectionKeychainItemName] account:[connectionController connectionKeychainItemAccount]];