From b73982892dde263a77608f219c3e02c48790f0c5 Mon Sep 17 00:00:00 2001
From: Michael Lotz <mmlr@mlotz.ch>
Date: Tue, 3 Jan 2012 17:15:24 +0100
Subject: [PATCH] Rename [Un]Register* functions to Add/Remove*.

---
 headers/os/app/KeyStore.h | 14 ++++++--------
 src/kits/app/KeyStore.cpp | 16 ++++++++--------
 2 files changed, 14 insertions(+), 16 deletions(-)

diff --git a/headers/os/app/KeyStore.h b/headers/os/app/KeyStore.h
index 83a86b27ff..6dc2096e64 100644
--- a/headers/os/app/KeyStore.h
+++ b/headers/os/app/KeyStore.h
@@ -41,12 +41,10 @@ public:
 									bool secondaryIdentifierOptional,
 									BKey& key);
 
-			status_t			RegisterKey(const BKey& key);
-			status_t			RegisterKey(const char* keyring,
-									const BKey& key);
-			status_t			UnregisterKey(const BKey& key);
-			status_t			UnregisterKey(const char* keyring,
-									const BKey& key);
+			status_t			AddKey(const BKey& key);
+			status_t			AddKey(const char* keyring, const BKey& key);
+			status_t			RemoveKey(const BKey& key);
+			status_t			RemoveKey(const char* keyring, const BKey& key);
 
 			status_t			GetNextKey(uint32& cookie, BKey& key);
 			status_t			GetNextKey(BKeyType type, BKeyPurpose purpose,
@@ -59,9 +57,9 @@ public:
 
 			// Keyrings
 
-			status_t			RegisterKeyring(const char* keyring,
+			status_t			AddKeyring(const char* keyring,
 									const BKey& key);
-			status_t			UnregisterKeyring(const char* keyring);
+			status_t			RemoveKeyring(const char* keyring);
 
 			status_t			GetNextKeyring(uint32& cookie,
 									BString& keyring);
diff --git a/src/kits/app/KeyStore.cpp b/src/kits/app/KeyStore.cpp
index c8417a2106..a3fbc593bc 100644
--- a/src/kits/app/KeyStore.cpp
+++ b/src/kits/app/KeyStore.cpp
@@ -74,28 +74,28 @@ BKeyStore::GetKey(const char* keyring, BKeyType type, BKeyPurpose purpose,
 
 
 status_t
-BKeyStore::RegisterKey(const BKey& key)
+BKeyStore::AddKey(const BKey& key)
 {
-	return RegisterKey(NULL, key);
+	return AddKey(NULL, key);
 }
 
 
 status_t
-BKeyStore::RegisterKey(const char* keyring, const BKey& key)
+BKeyStore::AddKey(const char* keyring, const BKey& key)
 {
 	return B_ERROR;
 }
 
 
 status_t
-BKeyStore::UnregisterKey(const BKey& key)
+BKeyStore::RemoveKey(const BKey& key)
 {
-	return UnregisterKey(NULL, key);
+	return RemoveKey(NULL, key);
 }
 
 
 status_t
-BKeyStore::UnregisterKey(const char* keyring, const BKey& key)
+BKeyStore::RemoveKey(const char* keyring, const BKey& key)
 {
 	return B_ERROR;
 }
@@ -135,14 +135,14 @@ BKeyStore::GetNextKey(const char* keyring, BKeyType type, BKeyPurpose purpose,
 
 
 status_t
-BKeyStore::RegisterKeyring(const char* keyring, const BKey& key)
+BKeyStore::AddKeyring(const char* keyring, const BKey& key)
 {
 	return B_ERROR;
 }
 
 
 status_t
-BKeyStore::UnregisterKeyring(const char* keyring)
+BKeyStore::RemoveKeyring(const char* keyring)
 {
 	return B_ERROR;
 }