mirror of
https://github.com/QuasarApp/Heart.git
synced 2025-04-26 09:44:37 +00:00
fix docs
This commit is contained in:
parent
388ddbd455
commit
832eeb10b9
2
.gitignore
vendored
2
.gitignore
vendored
@ -60,6 +60,6 @@ HeartTests/cmake_install.cmake
|
||||
cmake_install.cmake
|
||||
docs/
|
||||
src/heart_global.h
|
||||
|
||||
doxygen.conf
|
||||
# git
|
||||
*.orig
|
||||
|
7
.gitmodules
vendored
7
.gitmodules
vendored
@ -1,7 +1,6 @@
|
||||
[submodule "QuasarAppLib"]
|
||||
path = QuasarAppLib
|
||||
url = https://github.com/QuasarApp/QuasarAppLib.git
|
||||
|
||||
[submodule "submodules/crc"]
|
||||
path = submodules/crc
|
||||
url = https://github.com/QuasarApp/crc.git
|
||||
[submodule "submodules/QuasarAppLib"]
|
||||
path = submodules/QuasarAppLib
|
||||
url = https://github.com/QuasarApp/QuasarAppLib.git
|
||||
|
@ -13,8 +13,8 @@ if(TARGET ${PROJECT_NAME})
|
||||
return()
|
||||
endif()
|
||||
|
||||
include(QuasarAppLib/CMake/QuasarApp.cmake)
|
||||
include(QuasarAppLib/CMake/Version.cmake)
|
||||
include(submodules/QuasarAppLib/CMake/QuasarApp.cmake)
|
||||
include(submodules/QuasarAppLib/CMake/Version.cmake)
|
||||
|
||||
if (DEFINED TARGET_PLATFORM_TOOLCHAIN)
|
||||
if (${TARGET_PLATFORM_TOOLCHAIN} STREQUAL "wasm32")
|
||||
@ -23,26 +23,14 @@ if (DEFINED TARGET_PLATFORM_TOOLCHAIN)
|
||||
endif()
|
||||
endif()
|
||||
|
||||
if(NOT DEFINED HEART_BUILD_LVL)
|
||||
set(HEART_BUILD_LVL 1)
|
||||
endif()
|
||||
|
||||
if (NOT DEFINED HEART_TESTS)
|
||||
set(HEART_TESTS ON)
|
||||
updateGitVars()
|
||||
set(HEART_VERSION 1.2.${GIT_COMMIT_COUNT}.${GIT_COMMIT_HASH})
|
||||
|
||||
if (ANDROID OR IOS)
|
||||
set(HEART_TESTS OFF)
|
||||
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_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.
|
||||
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)
|
||||
@ -54,16 +42,11 @@ else()
|
||||
option(HEART_SSL "This option enable or disabled ssl functions of nodes" ON)
|
||||
endif()
|
||||
|
||||
|
||||
if (HEART_DB_CACHE)
|
||||
add_definitions(-DHEART_DB_CACHE)
|
||||
endif()
|
||||
|
||||
# Add sub directories
|
||||
find_package(QT NAMES Qt6 Qt5 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(src)
|
||||
|
||||
@ -73,4 +56,6 @@ endif()
|
||||
|
||||
initAll()
|
||||
|
||||
configure_file_in(${PROJECT_NAME} ${CMAKE_CURRENT_SOURCE_DIR}/doxygen.conf)
|
||||
addDoc(${PROJECT_NAME} ${CMAKE_CURRENT_SOURCE_DIR}/doxygen.conf)
|
||||
|
||||
|
@ -1 +0,0 @@
|
||||
Subproject commit c492fa2fe8b83f93806cc31498af66ee053630ae
|
27
doxygen.conf
27
doxygen.conf
@ -37,20 +37,21 @@ PROJECT_NAME = Heart
|
||||
# could be handy for archiving the generated documentation or if some version
|
||||
# control system is used.
|
||||
|
||||
PROJECT_NUMBER =
|
||||
PROJECT_NUMBER = @HEART_VERSION@
|
||||
|
||||
# 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
|
||||
# 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
|
||||
# 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
|
||||
# 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
|
||||
# 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
|
||||
# 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 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
|
||||
# Note: If this tag is empty the current directory is searched.
|
||||
|
||||
INPUT = Heart \
|
||||
INPUT = src \
|
||||
README.md
|
||||
|
||||
|
||||
@ -874,9 +875,7 @@ RECURSIVE = YES
|
||||
# Note that relative paths are relative to the directory from which doxygen is
|
||||
# run.
|
||||
|
||||
EXCLUDE = ./Heart/Qt-Secret \
|
||||
./Heart/NetworkSpace \
|
||||
./Heart/CMakeFiles
|
||||
EXCLUDE = ./submodules
|
||||
|
||||
# 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
|
||||
@ -1195,7 +1194,7 @@ HTML_STYLESHEET =
|
||||
# list). For an example see the documentation.
|
||||
# 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
|
||||
# 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.
|
||||
# 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
|
||||
# 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.
|
||||
# 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
|
||||
# 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.
|
||||
# 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
|
||||
# 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.
|
||||
# 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
|
||||
# Help Project output. For more information please see Qt Help Project / Virtual
|
||||
@ -1607,7 +1606,7 @@ SEARCHENGINE = YES
|
||||
# The default value is: NO.
|
||||
# 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
|
||||
# script for searching. Instead the search results are written to an XML file
|
||||
|
2497
doxygen.conf.in
Normal file
2497
doxygen.conf.in
Normal file
File diff suppressed because it is too large
Load Diff
BIN
res/Logo_Web_alpha.png
Normal file
BIN
res/Logo_Web_alpha.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 74 KiB |
@ -14,7 +14,6 @@ set(CMAKE_CXX_STANDARD_REQUIRED ON)
|
||||
set(CMAKE_AUTOMOC ON)
|
||||
set(CMAKE_AUTORCC ON)
|
||||
|
||||
updateGitVars()
|
||||
|
||||
add_definitions(-DHEART_LIBRARY)
|
||||
|
||||
|
@ -12,8 +12,7 @@
|
||||
|
||||
#define @SLL_DEFINE@
|
||||
|
||||
#define HEART_BUILD_LVL @HEART_BUILD_LVL@
|
||||
#define HEART_VERSION "1.1.@GIT_COMMIT_COUNT@.@GIT_COMMIT_HASH@"
|
||||
#define HEART_VERSION @HEART_VERSION@
|
||||
#if defined(HEART_LIBRARY)
|
||||
# define HEARTSHARED_EXPORT Q_DECL_EXPORT
|
||||
#else
|
||||
|
@ -1264,6 +1264,7 @@ void AbstractNode::nodeConfirmend(AbstractNodeInfo *node) {
|
||||
}
|
||||
|
||||
void AbstractNode::nodeConnected(AbstractNodeInfo *node) {
|
||||
|
||||
auto &actions = _connectActions[NodeCoonectionStatus::Connected];
|
||||
auto action = actions.take(node->networkAddress());
|
||||
if (action)
|
||||
|
1
submodules/QuasarAppLib
Submodule
1
submodules/QuasarAppLib
Submodule
@ -0,0 +1 @@
|
||||
Subproject commit afb0ef5fd83d5a00900c721b5d8cdcb1fa32b92a
|
Loading…
x
Reference in New Issue
Block a user