QuasarApp/Heart
4
1
Fork 0
mirror of https://github.com/QuasarApp/Heart.git synced 2025-04-26 17:54:38 +00:00
Code Issues Projects Releases Wiki Activity

fix docs

Browse Source
This commit is contained in:
Andrei Yankovich 2022-11-29 11:23:47 +03:00
parent 388ddbd455
commit 832eeb10b9
11 changed files with 2588 additions and 109 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@ -60,6 +60,6 @@ HeartTests/cmake_install.cmake
cmake_install.cmake cmake_install.cmake
docs/ docs/
src/heart_global.h src/heart_global.h
doxygen.conf
# git # git
*.orig *.orig

7
.gitmodules vendored
View File

@ -1,7 +1,6 @@
[submodule "QuasarAppLib"]
path = QuasarAppLib
url = https://github.com/QuasarApp/QuasarAppLib.git
[submodule "submodules/crc"] [submodule "submodules/crc"]
path = submodules/crc path = submodules/crc
url = https://github.com/QuasarApp/crc.git url = https://github.com/QuasarApp/crc.git
[submodule "submodules/QuasarAppLib"]
path = submodules/QuasarAppLib
url = https://github.com/QuasarApp/QuasarAppLib.git

39
CMakeLists.txt
View File

@ -13,8 +13,8 @@ if(TARGET ${PROJECT_NAME})
return() return()
endif() endif()
include(QuasarAppLib/CMake/QuasarApp.cmake) include(submodules/QuasarAppLib/CMake/QuasarApp.cmake)
include(QuasarAppLib/CMake/Version.cmake) include(submodules/QuasarAppLib/CMake/Version.cmake)
if (DEFINED TARGET_PLATFORM_TOOLCHAIN) if (DEFINED TARGET_PLATFORM_TOOLCHAIN)
if (${TARGET_PLATFORM_TOOLCHAIN} STREQUAL "wasm32") if (${TARGET_PLATFORM_TOOLCHAIN} STREQUAL "wasm32")
@ -23,26 +23,14 @@ if (DEFINED TARGET_PLATFORM_TOOLCHAIN)
endif() endif()
endif() endif()
if(NOT DEFINED HEART_BUILD_LVL) updateGitVars()
set(HEART_BUILD_LVL 1) set(HEART_VERSION 1.2.${GIT_COMMIT_COUNT}.${GIT_COMMIT_HASH})
if (ANDROID OR IOS)
option(HEART_TESTS "Enable or disable tests of the heart library" OFF)
else()
option(HEART_TESTS "Enable or disable tests of the heart library" ON)
endif() endif()
if (NOT DEFINED HEART_TESTS)
set(HEART_TESTS ON)
if (ANDROID OR IOS)
set(HEART_TESTS OFF)
endif()
endif()
if (NOT DEFINED HEART_DB_CACHE)
set(HEART_DB_CACHE OFF)
if (ANDROID OR WIN32)
set(HEART_DB_CACHE OFF)
endif()
endif()
# Use only for android debug builds with debugging from usb. # Use only for android debug builds with debugging from usb.
option(HEART_STATIC_SSL "This option enable or disabled static link ssl libraryes" OFF) option(HEART_STATIC_SSL "This option enable or disabled static link ssl libraryes" OFF)
option(CMAKE_SHARE "This option enable or disabled ssl functions of nodes" OFF) option(CMAKE_SHARE "This option enable or disabled ssl functions of nodes" OFF)
@ -54,16 +42,11 @@ else()
option(HEART_SSL "This option enable or disabled ssl functions of nodes" ON) option(HEART_SSL "This option enable or disabled ssl functions of nodes" ON)
endif() endif()
if (HEART_DB_CACHE)
add_definitions(-DHEART_DB_CACHE)
endif()
# Add sub directories # Add sub directories
find_package(QT NAMES Qt6 Qt5 COMPONENTS Core Network Sql Concurrent REQUIRED) find_package(QT NAMES Qt6 Qt5 COMPONENTS Core Network Sql Concurrent REQUIRED)
find_package(Qt${QT_VERSION_MAJOR} COMPONENTS Core Network Sql Concurrent REQUIRED) find_package(Qt${QT_VERSION_MAJOR} COMPONENTS Core Network Sql Concurrent REQUIRED)
add_subdirectory(QuasarAppLib) add_subdirectory(submodules/QuasarAppLib)
add_subdirectory(submodules/crc) add_subdirectory(submodules/crc)
add_subdirectory(src) add_subdirectory(src)
@ -73,4 +56,6 @@ endif()
initAll() initAll()
configure_file_in(${PROJECT_NAME} ${CMAKE_CURRENT_SOURCE_DIR}/doxygen.conf)
addDoc(${PROJECT_NAME} ${CMAKE_CURRENT_SOURCE_DIR}/doxygen.conf) addDoc(${PROJECT_NAME} ${CMAKE_CURRENT_SOURCE_DIR}/doxygen.conf)

