From 61bebf6c9a69ea46b4668acf98d42d679993fc27 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 11 Sep 2025 12:36:40 +0000 Subject: [PATCH] C/C++/QML formatted code --- CMakePresets.json | 2 +- README.md | 7 +- cmake/VersionFromGit.cmake | 184 ++++++++++++------------ include/amarula/dbus/connman/gagent.hpp | 6 +- 4 files changed, 99 insertions(+), 100 deletions(-) diff --git a/CMakePresets.json b/CMakePresets.json index 8dad0f2..ba9acae 100644 --- a/CMakePresets.json +++ b/CMakePresets.json @@ -131,4 +131,4 @@ ] } ] -} \ No newline at end of file +} diff --git a/README.md b/README.md index 3115101..ed12951 100644 --- a/README.md +++ b/README.md @@ -1,15 +1,14 @@ -# gdbus-cpp +# gdbus-cpp [TOC] -This repository should provide easy to use C++ API to communicate with the DBus using GDBus. +This repository should provide easy to use C++ API to communicate with the DBus using GDBus. ## Configure, build, test, package ... The project uses [CMake presets](https://cmake.org/cmake/help/latest/manual/cmake-presets.7.html) as a way to share CMake configurations. Refer to [cmake](https://cmake.org/cmake/help/latest/manual/cmake.1.html), [ctest](https://cmake.org/cmake/help/latest/manual/ctest.1.html) and [cpack](https://cmake.org/cmake/help/latest/manual/cpack.1.html) documentation for more information on the use of presets. - ## Adding the libraries to your CMake project ```CMake @@ -28,7 +27,7 @@ target_link_libraries( Amarula::GDbusProxy Am ## API reference You can read the [API reference](https://amarula.github.io/libcppconnman/), or generate it yourself like + ``` cmake --workflow --preset default-documentation ``` - diff --git a/cmake/VersionFromGit.cmake b/cmake/VersionFromGit.cmake index 9120b63..c538258 100644 --- a/cmake/VersionFromGit.cmake +++ b/cmake/VersionFromGit.cmake @@ -22,148 +22,148 @@ cmake_minimum_required(VERSION 3.11 FATAL_ERROR) -include( CMakeParseArguments ) +include(CMakeParseArguments) -function( version_from_git ) +function(version_from_git) # Parse arguments - set( options OPTIONAL FAST ) - set( oneValueArgs - GIT_EXECUTABLE - INCLUDE_HASH - LOG - TIMESTAMP - ) - set( multiValueArgs ) - cmake_parse_arguments( ARG "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN} ) + set(options OPTIONAL FAST) + set(oneValueArgs GIT_EXECUTABLE INCLUDE_HASH LOG TIMESTAMP) + set(multiValueArgs) + cmake_parse_arguments(ARG "${options}" "${oneValueArgs}" "${multiValueArgs}" + ${ARGN}) # Defaults - if( NOT DEFINED ARG_INCLUDE_HASH ) - set( ARG_INCLUDE_HASH ON ) + if(NOT DEFINED ARG_INCLUDE_HASH) + set(ARG_INCLUDE_HASH ON) endif() - if( DEFINED ARG_GIT_EXECUTABLE ) - set( GIT_EXECUTABLE "${ARG_GIT_EXECUTABLE}" ) - else () + if(DEFINED ARG_GIT_EXECUTABLE) + set(GIT_EXECUTABLE "${ARG_GIT_EXECUTABLE}") + else() # Find Git or bail out - find_package( Git ) - if( NOT GIT_FOUND ) - message( FATAL_ERROR "[VersionFromGit] Git not found" ) - endif( NOT GIT_FOUND ) + find_package(Git) + if(NOT GIT_FOUND) + message(FATAL_ERROR "[VersionFromGit] Git not found") + endif(NOT GIT_FOUND) endif() # Git describe execute_process( - COMMAND "${GIT_EXECUTABLE}" describe --tags + COMMAND "${GIT_EXECUTABLE}" describe --tags WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}" - RESULT_VARIABLE git_result - OUTPUT_VARIABLE git_describe - ERROR_VARIABLE git_error - OUTPUT_STRIP_TRAILING_WHITESPACE - ERROR_STRIP_TRAILING_WHITESPACE - ) - if( NOT git_result EQUAL 0 ) - message( FATAL_ERROR - "[VersionFromGit] Failed to execute Git: ${git_error}" - ) + RESULT_VARIABLE git_result + OUTPUT_VARIABLE git_describe + ERROR_VARIABLE git_error + OUTPUT_STRIP_TRAILING_WHITESPACE ERROR_STRIP_TRAILING_WHITESPACE) + if(NOT git_result EQUAL 0) + message(FATAL_ERROR "[VersionFromGit] Failed to execute Git: ${git_error}") endif() # Get Git tag execute_process( - COMMAND "${GIT_EXECUTABLE}" describe --tags --abbrev=0 + COMMAND "${GIT_EXECUTABLE}" describe --tags --abbrev=0 WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}" - RESULT_VARIABLE git_result - OUTPUT_VARIABLE git_tag - ERROR_VARIABLE git_error - OUTPUT_STRIP_TRAILING_WHITESPACE - ERROR_STRIP_TRAILING_WHITESPACE - ) - if( NOT git_result EQUAL 0 ) - message( FATAL_ERROR - "[VersionFromGit] Failed to execute Git: ${git_error}" - ) + RESULT_VARIABLE git_result + OUTPUT_VARIABLE git_tag + ERROR_VARIABLE git_error + OUTPUT_STRIP_TRAILING_WHITESPACE ERROR_STRIP_TRAILING_WHITESPACE) + if(NOT git_result EQUAL 0) + message(FATAL_ERROR "[VersionFromGit] Failed to execute Git: ${git_error}") endif() - if( git_tag MATCHES "^v(0|[1-9][0-9]*)[.](0|[1-9][0-9]*)[.](0|[1-9][0-9]*)(-[.0-9A-Za-z-]+)?([+][.0-9A-Za-z-]+)?$" ) - set( version_major "${CMAKE_MATCH_1}" ) - set( version_minor "${CMAKE_MATCH_2}" ) - set( version_patch "${CMAKE_MATCH_3}" ) - set( identifiers "${CMAKE_MATCH_4}" ) - set( metadata "${CMAKE_MATCH_5}" ) + if(git_tag + MATCHES + "^v(0|[1-9][0-9]*)[.](0|[1-9][0-9]*)[.](0|[1-9][0-9]*)(-[.0-9A-Za-z-]+)?([+][.0-9A-Za-z-]+)?$" + ) + set(version_major "${CMAKE_MATCH_1}") + set(version_minor "${CMAKE_MATCH_2}") + set(version_patch "${CMAKE_MATCH_3}") + set(identifiers "${CMAKE_MATCH_4}") + set(metadata "${CMAKE_MATCH_5}") else() - message( FATAL_ERROR - "[VersionFromGit] Git tag isn't valid semantic version: [${git_tag}]" - ) + message( + FATAL_ERROR + "[VersionFromGit] Git tag isn't valid semantic version: [${git_tag}]") endif() - if( "${git_tag}" STREQUAL "${git_describe}" ) - set( git_at_a_tag ON ) + if("${git_tag}" STREQUAL "${git_describe}") + set(git_at_a_tag ON) endif() - if( NOT git_at_a_tag ) + if(NOT git_at_a_tag) # Extract the Git hash (if one exists) - string( REGEX MATCH "g[0-9a-f]+$" git_hash "${git_describe}" ) + string(REGEX MATCH "g[0-9a-f]+$" git_hash "${git_describe}") endif() # Construct the version variables - set( version ${version_major}.${version_minor}.${version_patch} ) - set( semver ${version} ) + set(version ${version_major}.${version_minor}.${version_patch}) + set(semver ${version}) # Identifiers - if( identifiers MATCHES ".+" ) - string( SUBSTRING "${identifiers}" 1 -1 identifiers ) - set( semver "${semver}-${identifiers}") + if(identifiers MATCHES ".+") + string(SUBSTRING "${identifiers}" 1 -1 identifiers) + set(semver "${semver}-${identifiers}") endif() - # Metadata - # TODO Split and join (add Git hash inbetween) - if( metadata MATCHES ".+" ) - string( SUBSTRING "${metadata}" 1 -1 metadata ) + # Metadata TODO Split and join (add Git hash inbetween) + if(metadata MATCHES ".+") + string(SUBSTRING "${metadata}" 1 -1 metadata) # Split - string( REPLACE "." ";" metadata "${metadata}" ) + string(REPLACE "." ";" metadata "${metadata}") endif() - if( NOT git_at_a_tag ) + if(NOT git_at_a_tag) - if( ARG_INCLUDE_HASH ) - list( APPEND metadata "${git_hash}" ) - endif( ARG_INCLUDE_HASH ) + if(ARG_INCLUDE_HASH) + list(APPEND metadata "${git_hash}") + endif(ARG_INCLUDE_HASH) # Timestamp - if( DEFINED ARG_TIMESTAMP ) - string( TIMESTAMP timestamp "${ARG_TIMESTAMP}" ${ARG_UTC} ) - list( APPEND metadata "${timestamp}" ) - endif( DEFINED ARG_TIMESTAMP ) + if(DEFINED ARG_TIMESTAMP) + string(TIMESTAMP timestamp "${ARG_TIMESTAMP}" ${ARG_UTC}) + list(APPEND metadata "${timestamp}") + endif(DEFINED ARG_TIMESTAMP) endif() # Join - string( REPLACE ";" "." metadata "${metadata}" ) + string(REPLACE ";" "." metadata "${metadata}") - if( metadata MATCHES ".+" ) - set( semver "${semver}+${metadata}") + if(metadata MATCHES ".+") + set(semver "${semver}+${metadata}") endif() # Log the results - if( ARG_LOG ) - message( STATUS - "[VersionFromGit] Version: ${version} + if(ARG_LOG) + message( + STATUS + "[VersionFromGit] Version: ${version} Git tag: [${git_tag}] Git hash: [${git_hash}] Decorated: [${git_describe}] Identifiers: [${identifiers}] Metadata: [${metadata}] - SemVer: [${semver}]" - ) - endif( ARG_LOG ) + SemVer: [${semver}]") + endif(ARG_LOG) # Set parent scope variables - set( GIT_TAG ${git_tag} PARENT_SCOPE ) - set( SEMVER ${semver} PARENT_SCOPE ) - set( VERSION ${version} PARENT_SCOPE ) - set( VERSION_MAJOR ${version_major} PARENT_SCOPE ) - set( VERSION_MINOR ${version_minor} PARENT_SCOPE ) - set( VERSION_PATCH ${version_patch} PARENT_SCOPE ) - -endfunction( version_from_git ) - - + set(GIT_TAG + ${git_tag} + PARENT_SCOPE) + set(SEMVER + ${semver} + PARENT_SCOPE) + set(VERSION + ${version} + PARENT_SCOPE) + set(VERSION_MAJOR + ${version_major} + PARENT_SCOPE) + set(VERSION_MINOR + ${version_minor} + PARENT_SCOPE) + set(VERSION_PATCH + ${version_patch} + PARENT_SCOPE) + +endfunction(version_from_git) diff --git a/include/amarula/dbus/connman/gagent.hpp b/include/amarula/dbus/connman/gagent.hpp index 30363cd..998e3e5 100644 --- a/include/amarula/dbus/connman/gagent.hpp +++ b/include/amarula/dbus/connman/gagent.hpp @@ -12,11 +12,11 @@ class Connman; class Agent { GDBusNodeInfo *node_info_; guint registration_id_{0}; - GDBusConnection* connection_{nullptr}; + GDBusConnection *connection_{nullptr}; std::string path_{"/net/amarula/gconnman/agent"}; - explicit Agent(GDBusConnection* connection, - const std::string& path = std::string()); + explicit Agent(GDBusConnection *connection, + const std::string &path = std::string()); using RequestInputCallback = std::function;