Changed many uses of BackupProtocolClient to BackupProtocolCallable.

Makes way for more use of local protocol objects and protocol subclasses.

Merged back changes from the test refactor branch to reduce diffs.

3 files changed, 9 insertions, 9 deletions

diff --git a/bin/bbackupquery/BackupQueries.cpp b/bin/bbackupquery/BackupQueries.cpp
index 7bd2e367..bcb1827e 100644
--- a/bin/bbackupquery/BackupQueries.cpp
+++ b/bin/bbackupquery/BackupQueries.cpp
@@ -72,7 +72,7 @@
 //		Created: 2003/10/10
 //
 // --------------------------------------------------------------------------
-BackupQueries::BackupQueries(BackupProtocolClient &rConnection,
+BackupQueries::BackupQueries(BackupProtocolCallable &rConnection,
 	const Configuration &rConfiguration, bool readWrite)
 	: mReadWrite(readWrite),
 	  mrConnection(rConnection),
diff --git a/bin/bbackupquery/BackupQueries.h b/bin/bbackupquery/BackupQueries.h
index bad1a39c..96df34f5 100644
--- a/bin/bbackupquery/BackupQueries.h
+++ b/bin/bbackupquery/BackupQueries.h
@@ -18,7 +18,7 @@
 #include "BoxBackupCompareParams.h"
 #include "BackupStoreDirectory.h"
 
-class BackupProtocolClient;
+class BackupProtocolCallable;
 class Configuration;
 class ExcludeList;
 
@@ -55,7 +55,7 @@ struct QueryCommandSpecification;
 class BackupQueries
 {
 public:
-	BackupQueries(BackupProtocolClient &rConnection,
+	BackupQueries(BackupProtocolCallable &rConnection,
 		const Configuration &rConfiguration,
 		bool readWrite);
 	~BackupQueries();
@@ -396,7 +396,7 @@ private:
 
 private:
 	bool mReadWrite;
-	BackupProtocolClient &mrConnection;
+	BackupProtocolCallable &mrConnection;
 	const Configuration &mrConfiguration;
 	bool mQuitNow;
 	std::vector<std::pair<std::string, int64_t> > mDirStack;
@@ -407,14 +407,14 @@ private:
 
 typedef std::vector<std::string> (*CompletionHandler)
 	(BackupQueries::ParsedCommand& rCommand, const std::string& prefix,
-	BackupProtocolClient& rProtocol, const Configuration& rConfig,
+	BackupProtocolCallable& rProtocol, const Configuration& rConfig,
 	BackupQueries& rQueries);
 
 std::vector<std::string> CompleteCommand(BackupQueries::ParsedCommand& rCommand,
-	const std::string& prefix, BackupProtocolClient& rProtocol,
+	const std::string& prefix, BackupProtocolCallable& rProtocol,
 	const Configuration& rConfig, BackupQueries& rQueries);
 std::vector<std::string> CompleteOptions(BackupQueries::ParsedCommand& rCommand,
-	const std::string& prefix, BackupProtocolClient& rProtocol,
+	const std::string& prefix, BackupProtocolCallable& rProtocol,
 	const Configuration& rConfig, BackupQueries& rQueries);
 
 #define MAX_COMPLETION_HANDLERS 4
diff --git a/bin/bbackupquery/CommandCompletion.cpp b/bin/bbackupquery/CommandCompletion.cpp
index 2ca26991..5a547ea8 100644
--- a/bin/bbackupquery/CommandCompletion.cpp
+++ b/bin/bbackupquery/CommandCompletion.cpp
@@ -45,7 +45,7 @@
 std::vector<std::string> Complete ## name( \
 	BackupQueries::ParsedCommand& rCommand, \
 	const std::string& prefix, \
-	BackupProtocolClient& rProtocol, const Configuration& rConfig, \
+	BackupProtocolCallable& rProtocol, const Configuration& rConfig, \
 	BackupQueries& rQueries) \
 { \
 	std::vector<std::string> completions; \
@@ -170,7 +170,7 @@ int16_t GetExcludeFlags(BackupQueries::ParsedCommand& rCommand)
 
 std::vector<std::string> CompleteRemoteFileOrDirectory(
 	BackupQueries::ParsedCommand& rCommand,
-	const std::string& prefix, BackupProtocolClient& rProtocol,
+	const std::string& prefix, BackupProtocolCallable& rProtocol,
 	BackupQueries& rQueries, int16_t includeFlags)
 {
 	std::vector<std::string> completions;