From c5ece1e765a49257fa3cbbcb2328c715f0180325 Mon Sep 17 00:00:00 2001
From: EndrII <EndrIIMail@gmail.com>
Date: Sat, 20 Mar 2021 11:55:40 +0300
Subject: [PATCH] added Heart submodule

---
 .gitmodules          |  9 +++------
 CMake                |  1 -
 CMakeLists.txt       |  4 ++--
 DoxyStyle            |  1 -
 Heart                |  1 +
 init.sh              | 33 ---------------------------------
 src/CMakeLists.txt   |  6 +++---
 tests/CMakeLists.txt |  3 +--
 8 files changed, 10 insertions(+), 48 deletions(-)
 delete mode 160000 CMake
 delete mode 160000 DoxyStyle
 create mode 160000 Heart
 delete mode 100755 init.sh

diff --git a/.gitmodules b/.gitmodules
index bd4ed3f..ca259e9 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,6 +1,3 @@
-[submodule "CMake"]
-	path = CMake
-	url = https://github.com/QuasarApp/CMake.git
-[submodule "DoxyStyle"]
-	path = DoxyStyle
-	url = https://github.com/QuasarApp/DoxyStyle.git
+[submodule "Heart"]
+	path = Heart
+	url = https://github.com/QuasarApp/Heart
diff --git a/CMake b/CMake
deleted file mode 160000
index 30b2e07..0000000
--- a/CMake
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 30b2e07c474ab032dd120475b0a2a4cca6012fe7
diff --git a/CMakeLists.txt b/CMakeLists.txt
index a570035..52ca614 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -18,8 +18,8 @@ set (BUILD_SHARED_LIBS ON)
 find_package(QT NAMES Qt6 Qt5 COMPONENTS Core Test QUIET)
 find_package(Qt${QT_VERSION_MAJOR} COMPONENTS Core Test QUIET)
 
-include(CMake/ccache.cmake)
-include(CMake/QuasarAppCITargets.cmake)
+include(Heart/QuasarAppLib/CMake/ccache.cmake)
+include(Heart/QuasarAppLib/CMake/QuasarAppCITargets.cmake)
 
 # Add sub directories
 add_subdirectory(src)
diff --git a/DoxyStyle b/DoxyStyle
deleted file mode 160000
index b3d27bf..0000000
--- a/DoxyStyle
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit b3d27bf1bac532d6a2284cbcc9fb5134778c6440
diff --git a/Heart b/Heart
new file mode 160000
index 0000000..41bde39
--- /dev/null
+++ b/Heart
@@ -0,0 +1 @@
+Subproject commit 41bde39444410571b8c1e3fd84a4380e73703d64
diff --git a/init.sh b/init.sh
deleted file mode 100755
index 331d3bb..0000000
--- a/init.sh
+++ /dev/null
@@ -1,33 +0,0 @@
-#!/bin/sh
-
-echo "Project name: $1"
-
-if [ $# -ne 1 ]
-then
-    echo "You call this script wtth wrong arguments."
-    echo "Example for start script:"
-    echo "./init.sh MyCmakeProject"
-    exit 1
-fi
-
-REPLACESTRING="s+CQtDeployerServer+$1+g"
-echo $REPLACESTRING
-
-find . -not -path '*/\.*' -type f -exec sed -i $REPLACESTRING {} +
-find . -not -path '*/\.*' -type f -exec sed -i $REPLACESTRING {} +
-
-find src -type d -name '*CQtDeployerServer*' -exec sh -c 'x="{}"; NEWSTR=$(echo "$x" | sed "s/CQtDeployerServer/'$1'/"); mv "$x" "$NEWSTR"' \;
-
-find src -type f -name '*CQtDeployerServer*' -exec sh -c 'x="{}"; NEWSTR=$(echo "$x" | sed "s/CQtDeployerServer/'$1'/"); mv "$x" "$NEWSTR"' \;
-set -e
-
-git config -f .gitmodules --get-regexp '^submodule\..*\.path$' |
-    while read path_key path
-    do
-        url_key=$(echo $path_key | sed 's/\.path/.url/')
-        url=$(git config -f .gitmodules --get "$url_key")
-        git submodule add $url $path
-    done
-
-
-
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index bd71644..58f28c5 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -17,9 +17,9 @@ set(CMAKE_CXX_STANDARD 17)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 
 
-include(../CMake/ProjectOut.cmake)
-include(../CMake/Version.cmake)
-include(../CMake/tr.cmake)
+include(../Heart/QuasarAppLib/CMake/ProjectOut.cmake)
+include(../Heart/QuasarAppLib/CMake/Version.cmake)
+include(../Heart/QuasarAppLib/CMake/tr.cmake)
 
 add_subdirectory(Library)
 add_subdirectory(Server)
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 7f27540..3f274f6 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -9,7 +9,7 @@ cmake_minimum_required(VERSION 3.14)
 
 set(CURRENT_PROJECT ${PROJECT_NAME}Test)
 
-include(../CMake/ProjectOut.cmake)
+include(../Heart/QuasarAppLib/CMake/ProjectOut.cmake)
 
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 set(CMAKE_AUTOMOC ON)
@@ -34,6 +34,5 @@ target_link_libraries(${CURRENT_PROJECT} PRIVATE Qt::Test CQtDeployerServer)
 target_include_directories(${CURRENT_PROJECT} PUBLIC ${PUBLIC_INCUDE_DIR})
 
 
-include(../CMake/QuasarAppCITargets.cmake)
 initTests()
 addTests(${PROJECT_NAME} ${CURRENT_PROJECT})