1
QuasarAppLib

@ -1 +0,0 @@
Subproject commit c492fa2fe8b83f93806cc31498af66ee053630ae

27
doxygen.conf
View File

@ -37,20 +37,21 @@ PROJECT_NAME = Heart
# could be handy for archiving the generated documentation or if some version # could be handy for archiving the generated documentation or if some version
# control system is used. # control system is used.
PROJECT_NUMBER = PROJECT_NUMBER = @HEART_VERSION@
# Using the PROJECT_BRIEF tag one can provide an optional one line description # Using the PROJECT_BRIEF tag one can provide an optional one line description
# for a project that appears at the top of each page and should give viewer a # for a project that appears at the top of each page and should give viewer a
# quick idea about the purpose of the project. Keep the description short. # quick idea about the purpose of the project. Keep the description short.
PROJECT_BRIEF = PROJECT_BRIEF = Heart is base back end library for your c++ Qt projects.
# With the PROJECT_LOGO tag one can specify a logo or an icon that is included # With the PROJECT_LOGO tag one can specify a logo or an icon that is included
# in the documentation. The maximum height of the logo should not exceed 55 # in the documentation. The maximum height of the logo should not exceed 55
# pixels and the maximum width should not exceed 200 pixels. Doxygen will copy # pixels and the maximum width should not exceed 200 pixels. Doxygen will copy
# the logo to the output directory. # the logo to the output directory.
PROJECT_LOGO = PROJECT_LOGO = res/Logo_Web_alpha.png
# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) path # The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) path
# into which the generated documentation will be written. If a relative path is # into which the generated documentation will be written. If a relative path is
@ -702,7 +703,7 @@ FILE_VERSION_FILTER =
# DoxygenLayout.xml, doxygen will parse it automatically even if the LAYOUT_FILE # DoxygenLayout.xml, doxygen will parse it automatically even if the LAYOUT_FILE
# tag is left empty. # tag is left empty.
LAYOUT_FILE = Heart/Qt-Secret/res/DoxyStyle/DoxygenLayout.xml LAYOUT_FILE = submodules/CMake/DoxyStyle/DoxygenLayout.xml
# The CITE_BIB_FILES tag can be used to specify one or more bib files containing # The CITE_BIB_FILES tag can be used to specify one or more bib files containing
# the reference definitions. This must be a list of .bib files. The .bib # the reference definitions. This must be a list of .bib files. The .bib
@ -789,7 +790,7 @@ WARN_LOGFILE =
# spaces. See also FILE_PATTERNS and EXTENSION_MAPPING # spaces. See also FILE_PATTERNS and EXTENSION_MAPPING
# Note: If this tag is empty the current directory is searched. # Note: If this tag is empty the current directory is searched.
INPUT = Heart \ INPUT = src \
README.md README.md
@ -874,9 +875,7 @@ RECURSIVE = YES
# Note that relative paths are relative to the directory from which doxygen is # Note that relative paths are relative to the directory from which doxygen is
# run. # run.
EXCLUDE = ./Heart/Qt-Secret \ EXCLUDE = ./submodules
./Heart/NetworkSpace \
./Heart/CMakeFiles
# The EXCLUDE_SYMLINKS tag can be used to select whether or not files or # The EXCLUDE_SYMLINKS tag can be used to select whether or not files or
# directories that are symbolic links (a Unix file system feature) are excluded # directories that are symbolic links (a Unix file system feature) are excluded
@ -1195,7 +1194,7 @@ HTML_STYLESHEET =
# list). For an example see the documentation. # list). For an example see the documentation.
# This tag requires that the tag GENERATE_HTML is set to YES. # This tag requires that the tag GENERATE_HTML is set to YES.
HTML_EXTRA_STYLESHEET = Heart/Qt-Secret/res/DoxyStyle/doxygenStyles.css HTML_EXTRA_STYLESHEET = submodules/CMake/DoxyStyle/doxygenStyles.css
# The HTML_EXTRA_FILES tag can be used to specify one or more extra images or # The HTML_EXTRA_FILES tag can be used to specify one or more extra images or
# other source files which should be copied to the HTML output directory. Note # other source files which should be copied to the HTML output directory. Note
@ -1216,7 +1215,7 @@ HTML_EXTRA_FILES =
# Minimum value: 0, maximum value: 359, default value: 220. # Minimum value: 0, maximum value: 359, default value: 220.
# This tag requires that the tag GENERATE_HTML is set to YES. # This tag requires that the tag GENERATE_HTML is set to YES.
HTML_COLORSTYLE_HUE = 220 HTML_COLORSTYLE_HUE = 202
# The HTML_COLORSTYLE_SAT tag controls the purity (or saturation) of the colors # The HTML_COLORSTYLE_SAT tag controls the purity (or saturation) of the colors
# in the HTML output. For a value of 0 the output will use grayscales only. A # in the HTML output. For a value of 0 the output will use grayscales only. A
@ -1224,7 +1223,7 @@ HTML_COLORSTYLE_HUE = 220
# Minimum value: 0, maximum value: 255, default value: 100. # Minimum value: 0, maximum value: 255, default value: 100.
# This tag requires that the tag GENERATE_HTML is set to YES. # This tag requires that the tag GENERATE_HTML is set to YES.
HTML_COLORSTYLE_SAT = 100 HTML_COLORSTYLE_SAT = 212
# The HTML_COLORSTYLE_GAMMA tag controls the gamma correction applied to the # The HTML_COLORSTYLE_GAMMA tag controls the gamma correction applied to the
# luminance component of the colors in the HTML output. Values below 100 # luminance component of the colors in the HTML output. Values below 100
@ -1235,7 +1234,7 @@ HTML_COLORSTYLE_SAT = 100
# Minimum value: 40, maximum value: 240, default value: 80. # Minimum value: 40, maximum value: 240, default value: 80.
# This tag requires that the tag GENERATE_HTML is set to YES. # This tag requires that the tag GENERATE_HTML is set to YES.
HTML_COLORSTYLE_GAMMA = 80 HTML_COLORSTYLE_GAMMA = 59
# If the HTML_TIMESTAMP tag is set to YES then the footer of each generated HTML # If the HTML_TIMESTAMP tag is set to YES then the footer of each generated HTML
# page will contain the date and time when the page was generated. Setting this # page will contain the date and time when the page was generated. Setting this
@ -1394,7 +1393,7 @@ QCH_FILE =
# The default value is: org.doxygen.Project. # The default value is: org.doxygen.Project.
# This tag requires that the tag GENERATE_QHP is set to YES. # This tag requires that the tag GENERATE_QHP is set to YES.
QHP_NAMESPACE = QuasarAppj QHP_NAMESPACE = QuasarApp
# The QHP_VIRTUAL_FOLDER tag specifies the namespace to use when generating Qt # The QHP_VIRTUAL_FOLDER tag specifies the namespace to use when generating Qt
# Help Project output. For more information please see Qt Help Project / Virtual # Help Project output. For more information please see Qt Help Project / Virtual
@ -1607,7 +1606,7 @@ SEARCHENGINE = YES
# The default value is: NO. # The default value is: NO.
# This tag requires that the tag SEARCHENGINE is set to YES. # This tag requires that the tag SEARCHENGINE is set to YES.
SERVER_BASED_SEARCH = NO SERVER_BASED_SEARCH = YES
# When EXTERNAL_SEARCH tag is enabled doxygen will no longer generate the PHP # When EXTERNAL_SEARCH tag is enabled doxygen will no longer generate the PHP
# script for searching. Instead the search results are written to an XML file # script for searching. Instead the search results are written to an XML file

