From 0ae8962a1df35c3ccbf45ec0d55dd6ada4d809cb Mon Sep 17 00:00:00 2001
From: TheLavaBlock <36247472+TheLavaBlock@users.noreply.github.com>
Date: Sat, 19 Oct 2019 22:00:24 +0200
Subject: [PATCH] rename

---
 CMakeLists.txt                       | 28 ++++++++++++++--------------
 README.md                            |  2 +-
 liblava/base/base.hpp                |  2 +-
 liblava/frame/input.hpp              |  2 +-
 liblava/lava.hpp                     |  2 +-
 liblava/util.hpp                     | 12 ++++++++++++
 liblava/{utils => util}/file.cpp     |  6 +++---
 liblava/{utils => util}/file.hpp     |  4 ++--
 liblava/{utils => util}/log.hpp      |  2 +-
 liblava/{utils => util}/random.hpp   |  2 +-
 liblava/{utils => util}/telegram.hpp |  4 ++--
 liblava/{utils => util}/thread.hpp   |  2 +-
 liblava/{utils => util}/utility.hpp  |  2 +-
 liblava/utils.hpp                    | 12 ------------
 14 files changed, 41 insertions(+), 41 deletions(-)
 create mode 100644 liblava/util.hpp
 rename liblava/{utils => util}/file.cpp (98%)
 rename liblava/{utils => util}/file.hpp (98%)
 rename liblava/{utils => util}/log.hpp (98%)
 rename liblava/{utils => util}/random.hpp (96%)
 rename liblava/{utils => util}/telegram.hpp (96%)
 rename liblava/{utils => util}/thread.hpp (98%)
 rename liblava/{utils => util}/utility.hpp (96%)
 delete mode 100644 liblava/utils.hpp

diff --git a/CMakeLists.txt b/CMakeLists.txt
index c53a6f4b..a96f0f44 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -73,16 +73,16 @@ endif()
 
 add_library(lava::core ALIAS lava.core)
 
