aesxx/utils: move helper headers to helpers/

13 files changed, 18 insertions, 18 deletions

diff --git a/aesxx/utils/CMakeLists.txt b/aesxx/utils/CMakeLists.txt
index 470a313..4958bef 100644
--- a/aesxx/utils/CMakeLists.txt
+++ b/aesxx/utils/CMakeLists.txt
@@ -16,20 +16,20 @@ function(add_util name src)
 endfunction()
 
 set(block_util_headers
-    block_cmd_parser.hpp
     block_dumper.hpp
     block_input.hpp
-    data_parsers.hpp
-    helpers/command_line.hpp
+    helpers/cmd_parser.hpp
+    helpers/cmd_paresr_block.hpp
+    helpers/data_parsers.hpp
 )
 
 add_util(encrypt_block encrypt_block.cpp ${block_util_headers})
 add_util(decrypt_block decrypt_block.cpp ${block_util_headers})
 
 set(file_util_headers
-    data_parsers.hpp
-    file_cmd_parser.hpp
-    helpers/command_line.hpp
+    helpers/cmd_parser.hpp
+    helpers/cmd_parser_file.hpp
+    helpers/data_parsers.hpp
     helpers/file.hpp
 )
 
diff --git a/aesxx/utils/decrypt_block.cpp b/aesxx/utils/decrypt_block.cpp
index 6eeb1d7..bcd3381 100644
--- a/aesxx/utils/decrypt_block.cpp
+++ b/aesxx/utils/decrypt_block.cpp
@@ -3,9 +3,9 @@
 // For details, see https://github.com/egor-tensin/aes-tools.
 // Distributed under the MIT License.
 
-#include "block_cmd_parser.hpp"
-#include "block_dumper.hpp"
-#include "block_input.hpp"
+#include "helpers/block_dumper.hpp"
+#include "helpers/block_input.hpp"
+#include "helpers/cmd_parser_block.hpp"
 
 #include <aesxx/all.hpp>
 
diff --git a/aesxx/utils/decrypt_bmp.cpp b/aesxx/utils/decrypt_bmp.cpp
index 3247d63..d805c62 100644
--- a/aesxx/utils/decrypt_bmp.cpp
+++ b/aesxx/utils/decrypt_bmp.cpp
@@ -3,8 +3,8 @@
 // For details, see https://github.com/egor-tensin/aes-tools.
 // Distributed under the MIT License.
 
-#include "file_cmd_parser.hpp"
 #include "helpers/bmp.hpp"
+#include "helpers/cmd_parser_file.hpp"
 #include "helpers/file.hpp"
 
 #include <aesxx/all.hpp>
diff --git a/aesxx/utils/decrypt_file.cpp b/aesxx/utils/decrypt_file.cpp
index 85476a9..42fe3e9 100644
--- a/aesxx/utils/decrypt_file.cpp
+++ b/aesxx/utils/decrypt_file.cpp
@@ -3,7 +3,7 @@
 // For details, see https://github.com/egor-tensin/aes-tools.
 // Distributed under the MIT License.
 
-#include "file_cmd_parser.hpp"
+#include "helpers/cmd_parser_file.hpp"
 #include "helpers/file.hpp"
 
 #include <aesxx/all.hpp>
diff --git a/aesxx/utils/encrypt_block.cpp b/aesxx/utils/encrypt_block.cpp
index 5c8698d..d6e5534 100644
--- a/aesxx/utils/encrypt_block.cpp
+++ b/aesxx/utils/encrypt_block.cpp
@@ -3,9 +3,9 @@
 // For details, see https://github.com/egor-tensin/aes-tools.
 // Distributed under the MIT License.
 
-#include "block_cmd_parser.hpp"
-#include "block_dumper.hpp"
-#include "block_input.hpp"
+#include "helpers/block_dumper.hpp"
+#include "helpers/block_input.hpp"
+#include "helpers/cmd_parser_block.hpp"
 
 #include <aesxx/all.hpp>
 
diff --git a/aesxx/utils/encrypt_bmp.cpp b/aesxx/utils/encrypt_bmp.cpp
index 2be1e4f..5c9acbf 100644
--- a/aesxx/utils/encrypt_bmp.cpp
+++ b/aesxx/utils/encrypt_bmp.cpp
@@ -3,8 +3,8 @@
 // For details, see https://github.com/egor-tensin/aes-tools.
 // Distributed under the MIT License.
 
-#include "file_cmd_parser.hpp"
 #include "helpers/bmp.hpp"
+#include "helpers/cmd_parser_file.hpp"
 #include "helpers/file.hpp"
 
 #include <aesxx/all.hpp>
diff --git a/aesxx/utils/encrypt_file.cpp b/aesxx/utils/encrypt_file.cpp
index 94ed47c..e069ec7 100644
--- a/aesxx/utils/encrypt_file.cpp
+++ b/aesxx/utils/encrypt_file.cpp
@@ -3,7 +3,7 @@
 // For details, see https://github.com/egor-tensin/aes-tools.
 // Distributed under the MIT License.
 
-#include "file_cmd_parser.hpp"
+#include "helpers/cmd_parser_file.hpp"
 #include "helpers/file.hpp"
 
 #include <aesxx/all.hpp>
diff --git a/aesxx/utils/block_dumper.hpp b/aesxx/utils/helpers/block_dumper.hpp
index 8284b67..8284b67 100644
--- a/aesxx/utils/block_dumper.hpp
+++ b/aesxx/utils/helpers/block_dumper.hpp
diff --git a/aesxx/utils/block_input.hpp b/aesxx/utils/helpers/block_input.hpp
index 042a680..042a680 100644
--- a/aesxx/utils/block_input.hpp
+++ b/aesxx/utils/helpers/block_input.hpp
diff --git a/aesxx/utils/helpers/command_line.hpp b/aesxx/utils/helpers/cmd_parser.hpp
index 607253c..607253c 100644
--- a/aesxx/utils/helpers/command_line.hpp
+++ b/aesxx/utils/helpers/cmd_parser.hpp
diff --git a/aesxx/utils/block_cmd_parser.hpp b/aesxx/utils/helpers/cmd_parser_block.hpp
index a20f4f5..c8db431 100644
--- a/aesxx/utils/block_cmd_parser.hpp
+++ b/aesxx/utils/helpers/cmd_parser_block.hpp
@@ -6,8 +6,8 @@
 #pragma once
 
 #include "block_input.hpp"
+#include "cmd_parser.hpp"
 #include "data_parsers.hpp"
-#include "helpers/command_line.hpp"
 
 #include <aesxx/all.hpp>
 
diff --git a/aesxx/utils/file_cmd_parser.hpp b/aesxx/utils/helpers/cmd_parser_file.hpp
index 5cb109b..fd6072a 100644
--- a/aesxx/utils/file_cmd_parser.hpp
+++ b/aesxx/utils/helpers/cmd_parser_file.hpp
@@ -5,8 +5,8 @@
 
 #pragma once
 
+#include "cmd_parser.hpp"
 #include "data_parsers.hpp"
-#include "helpers/command_line.hpp"
 
 #include <aesxx/all.hpp>
 
diff --git a/aesxx/utils/data_parsers.hpp b/aesxx/utils/helpers/data_parsers.hpp
index a08f1bf..a08f1bf 100644
--- a/aesxx/utils/data_parsers.hpp
+++ b/aesxx/utils/helpers/data_parsers.hpp