2497
doxygen.conf.in Normal file
View File

File diff suppressed because it is too large Load Diff

BIN
res/Logo_Web_alpha.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 74 KiB

1
src/CMakeLists.txt
View File

@ -14,7 +14,6 @@ set(CMAKE_CXX_STANDARD_REQUIRED ON)
set(CMAKE_AUTOMOC ON) set(CMAKE_AUTOMOC ON)
set(CMAKE_AUTORCC ON) set(CMAKE_AUTORCC ON)
updateGitVars()
add_definitions(-DHEART_LIBRARY) add_definitions(-DHEART_LIBRARY)

3
src/heart_global.h.in
View File

@ -12,8 +12,7 @@
#define @SLL_DEFINE@ #define @SLL_DEFINE@
#define HEART_BUILD_LVL @HEART_BUILD_LVL@ #define HEART_VERSION @HEART_VERSION@
#define HEART_VERSION "1.1.@GIT_COMMIT_COUNT@.@GIT_COMMIT_HASH@"
#if defined(HEART_LIBRARY) #if defined(HEART_LIBRARY)
# define HEARTSHARED_EXPORT Q_DECL_EXPORT # define HEARTSHARED_EXPORT Q_DECL_EXPORT
#else #else

1
src/public/abstractnode.cpp
View File

@ -1264,6 +1264,7 @@ void AbstractNode::nodeConfirmend(AbstractNodeInfo *node) {
} }
void AbstractNode::nodeConnected(AbstractNodeInfo *node) { void AbstractNode::nodeConnected(AbstractNodeInfo *node) {
auto &actions = _connectActions[NodeCoonectionStatus::Connected]; auto &actions = _connectActions[NodeCoonectionStatus::Connected];
auto action = actions.take(node->networkAddress()); auto action = actions.take(node->networkAddress());
if (action) if (action)

1
submodules/QuasarAppLib Submodule

@ -0,0 +1 @@
Subproject commit afb0ef5fd83d5a00900c721b5d8cdcb1fa32b92a