-message(">> lava::utils")
-
-add_library(lava.utils STATIC
-        ${LIBLAVA_DIR}/utils/file.cpp
-        ${LIBLAVA_DIR}/utils/file.hpp
-        ${LIBLAVA_DIR}/utils/log.hpp
-        ${LIBLAVA_DIR}/utils/random.hpp
-        ${LIBLAVA_DIR}/utils/telegram.hpp
-        ${LIBLAVA_DIR}/utils/thread.hpp
-        ${LIBLAVA_DIR}/utils/utility.hpp
+message(">> lava::util")
+
+add_library(lava.util STATIC
+        ${LIBLAVA_DIR}/util/file.cpp
+        ${LIBLAVA_DIR}/util/file.hpp
+        ${LIBLAVA_DIR}/util/log.hpp
+        ${LIBLAVA_DIR}/util/random.hpp
+        ${LIBLAVA_DIR}/util/telegram.hpp
+        ${LIBLAVA_DIR}/util/thread.hpp
+        ${LIBLAVA_DIR}/util/utility.hpp
         ${LIBLAVA_EXT_DIR}/tinyfiledialogs/tinyfiledialogs.c
         )
 
@@ -90,7 +90,7 @@ if(WIN32)
         set_source_files_properties(${LIBLAVA_EXT_DIR}/tinyfiledialogs/tinyfiledialogs.c PROPERTIES COMPILE_FLAGS " /W0 ")
 endif()
 
-target_include_directories(lava.utils PUBLIC
+target_include_directories(lava.util PUBLIC
         ${LIBLAVA_EXT_DIR}/spdlog/include
         ${LIBLAVA_EXT_DIR}/physfs/src
         ${LIBLAVA_EXT_DIR}/tinyfiledialogs
@@ -116,12 +116,12 @@ add_subdirectory(${LIBLAVA_EXT_DIR}/physfs physfs EXCLUDE_FROM_ALL)
 
 message("<<< physfs")
 
-target_link_libraries(lava.utils
+target_link_libraries(lava.util
         lava::core
         physfs-static
         )
 
-add_library(lava::utils ALIAS lava.utils)
+add_library(lava::util ALIAS lava.util)
 
 message(">> lava::base")
 
@@ -147,7 +147,7 @@ target_include_directories(lava.base PUBLIC
         )
 
 target_link_libraries(lava.base 
-        lava::utils
+        lava::util
         ${CMAKE_DL_LIBS}
         )
 
diff --git a/README.md b/README.md
index 946d9a10..23ff0155 100644
--- a/README.md
+++ b/README.md
@@ -27,7 +27,7 @@ Download latest **<a href="https://github.com/liblava/liblava/releases">preview
 
 ## modules
 
-[![core](https://img.shields.io/badge/lava-core-blue.svg)](https://github.com/liblava/liblava/tree/master/liblava/core) [![utils](https://img.shields.io/badge/lava-utils-blue.svg)](https://github.com/liblava/liblava/tree/master/liblava/utils) [![base](https://img.shields.io/badge/lava-base-orange.svg)](https://github.com/liblava/liblava/tree/master/liblava/base) [![resource](https://img.shields.io/badge/lava-resource-orange.svg)](https://github.com/liblava/liblava/tree/master/liblava/resource) [![frame](https://img.shields.io/badge/lava-frame-red.svg)](https://github.com/liblava/liblava/tree/master/liblava/frame) [![block](https://img.shields.io/badge/lava-block-red.svg)](https://github.com/liblava/liblava/tree/master/liblava/block) [![tool](https://img.shields.io/badge/lava-tool-brightgreen.svg)](https://github.com/liblava/liblava/tree/master/liblava/tool) 
+[![core](https://img.shields.io/badge/lava-core-blue.svg)](https://github.com/liblava/liblava/tree/master/liblava/core) [![util](https://img.shields.io/badge/lava-util-blue.svg)](https://github.com/liblava/liblava/tree/master/liblava/util) [![base](https://img.shields.io/badge/lava-base-orange.svg)](https://github.com/liblava/liblava/tree/master/liblava/base) [![resource](https://img.shields.io/badge/lava-resource-orange.svg)](https://github.com/liblava/liblava/tree/master/liblava/resource) [![frame](https://img.shields.io/badge/lava-frame-red.svg)](https://github.com/liblava/liblava/tree/master/liblava/frame) [![block](https://img.shields.io/badge/lava-block-red.svg)](https://github.com/liblava/liblava/tree/master/liblava/block) [![tool](https://img.shields.io/badge/lava-tool-brightgreen.svg)](https://github.com/liblava/liblava/tree/master/liblava/tool) 
 
 ## hello frame
 
diff --git a/liblava/base/base.hpp b/liblava/base/base.hpp
index 05209e0f..bfa4e8f7 100644
--- a/liblava/base/base.hpp
+++ b/liblava/base/base.hpp
@@ -4,7 +4,7 @@
 
 #pragma once
 
-#include <liblava/utils.hpp>
+#include <liblava/util.hpp>
 #include <liblava/core/math.hpp>
 
 #define VK_NO_PROTOTYPES
diff --git a/liblava/frame/input.hpp b/liblava/frame/input.hpp
index 77dc6fc0..4192521b 100644
--- a/liblava/frame/input.hpp
+++ b/liblava/frame/input.hpp
@@ -4,7 +4,7 @@
 
 #pragma once
 
-#include <liblava/utils/utility.hpp>
+#include <liblava/util/utility.hpp>
 #include <liblava/core/id.hpp>
 
 namespace lava {
diff --git a/liblava/lava.hpp b/liblava/lava.hpp
index cce44662..0c9d7f2c 100644
--- a/liblava/lava.hpp
+++ b/liblava/lava.hpp
@@ -5,7 +5,7 @@
 #pragma once
 
 #include <liblava/core.hpp>
-#include <liblava/utils.hpp>
+#include <liblava/util.hpp>
 #include <liblava/base.hpp>
 #include <liblava/block.hpp>
 #include <liblava/resource.hpp>
diff --git a/liblava/util.hpp b/liblava/util.hpp
new file mode 100644
index 00000000..5b4305c3
--- /dev/null
+++ b/liblava/util.hpp
@@ -0,0 +1,12 @@
+// file      : liblava/util.hpp
+// copyright : Copyright (c) 2018-present, Lava Block OÜ
+// license   : MIT; see accompanying LICENSE file
+
+#pragma once
+
+#include <liblava/util/file.hpp>
+#include <liblava/util/log.hpp>
+#include <liblava/util/random.hpp>
+#include <liblava/util/telegram.hpp>
+#include <liblava/util/thread.hpp>
+#include <liblava/util/utility.hpp>
diff --git a/liblava/utils/file.cpp b/liblava/util/file.cpp
similarity index 98%
rename from liblava/utils/file.cpp
rename to liblava/util/file.cpp
index cca1b198..f27ecd1b 100644
--- a/liblava/utils/file.cpp
+++ b/liblava/util/file.cpp
@@ -1,9 +1,9 @@
-// file      : liblava/utils/file.cpp
+// file      : liblava/util/file.cpp
 // copyright : Copyright (c) 2018-present, Lava Block OÜ
 // license   : MIT; see accompanying LICENSE file
 
-#include <liblava/utils/file.hpp>
-#include <liblava/utils/utility.hpp>
+#include <liblava/util/file.hpp>
+#include <liblava/util/utility.hpp>
 
 #include <physfs.h>
 #include <tinyfiledialogs.h>
diff --git a/liblava/utils/file.hpp b/liblava/util/file.hpp
similarity index 98%
rename from liblava/utils/file.hpp
rename to liblava/util/file.hpp
index 4d5c75fb..b7573b19 100644
--- a/liblava/utils/file.hpp
+++ b/liblava/util/file.hpp
@@ -1,11 +1,11 @@
-// file      : liblava/file.hpp
+// file      : liblava/util/file.hpp
 // copyright : Copyright (c) 2018-present, Lava Block OÜ
 // license   : MIT; see accompanying LICENSE file
 
 #pragma once
 
 #include <liblava/core/data.hpp>
-#include <liblava/utils/log.hpp>
+#include <liblava/util/log.hpp>
 
 #include <fstream>
 #include <filesystem>
diff --git a/liblava/utils/log.hpp b/liblava/util/log.hpp
similarity index 98%
rename from liblava/utils/log.hpp
rename to liblava/util/log.hpp
index 530a0375..f163d7d9 100644
--- a/liblava/utils/log.hpp
+++ b/liblava/util/log.hpp
@@ -1,4 +1,4 @@
-// file      : liblava/log.hpp
+// file      : liblava/util/log.hpp
 // copyright : Copyright (c) 2018-present, Lava Block OÜ
 // license   : MIT; see accompanying LICENSE file
 
diff --git a/liblava/utils/random.hpp b/liblava/util/random.hpp
similarity index 96%
rename from liblava/utils/random.hpp
rename to liblava/util/random.hpp
index 756cbd37..c9577196 100644
--- a/liblava/utils/random.hpp
+++ b/liblava/util/random.hpp
@@ -1,4 +1,4 @@
-// file      : liblava/random.hpp
+// file      : liblava/util/random.hpp
 // copyright : Copyright (c) 2018-present, Lava Block OÜ
 // license   : MIT; see accompanying LICENSE file
 
diff --git a/liblava/utils/telegram.hpp b/liblava/util/telegram.hpp
similarity index 96%
rename from liblava/utils/telegram.hpp
rename to liblava/util/telegram.hpp
index 805ab1f7..a93b2686 100644
--- a/liblava/utils/telegram.hpp
+++ b/liblava/util/telegram.hpp
@@ -1,10 +1,10 @@
-// file      : liblava/telegram.hpp
+// file      : liblava/util/telegram.hpp
 // copyright : Copyright (c) 2018-present, Lava Block OÜ
 // license   : MIT; see accompanying LICENSE file
 
 #pragma once
 
-#include <liblava/utils/thread.hpp>
+#include <liblava/util/thread.hpp>
 
 #include <any>
 #include <cmath>
diff --git a/liblava/utils/thread.hpp b/liblava/util/thread.hpp
similarity index 98%
rename from liblava/utils/thread.hpp
rename to liblava/util/thread.hpp
index 225f14f4..a63a58cb 100644
--- a/liblava/utils/thread.hpp
+++ b/liblava/util/thread.hpp
@@ -1,4 +1,4 @@
-// file      : liblava/thread.hpp
+// file      : liblava/util/thread.hpp
 // copyright : Copyright (c) 2018-present, Lava Block OÜ
 // license   : MIT; see accompanying LICENSE file
 
diff --git a/liblava/utils/utility.hpp b/liblava/util/utility.hpp
similarity index 96%
rename from liblava/utils/utility.hpp
rename to liblava/util/utility.hpp
index fdd74709..b6747f43 100644
--- a/liblava/utils/utility.hpp
+++ b/liblava/util/utility.hpp
@@ -1,4 +1,4 @@
-// file      : liblava/utility.hpp
+// file      : liblava/util/utility.hpp
 // copyright : Copyright (c) 2018-present, Lava Block OÜ
 // license   : MIT; see accompanying LICENSE file
 
diff --git a/liblava/utils.hpp b/liblava/utils.hpp
deleted file mode 100644
index 8c7cf6a8..00000000
--- a/liblava/utils.hpp
+++ /dev/null
@@ -1,12 +0,0 @@
-// file      : liblava/utils.hpp
-// copyright : Copyright (c) 2018-present, Lava Block OÜ
-// license   : MIT; see accompanying LICENSE file
-
-#pragma once
-
-#include <liblava/utils/file.hpp>
-#include <liblava/utils/log.hpp>
-#include <liblava/utils/random.hpp>
-#include <liblava/utils/telegram.hpp>
-#include <liblava/utils/thread.hpp>
-#include <liblava/utils/utility.hpp>
-- 
GitLab