Core/Misc: Minor refactors in BaseEncoding and SslSocket to prepare for future bnetserver changes

5 files changed, 8 insertions, 5 deletions

diff --git a/src/common/Encoding/Base32.cpp b/src/common/Encoding/Base32.cpp
index a091ed1ca18..9ed27831791 100644
--- a/src/common/Encoding/Base32.cpp
+++ b/src/common/Encoding/Base32.cpp
@@ -49,7 +49,7 @@ struct B32Impl
     return Trinity::Impl::GenericBaseEncoding<B32Impl>::Encode(data);
 }
 
-/*static*/ Optional<std::vector<uint8>> Trinity::Encoding::Base32::Decode(std::string const& data)
+/*static*/ Optional<std::vector<uint8>> Trinity::Encoding::Base32::Decode(std::string_view data)
 {
     return Trinity::Impl::GenericBaseEncoding<B32Impl>::Decode(data);
 }
diff --git a/src/common/Encoding/Base32.h b/src/common/Encoding/Base32.h
index 23705ddfebb..17daa7a0ab3 100644
--- a/src/common/Encoding/Base32.h
+++ b/src/common/Encoding/Base32.h
@@ -21,6 +21,7 @@
 #include "Define.h"
 #include "Optional.h"
 #include <string>
+#include <string_view>
 #include <vector>
 
 namespace Trinity
@@ -30,7 +31,7 @@ namespace Encoding
 struct TC_COMMON_API Base32
 {
     static std::string Encode(std::vector<uint8> const& data);
-    static Optional<std::vector<uint8>> Decode(std::string const& data);
+    static Optional<std::vector<uint8>> Decode(std::string_view data);
 };
 }
 }
diff --git a/src/common/Encoding/Base64.cpp b/src/common/Encoding/Base64.cpp
index 1b1860375e8..84ab5687f82 100644
--- a/src/common/Encoding/Base64.cpp
+++ b/src/common/Encoding/Base64.cpp
@@ -51,7 +51,7 @@ struct B64Impl
     return Trinity::Impl::GenericBaseEncoding<B64Impl>::Encode(data);
 }
 
-/*static*/ Optional<std::vector<uint8>> Trinity::Encoding::Base64::Decode(std::string const& data)
+/*static*/ Optional<std::vector<uint8>> Trinity::Encoding::Base64::Decode(std::string_view data)
 {
     return Trinity::Impl::GenericBaseEncoding<B64Impl>::Decode(data);
 }
diff --git a/src/common/Encoding/Base64.h b/src/common/Encoding/Base64.h
index 43ef5da65e4..0d78eb6088e 100644
--- a/src/common/Encoding/Base64.h
+++ b/src/common/Encoding/Base64.h
@@ -21,6 +21,7 @@
 #include "Define.h"
 #include "Optional.h"
 #include <string>
+#include <string_view>
 #include <vector>
 
 namespace Trinity
@@ -30,7 +31,7 @@ namespace Encoding
 struct TC_COMMON_API Base64
 {
     static std::string Encode(std::vector<uint8> const& data);
-    static Optional<std::vector<uint8>> Decode(std::string const& data);
+    static Optional<std::vector<uint8>> Decode(std::string_view data);
 };
 }
 }
diff --git a/src/common/Encoding/BaseEncoding.h b/src/common/Encoding/BaseEncoding.h
index 7dfe3fd4993..b0f527ea2af 100644
--- a/src/common/Encoding/BaseEncoding.h
+++ b/src/common/Encoding/BaseEncoding.h
@@ -22,6 +22,7 @@
 #include "Optional.h"
 #include <numeric>
 #include <string>
+#include <string_view>
 #include <vector>
 
 namespace Trinity
@@ -100,7 +101,7 @@ struct GenericBaseEncoding
         return s;
     }
 
-    static Optional<std::vector<uint8>> Decode(std::string const& data)
+    static Optional<std::vector<uint8>> Decode(std::string_view data)
     {
         auto it = data.begin(), end = data.end();
         if (it == end)