Merge branch 'remove-network'

* remove-network:
  Remove remote-host and port options
  Remove Socket class

1 files changed, 2 insertions, 4 deletions

diff --git a/Keychain.h b/Keychain.h
index 8219424..de0d760 100644
--- a/Keychain.h
+++ b/Keychain.h
@@ -23,12 +23,12 @@ struct Credential {
 class Keychain {

 public:

 	// Structors

-	Keychain(std::string remoteHost, std::string port, std::string directory);

+	Keychain(std::string directory);

 	virtual ~Keychain();

 

 	// Open/close

 	static Keychain* newKeychain(std::string directory);

-	static Keychain* loadKeychain(std::string remoteHost, std::string port, std::string directory);

+	static Keychain* loadKeychain(std::string directory);

 	void saveKeychain();

 

 	// Info/Debug

@@ -80,8 +80,6 @@ public:
 

 private:

 	std::map<std::string, std::vector<Credential> > credentials; // map from service name (string) onto list of credentials for that service (vector<Credential>)

-	std::string remoteHost;

-	std::string port;

 	std::string directory;

 

 	// Reset Credentials