From 188460a91bd37ca6f18fb89e448819b642953be7 Mon Sep 17 00:00:00 2001
From: Egor Tensin <Egor.Tensin@gmail.com>
Date: Thu, 4 May 2017 04:08:15 +0300
Subject: code style & refactoring

---
 utils/block_input.hpp | 36 +++++++++++-------------------------
 1 file changed, 11 insertions(+), 25 deletions(-)

(limited to 'utils/block_input.hpp')

diff --git a/utils/block_input.hpp b/utils/block_input.hpp
index 0bcabbb..549e3f2 100644
--- a/utils/block_input.hpp
+++ b/utils/block_input.hpp
@@ -6,6 +6,7 @@
 #pragma once
 
 #include <string>
+#include <utility>
 #include <vector>
 
 namespace
@@ -13,34 +14,19 @@ namespace
     class Input
     {
     public:
-        Input(
-            const std::string& key_string,
-            const std::string& iv_string,
-            const std::vector<std::string>& input_block_strings)
-            : key_string(key_string)
-            , iv_string(iv_string)
-            , input_block_strings(input_block_strings)
+        Input(const std::string& key, const std::string& iv, std::vector<std::string>&& blocks)
+            : key{key}
+            , iv{iv}
+            , blocks{std::move(blocks)}
         { }
 
-        Input(
-            const std::string& key_string,
-            const std::vector<std::string>& input_block_strings)
-            : key_string(key_string)
-            , input_block_strings(input_block_strings)
+        Input(const std::string& key, std::vector<std::string>&& blocks)
+            : key{key}
+            , blocks{std::move(blocks)}
         { }
 
-        const std::string& get_key_string() const { return key_string; }
-
-        const std::string& get_iv_string() const { return iv_string; }
-
-        const std::vector<std::string>& get_input_block_strings() const
-        {
-            return input_block_strings;
-        }
-
-    private:
-        const std::string key_string;
-        const std::string iv_string;
-        const std::vector<std::string> input_block_strings;
+        const std::string key;
+        const std::string iv;
+        const std::vector<std::string> blocks;
     };
 }
-- 
cgit v1.2.3