Merge branch 'remove-network'

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

1 files changed, 10 insertions, 10 deletions

diff --git a/Compass.cpp b/Compass.cpp
index 9a27d55..dd0bbaf 100644
--- a/Compass.cpp
+++ b/Compass.cpp
@@ -215,7 +215,7 @@ void Compass::initialize() {
 }

 

 void Compass::create(std::string service) {

-	Keychain* kc = Keychain::loadKeychain(opt.rh, opt.pt, opt.dr);

+	Keychain* kc = Keychain::loadKeychain(opt.dr);

 	Credential c;

 

 	if (opt.user != "" && opt.pass != "")

@@ -238,13 +238,13 @@ void Compass::create(std::string service) {
 }

 

 void Compass::walk() {

-	Keychain* kc = Keychain::loadKeychain(opt.rh, opt.pt, opt.dr);

+	Keychain* kc = Keychain::loadKeychain(opt.dr);

 	kc->walk();

 	delete kc;

 }

 

 void Compass::rekey() {

-	Keychain* kc = Keychain::loadKeychain(opt.rh, opt.pt, opt.dr);

+	Keychain* kc = Keychain::loadKeychain(opt.dr);

 	Cryptor::rekey();

 

 	std::cout << "Enter a new master password for your keychain... (CTRL-C to abort)" << std::endl;

@@ -253,7 +253,7 @@ void Compass::rekey() {
 }

 

 void Compass::get(std::string service) {

-	Keychain* kc = Keychain::loadKeychain(opt.rh, opt.pt, opt.dr);

+	Keychain* kc = Keychain::loadKeychain(opt.dr);

 	Credential c;

 

 	if (opt.cn != -1)

@@ -278,7 +278,7 @@ void Compass::get(std::string service) {
 }

 

 void Compass::_delete(std::string service) {

-	Keychain* kc = Keychain::loadKeychain(opt.rh, opt.pt, opt.dr);

+	Keychain* kc = Keychain::loadKeychain(opt.dr);

 	bool b;

 

 	if (opt.cn != -1)

@@ -300,7 +300,7 @@ void Compass::_delete(std::string service) {
 }

 

 void Compass::show(std::string service, bool like) {

-	Keychain* kc = Keychain::loadKeychain(opt.rh, opt.pt, opt.dr);

+	Keychain* kc = Keychain::loadKeychain(opt.dr);

 

 	if (service == "")

 		kc->show();

@@ -319,7 +319,7 @@ void Compass::random() {
 }

 

 void Compass::markReset(std::string service) {

-	Keychain* kc = Keychain::loadKeychain(opt.rh, opt.pt, opt.dr);

+	Keychain* kc = Keychain::loadKeychain(opt.dr);

 	int i;

 

 	if (service == "")

@@ -335,7 +335,7 @@ void Compass::markReset(std::string service) {
 }

 

 void Compass::checkReset(std::string service) {

-	Keychain* kc = Keychain::loadKeychain(opt.rh, opt.pt, opt.dr);

+	Keychain* kc = Keychain::loadKeychain(opt.dr);

 	int i;

 

 	if (service == "")

@@ -349,7 +349,7 @@ void Compass::checkReset(std::string service) {
 }

 

 void Compass::ruser(std::string service) {

-	Keychain* kc = Keychain::loadKeychain(opt.rh, opt.pt, opt.dr);

+	Keychain* kc = Keychain::loadKeychain(opt.dr);

 	Credential c;

 

 	if (opt.user == "") {

@@ -376,7 +376,7 @@ void Compass::ruser(std::string service) {
 }

 

 void Compass::rpass(std::string service) {

-	Keychain* kc = Keychain::loadKeychain(opt.rh, opt.pt, opt.dr);

+	Keychain* kc = Keychain::loadKeychain(opt.dr);

 	Credential c;

 

 	if (opt.pass == "") {