refactor: use async tag to denote async calls or operations

This makes D-Bus proxy signal registration more flexible, more dynamic, and less error-prone since no `finishRegistration()` call is needed. A proxy can register to a signal at any time during its lifetime, and can unregister freely by simply destroying the associated slot.

.github/workflows/ci.yml

@@ -14,11 +14,18 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-22.04, ubuntu-24.04]
+        os: [ubuntu-20.04, ubuntu-22.04]
         compiler: [g++, clang]
-        build: [shared-libsystemd, embedded-static-libsystemd]
+        build: [shared-libsystemd]
+        include:
+          - os: ubuntu-22.04
+            compiler: g++
+            build: embedded-static-libsystemd
+          - os: ubuntu-22.04
+            compiler: clang
+            build: embedded-static-libsystemd
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v3
     - name: install-libsystemd-toolchain
       if: matrix.build == 'embedded-static-libsystemd'
       run: |
@@ -32,35 +39,43 @@ jobs:
     - name: install-clang
       if: matrix.compiler == 'clang'
       run: |
-        sudo apt-get install -y clang libc++-dev
+        sudo apt-get install -y clang
         sudo update-alternatives --remove-all cc
         sudo update-alternatives --install /usr/bin/cc cc /usr/bin/clang 10
         sudo update-alternatives --remove-all c++
         sudo update-alternatives --install /usr/bin/c++ c++ /usr/bin/clang++ 10
-        # We need to use libc++ with Clang because there is a bug in libstdc++ chrono headers that Clang has issues with
-        echo "SDBUSCPP_EXTRA_CXX_FLAGS=-stdlib=libc++" >> $GITHUB_ENV
-# We don't install googletest but we let it be built within sdbus-c++ builds below, since it needs to be built against libc++ for Clang jobs to pass
-#    - name: install-googletest
-#      run: |
-#        sudo apt-get install -y libgmock-dev
-    - name: configure-debug-gcc11 # For gcc 11, turn off the annoying deprecated-copy warning
-      if: matrix.build == 'shared-libsystemd' && matrix.compiler == 'g++' && matrix.os == 'ubuntu-22.04'
+    - name: install-googletest
+      if: matrix.os == 'ubuntu-22.04'
       run: |
+        sudo apt-get install -y libgmock-dev
+    - name: install-googletest
+      if: matrix.os == 'ubuntu-20.04' # On older ubuntus the libgmock-dev package is either unavailable or has faulty pkg-config file, so we build & install manually
+      run: |
+        git clone https://github.com/google/googletest.git
+        cd googletest
         mkdir build
         cd build
-        cmake -DCMAKE_BUILD_TYPE=Debug -DCMAKE_INSTALL_PREFIX:PATH=/usr -DCMAKE_CXX_FLAGS="-O0 -g -W -Wextra -Wall -Wnon-virtual-dtor -Wno-deprecated-copy -Werror $SDBUSCPP_EXTRA_CXX_FLAGS" -DCMAKE_VERBOSE_MAKEFILE=ON -DSDBUSCPP_INSTALL=ON -DSDBUSCPP_BUILD_TESTS=ON -DSDBUSCPP_BUILD_PERF_TESTS=ON -DSDBUSCPP_BUILD_STRESS_TESTS=ON -DSDBUSCPP_BUILD_CODEGEN=ON -DSDBUSCPP_GOOGLETEST_VERSION=1.14.0 ..
+        cmake ..
+        cmake --build . -j4
+        sudo cmake --build . --target install
     - name: configure-debug
-      if: matrix.build == 'shared-libsystemd' && (matrix.compiler != 'g++' || matrix.os != 'ubuntu-22.04')
+      if: matrix.build == 'shared-libsystemd' && matrix.os == 'ubuntu-20.04'
       run: |
         mkdir build
         cd build
-        cmake -DCMAKE_BUILD_TYPE=Debug -DCMAKE_INSTALL_PREFIX:PATH=/usr -DCMAKE_CXX_FLAGS="-O0 -g -W -Wextra -Wall -Wnon-virtual-dtor -Werror $SDBUSCPP_EXTRA_CXX_FLAGS" -DCMAKE_VERBOSE_MAKEFILE=ON -DSDBUSCPP_INSTALL=ON -DSDBUSCPP_BUILD_TESTS=ON -DSDBUSCPP_BUILD_PERF_TESTS=ON -DSDBUSCPP_BUILD_STRESS_TESTS=ON -DSDBUSCPP_BUILD_CODEGEN=ON -DSDBUSCPP_GOOGLETEST_VERSION=1.14.0 ..
-    - name: configure-release-with-embedded-libsystemd
+        cmake -DCMAKE_BUILD_TYPE=Debug -DCMAKE_INSTALL_PREFIX:PATH=/usr -DCMAKE_CXX_FLAGS="-O0 -g -W -Wextra -Wall -Wnon-virtual-dtor -Werror" -DCMAKE_VERBOSE_MAKEFILE=ON -DBUILD_TESTS=ON -DINSTALL_TESTS=ON -DENABLE_PERF_TESTS=ON -DENABLE_STRESS_TESTS=ON -DBUILD_CODE_GEN=ON ..
+    - name: configure-release
+      if: matrix.build == 'shared-libsystemd' && matrix.os == 'ubuntu-22.04'
+      run: |
+        mkdir build
+        cd build
+        cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_INSTALL_PREFIX:PATH=/usr -DCMAKE_CXX_FLAGS="-O3 -DNDEBUG -W -Wextra -Wall -Wnon-virtual-dtor -Werror" -DCMAKE_VERBOSE_MAKEFILE=ON -DBUILD_TESTS=ON -DINSTALL_TESTS=ON -DENABLE_PERF_TESTS=ON -DENABLE_STRESS_TESTS=ON -DBUILD_CODE_GEN=ON ..
+    - name: configure-with-embedded-libsystemd
       if: matrix.build == 'embedded-static-libsystemd'
       run: |
         mkdir build
         cd build
-        cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX:PATH=/usr -DCMAKE_CXX_FLAGS="$SDBUSCPP_EXTRA_CXX_FLAGS" -DCMAKE_VERBOSE_MAKEFILE=ON -DSDBUSCPP_INSTALL=ON -DSDBUSCPP_BUILD_TESTS=ON -DSDBUSCPP_BUILD_PERF_TESTS=ON -DSDBUSCPP_BUILD_STRESS_TESTS=ON -DSDBUSCPP_BUILD_CODEGEN=ON -DSDBUSCPP_BUILD_LIBSYSTEMD=ON -DSDBUSCPP_LIBSYSTEMD_VERSION=252 -DSDBUSCPP_GOOGLETEST_VERSION=1.14.0 ..
+        cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX:PATH=/usr -DCMAKE_VERBOSE_MAKEFILE=ON -DBUILD_TESTS=ON -DINSTALL_TESTS=ON -DENABLE_PERF_TESTS=ON -DENABLE_STRESS_TESTS=ON -DBUILD_CODE_GEN=ON -DBUILD_LIBSYSTEMD=ON -DLIBSYSTEMD_VERSION=252 ..
     - name: make
       run: |
         cd build
@@ -71,13 +86,13 @@ jobs:
         sudo cmake --build . --target install
         ctest --output-on-failure
     - name: pack
-      if: matrix.build == 'shared-libsystemd'
+      if: matrix.build == 'shared-libsystemd' && matrix.os == 'ubuntu-20.04'
       run: |
         cd build
         cpack -G DEB
     - name: 'Upload Artifact'
-      if: matrix.build == 'shared-libsystemd' && matrix.compiler == 'g++'
-      uses: actions/upload-artifact@v4
+      if: matrix.build == 'shared-libsystemd' && matrix.os == 'ubuntu-20.04' && matrix.compiler == 'g++'
+      uses: actions/upload-artifact@v3
       with:
         name: "debian-packages-${{ matrix.os }}-${{ matrix.compiler }}"
         path: |
@@ -88,7 +103,7 @@ jobs:
     name: build (freebsd, clang/libc++, basu)
     runs-on: ubuntu-22.04 # until https://github.com/actions/runner/issues/385
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v2
     - name: Test in FreeBSD VM
       uses: vmactions/freebsd-vm@v1
       with:
@@ -97,7 +112,7 @@ jobs:
         prepare: |
           pkg install -y cmake ninja pkgconf basu expat googletest
         run: |
-          cmake -B _build -G Ninja -DSDBUSCPP_INSTALL=ON -DSDBUSCPP_BUILD_CODEGEN=ON -DSDBUSCPP_BUILD_TESTS=ON -DSDBUSCPP_BUILD_PERF_TESTS=ON -DSDBUSCPP_BUILD_STRESS_TESTS=ON
+          cmake -B _build -G Ninja -DBUILD_CODE_GEN=ON -DBUILD_TESTS=ON -DINSTALL_TESTS=ON -DENABLE_PERF_TESTS=ON -DENABLE_STRESS_TESTS=ON
           cmake --build _build
           cmake --install _build
           pkg install -y dbus

CMakeLists.txt

@@ -4,128 +4,53 @@
 
 cmake_minimum_required(VERSION 3.14)
 
-project(sdbus-c++ VERSION 2.1.0 LANGUAGES CXX C)
+project(sdbus-c++ VERSION 2.0.0 LANGUAGES C CXX)
 
 include(GNUInstallDirs) # Installation directories for `install` command and pkgconfig file
 
-# -------------------------------
-# CONFIGURATION OPTIONS
-# -------------------------------
-
-option(SDBUSCPP_BUILD_LIBSYSTEMD "Fetch & build libsystemd static library and make it part of libsdbus-c++, instead of searching for it in the system" OFF)
-if(NOT SDBUSCPP_BUILD_LIBSYSTEMD)
-    set(SDBUSCPP_SDBUS_LIB "default" CACHE STRING "sd-bus implementation library to search for and use (default, systemd, elogind, or basu)")
-    set_property(CACHE SDBUSCPP_SDBUS_LIB PROPERTY STRINGS default systemd elogind basu)
-else()
-    set(SDBUSCPP_LIBSYSTEMD_VERSION "252" CACHE STRING "libsystemd version (>=239) to build and incorporate into libsdbus-c++")
-    set(SDBUSCPP_LIBSYSTEMD_EXTRA_CONFIG_OPTS "" CACHE STRING "Additional configuration options to be passed as-is to libsystemd build system")
-endif()
-option(SDBUSCPP_INSTALL "Enable installation of sdbus-c++ (downstream projects embedding sdbus-c++ may want to turn this OFF)" ON)
-option(SDBUSCPP_BUILD_TESTS "Build tests" OFF)
-if (SDBUSCPP_BUILD_TESTS)
-    option(SDBUSCPP_BUILD_PERF_TESTS "Build also sdbus-c++ performance tests" OFF)
-    option(SDBUSCPP_BUILD_STRESS_TESTS "Build also sdbus-c++ stress tests" OFF)
-    set(SDBUSCPP_TESTS_INSTALL_PATH "tests/${PROJECT_NAME}" CACHE STRING "Specifies where the test binaries will be installed")
-    set(SDBUSCPP_GOOGLETEST_VERSION 1.14.0 CACHE STRING "Version of gmock library to use")
-    set(SDBUSCPP_GOOGLETEST_GIT_REPO "https://github.com/google/googletest.git" CACHE STRING "A git repo to clone and build googletest from if gmock is not found in the system")
-endif()
-option(SDBUSCPP_BUILD_CODEGEN "Build generator tool for C++ native bindings" OFF)
-option(SDBUSCPP_BUILD_EXAMPLES "Build example programs" OFF)
-option(SDBUSCPP_BUILD_DOCS "Build documentation for sdbus-c++" ON)
-if(SDBUSCPP_BUILD_DOCS)
-    option(SDBUSCPP_BUILD_DOXYGEN_DOCS "Build doxygen documentation for sdbus-c++ API" OFF)
-endif()
-#option(SDBUSCPP_CLANG_TIDY "Co-compile with clang-tidy static analyzer" OFF)
-#option(SDBUSCPP_COVERAGE "Build sdbus-c++ with code coverage instrumentation" OFF)
-# We promote the BUILD_SHARED_LIBS flag to a (global) option only if we are the main project
-if(CMAKE_SOURCE_DIR STREQUAL PROJECT_SOURCE_DIR)
-    option(BUILD_SHARED_LIBS "Build shared libraries (.so) instead of static ones (.a)" ON)
-endif()
-
-message(STATUS "")
-message(STATUS "  *******************************************")
-message(STATUS "  *         SDBUS-C++ CONFIGURATION         *")
-message(STATUS "  *******************************************")
-message(STATUS "")
-message(STATUS "  SDBUSCPP_BUILD_LIBSYSTEMD: ${SDBUSCPP_BUILD_LIBSYSTEMD}")
-if(SDBUSCPP_BUILD_LIBSYSTEMD)
-    message(STATUS "    SDBUSCPP_LIBSYSTEMD_VERSION: ${SDBUSCPP_LIBSYSTEMD_VERSION}")
-    message(STATUS "    SDBUSCPP_LIBSYSTEMD_EXTRA_CONFIG_OPTS: ${SDBUSCPP_LIBSYSTEMD_EXTRA_CONFIG_OPTS}")
-endif()
-message(STATUS "  SDBUSCPP_INSTALL: ${SDBUSCPP_INSTALL}")
-message(STATUS "  SDBUSCPP_BUILD_TESTS: ${SDBUSCPP_BUILD_TESTS}")
-if(SDBUSCPP_BUILD_TESTS)
-    message(STATUS "    SDBUSCPP_BUILD_PERF_TESTS: ${SDBUSCPP_BUILD_PERF_TESTS}")
-    message(STATUS "    SDBUSCPP_BUILD_STRESS_TESTS: ${SDBUSCPP_BUILD_STRESS_TESTS}")
-    message(STATUS "    SDBUSCPP_TESTS_INSTALL_PATH: ${SDBUSCPP_TESTS_INSTALL_PATH}")
-    message(STATUS "    SDBUSCPP_GOOGLETEST_VERSION: ${SDBUSCPP_GOOGLETEST_VERSION}")
-    message(STATUS "    SDBUSCPP_GOOGLETEST_GIT_REPO: ${SDBUSCPP_GOOGLETEST_GIT_REPO}")
-endif()
-message(STATUS "  SDBUSCPP_BUILD_CODEGEN: ${SDBUSCPP_BUILD_CODEGEN}")
-message(STATUS "  SDBUSCPP_BUILD_EXAMPLES: ${SDBUSCPP_BUILD_EXAMPLES}")
-message(STATUS "  SDBUSCPP_BUILD_DOCS: ${SDBUSCPP_BUILD_DOCS}")
-if(SDBUSCPP_BUILD_DOCS)
-    message(STATUS "    SDBUSCPP_BUILD_DOXYGEN_DOCS: ${SDBUSCPP_BUILD_DOXYGEN_DOCS}")
-endif()
-message(STATUS "  BUILD_SHARED_LIBS: ${BUILD_SHARED_LIBS}")
-message(STATUS "")
-
 #-------------------------------
 # PERFORMING CHECKS & PREPARING THE DEPENDENCIES
 #-------------------------------
 
-if(SDBUSCPP_BUILD_LIBSYSTEMD)
-    # Build static libsystemd library as an external project
-    include(cmake/LibsystemdExternalProject.cmake)
-    set(SDBUS_IMPL "systemd")
-    set(SDBUS_LIB "libsystemd")
-else()
-    # Search for sd-bus implementations in the system as per user's configuration
-    set(SDBUS_LIBS ${SDBUSCPP_SDBUS_LIB})
-    if(SDBUSCPP_SDBUS_LIB STREQUAL "default")
-        set(SDBUS_LIBS systemd elogind basu) # This is the default search order
-    endif()
+set(LIBSYSTEMD_IMPL "systemd")
+set(LIBSYSTEMD_LIB "libsystemd")
 
-    set(MINIMUM_SDBUS_VERSION 238)
+option(BUILD_LIBSYSTEMD "Build libsystemd static library and incorporate it into libsdbus-c++" OFF)
 
+if(NOT BUILD_LIBSYSTEMD)
     find_package(PkgConfig REQUIRED)
-    foreach(LIB ${SDBUS_LIBS})
-        if(LIB STREQUAL "systemd")
-            pkg_check_modules(Systemd IMPORTED_TARGET GLOBAL libsystemd>=${MINIMUM_SDBUS_VERSION})
-            if(TARGET PkgConfig::Systemd)
-                set(SDBUS_IMPL "systemd")
-                set(SDBUS_LIB "libsystemd")
-                break()
-            endif()
-        elseif(LIB STREQUAL "elogind")
-            pkg_check_modules(Systemd IMPORTED_TARGET GLOBAL libelogind>=${MINIMUM_SDBUS_VERSION})
-            if(TARGET PkgConfig::Systemd)
-                set(SDBUS_IMPL "elogind")
-                set(SDBUS_LIB "libelogind")
-                string(REPLACE "." ";" VERSION_LIST ${Systemd_VERSION})
-                list(GET VERSION_LIST 0 Systemd_VERSION)
-                break()
-            endif()
-        elseif(LIB STREQUAL "basu")
-            pkg_check_modules(Systemd IMPORTED_TARGET GLOBAL basu)
-            if(TARGET PkgConfig::Systemd)
-                set(SDBUS_IMPL "basu")
-                set(SDBUS_LIB "basu")
-                set(Systemd_VERSION "240") # https://git.sr.ht/~emersion/basu/commit/d4d185d29a26
-                break()
-            endif()
-        else()
-            message(FATAL_ERROR "Unrecognized sd-bus implementation library ${LIB}")
-        endif()
-    endforeach()
-
+    pkg_check_modules(Systemd IMPORTED_TARGET GLOBAL libsystemd>=238)
     if(NOT TARGET PkgConfig::Systemd)
-        message(FATAL_ERROR "None of ${SDBUS_LIBS} libraries implementing sd-bus was found (Are their dev packages installed?)")
+        message(WARNING "libsystemd not found, checking for libelogind instead")
+        pkg_check_modules(Systemd IMPORTED_TARGET GLOBAL libelogind>=238)
+        if(TARGET PkgConfig::Systemd)
+            set(LIBSYSTEMD_IMPL "elogind")
+            set(LIBSYSTEMD_LIB "libelogind")
+            string(REPLACE "." ";" VERSION_LIST ${Systemd_VERSION})
+            list(GET VERSION_LIST 0 Systemd_VERSION)
+        else()
+            message(WARNING "libelogind not found, checking for basu instead")
+            pkg_check_modules(Systemd IMPORTED_TARGET GLOBAL basu)
+            set(LIBSYSTEMD_IMPL "basu")
+            set(LIBSYSTEMD_LIB "basu")
+            # https://git.sr.ht/~emersion/basu/commit/d4d185d29a26
+            set(Systemd_VERSION "240")
+        endif()
+    endif()
+    if(NOT TARGET PkgConfig::Systemd)
+        message(FATAL_ERROR "libsystemd of version at least 238 is required, but was not found "
+                            "(if you have systemd in your OS, you may want to install package containing pkgconfig "
+                            " files for libsystemd library. On Ubuntu, that is libsystemd-dev. "
+                            " Alternatively, you may turn BUILD_LIBSYSTEMD on for sdbus-c++ to download, build "
+                            "and incorporate libsystemd as embedded library within sdbus-c++)")
     endif()
     add_library(Systemd::Libsystemd ALIAS PkgConfig::Systemd)
     string(REGEX MATCHALL "([0-9]+)" SYSTEMD_VERSION_LIST "${Systemd_VERSION}")
-    list(GET SYSTEMD_VERSION_LIST 0 SDBUSCPP_LIBSYSTEMD_VERSION)
-    message(STATUS "Building with libsystemd v${SDBUSCPP_LIBSYSTEMD_VERSION}")
+    list(GET SYSTEMD_VERSION_LIST 0 LIBSYSTEMD_VERSION)
+    message(STATUS "Building with libsystemd v${LIBSYSTEMD_VERSION}")
+else()
+    # Build static libsystemd library as an external project
+    include(cmake/LibsystemdExternalProject.cmake)
 endif()
 
 find_package(Threads REQUIRED)
@@ -186,7 +111,7 @@ set(SDBUSCPP_SRCS ${SDBUSCPP_CPP_SRCS} ${SDBUSCPP_HDR_SRCS} ${SDBUSCPP_PUBLIC_HD
 # GENERAL COMPILER CONFIGURATION
 #-------------------------------
 
-set(CMAKE_CXX_STANDARD 20)
+set(CMAKE_CXX_STANDARD 17)
 
 #----------------------------------
 # LIBRARY BUILD INFORMATION
@@ -195,19 +120,24 @@ set(CMAKE_CXX_STANDARD 20)
 set(SDBUSCPP_VERSION_MAJOR "${PROJECT_VERSION_MAJOR}")
 set(SDBUSCPP_VERSION "${PROJECT_VERSION}")
 
+# We promote the BUILD_SHARED_LIBS flag to a (global) option only if we are the main project
+if(CMAKE_SOURCE_DIR STREQUAL PROJECT_SOURCE_DIR)
+    option(BUILD_SHARED_LIBS "Build shared libraries (.so) instead of static ones (.a)" ON)
+endif()
+
 # Having an object target allows unit tests to reuse already built sources without re-building
 add_library(sdbus-c++-objlib OBJECT ${SDBUSCPP_SRCS})
 target_compile_definitions(sdbus-c++-objlib PRIVATE
     BUILD_LIB=1
-    LIBSYSTEMD_VERSION=${SDBUSCPP_LIBSYSTEMD_VERSION}
-    SDBUS_${SDBUS_IMPL}
-    SDBUS_HEADER=<${SDBUS_IMPL}/sd-bus.h>)
+    LIBSYSTEMD_VERSION=${LIBSYSTEMD_VERSION}
+    SDBUS_${LIBSYSTEMD_IMPL}
+    SDBUS_HEADER=<${LIBSYSTEMD_IMPL}/sd-bus.h>)
 target_include_directories(sdbus-c++-objlib PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
                                                    $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/src>)
 if(BUILD_SHARED_LIBS)
     set_target_properties(sdbus-c++-objlib PROPERTIES POSITION_INDEPENDENT_CODE ON)
 endif()
-if(SDBUSCPP_BUILD_LIBSYSTEMD)
+if(BUILD_LIBSYSTEMD)
     add_dependencies(sdbus-c++-objlib LibsystemdBuildProject)
 endif()
 target_link_libraries(sdbus-c++-objlib
@@ -225,11 +155,28 @@ set_target_properties(sdbus-c++
                                  OUTPUT_NAME "sdbus-c++")
 target_link_libraries(sdbus-c++ PRIVATE sdbus-c++-objlib)
 
+#----------------------------------
+# INSTALLATION
+#----------------------------------
+set(EXPORT_SET sdbus-c++)
+if(NOT BUILD_SHARED_LIBS)
+    list(APPEND EXPORT_SET "sdbus-c++-objlib")
+endif()
+
+install(TARGETS ${EXPORT_SET}
+        EXPORT sdbus-c++-targets
+        RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT runtime
+        LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT runtime NAMELINK_COMPONENT dev
+        ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT dev
+        PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${SDBUSCPP_INCLUDE_SUBDIR} COMPONENT dev)
+
 #----------------------------------
 # TESTS
 #----------------------------------
 
-if(SDBUSCPP_BUILD_TESTS)
+option(BUILD_TESTS "Build tests (default OFF)" OFF)
+
+if(BUILD_TESTS)
     message(STATUS "Building with tests")
     enable_testing()
     add_subdirectory("${CMAKE_CURRENT_SOURCE_DIR}/tests")
@@ -239,7 +186,9 @@ endif()
 # UTILS
 #----------------------------------
 
-if(SDBUSCPP_BUILD_CODEGEN)
+option(BUILD_CODE_GEN "Build and install interface stub code generator (default OFF)" OFF)
+
+if(BUILD_CODE_GEN)
     message(STATUS "Building with code generator tool")
     add_subdirectory("${CMAKE_CURRENT_SOURCE_DIR}/tools")
 endif()
@@ -248,7 +197,9 @@ endif()
 # EXAMPLES
 #----------------------------------
 
-if(SDBUSCPP_BUILD_EXAMPLES)
+option(BUILD_EXAMPLES "Build example programs (default OFF)" OFF)
+
+if(BUILD_EXAMPLES)
     message(STATUS "Building with examples")
     add_subdirectory(examples)
 endif()
@@ -257,9 +208,13 @@ endif()
 # DOCUMENTATION
 #----------------------------------
 
-if(SDBUSCPP_BUILD_DOCS)
+option(BUILD_DOC "Build documentation for sdbus-c++" ON)
+
+if(BUILD_DOC)
     message(STATUS "Building with documentation")
+    option(BUILD_DOXYGEN_DOC "Build doxygen documentation for sdbus-c++ API" OFF)
     add_subdirectory("${CMAKE_CURRENT_SOURCE_DIR}/docs")
+    install(FILES README README.md NEWS COPYING ChangeLog AUTHORS DESTINATION ${CMAKE_INSTALL_DOCDIR} COMPONENT doc)
 endif()
 
 #----------------------------------
@@ -268,58 +223,39 @@ endif()
 
 include(CMakePackageConfigHelpers)
 
+install(EXPORT sdbus-c++-targets
+        DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/sdbus-c++
+        NAMESPACE SDBusCpp::
+        COMPONENT dev)
+
 configure_package_config_file(cmake/sdbus-c++-config.cmake.in cmake/sdbus-c++-config.cmake
                               INSTALL_DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/sdbus-c++)
 write_basic_package_version_file(cmake/sdbus-c++-config-version.cmake COMPATIBILITY SameMajorVersion)
+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/cmake/sdbus-c++-config.cmake
+              ${CMAKE_CURRENT_BINARY_DIR}/cmake/sdbus-c++-config-version.cmake
+        DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/sdbus-c++
+        COMPONENT dev)
 
-if(BUILD_SHARED_LIBS AND (SDBUSCPP_BUILD_LIBSYSTEMD OR Systemd_LINK_LIBRARIES MATCHES "/libsystemd\.a(;|$)"))
+if(BUILD_SHARED_LIBS AND (BUILD_LIBSYSTEMD OR Systemd_LINK_LIBRARIES MATCHES "/libsystemd\.a(;|$)"))
     set(PKGCONFIG_REQS ".private")
 else()
     set(PKGCONFIG_REQS "")
 endif()
-set(PKGCONFIG_DEPS ${SDBUS_LIB})
+set(PKGCONFIG_DEPS ${LIBSYSTEMD_LIB})
 configure_file(pkgconfig/sdbus-c++.pc.in pkgconfig/sdbus-c++.pc @ONLY)
+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/pkgconfig/sdbus-c++.pc
+        DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig COMPONENT dev)
 
 #----------------------------------
-# INSTALLATION
+# CPack
 #----------------------------------
-
-if(SDBUSCPP_INSTALL)
-    set(EXPORT_SET sdbus-c++)
-    if(NOT BUILD_SHARED_LIBS)
-        list(APPEND EXPORT_SET "sdbus-c++-objlib")
-    endif()
-    install(TARGETS ${EXPORT_SET}
-            EXPORT sdbus-c++-targets
-            RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT sdbus-c++-runtime
-            LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT sdbus-c++-runtime NAMELINK_COMPONENT sdbus-c++-dev
-            ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT sdbus-c++-dev
-            PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${SDBUSCPP_INCLUDE_SUBDIR} COMPONENT sdbus-c++-dev)
-    install(EXPORT sdbus-c++-targets
-            DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/sdbus-c++
-            NAMESPACE SDBusCpp::
-            COMPONENT sdbus-c++-dev)
-    install(FILES ${CMAKE_CURRENT_BINARY_DIR}/cmake/sdbus-c++-config.cmake
-            ${CMAKE_CURRENT_BINARY_DIR}/cmake/sdbus-c++-config-version.cmake
-            DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/sdbus-c++
-            COMPONENT sdbus-c++-dev)
-    install(FILES ${CMAKE_CURRENT_BINARY_DIR}/pkgconfig/sdbus-c++.pc
-            DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig COMPONENT sdbus-c++-dev)
-    if(SDBUSCPP_BUILD_DOCS)
-        install(FILES README README.md NEWS COPYING ChangeLog AUTHORS DESTINATION ${CMAKE_INSTALL_DOCDIR} COMPONENT sdbus-c++-doc)
-    endif()
-endif()
-
-#----------------------------------
-# CPACK
-#----------------------------------
-
 set(CPACK_PACKAGE_VENDOR "Kistler")
-set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "High-level C++ D-Bus library")
+set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "high-level C++ D-Bus library")
 set(CPACK_PACKAGE_CONTACT "info@kistler.com")
 set(CPACK_RESOURCE_FILE_README "${CMAKE_CURRENT_SOURCE_DIR}/README.md")
 set(CPACK_COMPONENTS_ALL runtime dev doc)
 set(CPACK_COMPONENT_DEV_DEPENDS "runtime")
+
 # specific for DEB generator
 set(CPACK_DEB_COMPONENT_INSTALL ON)
 set(CPACK_DEBIAN_RUNTIME_DEBUGINFO_PACKAGE ON)
@@ -328,6 +264,6 @@ set(CPACK_DEBIAN_FILE_NAME DEB-DEFAULT)
 set(CPACK_DEBIAN_PACKAGE_SECTION "libs")
 set(CPACK_DEBIAN_PACKAGE_SHLIBDEPS ON)
 set(CPACK_DEBIAN_ENABLE_COMPONENT_DEPENDS ON)
-set(CPACK_DEBIAN_DEV_PACKAGE_DEPENDS "libsystemd-dev (>=${MINIMUM_SDBUS_VERSION})")
+set(CPACK_DEBIAN_DEV_PACKAGE_DEPENDS "libsystemd-dev (>=236)")
 
 include(CPack)

ChangeLog

@@ -240,64 +240,21 @@ v1.4.0
 - Add option to create IConnection directly from an underlying sd_bus instance
 - Some additional fixes
 
-v1.5.0
-- Improve handling of exceptions from callback handlers
-- Add support for async registration of matches
-- Correctly add libsystemd dependency to pkgconfi
-- Fix request name signal handling issue
-- Add INSTALL_TESTS CMake option
-- Minor UnixFd cleanups
-- Additional little fixes and updates in code, build system, CI, and documentation
-
-v1.6.0
-- Add support for enums in D-Bus serialization and signatures
-- Add support for std::variant as an alternative C++ type for D-Bus Variant
-- Add support for implicit conversions between std::variant and sdbus::Variant
-- Fix missing includes
-
-v2.0.0
-- A new major version with revamped API, bringing numerous new features, simplifications, fixes and breaking changes improving not only API consistency, safety and expressiveness, but also performance
-- Add section 'Migrating to sdbus-c++ v2' to the 'Using sdbus-c++' document providing the complete list of breaking API/ABI/behavior changes and migration notes
-- Switch to C++20 standard (but the API is backwards-compatible with C++17, skipping C++20 features in such a case)
-- Add strong types to public API
-- Add support for string_view as a D-Bus type representation
-- Enable compile-time D-Bus signature generation
-- Redesign Object vtable registration API
-- Improve Proxy signal subscription API
-- Refactor object manager API for consistency
-- Introduce native sd-event integration
-- Let callbacks take message objects by value
-- Simplify async D-Bus connection handling
-- Simplify async call state flag
-- Make Variant constructor explicit
-- Use optional for passing potential call errors
-- Rename and re-organize CMake options
-- Rename connection creation methods
-- Have all async function names finish with *Async for consistency
-- Implement more flexible searching for sd-bus libs
-- Add new `SDBUSCPP_SDBUS_LIB` CMake configuration variable determining which sd-bus library shall be picked
-- Make Variant conversion operator explicit
-- Use sd-bus API to get the current message
-- Use sd_bus_match_signal() for signal registration
-- Provide also const char* overloads for convenience functions
-- Disable move in generated adaptor and proxy classes
-- Improve and make more efficient some Message API
-- Add Slot-returning overloads of async method calls
-- Remove floating_slot_t tag and use return_slot_t instead
-- Add [[nodiscard]] to many relevant API functions
-- Add proper fix for timeout handling
+v2.x
+- Breaking changes in API/ABI/behavior:
+  - In *synchronous* D-Bus calls, the proxy now **always** blocks the connection for concurrent use until the call finishes (with either a received reply,
+    an error, or time out). If this creates a connection contention issue in your multi-threaded design, use short-lived, light-weight proxies, or call
+    the method in an asynchronous way.
+  - Signatures of callbacks `async_reply_handler`, `signal_handler`, `message_handler` and `property_set_callback` were modified to take input message objects
+    by value, as opposed to non-const ref. Callee assumes ownership of the message. This API is more idiomatic, cleaner and safer.
+  - The `PollData` struct has been extended with a new data member: `eventFd`. All hooks with external event loops shall be modified to poll on this fd as well.
+  - `PollData::timeout_usec` was renamed to `PollData::timeout` and its type has been changed to `std::chrono::microseconds`. This member now holds directly
+    what before had to be obtained through `PollData::getAbsoluteTimeout()` call.
+  - `PollData::getRelativeTimeout()` return type was changed to `std::chrono::microseconds`.
+  - `IConnection::processPendingRequest()` was renamed to `IConnection::processPendingEvent()`.
+  - `Variant` constructor is now explicit.
+  - Object D-Bus API registration is now done through `IObject::addVTable()` method. The registration is immediate; no `finishRegistration()` call is needed anymore.
+- Systemd of at least v238 is required to compile sdbus-c++
+- A proper fix for timeout handling
 - Fix for external event loops in which the event loop thread ID was not correctly initialized (now fixed and simplified by not needing the thread ID anymore)
-- Remove deprecated stuff
-- Add `SDBUSCPP_` prefix to CMake configuration variables to avoid conflicts with downstream projects
-- Require systemd of at least v238
-- Many other fixes and updates in code, tests, build system, CI, and documentation
-
-v2.1.0
-- Add SDBUSCPP_REGISTER_STRUCT macro to conveniently teach sdbus-c++ about user-defined structs
-- Extend the SDBUSCPP_REGISTER_STRUCT macro with serialization of user-defined structs as dicts, and deserialization of dicts into user-defined structs
-- Make createPlainMessage() function public
-- Solve the problem of sending large D-Bus messages properly (through the event loop thread)
-- Fix partially renamed BUILD_DOXYGEN_DOC CMake option
-- Change googletest to default version 1.14.0
-- Add version parameter to the xml2cpp codegen tool
-- A few other internal refactorings and improvements
+- Other simplifications, improvements and fixes springing out from the above refactoring

README.md

@@ -26,76 +26,70 @@ $ sudo cmake --build . --target install
 
 ### CMake configuration flags for sdbus-c++
 
-* `SDBUSCPP_BUILD_CODEGEN` [boolean]
+* `BUILD_CODE_GEN` [boolean]
 
-  Build the codegen tool `sdbus-c++-xml2cpp` for generating the high level C++ bindings out of the D-Bus IDL XML description. Default value: `OFF`. Use `-DSDBUSCPP_BUILD_CODEGEN=ON` flag to turn on building the code gen.
+  Option for building the stub code generator `sdbus-c++-xml2cpp` for generating the adaptor and proxy interfaces out of the D-Bus IDL XML description. Default value: `OFF`. Use `-DBUILD_CODE_GEN=ON` flag to turn on building the code gen.
 
-* `SDBUSCPP_BUILD_DOCS` [boolean]
+* `BUILD_DOC` [boolean]
 
-  Include sdbus-c++ documentation files and tutorials. Default value: `ON`. With this option turned on, you may also enable/disable the following option:
+  Option for including sdbus-c++ documentation files and tutorials. Default value: `ON`. With this option turned on, you may also enable/disable the following option:
 
-    * `SDBUSCPP_BUILD_DOXYGEN_DOCS` [boolean]
+    * `BUILD_DOXYGEN_DOC` [boolean]
 
-      Build Doxygen documentation of sdbus-c++ API. If enabled, the documentation must still be built explicitly through `cmake --build . --target doc`. Default value: `OFF`. Use `-DSDBUSCPP_BUILD_DOXYGEN_DOCS=OFF` to disable searching for Doxygen and building Doxygen documentation of sdbus-c++ API.
+      Option for building Doxygen documentation of sdbus-c++ API. If enabled, the documentation must still be built explicitly through `cmake --build . --target doc`. Default value: `OFF`. Use `-DBUILD_DOXYGEN_DOC=OFF` to disable searching for Doxygen and building Doxygen documentation of sdbus-c++ API.
 
-* `SDBUSCPP_BUILD_TESTS` [boolean]
+* `BUILD_TESTS` [boolean]
 
-  Build sdbus-c++ unit and integration tests, invokable by `cmake --build . --target test` (Note: before invoking `cmake --build . --target test`, make sure you copy `tests/integrationtests/files/org.sdbuscpp.integrationtests.conf` file to `/etc/dbus-1/system.d` directory). That incorporates downloading and building static libraries of Google Test. Default value: `OFF`. Use `-DBUILD_TESTS=ON` to enable building the tests. With this option turned on, you may also enable/disable the following options:
+  Option for building sdbus-c++ unit and integration tests, invokable by `cmake --build . --target test` (Note: before invoking `cmake --build . --target test`, make sure you copy `tests/integrationtests/files/org.sdbuscpp.integrationtests.conf` file to `/etc/dbus-1/system.d` directory). That incorporates downloading and building static libraries of Google Test. Default value: `OFF`. Use `-DBUILD_TESTS=ON` to enable building the tests. With this option turned on, you may also enable/disable the following options:
 
-    * `SDBUSCPP_BUILD_PERF_TESTS` [boolean]
+    * `ENABLE_PERF_TESTS` [boolean]
 
-      Build sdbus-c++ performance tests. Default value: `OFF`.
+      Option for building sdbus-c++ performance tests. Default value: `OFF`.
 
-    * `SDBUSCPP_BUILD_STRESS_TESTS` [boolean]
+    * `ENABLE_STRESS_TESTS` [boolean]
 
-      Build sdbus-c++ stress tests. Default value: `OFF`.
+      Option for building sdbus-c++ stress tests. Default value: `OFF`.
 
-    * `SDBUSCPP_TESTS_INSTALL_PATH` [string]
+    * `INSTALL_TESTS` [boolean]
+
+      Option for installing tests that were built. Default value: `OFF`.
+
+    * `TESTS_INSTALL_PATH` [string]
 
       Path where the test binaries shall get installed. Default value: `${CMAKE_INSTALL_PREFIX}/tests/sdbus-c++` (previously: `/opt/test/bin`).
 
-* `SDBUSCPP_BUILD_EXAMPLES` [boolean]
+* `BUILD_LIBSYSTEMD` [boolean]
 
-  Build example programs which are located in the _example_ directory. Examples are not installed. Default value: `OFF`.
+  Option for building libsystemd dependency library automatically when sdbus-c++ is built, and making libsystemd an integral part of sdbus-c++ library. Default value: `OFF`. Might be very helpful in non-systemd environments where libsystemd shared library is unavailable (see [Solving libsystemd dependency](docs/using-sdbus-c++.md#solving-libsystemd-dependency) for more information). With this option turned on, you may also provide the following configuration flag:
 
-* `SDBUSCPP_BUILD_LIBSYSTEMD` [boolean]
+    * `LIBSYSTEMD_VERSION` [string]
 
-  Build sd-bus (libsystemd library) instead of searching for it in the system, and make it part of sdbus-c++ library. Default value: `OFF`, which means that the sd-bus implementation library (`libsystemd`, `libelogind`, or `basu`) will be searched via `pkg-config` in the system.
+      Defines version of systemd to be downloaded, built and integrated into sdbus-c++. Default value: `242`.
 
-  This option may be very helpful in environments where sd-bus implementation library is unavailable (see [Solving sd-bus dependency](docs/using-sdbus-c++.md#solving-sd-bus-dependency) for more information).
-  
-  With this option turned off, you may provide the following additional configuration flag:
+    * `LIBSYSTEMD_EXTRA_CONFIG_OPTS` [string]
 
-    * `SDBUSCPP_SDBUS_LIB` [string]
-
-      Defines which sd-bus implementation library to search for and use. Allowed values: `default`, `systemd`, `elogind`, `basu`. Default value: `default`, which means that sdbus-c++ will try to find any of `systemd`, `elogind`, `basu` in the order as listed here.
-
-  With this option turned on, you may provide the following additional configuration flag:
-
-    * `SDBUSCPP_LIBSYSTEMD_VERSION` [string]
-
-      Defines version of systemd to be downloaded, built and integrated into sdbus-c++. Default value: `252`, minimum value: `239`.
-
-    * `SDBUSCPP_LIBSYSTEMD_EXTRA_CONFIG_OPTS` [string]
-
-      Additional options to be passed as-is to the libsystemd build system in its configure step. Can be used for passing e.g. toolchain file path in case of cross builds. Default value: empty.
+      Additional options to be passed as-is to the libsystemd build system (meson for systemd v242) in its configure step. Can be used for passing e.g. toolchain file path in case of cross builds. Default value: empty.
 
 * `CMAKE_BUILD_TYPE` [string]
 
-  CMake-builtin option. Set to `Release` to build sdbus-c++ for production use. Set to `Debug` if you want to help further develop (and debug) the library :)
+  This is a CMake-builtin option. Set to `Release` to build sdbus-c++ for production use. Set to `Debug` if you want to help further develop (and debug) the library :)
 
 * `BUILD_SHARED_LIBS` [boolean]
 
-  Global CMake flag, promoted in sdbus-c++ project to a CMake option. Use this to control whether sdbus-c++ is built as either a shared or static library. Default value: `ON`.
+  This is a global CMake flag, promoted in sdbus-c++ project to a CMake option. Use this to control whether sdbus-c++ is built as either a shared or static library. Default value: `ON`.
+
+* `BUILD_EXAMPLES` [boolean]
+
+  Build example programs which are located in the _example_ directory. Examples are not installed. Default value: `OFF`
 
 Dependencies
 ------------
 
-* `C++20/C++17` - the library uses C++20 features, but its public API is backwards compatible with C++17 and provides optional extra features when C++20 features are available
-* `libsystemd`/`libelogind`/`basu` - libraries containing sd-bus implementation that sdbus-c++ is written around. In case of `libsystemd` and `libelogind`, version >= 238 is needed. (In case you have you're missing any of those sd-bus implementations, don't worry, see [Solving sd-bus dependency](docs/using-sdbus-c++.md#solving-sd-bus-dependency) for more information.)
+* `C++17` - the library uses C++17 features.
+* `libsystemd`/`libelogind`/`basu` - libraries containing sd-bus implementation that sdbus-c++ is written around. In case of `libsystemd` and `libelogind`, version >= 236 is needed. (In case you have a non-systemd environment, don't worry, see [Solving libsystemd dependency](docs/using-sdbus-c++.md#solving-libsystemd-dependency) for more information.)
 * `googletest` - google unit testing framework, only necessary when building tests, will be downloaded and built automatically.
 * `pkgconfig` - required for sdbus-c++ to be able to find some dependency packages.
-* `expat` - necessary when building the xml2cpp binding code generator (`SDBUSCPP_BUILD_CODEGEN` option is `ON`).
+* `expat` - necessary when building xml2cpp code generator (`BUILD_CODE_GEN` option is ON).
 
 Licensing
 ---------

cmake/LibsystemdExternalProject.cmake

@@ -18,6 +18,9 @@ if (NOT CAP_FOUND)
     find_library(CAP_LIBRARIES cap) # Compat with Ubuntu 14.04 which ships libcap w/o .pc file
 endif()
 
+set(LIBSYSTEMD_VERSION "242" CACHE STRING "libsystemd version (>=239) to build and incorporate into libsdbus-c++")
+set(LIBSYSTEMD_EXTRA_CONFIG_OPTS "" CACHE STRING "Additional configuration options to be passed as-is to libsystemd build system")
+
 if(NOT CMAKE_BUILD_TYPE)
     set(LIBSYSTEMD_BUILD_TYPE "plain")
 elseif(CMAKE_BUILD_TYPE STREQUAL "Debug")
@@ -26,24 +29,24 @@ else()
     set(LIBSYSTEMD_BUILD_TYPE "release")
 endif()
 
-if(SDBUSCPP_LIBSYSTEMD_VERSION LESS "239")
+if(LIBSYSTEMD_VERSION LESS "239")
     message(FATAL_ERROR "Only libsystemd version >=239 can be built as static part of sdbus-c++")
 endif()
-if(SDBUSCPP_LIBSYSTEMD_VERSION GREATER "240")
+if(LIBSYSTEMD_VERSION GREATER "240")
     set(BUILD_VERSION_H ${NINJA} -C <BINARY_DIR> version.h)
 endif()
 
-message(STATUS "Building with embedded libsystemd v${SDBUSCPP_LIBSYSTEMD_VERSION}")
+message(STATUS "Building with embedded libsystemd v${LIBSYSTEMD_VERSION}")
 
 include(ExternalProject)
 ExternalProject_Add(LibsystemdBuildProject
-                    PREFIX libsystemd-v${SDBUSCPP_LIBSYSTEMD_VERSION}
+                    PREFIX libsystemd-v${LIBSYSTEMD_VERSION}
                     GIT_REPOSITORY    https://github.com/systemd/systemd-stable.git
-                    GIT_TAG           v${SDBUSCPP_LIBSYSTEMD_VERSION}-stable
+                    GIT_TAG           v${LIBSYSTEMD_VERSION}-stable
                     GIT_SHALLOW       1
                     UPDATE_COMMAND    ""
                     CONFIGURE_COMMAND ${CMAKE_COMMAND} -E remove <BINARY_DIR>/*
-                              COMMAND ${MESON} --prefix=<INSTALL_DIR> --buildtype=${LIBSYSTEMD_BUILD_TYPE} -Drootprefix=<INSTALL_DIR> -Dstatic-libsystemd=pic -Dselinux=false <SOURCE_DIR> <BINARY_DIR> ${SDBUSCPP_LIBSYSTEMD_EXTRA_CONFIG_OPTS}
+                              COMMAND ${MESON} --prefix=<INSTALL_DIR> --buildtype=${LIBSYSTEMD_BUILD_TYPE} -Drootprefix=<INSTALL_DIR> -Dstatic-libsystemd=pic -Dselinux=false <SOURCE_DIR> <BINARY_DIR> ${LIBSYSTEMD_EXTRA_CONFIG_OPTS}
                     BUILD_COMMAND     ${BUILD_VERSION_H}
                           COMMAND     ${NINJA} -C <BINARY_DIR> libsystemd.a
                     BUILD_ALWAYS      0

docs/CMakeLists.txt

@@ -2,7 +2,7 @@
 
 find_package(Doxygen)
 
-if(SDBUSCPP_BUILD_DOXYGEN_DOCS)
+if(BUILD_DOXYGEN_DOC)
     if(DOXYGEN_FOUND)
         configure_file(${CMAKE_CURRENT_SOURCE_DIR}/Doxyfile.in ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile @ONLY)
 
@@ -15,19 +15,15 @@ if(SDBUSCPP_BUILD_DOXYGEN_DOCS)
         # workaround bug https://github.com/doxygen/doxygen/pull/6787
         add_custom_command(TARGET doc POST_BUILD
           COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_LIST_DIR}/sdbus-c++-class-diagram.png ${CMAKE_CURRENT_BINARY_DIR}/html/.)
+
+        install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/html DESTINATION ${CMAKE_INSTALL_DOCDIR} OPTIONAL COMPONENT doc)
     else()
         message(WARNING "Documentation enabled, but Doxygen cannot be found")
     endif()
 endif()
 
-if(SDBUSCPP_INSTALL)
-    install(FILES sdbus-c++-class-diagram.png
-                  sdbus-c++-class-diagram.uml
-                  systemd-dbus-config.md
-                  using-sdbus-c++.md
-            DESTINATION ${CMAKE_INSTALL_DOCDIR} COMPONENT sdbus-c++-doc)
-
-    if (SDBUSCPP_BUILD_DOXYGEN_DOCS AND DOXYGEN_FOUND)
-        install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/html DESTINATION ${CMAKE_INSTALL_DOCDIR} OPTIONAL COMPONENT sdbus-c++-doc)
-    endif()
-endif()
+install(FILES sdbus-c++-class-diagram.png
+              sdbus-c++-class-diagram.uml
+              systemd-dbus-config.md
+              using-sdbus-c++.md
+        DESTINATION ${CMAKE_INSTALL_DOCDIR} COMPONENT doc)

docs/using-sdbus-c++.md

@@ -5,7 +5,7 @@ Using sdbus-c++ library
 
 1. [Introduction](#introduction)
 2. [Integrating sdbus-c++ into your project](#integrating-sdbus-c-into-your-project)
-3. [Solving sd-bus dependency](#solving-sd-bus-dependency)
+3. [Solving libsystemd dependency](#solving-libsystemd-dependency)
 4. [Distributing sdbus-c++](#distributing-sdbus-c)
 5. [Header files and namespaces](#header-files-and-namespaces)
 6. [Error signalling and propagation](#error-signalling-and-propagation)
@@ -20,12 +20,10 @@ Using sdbus-c++ library
 15. [Using D-Bus properties](#using-d-bus-properties)
 16. [Standard D-Bus interfaces](#standard-d-bus-interfaces)
 17. [Representing D-Bus Types in sdbus-c++](#representing-d-bus-types-in-sdbus-c)
-18. [Adding user-defined types to the sdbus-c++ type system](#adding-user-defined-types-to-the-sdbus-c-type-system)
-19. [Support for match rules](#support-for-match-rules)
-20. [Using direct (peer-to-peer) D-Bus connections](#using-direct-peer-to-peer-d-bus-connections)
-21. [Using sdbus-c++ in external event loops](#using-sdbus-c-in-external-event-loops)
-22. [Migrating to sdbus-c++ v2](#migrating-to-sdbus-c-v2)
-23. [Conclusion](#conclusion)
+18. [Support for match rules](#support-for-match-rules)
+19. [Using direct (peer-to-peer) D-Bus connections](#using-direct-peer-to-peer-d-bus-connections)
+20. [Using sdbus-c++ in external event loops](#using-sdbus-c-in-external-event-loops)
+21. [Conclusion](#conclusion)
 
 Introduction
 ------------
@@ -57,7 +55,7 @@ PKG_CHECK_MODULES(SDBUSCPP, [sdbus-c++ >= 0.6],,
 )
 ```
 
-> **_Note_:** sdbus-c++ library uses a number of modern C++17 (and, conditionally, C++20) features. Please make sure you have a recent compiler (best gcc >= 10, clang >= 11).
+> **_Note_:** sdbus-c++ library uses a number of modern C++17 features. Please make certain you have a recent compiler (gcc >= 7, clang >= 6).
 
 If you intend to use xml-to-c++ generator tool (explained later) in your project to generate interface headers from XML, you can integrate that too with CMake or `pkg-config`:
 
@@ -75,14 +73,14 @@ add_custom_command(
 )
 ```
 
-Solving sd-bus dependency
--------------------------
+Solving libsystemd dependency
+-----------------------------
 
-sdbus-c++ is a wrapper around sd-bus, a C library that has been written as part of [systemd](https://github.com/systemd/systemd) project.
+sdbus-c++ depends on sd-bus API, which is implemented in libsystemd, a C library that is part of [systemd](https://github.com/systemd/systemd).
 
-Within systemd, sd-bus is implemented as part of `libsystemd` shared library. At least version 0.22.0 (which corresponds to the minimum systemd version 238) of `libsystemd` is needed.
+Minimum required libsystemd shared library version is 0.20.0 (which corresponds to minimum systemd version 236).
 
-If your target Linux distribution is already based on systemd ecosystem of version 238 and higher, then there is no additional effort, just make sure you have corresponding systemd header files available (provided by `libsystemd-dev` package on Debian/Ubuntu, for example), and you may go on building sdbus-c++ seamlessly.
+If your target Linux distribution is already based on systemd ecosystem of version 236 and higher, then there is no additional effort, just make sure you have corresponding systemd header files available (provided by `libsystemd-dev` package on Debian/Ubuntu, for example), and you may go on building sdbus-c++ seamlessly.
 
 However, sdbus-c++ can perfectly be used in non-systemd environments as well. If `libsystemd` is not found in the system when configuring sdbus-c++, then
 
@@ -90,9 +88,7 @@ However, sdbus-c++ can perfectly be used in non-systemd environments as well. If
 
 2. sdbus-c++ will try to find `basu`, which is just sd-bus implementation extracted from systemd.
 
-Alternatively to this fallback search sequence, you may explicitly instruct sdbus-c++ to use a specified sd-bus implementation through the `SDBUSCPP_SDBUS_LIB` CMake configuration option.
-
-On systems where neither of those libraries is available, we can build sd-bus manually, or we can (conveniently) instruct sdbus-c++ to build and integrate sd-bus into itself for us.
+On systems where neither of these is available, we can build sd-bus as a shared lib manually or we can (conveniently) instruct sdbus-c++ to build and integrate sd-bus into itself for us.
 
 ### Building and distributing libsystemd as a shared library yourself
 
@@ -112,9 +108,9 @@ $ ninja libsystemd.so.0.26.0  # or another version number depending which system
 
 ### Building and distributing libsystemd as part of sdbus-c++
 
-sdbus-c++ provides `SDBUSCPP_BUILD_LIBSYSTEMD` configuration option. When turned on, sdbus-c++ will automatically download and build libsystemd as a static library and make it an opaque part of sdbus-c++ shared library for you. This is the most convenient and effective approach to build, distribute and use sdbus-c++ as a self-contained, systemd-independent library in non-systemd environments. Just make sure your build machine has all dependencies needed by libsystemd build process. That includes, among others, `meson`, `ninja`, `git`, `gperf`, and -- primarily -- libraries and library headers for `libmount`, `libcap` and `librt` (part of glibc). Also, when distributing, make sure these dependency libraries are installed on the production machine.
+sdbus-c++ provides `BUILD_LIBSYSTEMD` configuration option. When turned on, sdbus-c++ will automatically download and build libsystemd as a static library and make it an opaque part of sdbus-c++ shared library for you. This is the most convenient and effective approach to build, distribute and use sdbus-c++ as a self-contained, systemd-independent library in non-systemd environments. Just make sure your build machine has all dependencies needed by libsystemd build process. That includes, among others, `meson`, `ninja`, `git`, `gperf`, and -- primarily -- libraries and library headers for `libmount`, `libcap` and `librt` (part of glibc). Also, when distributing, make sure these dependency libraries are installed on the production machine.
 
-You may additionally set the `SDBUSCPP_LIBSYSTEMD_VERSION` configuration flag to fine-tune the version of systemd to be taken in. (The default value is 242, the minimum value is 239).
+You may additionally set the `LIBSYSTEMD_VERSION` configuration flag to fine-tune the version of systemd to be taken in. (The default value is 242).
 
 Distributing sdbus-c++
 ----------------------
@@ -171,10 +167,10 @@ All public types and functions of sdbus-c++ reside in the `sdbus` namespace.
 Error signalling and propagation
 --------------------------------
 
-`sdbus::Error` type is used as an exception to signal errors in sdbus-c++. There are two types of errors:
+`sdbus::Error` exception is used to signal errors in sdbus-c++. There are two types of errors:
 
   * D-Bus related errors, like call timeouts, failed socket allocation, etc. These are raised by the D-Bus library or D-Bus daemon itself.
-  * user-defined errors, i.e. errors signalled and propagated from remote methods back to the caller. So these are issued by sdbus-c++ clients.
+  * user-defined errors, i.e. errors signalled and propagated from remote methods back to the caller. So these are issued by sdbus-c++ users.
 
 `sdbus::Error` is a carrier for both types of errors, carrying the error name and error message with it.
 
@@ -185,7 +181,7 @@ The following diagram illustrates the major entities in sdbus-c++.
 
 ![class](sdbus-c++-class-diagram.png)
 
-`IConnection` represents the concept of a D-Bus connection. You can connect to either the system bus or a session bus. Services can assign well-known service names to those connections. An I/O event loop should be run on the bus connection.
+`IConnection` represents the concept of a D-Bus connection. You can connect to either the system bus or a session bus. Services can assign unique service names to those connections. An I/O event loop should be run on the bus connection.
 
 `IObject` represents the concept of an object that exposes its methods, signals and properties. Its responsibilities are:
 
@@ -239,7 +235,7 @@ Let's have an object `/org/sdbuscpp/concatenator` that implements the `org.sdbus
 
 In the following sections, we will elaborate on the ways of implementing such an object on both the server and the client side.
 
-> **Before running Concatenator example in your system:** In order for your service to be allowed to provide a D-Bus API on ** the system bus**, a D-Bus security policy file has to be put in place for that service. Otherwise the service will fail to start (you'll get `[org.freedesktop.DBus.Error.AccessDenied] Failed to request bus name (Permission denied)`, for example). To make the Concatenator example work in your system, [look in this section of systemd configuration](systemd-dbus-config.md#dbus-configuration) for how to name the file, where to place it, how to populate it. For further information, consult [dbus-daemon documentation](https://dbus.freedesktop.org/doc/dbus-daemon.1.html), sections *INTEGRATING SYSTEM SERVICES* and *CONFIGURATION FILE*. As an example used for sdbus-c++ integration tests, you may look at the [policy file for sdbus-c++ integration tests](/tests/integrationtests/files/org.sdbuscpp.integrationtests.conf).
+> **Before running Concatenator example in your system:** In order for your service to be allowed to provide a D-Bus API on system bus, a D-Bus security policy file has to be put in place for that service. Otherwise the service will fail to start (you'll get `[org.freedesktop.DBus.Error.AccessDenied] Failed to request bus name (Permission denied)`, for example). To make the Concatenator example work in your system, [look in this section of systemd configuration](systemd-dbus-config.md#dbus-configuration) for how to name the file, where to place it, how to populate it. For further information, consult [dbus-daemon documentation](https://dbus.freedesktop.org/doc/dbus-daemon.1.html), sections *INTEGRATING SYSTEM SERVICES* and *CONFIGURATION FILE*. As an example used for sdbus-c++ integration tests, you may look at the [policy file for sdbus-c++ integration tests](/tests/integrationtests/files/org.sdbuscpp.integrationtests.conf).
 
 Implementing the Concatenator example using basic sdbus-c++ API layer
 ---------------------------------------------------------------------
@@ -276,7 +272,7 @@ void concatenate(sdbus::MethodCall call)
 
     // Return error if there are no numbers in the collection
     if (numbers.empty())
-        throw sdbus::Error(sdbus::Error::Name{"org.sdbuscpp.Concatenator.Error"}, "No numbers provided");
+        throw sdbus::Error("org.sdbuscpp.Concatenator.Error", "No numbers provided");
 
     std::string result;
     for (auto number : numbers)
@@ -290,29 +286,28 @@ void concatenate(sdbus::MethodCall call)
     reply.send();
 
     // Emit 'concatenated' signal
-    sdbus::InterfaceName interfaceName{"org.sdbuscpp.Concatenator"};
-    sdbus::SignalName signalName{"concatenated"};
-    auto signal = g_concatenator->createSignal(interfaceName, signalName);
+    const char* interfaceName = "org.sdbuscpp.Concatenator";
+    auto signal = g_concatenator->createSignal(interfaceName, "concatenated");
     signal << result;
     g_concatenator->emitSignal(signal);
 }
 
 int main(int argc, char *argv[])
 {
-    // Create D-Bus connection to (either the session or system) bus and requests a well-known name on it.
-    sdbus::ServiceName serviceName{"org.sdbuscpp.concatenator"};
-    auto connection = sdbus::createBusConnection(serviceName);
+    // Create D-Bus connection to the system bus and requests name on it.
+    const char* serviceName = "org.sdbuscpp.concatenator";
+    auto connection = sdbus::createSystemBusConnection(serviceName);
 
     // Create concatenator D-Bus object.
-    sdbus::ObjectPath objectPath{"/org/sdbuscpp/concatenator"};
-    auto concatenator = sdbus::createObject(*connection, std::move(objectPath));
+    const char* objectPath = "/org/sdbuscpp/concatenator";
+    auto concatenator = sdbus::createObject(*connection, objectPath);
 
     g_concatenator = concatenator.get();
 
     // Register D-Bus methods and signals on the concatenator object, and exports the object.
-    sdbus::InterfaceName interfaceName{"org.sdbuscpp.Concatenator"};
-    concatenator->addVTable( sdbus::MethodVTableItem{sdbus::MethodName{"concatenate"}, sdbus::Signature{"ais"}, {}, sdbus::Signature{"s"}, {}, &concatenate, {}}
-                           , sdbus::SignalVTableItem{sdbus::MethodName{"concatenated"}, sdbus::Signature{"s"}, {}, {}} )
+    const char* interfaceName = "org.sdbuscpp.Concatenator";
+    concatenator->addVTable( sdbus::MethodVTableItem{"concatenate", "ais", {}, "s", {}, &concatenate, {}}
+                           , sdbus::SignalVTableItem{"concatenated", "s", {}, {}} )
                            .forInterface(interfaceName);
 
     // Run the I/O event loop on the bus connection.
@@ -351,24 +346,21 @@ int main(int argc, char *argv[])
 {
     // Create proxy object for the concatenator object on the server side. Since here
     // we are creating the proxy instance without passing connection to it, the proxy
-    // will create its own connection automatically (to either system bus or session bus,
-    // depending on the context).
-    sdbus::ServiceName destination{"org.sdbuscpp.concatenator"};
-    sdbus::ObjectPath objectPath{"/org/sdbuscpp/concatenator"};
-    auto concatenatorProxy = sdbus::createProxy(std::move(destination), std::move(objectPath));
+    // will create its own connection automatically, and it will be system bus connection.
+    const char* destinationName = "org.sdbuscpp.concatenator";
+    const char* objectPath = "/org/sdbuscpp/concatenator";
+    auto concatenatorProxy = sdbus::createProxy(destinationName, objectPath);
 
     // Let's subscribe for the 'concatenated' signals
-    sdbus::InterfaceName interfaceName{"org.sdbuscpp.Concatenator"};
-    sdbus::SignalName signalName{"concatenated"};
-    concatenatorProxy->registerSignalHandler(interfaceName, signalName, &onConcatenated);
+    const char* interfaceName = "org.sdbuscpp.Concatenator";
+    concatenatorProxy->registerSignalHandler(interfaceName, "concatenated", &onConcatenated);
 
     std::vector<int> numbers = {1, 2, 3};
     std::string separator = ":";
 
-    sdbus::MethodName concatenate{"concatenate"};
     // Invoke concatenate on given interface of the object
     {
-        auto method = concatenatorProxy->createMethodCall(interfaceName, concatenate);
+        auto method = concatenatorProxy->createMethodCall(interfaceName, "concatenate");
         method << numbers << separator;
         auto reply = concatenatorProxy->callMethod(method);
         std::string result;
@@ -376,9 +368,9 @@ int main(int argc, char *argv[])
         assert(result == "1:2:3");
     }
 
-    // Invoke concatenate again, this time with no numbers and we shall get an error
+/    // Invoke concatenate again, this time with no numbers and we shall get an error
     {
-        auto method = concatenatorProxy->createMethodCall(interfaceName, concatenate);
+        auto method = concatenatorProxy->createMethodCall(interfaceName, "concatenate");
         method << std::vector<int>() << separator;
         try
         {
@@ -398,7 +390,7 @@ int main(int argc, char *argv[])
 }
 ```
 
-In simple cases, we don't need to create D-Bus connection explicitly for our proxies. We either pass a connection object to the proxy upon creation, or otherwise the proxy will create a connection of his own (to either the session bus or the system bus, depending on the context, see `man sd_bus_open`). This is the case in the example above. (This approach is not scalable and resource-saving if we have plenty of proxies; see section [Working with D-Bus connections](#working-with-d-bus-connections-in-sdbus-c) for elaboration.) So, in the example, we create a proxy for object `/org/sdbuscpp/concatenator` publicly available at bus `org.sdbuscpp.concatenator`. We register handlers for signals we are interested in (if any).
+In simple cases, we don't need to create D-Bus connection explicitly for our proxies. Unless a connection is provided to a proxy object explicitly via factory parameter, the proxy will create a connection of his own (unless it is a light-weight, short-lived proxy created with `dont_run_event_loop_thread_t`), and it will be a system bus connection. This is the case in the example above. (This approach is not scalable and resource-saving if we have plenty of proxies; see section [Working with D-Bus connections](#working-with-d-bus-connections-in-sdbus-c) for elaboration.) So, in the example, we create a proxy for object `/org/sdbuscpp/concatenator` publicly available at bus `org.sdbuscpp.concatenator`. We register handlers for signals we are interested in (if any).
 
 The callback for a D-Bus signal handler on this level is any callable of signature `void(sdbus::Signal signal)`. The one and only parameter `signal` is the incoming signal message. We need to deserialize arguments from it, and then we can do our business logic with it.
 
@@ -412,12 +404,14 @@ Please note that we can create and destroy D-Bus object proxies dynamically, at
 
 There are several factory methods to create a bus connection object in sdbus-c++:
 
-* `createBusConnection()` - opens a connection to the session bus when in a user context, and a connection to the system bus, otherwise
-* `createBusConnection(const sdbus::ServiceName& name)` - opens a connection to the session bus when in a user context, and a connection with the given name to the system bus, otherwise, and requests the given well-known service name on the bus
+* `createConnection()` - opens a connection to the system bus
+* `createConnection(const std::string& name)` - opens a connection with the given name to the system bus
+* `createDefaultBusConnection()` - opens a connection to the session bus when in a user context, and a connection to the system bus, otherwise
+* `createDefaultBusConnection(const std::string& name)` - opens a connection with the given name to the session bus when in a user context, and a connection with the given name to the system bus, otherwise
 * `createSystemBusConnection()` - opens a connection to the system bus
-* `createSystemBusConnection(const sdbus::ServiceName& name)` - opens a connection to the system bus, and requests the given well-known service name on the bus
+* `createSystemBusConnection(const std::string& name)` - opens a connection with the given name to the system bus
 * `createSessionBusConnection()` - opens a connection to the session bus
-* `createSessionBusConnection(const sdbus::ServiceName& name)` - opens a connection to the session bus, and requests the given well-known service name on the bus.
+* `createSessionBusConnection(const std::string& name)` - opens a connection with the given name to the session bus
 * `createSessionBusConnectionWithAddress(const std::string& address)` - opens a connection to the session bus at a custom address
 * `createRemoteSystemBusConnection(const std::string& host)` - opens a connection to the system bus on a remote host using ssh
 * `createDirectBusConnection(const std::string& address)` - opens direct D-Bus connection at a custom address (see [Using direct (peer-to-peer) D-Bus connections](#using-direct-peer-to-peer-d-bus-connections))
@@ -451,7 +445,7 @@ On the **server** side, we generally need to create D-Bus objects and publish th
 
   * its internal event loop
     * either in a blocking way, through `enterEventLoop()`,
-    * or in a non-blocking async way, through `enterEventLoopAsync()`,
+    * or in a non-blocking async way, through `enterEventLoop(sdbus::async_t)`,
   * or an external event loop. This is suitable if we use in our application an event loop implementation of our choice (e.g., sd-event, GLib Event Loop, boost::asio, ...) and we want to hook up our sdbus-c++ connections with it. See [Using sdbus-c++ in external event loops](#using-sdbus-c-in-external-event-loops) section for more information.
 
 The object takes the D-Bus connection as a reference in its constructor. This is the only way to wire the connection and the object together. We must make sure the connection exists as long as objects using it exist.
@@ -466,22 +460,22 @@ On the **client** side we likewise need a connection -- just that unlike on the
 
   * Pass an already existing connection as a reference. This is the typical approach when the application already maintains a D-Bus connection (maybe it provide D-Bus API on it, and/or it already has some proxies hooked on it). The proxy will share the connection with others. With this approach we must of course ensure that the connection exists as long as the proxy exists. For discussion on options for running an event loop on that connection, see above section [Using D-Bus connections on the server side](#using-d-bus-connections-on-the-server-side).
 
-  * Or -- and this is a simpler approach for simple D-Bus client applications -- we have another option: we let the proxy maintain its own connection (and potentially an associated event loop thread, see below). We have two options here:
+  * Or -- and this is a simpler approach for  simple D-Bus client applications -- we have another option: we let the proxy maintain its own connection (and potentially an associated event loop thread, see below). We have two options here:
 
     * We either create the connection ourselves and `std::move` it to the proxy object factory. The proxy becomes an owner of this connection, and it will be his dedicated connection. This has the advantage that we may choose the type of connection (system, session, remote). Additionally,
 
       * when created **without** `dont_run_event_loop_thread_t` tag, the proxy **will start** a dedicated event loop thread on that connection;
       * or, when created **with** `dont_run_event_loop_thread_t` tag, the proxy will start **no** event loop thread on that connection.
 
-    * Or we don't care about connections at all (proxy factory overloads with no connection parameter). Under the hood, the proxy creates its own connection, to either the session bus (when in a user context) or the system bus otherwise. Additionally:
+    * Or we don't care about connnections at all (proxy factory overloads with no connection parameter). Under the hood, the proxy creates its own *system bus* connection. Additionally:
       * when created **without** `dont_run_event_loop_thread_t` tag, the proxy **will start** a dedicated event loop thread on that connection;
       * or, when created **with** `dont_run_event_loop_thread_t` tag, the proxy will start **no** event loop thread on that connection.
 
-    A proxy needs an event loop if it's a "**long-lived**" proxy that listens on incoming messages like signals, async call replies, atc. Sharing one connection with its one event loop is more scalable. Starting a dedicated event loop in a proxy is simpler from API perspective, but comes at a performance and resource cost for each proxy creation/destruction, and it hurts scalability. A simple and scalable option are "**short-lived, light-weight**" proxies. Quite a typical use case is that we occasionally need to carry out one or a few D-Bus calls and that's it. We may create a proxy, do the calls, and let go of proxy. Such a light-weight proxy is created when `dont_run_event_loop_thread_t` tag is passed to the proxy factory (or with `createLightWeightProxy()`). Such a proxy **does not spawn** an event loop thread. It only support synchronous D-Bus calls (no signals, no async calls...), and is meant to be created, used right away, and then destroyed immediately.
+    A proxy needs an event loop if it's a "**long-lived**" proxy that listens on incoming messages like signals, async call replies, atc. Sharing one connection with its one event loop is more scalable. Starting a dedicated event loop in a proxy is simpler from API perspective, but comes at a performance and resource cost for each proxy creation/destruction, and it hurts scalability. A simple and scalable option are "**short-lived, light-weight**" proxies. Quite a typical use case is that we occasionally need to carry out one or a few D-Bus calls and that's it. We may create a proxy, do the calls, and let go of proxy. Such a light-weight proxy is created when `dont_run_event_loop_thread_t` tag is passed to the proxy factory. Such a proxy **does not spawn** an event loop thread. It only support synchronous D-Bus calls (no signals, no async calls...), and is meant to be created, used right away, and then destroyed immediately.
 
 #### Stopping internal I/O event loops graciously
 
-A connection with an asynchronous event loop (i.e. one initiated through `enterEventLoopAsync()`) will stop and join its event loop thread automatically in its destructor. An event loop that blocks in the synchronous `enterEventLoop()` call can be unblocked through `leaveEventLoop()` call on the respective bus connection issued from a different thread or from an OS signal handler.
+A connection with an asynchronous event loop (i.e. one initiated through `enterEventLoop(async_t)`) will stop and join its event loop thread automatically in its destructor. An event loop that blocks in the synchronous `enterEventLoop()` call can be unblocked through `leaveEventLoop()` call on the respective bus connection issued from a different thread or from an OS signal handler.
 
 Implementing the Concatenator example using convenience sdbus-c++ API layer
 ---------------------------------------------------------------------------
@@ -508,19 +502,19 @@ The code written using this layer expresses in a declarative way *what* it does,
 
 int main(int argc, char *argv[])
 {
-    // Create D-Bus connection to the (either system or session) bus and requests a well-known name on it.
-    sdbus::ServiceName serviceName{"org.sdbuscpp.concatenator"};
-    auto connection = sdbus::createBusConnection(serviceName);
+    // Create D-Bus connection to the system bus and requests name on it.
+    const char* serviceName = "org.sdbuscpp.concatenator";
+    auto connection = sdbus::createSystemBusConnection(serviceName);
 
     // Create concatenator D-Bus object.
-    sdbus::ObjectPath objectPath{"/org/sdbuscpp/concatenator"};
-    auto concatenator = sdbus::createObject(*connection, std::move(objectPath));
+    const char* objectPath = "/org/sdbuscpp/concatenator";
+    auto concatenator = sdbus::createObject(*connection, objectPath);
 
     auto concatenate = [&concatenator](const std::vector<int> numbers, const std::string& separator)
     {
         // Return error if there are no numbers in the collection
         if (numbers.empty())
-            throw sdbus::Error(sdbus::Error::Name{"org.sdbuscpp.Concatenator.Error"}, "No numbers provided");
+            throw sdbus::Error("org.sdbuscpp.Concatenator.Error", "No numbers provided");
 
         std::string result;
         for (auto number : numbers)
@@ -529,15 +523,17 @@ int main(int argc, char *argv[])
         }
 
         // Emit 'concatenated' signal
-        concatenator->emitSignal("concatenated").onInterface("org.sdbuscpp.Concatenator").withArguments(result);
+        const char* interfaceName = "org.sdbuscpp.Concatenator";
+        concatenator->emitSignal("concatenated").onInterface(interfaceName).withArguments(result);
 
         return result;
     };
 
     // Register D-Bus methods and signals on the concatenator object, and exports the object.
-    concatenator->addVTable(sdbus::registerMethod("concatenate").implementedAs(std::move(concatenate)),
-                            sdbus::registerSignal("concatenated").withParameters<std::string>())
-                           .forInterface("org.sdbuscpp.Concatenator");
+    const char* interfaceName = "org.sdbuscpp.Concatenator";
+    concatenator->addVTable( sdbus::registerMethod("concatenate").implementedAs(std::move(concatenate))
+                           , sdbus::registerSignal{"concatenated").withParameters<std::string>() )
+                           .forInterface(interfaceName);
 
     // Run the loop on the connection.
     connection->enterEventLoop();
@@ -565,12 +561,12 @@ void onConcatenated(const std::string& concatenatedString)
 int main(int argc, char *argv[])
 {
     // Create proxy object for the concatenator object on the server side
-    sdbus::ServiceName destination{"org.sdbuscpp.concatenator"};
-    sdbus::ObjectPath objectPath{"/org/sdbuscpp/concatenator"};
-    auto concatenatorProxy = sdbus::createProxy(std::move(destination), std::move(objectPath));
+    const char* destinationName = "org.sdbuscpp.concatenator";
+    const char* objectPath = "/org/sdbuscpp/concatenator";
+    auto concatenatorProxy = sdbus::createProxy(destinationName, objectPath);
 
     // Let's subscribe for the 'concatenated' signals
-    sdbus::InterfaceName interfaceName{"org.sdbuscpp.Concatenator"};
+    const char* interfaceName = "org.sdbuscpp.Concatenator";
     concatenatorProxy->uponSignal("concatenated").onInterface(interfaceName).call([](const std::string& str){ onConcatenated(str); });
 
     std::vector<int> numbers = {1, 2, 3};
@@ -609,15 +605,15 @@ When registering methods, calling methods or emitting signals, multiple lines of
 
 We recommend that sdbus-c++ users prefer the convenience API to the lower level, basic API. When feasible, using generated adaptor and proxy C++ bindings is even better as it provides yet slightly higher abstraction built on top of the convenience API, where remote calls look simply like local, native calls of object methods. They are described in the following section.
 
-> **_Note_:** By default, signal callback handlers are not invoked (i.e., the signal is silently dropped) if there is a signal signature mismatch. If you want to be informed of such situations, you can add `std::optional<sdbus::Error>` parameter to the beginning of your signal callback handler's parameter list. When sdbus-c++ invokes the handler, it will set this argument either to be empty (in normal cases), or to carry a corresponding `sdbus::Error` object (in case of deserialization failures, like type mismatches). An example of a handler with the signature (`int`) different from the real signal contents (`string`):
+> **_Note_:** By default, signal callback handlers are not invoked (i.e., the signal is silently dropped) if there is a signal signature mismatch. If you want to be informed of such situations, they can prepend `const sdbus::Error*` parameter to their signal callback handler's parameter list. This argument will be `nullptr` in normal cases, and will provide access to the corresponding `sdbus::Error` object in case of deserialization failures. An example of a handler with the signature (`int`) different from the real signal contents (`string`):
 > ```c++
->     void onConcatenated(std::optional<sdbus::Error> e, int wrongParameter)
+>     void onConcatenated(const sdbus::Error* e, int wrongParameter)
 >     {
->         assert(e.has_value());
+>         assert(e);
 >         assert(e->getMessage() == "Failed to deserialize a int32 value");
 >     }
 > ```
-> Signature mismatch in signal handlers is probably the most common reason why signals are not received in the client, while we can see them on the bus with `dbus-monitor`. Use `std::optional<sdbus::Error>`-based callback variant and inspect the error to check if that's the cause of your problems.
+> Signature mismatch in signal handlers is probably the most common reason why signals are not received in the client, while we can see them on the bus with `dbus-monitor`. Use `const sdbus::Error*`-based callback variant and inspect the error to check if that's the cause of such problems.
 
 > **_Tip_:** When registering a D-Bus object, we can additionally provide names of input and output parameters of its methods and names of parameters of its signals. When the object is introspected, these names are listed in the resulting introspection XML, which improves the description of object's interfaces:
 > ```c++
@@ -695,7 +691,7 @@ After running this through the code generator, we get the generated code that is
 
 For each interface in the XML IDL file the generator creates one class that represents it. The class is de facto an interface which shall be implemented by the class inheriting it. The class' constructor takes care of registering all methods, signals and properties. For each D-Bus method there is a pure virtual member function. These pure virtual functions must be implemented in the child class. For each signal, there is a public function member that emits this signal.
 
-Generated adaptor classes are not copyable and not moveable by design. One can create them on the heap and manage them in e.g. a `std::unique_ptr` if move semantics is needed (for example, when they are stored in a container).
+Generated adaptor classes support move semantics. They are moveable but not copyable.
 
 ```cpp
 /*
@@ -719,35 +715,30 @@ public:
 
 protected:
     Concatenator_adaptor(sdbus::IObject& object)
-        : m_object(object)
+        : object_(&object)
     {
+        object_->registerMethod("concatenate").onInterface(INTERFACE_NAME).withInputParamNames("numbers", "separator").withOutputParamNames("concatenatedString").implementedAs([this](const std::vector<int32_t>& numbers, const std::string& separator){ return this->concatenate(numbers, separator); });
+        object_->registerSignal("concatenated").onInterface(INTERFACE_NAME).withParameters<std::string>("concatenatedString");
     }
 
     Concatenator_adaptor(const Concatenator_adaptor&) = delete;
     Concatenator_adaptor& operator=(const Concatenator_adaptor&) = delete;
-    Concatenator_adaptor(Concatenator_adaptor&&) = delete;
-    Concatenator_adaptor& operator=(Concatenator_adaptor&&) = delete;
+    Concatenator_adaptor(Concatenator_adaptor&&) = default;
+    Concatenator_adaptor& operator=(Concatenator_adaptor&&) = default;
 
     ~Concatenator_adaptor() = default;
 
-    void registerAdaptor()
-    {
-        m_object.addVTable( sdbus::registerMethod("concatenate").withInputParamNames("numbers", "separator").withOutputParamNames("concatenatedString").implementedAs([this](const std::vector<int32_t>& numbers, const std::string& separator){ return this->concatenate(numbers, separator); })
-                          , sdbus::registerSignal("concatenated").withParameters<std::string>("concatenatedString")
-                          ).forInterface(INTERFACE_NAME);
-    }
-
 public:
     void emitConcatenated(const std::string& concatenatedString)
     {
-        m_object.emitSignal("concatenated").onInterface(INTERFACE_NAME).withArguments(concatenatedString);
+        object_->emitSignal("concatenated").onInterface(INTERFACE_NAME).withArguments(concatenatedString);
     }
 
 private:
     virtual std::string concatenate(const std::vector<int32_t>& numbers, const std::string& separator) = 0;
 
 private:
-    sdbus::IObject& m_object;
+    sdbus::IObject* object_;
 };
 
 }} // namespaces
@@ -759,7 +750,7 @@ private:
 
 Analogously to the adaptor classes described above, there is one proxy class generated for one interface in the XML IDL file. The class is de facto a proxy to the concrete single interface of a remote object. For each D-Bus signal there is a pure virtual member function whose body must be provided in a child class. For each method, there is a public function member that calls the method remotely.
 
-Generated proxy classes are not copyable and not moveable by design. One can create them on the heap and manage them in e.g. a `std::unique_ptr` if move semantics is needed (for example, when they are stored in a container). 
+Generated proxy classes support move semantics. They are moveable but not copyable.
 
 ```cpp
 /*
@@ -783,34 +774,30 @@ public:
 
 protected:
     Concatenator_proxy(sdbus::IProxy& proxy)
-        : m_proxy(proxy)
+        : proxy_(&proxy)
     {
+        proxy_->uponSignal("concatenated").onInterface(INTERFACE_NAME).call([this](const std::string& concatenatedString){ this->onConcatenated(concatenatedString); });
     }
 
     Concatenator_proxy(const Concatenator_proxy&) = delete;
     Concatenator_proxy& operator=(const Concatenator_proxy&) = delete;
-    Concatenator_proxy(Concatenator_proxy&&) = delete;
-    Concatenator_proxy& operator=(Concatenator_proxy&&) = delete;
+    Concatenator_proxy(Concatenator_proxy&&) = default;
+    Concatenator_proxy& operator=(Concatenator_proxy&&) = default;
 
     ~Concatenator_proxy() = default;
 
-    void registerProxy()
-    {
-        m_proxy.uponSignal("concatenated").onInterface(INTERFACE_NAME).call([this](const std::string& concatenatedString){ this->onConcatenated(concatenatedString); });
-    }
-
     virtual void onConcatenated(const std::string& concatenatedString) = 0;
 
 public:
     std::string concatenate(const std::vector<int32_t>& numbers, const std::string& separator)
     {
         std::string result;
-        m_proxy.callMethod("concatenate").onInterface(INTERFACE_NAME).withArguments(numbers, separator).storeResultsTo(result);
+        proxy_->callMethod("concatenate").onInterface(INTERFACE_NAME).withArguments(numbers, separator).storeResultsTo(result);
         return result;
     }
 
 private:
-    sdbus::IProxy& m_proxy;
+    sdbus::IProxy* proxy_;
 };
 
 }} // namespaces
@@ -839,7 +826,7 @@ Calling `registerAdaptor()` and `unregisterAdaptor()` was not necessary in previ
 class Concatenator : public sdbus::AdaptorInterfaces<org::sdbuscpp::Concatenator_adaptor /*, more adaptor classes if there are more interfaces*/>
 {
 public:
-    Concatenator(sdbus::IConnection& connection, sdbus::ObjectPath objectPath)
+    Concatenator(sdbus::IConnection& connection, std::string objectPath)
         : AdaptorInterfaces(connection, std::move(objectPath))
     {
         registerAdaptor();
@@ -855,7 +842,7 @@ protected:
     {
         // Return error if there are no numbers in the collection
         if (numbers.empty())
-            throw sdbus::Error(sdbus::Error::Name{"org.sdbuscpp.Concatenator.Error"}, "No numbers provided");
+            throw sdbus::Error("org.sdbuscpp.Concatenator.Error", "No numbers provided");
 
         // Concatenate the numbers
         std::string result;
@@ -882,13 +869,13 @@ That's it. We now have an implementation of a D-Bus object implementing `org.sdb
 
 int main(int argc, char *argv[])
 {
-    // Create D-Bus connection to (either the system or session) bus and request a well-known name on it.
-    sdbus::ServiceName serviceName{"org.sdbuscpp.concatenator"};
-    auto connection = sdbus::createBusConnection(serviceName);
+    // Create D-Bus connection to the system bus and requests name on it.
+    const char* serviceName = "org.sdbuscpp.concatenator";
+    auto connection = sdbus::createSystemBusConnection(serviceName);
 
     // Create concatenator D-Bus object.
-    sdbus::ObjectPath objectPath{"/org/sdbuscpp/concatenator"};
-    Concatenator concatenator(*connection, std::move(objectPath));
+    const char* objectPath = "/org/sdbuscpp/concatenator";
+    Concatenator concatenator(*connection, objectPath);
 
     // Run the loop on the connection.
     connection->enterEventLoop();
@@ -918,7 +905,7 @@ Calling `registerProxy()` and `unregisterProxy()` was not necessary in previous
 class ConcatenatorProxy : public sdbus::ProxyInterfaces<org::sdbuscpp::Concatenator_proxy /*, more proxy classes if there are more interfaces*/>
 {
 public:
-    ConcatenatorProxy(sdbus::ServiceName destination, sdbus::ObjectPath objectPath)
+    ConcatenatorProxy(std::string destination, std::string objectPath)
         : ProxyInterfaces(std::move(destination), std::move(objectPath))
     {
         registerProxy();
@@ -939,7 +926,7 @@ protected:
 
 > **_Tip_:** By inheriting from `sdbus::ProxyInterfaces`, we get access to the protected `getProxy()` method. We can call this method inside our proxy implementation class to access the underlying `IProxy` object.
 
-In the above example, a proxy is created that creates and maintains its own bus connection (the bus is either session bus or system bus depending on the context, see `man sd_bus_open`). However, there are `ProxyInterfaces` class template constructor overloads that also take the connection from the user as the first parameter, and pass that connection over to the underlying proxy. The connection instance is used by all interfaces listed in the `ProxyInterfaces` template parameter list.
+In the above example, a proxy is created that creates and maintains its own system bus connection. However, there are `ProxyInterfaces` class template constructor overloads that also take the connection from the user as the first parameter, and pass that connection over to the underlying proxy. The connection instance is used by all interfaces listed in the `ProxyInterfaces` template parameter list.
 
 Note however that there are multiple `ProxyInterfaces` constructor overloads, and they differ in how the proxy behaves towards the D-Bus connection. These overloads precisely map the `sdbus::createProxy` overloads, as they are actually implemented on top of them. See [Proxy and D-Bus connection](#Proxy-and-D-Bus-connection) for more info. We can even create a `IProxy` instance on our own, and inject it into our proxy class -- there is a constructor overload for it in `ProxyInterfaces`. This can help if we need to provide mocked implementations in our unit tests.
 
@@ -952,9 +939,9 @@ Now let's use this proxy to make remote calls and listen to signals in a real ap
 int main(int argc, char *argv[])
 {
     // Create proxy object for the concatenator object on the server side
-    sdbus::ServiceName destination{"org.sdbuscpp.concatenator"};
-    sdbus::ObjectPath objectPath{"/org/sdbuscpp/concatenator"};
-    ConcatenatorProxy concatenatorProxy(std::move(destination), std::move(objectPath));
+    const char* destinationName = "org.sdbuscpp.concatenator";
+    const char* objectPath = "/org/sdbuscpp/concatenator";
+    ConcatenatorProxy concatenatorProxy(destinationName, objectPath);
 
     std::vector<int> numbers = {1, 2, 3};
     std::string separator = ":";
@@ -1046,9 +1033,8 @@ void concatenate(sdbus::MethodCall call)
         reply.send();
 
         // Emit 'concatenated' signal (creating and emitting signals is thread-safe)
-        sdbus::InterfaceName interfaceName{"org.sdbuscpp.Concatenator"};
-        sdbus::SignalName signalName{"concatenated"};
-        auto signal = g_concatenator->createSignal(interfaceName, signalName);
+        const char* interfaceName = "org.sdbuscpp.Concatenator";
+        auto signal = g_concatenator->createSignal(interfaceName, "concatenated");
         signal << result;
         g_concatenator->emitSignal(signal);
     }).detach();
@@ -1141,15 +1127,15 @@ int main(int argc, char *argv[])
 {
     /* ...  */
 
-    auto callback = [](MethodReply reply, std::optional<sdbus::Error> error)
+    auto callback = [](MethodReply reply, const sdbus::Error* error)
     {
-        if (!error) // No error
+        if (error == nullptr) // No error
         {
             std::string result;
             reply >> result;
             std::cout << "Got concatenate result: " << result << std::endl;
         }
-        else // We've got a D-Bus error...
+        else // We got a D-Bus error...
         {
             std::cerr << "Got concatenate error " << error->getName() << " with message " << error->getMessage() << std::endl;
         }
@@ -1157,7 +1143,7 @@ int main(int argc, char *argv[])
 
     // Invoke concatenate on given interface of the object
     {
-        auto method = concatenatorProxy->createMethodCall(interfaceName, concatenate);
+        auto method = concatenatorProxy->createMethodCall(interfaceName, "concatenate");
         method << numbers << separator;
         concatenatorProxy->callMethod(method, callback);
         // When the reply comes, we shall get "Got concatenate result 1:2:3" on the standard output
@@ -1165,7 +1151,7 @@ int main(int argc, char *argv[])
 
     // Invoke concatenate again, this time with no numbers and we shall get an error
     {
-        auto method = concatenatorProxy->createMethodCall(interfaceName, concatenate);
+        auto method = concatenatorProxy->createMethodCall(interfaceName, "concatenate");
         method << std::vector<int>() << separator;
         concatenatorProxy->callMethod(method, callback);
         // When the reply comes, we shall get concatenation error message on the standard error output
@@ -1177,7 +1163,7 @@ int main(int argc, char *argv[])
 }
 ```
 
-The callback is a void-returning function taking two arguments: a reference to the reply message, and a pointer to the prospective `sdbus::Error` instance. Empty `error` optional argument means that no D-Bus error occurred while making the call, and the reply message contains a valid reply. A non-empty `error` argument means that an error occurred during the call, and we can access the error name and message from the `Error` value inside the argument.
+The callback is a void-returning function taking two arguments: a reference to the reply message, and a pointer to the prospective `sdbus::Error` instance. Zero `Error` pointer means that no D-Bus error occurred while making the call, and the reply message contains valid reply. Non-zero `Error` pointer, however, points to the valid `Error` instance, meaning that an error occurred. Error name and message can then be read out by the client from that instance.
 
 There is also an overload of this `IProxy::callMethod()` function taking method call timeout argument.
 
@@ -1187,7 +1173,7 @@ Another option is to use `std::future`-based overload of the `IProxy::callMethod
     ...
     // Invoke concatenate on given interface of the object
     {
-        auto method = concatenatorProxy->createMethodCall(interfaceName, concatenate);
+        auto method = concatenatorProxy->createMethodCall(interfaceName, "concatenate");
         method << numbers << separator;
         auto future = concatenatorProxy->callMethod(method, sdbus::with_future);
         try
@@ -1206,30 +1192,32 @@ Another option is to use `std::future`-based overload of the `IProxy::callMethod
 
 ### Convenience API
 
-On the convenience API level, the call statement starts with `callMethodAsync()`, and one option is to finish the statement with `uponReplyInvoke()` that takes a callback handler. The callback is a void-returning function that takes at least one argument: `std::optional<sdbus::Error>`. All subsequent arguments shall exactly reflect the D-Bus method output arguments. A concatenator example:
+On the convenience API level, the call statement starts with `callMethod()` overload with `async_t` tag parameter, and one option is to finish the statement with `uponReplyInvoke()` that takes a callback handler. The callback is a void-returning function that takes at least one argument: pointer to the `sdbus::Error` instance. All subsequent arguments shall exactly reflect the D-Bus method output arguments. A concatenator example:
 
 ```c++
 int main(int argc, char *argv[])
 {
     /* ...  */
 
-    auto callback = [](std::optional<sdbus::Error> error, const std::string& concatenatedString)
+    auto callback = [](const sdbus::Error* error, const std::string& concatenatedString)
     {
-        if (!error) // No error
+        if (error == nullptr) // No error
             std::cout << "Got concatenate result: " << concatenatedString << std::endl;
         else // We got a D-Bus error...
             std::cerr << "Got concatenate error " << error->getName() << " with message " << error->getMessage() << std::endl;
     }
+    
+    using sdbus::async;
 
     // Invoke concatenate on given interface of the object
     {
-        concatenatorProxy->callMethodAsync("concatenate").onInterface(interfaceName).withArguments(numbers, separator).uponReplyInvoke(callback);
+        concatenatorProxy->callMethod("concatenate", async).onInterface(interfaceName).withArguments(numbers, separator).uponReplyInvoke(callback);
         // When the reply comes, we shall get "Got concatenate result 1:2:3" on the standard output
     }
 
     // Invoke concatenate again, this time with no numbers and we shall get an error
     {
-        concatenatorProxy->callMethodAsync("concatenate").onInterface(interfaceName).withArguments(std::vector<int>{}, separator).uponReplyInvoke(callback);
+        concatenatorProxy->callMethod("concatenate", async).onInterface(interfaceName).withArguments(std::vector<int>{}, separator).uponReplyInvoke(callback);
         // When the reply comes, we shall get concatenation error message on the standard error output
     }
 
@@ -1239,11 +1227,7 @@ int main(int argc, char *argv[])
 }
 ```
 
-Empty `error` parameter means that no D-Bus error occurred while making the call, and subsequent arguments are valid D-Bus method return values. However, `error` parameter containing a value means that an error occurred during the call (and subsequent arguments are simply default-constructed), and the underlying `Error` instance provides us with the error name and message.
-
-> **_Tip_:** The function returns the `sdbus::PendingAsyncCall` object, a non-owning, observing handle to the async call. It can be used to query whether the call is still in progress, and to cancel the call.
-
-> **_Tip_:** There is also the `.uponReplyInvoke(callback, sdbus::return_slot);` variant with the `return_slot` tag, which returns `Slot` object, an owning RAII handle to the async call. This makes the client an owner of the pending async call. Letting go of the handle means cancelling the call.
+When the `Error` pointer is zero, it means that no D-Bus error occurred while making the call, and subsequent arguments are valid D-Bus method return values. Non-zero `Error` pointer, however, points to the valid `Error` instance, meaning that an error occurred during the call (and subsequent arguments are simply default-constructed). Error name and message can then be read out by the client from `Error` instance.
 
 Another option is to finish the async call statement with `getResultAsFuture()`, which is a template function which takes the list of types returned by the D-Bus method (empty list in case of `void`-returning method) which returns a `std::future` object, which will later, when the reply arrives, be set to contain the return value(s). Or if the call returns an error, `sdbus::Error` will be thrown by `std::future::get()`.
 
@@ -1251,7 +1235,7 @@ The future object will contain void for a void-returning D-Bus method, a single
 
 ```c++
         ...
-        auto future = concatenatorProxy->callMethodAsync("concatenate").onInterface(interfaceName).withArguments(numbers, separator).getResultAsFuture<std::string>();
+        auto future = concatenatorProxy->callMethod("concatenate", sdbus::async).onInterface(interfaceName).withArguments(numbers, separator).getResultAsFuture<std::string>();
         try
         {
             auto concatenatedString = future.get(); // This waits for the reply
@@ -1292,7 +1276,7 @@ An asynchronous method can be generated as a callback-based method or `std::futu
 
 For each client-side async method, a corresponding `on<MethodName>Reply` pure virtual function, where `<MethodName>` is the capitalized D-Bus method name, is generated in the generated proxy class. This function is the callback invoked when the D-Bus method reply arrives, and must be provided a body by overriding it in the implementation class.
 
-So in the specific example above, the tool will generate a `Concatenator_proxy` class similar to one shown in a [dedicated section above](#concatenator-client-glueh), with the difference that it will also generate an additional `virtual void onConcatenateReply(std::optional<sdbus::Error> error, const std::string& concatenatedString);` method, which we shall override in the derived `ConcatenatorProxy`.
+So in the specific example above, the tool will generate a `Concatenator_proxy` class similar to one shown in a [dedicated section above](#concatenator-client-glueh), with the difference that it will also generate an additional `virtual void onConcatenateReply(const sdbus::Error* error, const std::string& concatenatedString);` method, which we shall override in derived `ConcatenatorProxy`.
 
 #### Generating std:future-based async methods
 
@@ -1338,22 +1322,22 @@ We read property value easily through `IProxy::getProperty()` method:
 uint32_t status = proxy->getProperty("status").onInterface("org.sdbuscpp.Concatenator");
 ```
 
-Getting a property in asynchronous manner is also possible, in both callback-based and future-based way, by calling `IProxy::getPropertyAsync()` method:
+Getting a property in asynchronous manner is also possible, in both callback-based and future-based way, by calling `IProxy::getProperty()` method overload with `async_t` tag parameter:
 
 ```c++
 // Callback-based method:
-auto callback = [](std::optional<sdbus::Error> /*error*/, sdbus::Variant value)
+auto callback = [](const sdbus::Error* err, sdbus::Variant value)
 {
     std::cout << "Got property value: " << value.get<uint32_t>() << std::endl;
 };
-uint32_t status = proxy->getPropertyAsync("status").onInterface("org.sdbuscpp.Concatenator").uponReplyInvoke(std::move(callback));
+uint32_t status = proxy->getProperty("status", sdbus::async).onInterface("org.sdbuscpp.Concatenator").uponReplyInvoke(std::move(callback));
 // Future-based method:
-std::future<sdbus::Variant> statusFuture = object.getPropertyAsync("status").onInterface("org.sdbuscpp.Concatenator").getResultAsFuture();
+std::future<sdbus::Variant> statusFuture = object.getProperty("status", sdbus::async).onInterface("org.sdbuscpp.Concatenator").getResultAsFuture();
 ...
 std::cout << "Got property value: " << statusFuture.get().get<uint32_t>() << std::endl;
 ```
 
-More information on an `error` callback handler parameter, on behavior of `future` in erroneous situations, can be found in section [Asynchronous client-side methods](#asynchronous-client-side-methods).
+More information on `error` callback handler parameter, on behavior of `future` in erroneous situations, can be found in section [Asynchronous client-side methods](#asynchronous-client-side-methods).
 
 #### Writing a property
 
@@ -1364,14 +1348,14 @@ uint32_t status = ...;
 proxy->setProperty("status").onInterface("org.sdbuscpp.Concatenator").toValue(status);
 ```
 
-Setting a property in asynchronous manner is also possible, in both callback-based and future-based way, by calling `IProxy::setPropertyAsync()` method:
+Setting a property in asynchronous manner is also possible, in both callback-based and future-based way, by calling `IProxy::setProperty()` method overload with `async_t` tag parameter:
 
 ```c++
 // Callback-based method:
-auto callback = [](std::optional<sdbus::Error> error { /*... Error handling in case error contains a value...*/ };
-uint32_t status = proxy->setPropertyAsync("status").onInterface("org.sdbuscpp.Concatenator").toValue(status).uponReplyInvoke(std::move(callback));
+auto callback = [](const sdbus::Error* err) { /*... Error handling in case err is non-null...*/ };
+uint32_t status = proxy->setProperty("status", sdbus::async).onInterface("org.sdbuscpp.Concatenator").toValue(status).uponReplyInvoke(std::move(callback));
 // Future-based method:
-std::future<void> statusFuture = object.setPropertyAsync("status").onInterface("org.sdbuscpp.Concatenator").getResultAsFuture();
+std::future<void> statusFuture = object.setProperty("status", sdbus::async).onInterface("org.sdbuscpp.Concatenator").getResultAsFuture();
 ```
 
 More information on `error` callback handler parameter, on behavior of `future` in erroneous situations, can be found in section [Asynchronous client-side methods](#asynchronous-client-side-methods).
@@ -1415,17 +1399,12 @@ class PropertyProvider_adaptor
 
 public:
     PropertyProvider_adaptor(sdbus::IObject& object)
-        : m_object(object)
+        : object_(&object)
     {
+        object_->registerProperty("status").onInterface(INTERFACE_NAME).withGetter([this](){ return this->status(); }).withSetter([this](const uint32_t& value){ this->status(value); });
     }
 
-    /*...*/
-
-    void registerAdaptor()
-    {
-        m_object.addVTable( sdbus::registerProperty("status").withGetter([this](){ return this->status(); }).withSetter([this](const uint32_t& value){ this->status(value); })
-                          ).forInterface(INTERFACE_NAME);
-    }
+    ~PropertyProvider_adaptor() = default;
 
 private:
     // property getter
@@ -1449,13 +1428,13 @@ public:
     // getting the property value
     uint32_t status()
     {
-        return m_object.getProperty("status").onInterface(INTERFACE_NAME).get<uint32_t>();
+        return object_->getProperty("status").onInterface(INTERFACE_NAME);
     }
 
     // setting the property value
     void status(const uint32_t& value)
     {
-        m_object.setProperty("status").onInterface(INTERFACE_NAME).toValue(value);
+        object_->setProperty("status").onInterface(INTERFACE_NAME).toValue(value);
     }
 
     /*...*/
@@ -1496,19 +1475,19 @@ class PropertyProvider_proxy
 {
     /*...*/
 
-    virtual void onStatusPropertyGetReply(const uint32_t& value, std::optional<sdbus::Error> error) = 0;
+    virtual void onStatusPropertyGetReply(const uint32_t& value, const sdbus::Error* error) = 0;
 
 public:
     // getting the property value
     sdbus::PendingAsyncCall status()
     {
-        return m_object.getPropertyAsync("status").onInterface(INTERFACE_NAME).uponReplyInvoke([this](std::optional<sdbus::Error> error, const sdbus::Variant& value){ this->onStatusPropertyGetReply(value.get<uint32_t>(), std::move(error)); });
+        return object_->getProperty("status", sdbus::async).onInterface(INTERFACE_NAME).uponReplyInvoke([this](const sdbus::Error* error, const sdbus::Variant& value){ this->onActionPropertyGetReply(value.get<uint32_t>(), error); });
     }
 
     // setting the property value
     void status(const uint32_t& value)
     {
-        m_object.setProperty("status").onInterface(INTERFACE_NAME).toValue(value);
+        object_->setProperty("status").onInterface(INTERFACE_NAME).toValue(value);
     }
 
     /*...*/
@@ -1559,8 +1538,8 @@ sdbus-c++ provides many default, pre-defined C++ type representations for D-Bus
 | string-like, basic  | 111         | o          | OBJECT_PATH        | `sdbus::ObjectPath`             |
 | string-like, basic  | 103         | g          | SIGNATURE          | `sdbus::Signature`              |
 | container           | 97          | a          | ARRAY              | `std::vector<T>`, `std::array<T>`, `std::span<T>` - if used as an array followed by a single complete type `T` <br /> `std::map<T1, T2>`, `std::unordered_map<T1, T2>` - if used as an array of dict entries |
-| container           | 114,40,41   | r()        | STRUCT             | `sdbus::Struct<T1, T2, ...>` variadic class template                               |
-| container           | 118         | v          | VARIANT            | `sdbus::Variant`, `std::variant<T1, ...>` |
+| container           | 114,40,41   | r()        | STRUCT             | `sdbus::Struct<T1, T2, ...>` variadic class template                                                                                                                                                         |
+| container           | 118         | v          | VARIANT            | `sdbus::Variant`                |
 | container           | 101,123,125 | e{}        | DICT_ENTRY         | -                               |
 | fixed, basic        | 104         | h          | UNIX_FD            | `sdbus::UnixFd`                 |
 | reserved            | 109         | m          | (reserved)         | -                               |
@@ -1578,16 +1557,16 @@ To see how C++ types are mapped to D-Bus types (including container types) in sd
 
 For more information on basic D-Bus types, D-Bus container types, and D-Bus type system in general, make sure to consult the [D-Bus specification](https://dbus.freedesktop.org/doc/dbus-specification.html#type-system).
 
-## Adding user-defined types to the sdbus-c++ type system
+### Extending sdbus-c++ type system
 
-The above mapping between D-Bus and C++ types is what sdbus-c++ provides by default. However, the mapping can be extended. We can implement additional mapping between a D-Bus type and our custom type, i.e. teach sdbus-c++ to recognize and accept our own C++ types.
+The above mapping between D-Bus and C++ types is what sdbus-c++ provides by default. However, the mapping can be extended. You can implement additional mapping between a D-Bus type and their custom type.
 
 We need two things to do that:
 
 * implement `sdbus::Message` insertion (serialization) and extraction (deserialization) operators, so sdbus-c++ knows how to serialize/deserialize our custom type,
 * specialize `sdbus::signature_of` template for our custom type, so sdbus-c++ knows the mapping to D-Bus type and other necessary information about our type.
 
-Say, we would like to represent D-Bus arrays as `std::list`s in our application. Since sdbus-c++ comes with pre-defined support for `std::vector`s, `std::array`s and `std::span`s as D-Bus array representations, we have to provide an extension. To implement message serialization and deserialization functions for `std::list`, we can simply copy the sdbus-c++ implementation of these functions for `std::vector`, and simply adjust for `std::list`. Then we provide `signature_of` specialization, again written in terms of one specialized for `std::vector`:
+Say, we would like to represent D-Bus arrays as `std::list`s in our application. Since sdbus-c++ comes with pre-defined support for `std::vector`s, `std::array`s and `std::span`s as D-Bus array representations, we have to provide an extension. To implement message serialization and deserialization functions for `std::list`, we can simply copy the sdbus-c++ implementation of these functions for `std::vector`, and simply adjust for `std::list`. Then we provide `signature_of` specialization, again written on terms of one specialized for `std::vector`:
 
 ```c++
 #include <list>
@@ -1599,7 +1578,7 @@ namespace sdbus {
 template <typename _ElementType>
 sdbus::Message& operator<<(sdbus::Message& msg, const std::list<_ElementType>& items)
 {
-    msg.openContainer<_ElementType>();
+    msg.openContainer(sdbus::signature_of<_ElementType>::str());
 
     for (const auto& item : items)
         msg << item;
@@ -1613,7 +1592,7 @@ sdbus::Message& operator<<(sdbus::Message& msg, const std::list<_ElementType>& i
 template <typename _ElementType>
 sdbus::Message& operator>>(sdbus::Message& msg, std::list<_ElementType>& items)
 {
-    if(!msg.enterContainer<_ElementType>())
+    if(!msg.enterContainer(sdbus::signature_of<_ElementType>::str()))
         return msg;
 
     while (true)
@@ -1634,23 +1613,17 @@ sdbus::Message& operator>>(sdbus::Message& msg, std::list<_ElementType>& items)
 
 } // namespace sdbus
 
-// Implementing type traits for std::list -- we re-use by inheriting
-// from type traits already provided by sdbus-c++ for D-Bus arrays
+// Implementing type traits for std::list, and since we map it to D-Bus array,
+// we can re-use std::vector type traits because it's the same stuff.
 template <typename _Element, typename _Allocator>
 struct sdbus::signature_of<std::list<_Element, _Allocator>>
-    : sdbus::signature_of<std::vector<_Element>>
+        : sdbus::signature_of<std::vector<_Element, _Allocator>>
 {};
 ```
 
 Then we can simply use `std::list`s, serialize/deserialize them in a D-Bus message, in D-Bus method calls or return values... and they will be simply transmitted as D-Bus arrays.
 
-Similarly, say we have our own `lockfree_map` which we would like to use natively with sdbus-c++ as a C++ type for D-Bus dictionary -- we can copy or build on top of `std::map` specializations.
-
-### Teaching sdbus-c++ about user-defined structs
-
-There is `SDBUSCPP_REGISTER_STRUCT` macro that we can use to teach sdbus-c++ about our structs and unlock some struct-related convenience functionality.
-
-Say we have our custom type `my::Struct`:
+As another example, say we have our custom type `my::Struct` which we'd like to use as a D-Bus structure representation (sdbus-c++ provides `sdbus::Struct` type for that, but we don't want to use it because using our custom type directly is more convenient). Again, we have to provide type traits and message serialization/deserialization functions for our custom type. We build our functions and specializations on top of `sdbus::Struct`, so we don't have to copy and write a lot of boiler-plate. Serialization/deserialization functions can be placed in the same namespace as our custom type, and will be found thanks to the ADR lookup. The `signature_of` specialization must always be in either `sdbus` namespace or in a global namespace:
 
 ```c++
 namespace my {
@@ -1660,101 +1633,30 @@ namespace my {
         std::string s;
         std::list<double> l;
     };
+
+    sdbus::Message& operator<<(sdbus::Message& msg, const Struct& items)
+    {
+        // Re-use sdbus::Struct functionality for simplicity -- view of my::Struct through sdbus::Struct with reference types
+        return msg << sdbus::Struct{std::forward_as_tuple(items.i, items.s, items.l)};
+    }
+
+    sdbus::Message& operator>>(sdbus::Message& msg, Struct& items)
+    {
+        // Re-use sdbus::Struct functionality for simplicity -- view of my::Struct through sdbus::Struct with reference types
+        sdbus::Struct s{std::forward_as_tuple(items.i, items.s, items.l)};
+        return msg >> s;
+    }
 } // namespace my
+
+template <>
+struct sdbus::signature_of<my::Struct>
+    : sdbus::signature_of<sdbus::Struct<int, std::string, std::list<double>>>
+{};
 ```
 
-This is how we introduce the struct to sdbus-c++:
+> **_Note_:** One of `my::Struct` members is `std::list`. Thanks to the above custom support for `std::list`, it's now automatically accepted by sdbus-c++ as a D-Bus array representation.
 
-```c++
-SDBUSCPP_REGISTER_STRUCT(my::Struct, i, s, l);
-```
-
-The macro must be placed in the global namespace. The first argument is the struct type name and the remaining arguments are names of struct members. Of course, struct members must be of types supported by sdbus-c++ (or of user-defined types that sdbus-c++ was taught to recognize). This also means that members can be other structs -- provided that sdbus-c++ was taught about them with `SDBUSCPP_REGISTER_STRUCT` prior to this one.
-
-`SDBUSCPP_REGISTER_STRUCT` enables us:
-
-  * to use user-defined structs in place of (more generic, less expressive) `sdbus::Struct`s
-  * to serialize a user-defined struct as a dictionary of strings to variants (`a{sv}` dictionary)
-  * to deserialize the `a{sv}` dictionary into a user-defined struct.
-
-This is described in detail in the following sections.
-
-> **_Note_:** The macro supports **max 16 struct members**. If you need more, feel free to open an issue, or implement the teaching code yourself :o) 
-
-> **_Another note_:** You may have noticed one of `my::Struct` members is `std::list`. Thanks to the custom support for `std::list` implemented higher above, it's now automatically accepted by sdbus-c++ as a D-Bus array representation.
-
-### Using user-defined structs in place of `sdbus::Struct`
-
-Many times, we have our own structs defined in our business logic code, and it would be very convenient to pass these structs directly to or from the sdbus-c++ IPC API where a D-Bus struct is expected, without having to translate them to or from `sdbus::Struct`.
-
-For example, a D-Bus method `foo` that takes an argument of signature `(isad)` can simply be called with `my::Struct` instance instead of `sdbus::Struct<int, std::string, std::vector<dobule>>` instance:
-
-```c++
-my::Struct s{77, "hello"s, {3.14, 285.9}};
-proxy->callMethod("foo").onInterface(INTERFACE_NAME).withArguments(s);
-```
-
-For this purpose, the macro simply generates the `sdbus::Message` serialization and deserialization operators and the type traits (the `sdbus::signature_of` specialization) for `my::Struct`.
-
-Nesting structs is supported by default.
-
-### Serializing a user-defined struct as the a{sv} dictionary
-
-`SDBUSCPP_REGISTER_STRUCT` macro additionally teaches sdbus-c++ to serialize our structs as `a{sv}` dictionaries. This can be quite a handy feature.
-
-For example, a D-Bus method `foo` that takes an argument of signature `a{sv}` can be passed `my::Struct` instance:
-
-```c++
-my::Struct s{77, "hello"s, {3.14, 285.9}};
-proxy->callMethod("foo").onInterface(INTERFACE_NAME).withArguments(sdbus::as_dictionary(s));
-```
-
-Decorating the struct instance with `sdbus::as_dictionary()` instructs sdbus-c++ to serialize the struct as an `a{sv}` dictionary, with struct field name being the key and struct field value being the value. Here is a C++ representation of the resulting dictionary:
-
-```c++
-std::map<std::string, sdbus::Variant> dict{{"i"s, sdbus::Variant{77}}, {"s"s, sdbus::Variant{"hello"s}}, {"l"s, sdbus::Variant{std::list<double>{3.14, 285.9}}}};
-```
-
-The default struct-as-dict serialization strategy is single-level (as opposed to nested). Single-level means that struct members that are structs themselves are serialized as D-Bus structs (the variant in the dict entry contains a struct value). Nested means that also struct members that are structs are all serialized as an `a{sv}` dictionary (the variant in the dict entry contains `a{sv}` dictionary). We can turn on nested serialization with the `SDBUSCPP_ENABLE_NESTED_STRUCT2DICT_SERIALIZATION` macro:
-
-```c++
-SDBUSCPP_ENABLE_NESTED_STRUCT2DICT_SERIALIZATION(my::Struct);
-```
-
-If nested strategy is also enabled for the nested struct type, then the same behavior applies for that struct, recursively. (It goes without saying that member struct type needs to be registered through `SDBUSCPP_REGISTER_STRUCT` macro, too.)
-
-The macro must be placed before the `SDBUSCPP_REGISTER_STRUCT(my::Struct);` macro.
-
-### Deserializing the a{sv} dictionary into a user-defined struct
-
-Another handy feature enabled by the `SDBUSCPP_REGISTER_STRUCT` macro is an automatic deserialization of `a{sv}` dictionaries to user-defined structs.
-
-For example, a D-Bus signal `bar` that carries data of signature `a{sv}` can be deserialized not only into a C++ dictionary type, but also directly into a user-defined struct, leading to shorter and more natural code:
-
-```c++
-proxy->uponSignal("bar").onInterface(INTERFACE_NAME).call([](const my::Struct& s){ std::cout << "Got signal with s.i == " << s.i << "\n"; });
-```
-
-How easy and convenient, right?
-
-The requirements:
-
-  * All keys in the dictionary must exactly match the names of fields in the struct. Ordering of struct fields vs. items in the dictionary is irrelevant; the field in the struct is found by its name given by the dict key. If the corresponding struct field is not found, `sdbus::Error` exception is thrown.
-  * The type of value in the dictionary item and the corresponding struct field must also exactly match. Otherwise, `sdbus::Error` exception is thrown.
-
-The first bullet point is a so-called strict dict-to-struct deserialization strategy. There is also a relaxed one -- meaning that a dict entry key that does not have a matching struct member counterpart is not an error and is silently skipped. We can turn on relaxed deserialization with the `SDBUSCPP_ENABLE_RELAXED_DICT2STRUCT_DESERIALIZATION` macro:
-
-```c++
-SDBUSCPP_ENABLE_RELAXED_DICT2STRUCT_DESERIALIZATION(my::Struct);
-```
-
-The macro must be placed before the `SDBUSCPP_REGISTER_STRUCT(my::Struct);` macro.
-
-Real examples of extending sdbus-c++ types, including the use of all above-mentioned struct-related macros, can be found in [Message unit tests](/tests/unittests/Message_test.cpp) and also in test case [SdbusTestObject.CanSendAndReceiveDictionariesAsCustomStructsImplicitly](/tests/integrationtests/DBusMethodsTests.cpp#L266) in integration tests.
-
-Happy `struct`ing!
-
-> **_Wait!_:** You might say. What about XML IDL and generated C++ bindings? Well, there is no user-defined struct support in there. Yet. An extended XML syntax would be required. But we may implement something like that in the future (and you can help us).
+Live examples of extending sdbus-c++ types can be found in [Message unit tests](/tests/unittests/Message_test.cpp).
 
 Support for match rules
 -----------------------
@@ -1791,19 +1693,20 @@ int main(int argc, char *argv[])
     {
         serverConnection = sdbus::createServerBus(fds[0]);
         // This is necessary so that createDirectBusConnection() below does not block
-        serverConnection->enterEventLoopAsync();
+        serverConnection->enterEventLoop(sdbus::async);
     });
 
     clientConnection = sdbus::createDirectBusConnection(fds[1]);
-    clientConnection->enterEventLoopAsync();
+    clientConnection->enterEventLoop(sdbus::async);
 
     t.join();
 
     // We can now use connection objects in a familiar way, e.g. create adaptor and proxy objects on them, and exchange messages.
     // Here, using Concatenator IDL-generated bindings example from chapters above:
-    Concatenator concatenator(*serverConnection, sdbus::ObjectPath{"/org/sdbuscpp/concatenator"});
-    sdbus::ServiceName emptyDestination; // Destination may be empty in case of direct connections
-    ConcatenatorProxy concatenatorProxy(*clientConnection, std::move(emptyDestination), sdbus::ObjectPath{"/org/sdbuscpp/concatenator"});
+    const char* objectPath = "/org/sdbuscpp/concatenator";
+    Concatenator concatenator(*serverConnection, objectPath);
+    const char* emptyDestinationName = ""; // Destination may be empty in case of direct connections
+    ConcatenatorProxy concatenatorProxy(*clientConnection, emptyDestinationName, objectPath);
 
     // Perform call of concatenate D-Bus method
     std::vector<int> numbers = {1, 2, 3};
@@ -1840,54 +1743,6 @@ sdbus-c++ provides built-in integration of sd-event, which makes it very conveni
 
 See documentation of `IConnection::attachSdEventLoop()`, `IConnection::detachSdEventLoop()`, and `IConnection::getSdEventLoop()` methods, or sdbus-c++ integration tests for an example of use. These methods are sdbus-c++ counterparts to and mimic the behavior of these underlying sd-bus functions: `sd_bus_attach_event()`, `sd_bus_detach_event()`, and `sd_bus_get_event()`. Their manual pages provide much more details about their behavior.
 
-Migrating to sdbus-c++ v2
--------------------------
-
-sdbus-c++ v2 is a major release that comes with a number of breaking API/ABI/behavior changes compared to v1. The following list describes the changes:
-
-* Change in behavior: In *synchronous* D-Bus calls, the proxy object now keeps the connection instance blocked for the entire duration of the method call. Incoming messages like signals will be queued and processed after the call. Access to the connection from other threads is blocked. To avoid this (in case this hurts you):
-  * either use short-lived, light-weight proxies for such synchronous calls,
-  * or call the method in an asynchronous way.
-* Strong types were introduced for safer, less error-prone and more expressive API. What previously was `auto proxy = createProxy("org.sdbuscpp.concatenator", "/org/sdbuscpp/concatenator");` is now written like `auto proxy = createProxy(ServiceName{"org.sdbuscpp.concatenator"}, ObjectPath{"/org/sdbuscpp/concatenator"});`. These types are:
-  * `ObjectPath` type for the object path (the type has been around already but now is also used consistently in sdbus-c++ API for object path strings)
-  * `InterfaceName` type for D-Bus interface names
-  * `BusName` (and its aliases `ServiceName` and `ConnectionName`) type for bus/service/connection names
-  * `MemberName` (and its aliases `MethodName`, `SignalName` and `PropertyName`) type for D-Bus method, signal and property names
-  * `Signature` type for the D-Bus signature (the type has been around already but now is also used consistently in sdbus-c++ API for signature strings)
-  * `Error::Name` type for D-Bus error names
-* Signatures of callbacks `async_reply_handler`, `signal_handler`, `message_handler` and `property_set_callback` were modified to take input message objects by value instead of non-const ref to a message. The callback handler assumes ownership of the message. This API is cleaner and more self-explaining.
-* The `PollData` struct has been extended with a new data member: `eventFd`. All hooks with external event loops shall be modified to poll on this `eventFd` in addition to the `fd`.
-* `PollData::timeout_usec` was renamed to `PollData::timeout` and its type has been changed to `std::chrono::microseconds`. This member now holds directly what before had to be obtained through `PollData::getAbsoluteTimeout()` call.
-* `PollData::getRelativeTimeout()` return type was changed to `std::chrono::microseconds`.
-* `IConnection::processPendingRequest()` was renamed to `IConnection::processPendingEvent()`.
-* `Variant` constructor is now explicit.
-* `Variant`'s conversion operator to the underlying type is now explicit.
-* `IProxy::getCurrentlyProcessedMessage()` now returns `Message` by value instead of a raw pointer to it. The caller assumes ownership of the message.
-* Object D-Bus API registration is now done through `IObject::addVTable()` method. The vtable gets active immediately. No `finishRegistration()` call is needed anymore. vtables can be added and removed dynamically at run time. In addition to API simplification this brings consistency with sd-bus API and increases flexibility.
-* Subscription to signals has been simplified. The subscription is active right after the `registerSignalHandler`/`uponSignal()` call. No need for the final call to `finishRegistration()`.
-* `IProxy::muteSignal()` and `IProxy::unregisterSignal()` have been removed. When subscribing to a signal, we can ask sdbus-c++ to give us a RAII-based slot object. As long as we keep the slot, the subscription is active. Destroying the slot object implies unsubscribing from the signal.
-* `request_slot` tag was renamed to `return_slot`.
-* Deprecated `dont_request_slot` was removed. It shall be replaced with `floating_slot`.
-* `ProxyInterfaces::getObjectPath()` was removed. It shall be replaced with `ProxyInterfaces::getProxy().getObjectPath()`.
-* `AdaptorInterfaces::getObjectPath()` was removed. It can be replaced with `AdaptorInterfaces::getObject().getObjectPath()`.
-* `createConnection()` has been removed. To create a connection to the system bus use `createSystemConnection()` instead.
-* `createDefaultBusConnection()` has been renamed to `createBusConnection()`.
-* `IObject::removeObjectManager()` and `IObject::hasObjectManager()` were removed. Clients should now use the slot-returning `IObject::addObjectManager()` to control the `ObjectManager` interface lifetime.
-* `floating_slot_t` tag was removed from `IConnection::addObjectManager()`, the function is now by default floating-slot-based.
-* Slot-returning `IConnection::addMatch()` has gotten the `return_slot_t` tag parameter, while `floating_slot_t` was removed from the floating slot-based overload of the method.
-* Slot-returning `IConnection::addMatchAsync()` has gotten the `return_slot_t` tag parameter, while `floating_slot_t` was removed from the floating slot-based overload of the method.
-* Change in behavior: `Proxy`s now by default call `createBusConnection()` to get a connection when the connection is not provided explicitly by the caller, so they connect to either the session bus or the system bus depending on the context (as opposed to always to the system bus like before).
-* Callbacks taking `const sdbus::Error* error` were changed to take `std::optional<sdbus::Error>`, which better expresses the intent and meaning.
-* `getInterfaceName()`, `getMemberName()`, `getSender()`, `getPath()` and `getDestination()` methods of `Message` class now return `const char*` instead of `std::string`, for efficiency reasons.
-* `peekType()` method of `Message` class now returns a pair of `char` (type signature) and `const char*` (contents signature), for expressiveness and efficiency reasons.
-* D-Bus signatures when using high-level API are now assembled at compile time. There are breaking changes inside `signature_of` type traits and `Message` serialization/deserialization methods. This only interests you if you extend sdbus-c++ type system with your own types. See the updated tutorial on extending sdbus-c++ type system.
-* Generated adaptor and proxy classes are not moveable anymore.
-* Types and methods marked deprecated in sdbus-c++ v1 were removed completely.
-* CMake options got `SDBUSCPP_` prefix for better usability and minimal risk of conflicts in downstream CMake projects. `SDBUSCPP_INSTALL` CMake option was added.
-* CMake components got `sdbus-c++-` prefix.
-
-An important note: **C++ bindings generated from XML files must be re-generated** with the new `sdbus-c++-xml2cpp` when migrating to sdbus-c++ v2.0.
-
 Conclusion
 ----------
 

examples/CMakeLists.txt

@@ -1,12 +1,6 @@
-# Building examples
 
 add_executable(obj-manager-server org.freedesktop.DBus.ObjectManager/obj-manager-server.cpp)
 target_link_libraries(obj-manager-server sdbus-c++)
 
 add_executable(obj-manager-client org.freedesktop.DBus.ObjectManager/obj-manager-client.cpp)
-target_link_libraries(obj-manager-client sdbus-c++)
-
-if(SDBUSCPP_INSTALL)
-    install(TARGETS obj-manager-server DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT sdbus-c++-examples)
-    install(TARGETS obj-manager-client DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT sdbus-c++-examples)
-endif()
+target_link_libraries(obj-manager-client sdbus-c++)

examples/org.freedesktop.DBus.ObjectManager/examplemanager-planet1-client-glue.h

@@ -21,14 +21,14 @@ public:
 
 protected:
     Planet1_proxy(sdbus::IProxy& proxy)
-        : m_proxy(proxy)
+        : proxy_(&proxy)
     {
     }
 
     Planet1_proxy(const Planet1_proxy&) = delete;
     Planet1_proxy& operator=(const Planet1_proxy&) = delete;
-    Planet1_proxy(Planet1_proxy&&) = delete;
-    Planet1_proxy& operator=(Planet1_proxy&&) = delete;
+    Planet1_proxy(Planet1_proxy&&) = default;
+    Planet1_proxy& operator=(Planet1_proxy&&) = default;
 
     ~Planet1_proxy() = default;
 
@@ -40,18 +40,18 @@ public:
     uint64_t GetPopulation()
     {
         uint64_t result;
-        m_proxy.callMethod("GetPopulation").onInterface(INTERFACE_NAME).storeResultsTo(result);
+        proxy_->callMethod("GetPopulation").onInterface(INTERFACE_NAME).storeResultsTo(result);
         return result;
     }
 
 public:
     std::string Name()
     {
-        return m_proxy.getProperty("Name").onInterface(INTERFACE_NAME).get<std::string>();
+        return proxy_->getProperty("Name").onInterface(INTERFACE_NAME);
     }
 
 private:
-    sdbus::IProxy& m_proxy;
+    sdbus::IProxy* proxy_;
 };
 
 }}} // namespaces

examples/org.freedesktop.DBus.ObjectManager/examplemanager-planet1-server-glue.h

@@ -21,20 +21,20 @@ public:
 
 protected:
     Planet1_adaptor(sdbus::IObject& object)
-        : m_object(object)
+        : object_(&object)
     {
     }
 
     Planet1_adaptor(const Planet1_adaptor&) = delete;
     Planet1_adaptor& operator=(const Planet1_adaptor&) = delete;
-    Planet1_adaptor(Planet1_adaptor&&) = delete;
-    Planet1_adaptor& operator=(Planet1_adaptor&&) = delete;
+    Planet1_adaptor(Planet1_adaptor&&) = default;
+    Planet1_adaptor& operator=(Planet1_adaptor&&) = default;
 
     ~Planet1_adaptor() = default;
 
     void registerAdaptor()
     {
-        m_object.addVTable( sdbus::registerMethod("GetPopulation").withOutputParamNames("population").implementedAs([this](){ return this->GetPopulation(); })
+        object_->addVTable( sdbus::registerMethod("GetPopulation").withOutputParamNames("population").implementedAs([this](){ return this->GetPopulation(); })
                           , sdbus::registerProperty("Name").withGetter([this](){ return this->Name(); })
                           ).forInterface(INTERFACE_NAME);
     }
@@ -46,7 +46,7 @@ private:
     virtual std::string Name() = 0;
 
 private:
-    sdbus::IObject& m_object;
+    sdbus::IObject* object_;
 };
 
 }}} // namespaces

examples/org.freedesktop.DBus.ObjectManager/obj-manager-client.cpp

@@ -17,7 +17,7 @@
 class PlanetProxy final : public sdbus::ProxyInterfaces< org::sdbuscpp::ExampleManager::Planet1_proxy >
 {
 public:
-    PlanetProxy(sdbus::IConnection& connection, sdbus::ServiceName destination, sdbus::ObjectPath path)
+    PlanetProxy(sdbus::IConnection& connection, std::string destination, std::string path)
     : ProxyInterfaces(connection, std::move(destination), std::move(path))
     {
         registerProxy();
@@ -29,13 +29,13 @@ public:
     }
 };
 
-class ManagerProxy final : public sdbus::ProxyInterfaces<sdbus::ObjectManager_proxy>
+class ManagerProxy final : public sdbus::ProxyInterfaces< sdbus::ObjectManager_proxy >
 {
 public:
-    ManagerProxy(sdbus::IConnection& connection, sdbus::ServiceName destination, sdbus::ObjectPath path)
-        : ProxyInterfaces(connection, destination, std::move(path))
-        , m_connection(connection)
-        , m_destination(destination)
+    ManagerProxy(sdbus::IConnection& connection, const std::string& destination, std::string path)
+    : ProxyInterfaces(connection, destination, std::move(path))
+    , m_connection(connection)
+    , m_destination(destination)
     {
         registerProxy();
     }
@@ -47,7 +47,8 @@ public:
 
     void handleExistingObjects()
     {
-        auto objectsInterfacesAndProperties = GetManagedObjects();
+        std::map<sdbus::ObjectPath, std::map<std::string, std::map<std::string, sdbus::Variant>>> objectsInterfacesAndProperties;
+        objectsInterfacesAndProperties = GetManagedObjects();
         for (const auto& [object, interfacesAndProperties] : objectsInterfacesAndProperties) {
             onInterfacesAdded(object, interfacesAndProperties);
         }
@@ -55,7 +56,7 @@ public:
 
 private:
     void onInterfacesAdded( const sdbus::ObjectPath& objectPath
-                          , const std::map<sdbus::InterfaceName, std::map<sdbus::PropertyName, sdbus::Variant>>& interfacesAndProperties) override
+            , const std::map<std::string, std::map<std::string, sdbus::Variant>>& interfacesAndProperties) override
     {
         std::cout << objectPath << " added:\t";
         for (const auto& [interface, _] : interfacesAndProperties) {
@@ -64,20 +65,20 @@ private:
         std::cout << std::endl;
 
         // Parse and print some more info
-        auto planetInterface = interfacesAndProperties.find(sdbus::InterfaceName{org::sdbuscpp::ExampleManager::Planet1_proxy::INTERFACE_NAME});
+        auto planetInterface = interfacesAndProperties.find(org::sdbuscpp::ExampleManager::Planet1_proxy::INTERFACE_NAME);
         if (planetInterface == interfacesAndProperties.end()) {
             return;
         }
         const auto& properties = planetInterface->second;
         // get a property which was passed as part of the signal.
-        const auto& name = properties.at(sdbus::PropertyName{"Name"}).get<std::string>();
+        const auto& name = properties.at("Name").get<std::string>();
         // or create a proxy instance to the newly added object.
         PlanetProxy planet(m_connection, m_destination, objectPath);
         std::cout << name << " has a population of " << planet.GetPopulation() << ".\n" << std::endl;
     }
 
     void onInterfacesRemoved( const sdbus::ObjectPath& objectPath
-                            , const std::vector<sdbus::InterfaceName>& interfaces) override
+            , const std::vector<std::string>& interfaces) override
     {
         std::cout << objectPath << " removed:\t";
         for (const auto& interface : interfaces) {
@@ -87,16 +88,14 @@ private:
     }
 
     sdbus::IConnection& m_connection;
-    sdbus::ServiceName m_destination;
+    std::string m_destination;
 };
 
 int main()
 {
     auto connection = sdbus::createSessionBusConnection();
 
-    sdbus::ServiceName destination{"org.sdbuscpp.examplemanager"};
-    sdbus::ObjectPath objectPath{"/org/sdbuscpp/examplemanager"};
-    auto managerProxy = std::make_unique<ManagerProxy>(*connection, std::move(destination), std::move(objectPath));
+    auto managerProxy = std::make_unique<ManagerProxy>(*connection, "org.sdbuscpp.examplemanager", "/org/sdbuscpp/examplemanager");
     try {
         managerProxy->handleExistingObjects();
     }
@@ -108,4 +107,4 @@ int main()
 
     connection->enterEventLoop();
     return 0;
-}
+}

examples/org.freedesktop.DBus.ObjectManager/obj-manager-server.cpp

@@ -19,12 +19,10 @@
 #include <thread>
 #include <chrono>
 
-using sdbus::ObjectPath;
-
 class ManagerAdaptor : public sdbus::AdaptorInterfaces<sdbus::ObjectManager_adaptor>
 {
 public:
-    ManagerAdaptor(sdbus::IConnection& connection, sdbus::ObjectPath path)
+    ManagerAdaptor(sdbus::IConnection& connection, std::string path)
         : AdaptorInterfaces(connection, std::move(path))
     {
         registerAdaptor();
@@ -41,18 +39,18 @@ class PlanetAdaptor final : public sdbus::AdaptorInterfaces< org::sdbuscpp::Exam
                                                            , sdbus::Properties_adaptor >
 {
 public:
-    PlanetAdaptor(sdbus::IConnection& connection, sdbus::ObjectPath path, std::string name, uint64_t population)
+    PlanetAdaptor(sdbus::IConnection& connection, std::string path, std::string name, uint64_t population)
         : AdaptorInterfaces(connection, std::move(path))
         , m_name(std::move(name))
         , m_population(population)
     {
         registerAdaptor();
-        emitInterfacesAddedSignal({sdbus::InterfaceName{org::sdbuscpp::ExampleManager::Planet1_adaptor::INTERFACE_NAME}});
+        emitInterfacesAddedSignal({org::sdbuscpp::ExampleManager::Planet1_adaptor::INTERFACE_NAME});
     }
 
     ~PlanetAdaptor()
     {
-        emitInterfacesRemovedSignal({sdbus::InterfaceName{org::sdbuscpp::ExampleManager::Planet1_adaptor::INTERFACE_NAME}});
+        emitInterfacesRemovedSignal({org::sdbuscpp::ExampleManager::Planet1_adaptor::INTERFACE_NAME});
         unregisterAdaptor();
     }
 
@@ -84,19 +82,18 @@ void printCountDown(const std::string& message, int seconds)
 int main()
 {
     auto connection = sdbus::createSessionBusConnection();
-    sdbus::ServiceName serviceName{"org.sdbuscpp.examplemanager"};
-    connection->requestName(serviceName);
-    connection->enterEventLoopAsync();
+    connection->requestName("org.sdbuscpp.examplemanager");
+    connection->enterEventLoop(sdbus::async);
 
-    auto manager = std::make_unique<ManagerAdaptor>(*connection, ObjectPath{"/org/sdbuscpp/examplemanager"});
+    auto manager = std::make_unique<ManagerAdaptor>(*connection, "/org/sdbuscpp/examplemanager");
     while (true)
     {
         printCountDown("Creating PlanetAdaptor in ", 5);
-        auto earth = std::make_unique<PlanetAdaptor>(*connection, ObjectPath{"/org/sdbuscpp/examplemanager/Planet1/Earth"}, "Earth", 7'874'965'825);
+        auto earth = std::make_unique<PlanetAdaptor>(*connection, "/org/sdbuscpp/examplemanager/Planet1/Earth", "Earth", 7'874'965'825);
         printCountDown("Creating PlanetAdaptor in ", 5);
-        auto trantor = std::make_unique<PlanetAdaptor>(*connection, ObjectPath{"/org/sdbuscpp/examplemanager/Planet1/Trantor"}, "Trantor", 40'000'000'000);
+        auto trantor = std::make_unique<PlanetAdaptor>(*connection, "/org/sdbuscpp/examplemanager/Planet1/Trantor", "Trantor", 40'000'000'000);
         printCountDown("Creating PlanetAdaptor in ", 5);
-        auto laconia = std::make_unique<PlanetAdaptor>(*connection, ObjectPath{"/org/sdbuscpp/examplemanager/Planet1/Laconia"}, "Laconia", 231'721);
+        auto laconia = std::make_unique<PlanetAdaptor>(*connection, "/org/sdbuscpp/examplemanager/Planet1/Laconia", "Laconia", 231'721);
         printCountDown("Removing PlanetAdaptor in ", 5);
         earth.reset();
         printCountDown("Removing PlanetAdaptor in ", 5);
@@ -105,7 +102,7 @@ int main()
         laconia.reset();
     }
 
-    connection->releaseName(serviceName);
+    connection->releaseName("org.sdbuscpp.examplemanager");
     connection->leaveEventLoop();
     return 0;
 }

include/sdbus-c++/AdaptorInterfaces.h

@@ -1,6 +1,6 @@
 /**
  * (C) 2016 - 2021 KISTLER INSTRUMENTE AG, Winterthur, Switzerland
- * (C) 2016 - 2024 Stanislav Angelovic <stanislav.angelovic@protonmail.com>
+ * (C) 2016 - 2022 Stanislav Angelovic <stanislav.angelovic@protonmail.com>
  *
  * @file AdaptorInterfaces.h
  *
@@ -102,7 +102,7 @@ namespace sdbus {
          *
          * For more information, consult @ref createObject(sdbus::IConnection&,std::string)
          */
-        AdaptorInterfaces(IConnection& connection, ObjectPath objectPath)
+        AdaptorInterfaces(IConnection& connection, std::string objectPath)
             : ObjectHolder(createObject(connection, std::move(objectPath)))
             , _Interfaces(getObject())...
         {
@@ -142,8 +142,8 @@ namespace sdbus {
 
         AdaptorInterfaces(const AdaptorInterfaces&) = delete;
         AdaptorInterfaces& operator=(const AdaptorInterfaces&) = delete;
-        AdaptorInterfaces(AdaptorInterfaces&&) = delete;
-        AdaptorInterfaces& operator=(AdaptorInterfaces&&) = delete;
+        AdaptorInterfaces(AdaptorInterfaces&&) = default;
+        AdaptorInterfaces& operator=(AdaptorInterfaces&&) = default;
         ~AdaptorInterfaces() = default;
     };
 

include/sdbus-c++/ConvenienceApiClasses.h

@@ -1,6 +1,6 @@
 /**
  * (C) 2016 - 2021 KISTLER INSTRUMENTE AG, Winterthur, Switzerland
- * (C) 2016 - 2024 Stanislav Angelovic <stanislav.angelovic@protonmail.com>
+ * (C) 2016 - 2022 Stanislav Angelovic <stanislav.angelovic@protonmail.com>
  *
  * @file ConvenienceApiClasses.h
  *
@@ -27,18 +27,16 @@
 #ifndef SDBUS_CXX_CONVENIENCEAPICLASSES_H_
 #define SDBUS_CXX_CONVENIENCEAPICLASSES_H_
 
+#include <sdbus-c++/VTableItems.h>
 #include <sdbus-c++/Message.h>
 #include <sdbus-c++/TypeTraits.h>
 #include <sdbus-c++/Types.h>
-#include <sdbus-c++/VTableItems.h>
-
-#include <chrono>
-#include <cstdint>
-#include <future>
-#include <map>
 #include <string>
-#include <string_view>
 #include <vector>
+#include <map>
+#include <chrono>
+#include <future>
+#include <cstdint>
 
 // Forward declarations
 namespace sdbus {
@@ -53,14 +51,9 @@ namespace sdbus {
     class VTableAdder
     {
     public:
-        void forInterface(InterfaceName interfaceName);
-        void forInterface(std::string interfaceName);
-        [[nodiscard]] Slot forInterface(InterfaceName interfaceName, return_slot_t);
-        [[nodiscard]] Slot forInterface(std::string interfaceName, return_slot_t);
-
-    private:
-        friend IObject;
         VTableAdder(IObject& object, std::vector<VTableItem> vtable);
+        void forInterface(std::string interfaceName);
+        [[nodiscard]] Slot forInterface(std::string interfaceName, return_slot_t);
 
     private:
         IObject& object_;
@@ -70,22 +63,15 @@ namespace sdbus {
     class SignalEmitter
     {
     public:
-        SignalEmitter& onInterface(const InterfaceName& interfaceName);
-        SignalEmitter& onInterface(const std::string& interfaceName);
-        SignalEmitter& onInterface(const char* interfaceName);
-        template <typename... _Args> void withArguments(_Args&&... args);
-
+        SignalEmitter(IObject& object, const std::string& signalName);
         SignalEmitter(SignalEmitter&& other) = default;
         ~SignalEmitter() noexcept(false);
-
-    private:
-        friend IObject;
-        SignalEmitter(IObject& object, const SignalName& signalName);
-        SignalEmitter(IObject& object, const char* signalName);
+        SignalEmitter& onInterface(const std::string& interfaceName);
+        template <typename... _Args> void withArguments(_Args&&... args);
 
     private:
         IObject& object_;
-        const char* signalName_;
+        const std::string& signalName_;
         Signal signal_;
         int exceptions_{}; // Number of active exceptions when SignalEmitter is constructed
     };
@@ -93,27 +79,22 @@ namespace sdbus {
     class MethodInvoker
     {
     public:
-        MethodInvoker& onInterface(const InterfaceName& interfaceName);
+        MethodInvoker(IProxy& proxy, const std::string& methodName);
+        MethodInvoker(MethodInvoker&& other) = default;
+        ~MethodInvoker() noexcept(false);
+
         MethodInvoker& onInterface(const std::string& interfaceName);
-        MethodInvoker& onInterface(const char* interfaceName);
         MethodInvoker& withTimeout(uint64_t usec);
         template <typename _Rep, typename _Period>
         MethodInvoker& withTimeout(const std::chrono::duration<_Rep, _Period>& timeout);
         template <typename... _Args> MethodInvoker& withArguments(_Args&&... args);
         template <typename... _Args> void storeResultsTo(_Args&... args);
+
         void dontExpectReply();
 
-        MethodInvoker(MethodInvoker&& other) = default;
-        ~MethodInvoker() noexcept(false);
-
-    private:
-        friend IProxy;
-        MethodInvoker(IProxy& proxy, const MethodName& methodName);
-        MethodInvoker(IProxy& proxy, const char* methodName);
-
     private:
         IProxy& proxy_;
-        const char* methodName_;
+        const std::string& methodName_;
         uint64_t timeout_{};
         MethodCall method_;
         int exceptions_{}; // Number of active exceptions when MethodInvoker is constructed
@@ -123,29 +104,21 @@ namespace sdbus {
     class AsyncMethodInvoker
     {
     public:
-        AsyncMethodInvoker& onInterface(const InterfaceName& interfaceName);
+        AsyncMethodInvoker(IProxy& proxy, const std::string& methodName);
         AsyncMethodInvoker& onInterface(const std::string& interfaceName);
-        AsyncMethodInvoker& onInterface(const char* interfaceName);
         AsyncMethodInvoker& withTimeout(uint64_t usec);
         template <typename _Rep, typename _Period>
         AsyncMethodInvoker& withTimeout(const std::chrono::duration<_Rep, _Period>& timeout);
         template <typename... _Args> AsyncMethodInvoker& withArguments(_Args&&... args);
         template <typename _Function> PendingAsyncCall uponReplyInvoke(_Function&& callback);
-        template <typename _Function> [[nodiscard]] Slot uponReplyInvoke(_Function&& callback, return_slot_t);
         // Returned future will be std::future<void> for no (void) D-Bus method return value
         //                      or std::future<T> for single D-Bus method return value
         //                      or std::future<std::tuple<...>> for multiple method return values
         template <typename... _Args> std::future<future_return_t<_Args...>> getResultAsFuture();
 
-    private:
-        friend IProxy;
-        AsyncMethodInvoker(IProxy& proxy, const MethodName& methodName);
-        AsyncMethodInvoker(IProxy& proxy, const char* methodName);
-        template <typename _Function> async_reply_handler makeAsyncReplyHandler(_Function&& callback);
-
     private:
         IProxy& proxy_;
-        const char* methodName_;
+        const std::string& methodName_;
         uint64_t timeout_{};
         MethodCall method_;
     };
@@ -153,114 +126,83 @@ namespace sdbus {
     class SignalSubscriber
     {
     public:
-        SignalSubscriber& onInterface(const InterfaceName& interfaceName);
-        SignalSubscriber& onInterface(const std::string& interfaceName);
-        SignalSubscriber& onInterface(const char* interfaceName);
+        SignalSubscriber(IProxy& proxy, const std::string& signalName);
+        SignalSubscriber& onInterface(std::string interfaceName);
         template <typename _Function> void call(_Function&& callback);
         template <typename _Function> [[nodiscard]] Slot call(_Function&& callback, return_slot_t);
 
     private:
-        friend IProxy;
-        SignalSubscriber(IProxy& proxy, const SignalName& signalName);
-        SignalSubscriber(IProxy& proxy, const char* signalName);
         template <typename _Function> signal_handler makeSignalHandler(_Function&& callback);
 
     private:
         IProxy& proxy_;
-        const char* signalName_;
-        const char* interfaceName_{};
+        const std::string& signalName_;
+        std::string interfaceName_;
     };
 
     class PropertyGetter
     {
     public:
-        Variant onInterface(std::string_view interfaceName);
-
-    private:
-        friend IProxy;
-        PropertyGetter(IProxy& proxy, std::string_view propertyName);
-
-        static constexpr const char* DBUS_PROPERTIES_INTERFACE_NAME = "org.freedesktop.DBus.Properties";
+        PropertyGetter(IProxy& proxy, const std::string& propertyName);
+        Variant onInterface(const std::string& interfaceName);
 
     private:
         IProxy& proxy_;
-        std::string_view propertyName_;
+        const std::string& propertyName_;
     };
 
     class AsyncPropertyGetter
     {
     public:
-        AsyncPropertyGetter& onInterface(std::string_view interfaceName);
+        AsyncPropertyGetter(IProxy& proxy, const std::string& propertyName);
+        AsyncPropertyGetter& onInterface(const std::string& interfaceName);
         template <typename _Function> PendingAsyncCall uponReplyInvoke(_Function&& callback);
-        template <typename _Function> [[nodiscard]] Slot uponReplyInvoke(_Function&& callback, return_slot_t);
         std::future<Variant> getResultAsFuture();
 
-    private:
-        friend IProxy;
-        AsyncPropertyGetter(IProxy& proxy, std::string_view propertyName);
-
-        static constexpr const char* DBUS_PROPERTIES_INTERFACE_NAME = "org.freedesktop.DBus.Properties";
-
     private:
         IProxy& proxy_;
-        std::string_view propertyName_;
-        std::string_view interfaceName_;
+        const std::string& propertyName_;
+        const std::string* interfaceName_{};
     };
 
     class PropertySetter
     {
     public:
-        PropertySetter& onInterface(std::string_view interfaceName);
+        PropertySetter(IProxy& proxy, const std::string& propertyName);
+        PropertySetter& onInterface(const std::string& interfaceName);
         template <typename _Value> void toValue(const _Value& value);
         template <typename _Value> void toValue(const _Value& value, dont_expect_reply_t);
         void toValue(const Variant& value);
         void toValue(const Variant& value, dont_expect_reply_t);
 
-    private:
-        friend IProxy;
-        PropertySetter(IProxy& proxy, std::string_view propertyName);
-
-        static constexpr const char* DBUS_PROPERTIES_INTERFACE_NAME = "org.freedesktop.DBus.Properties";
-
     private:
         IProxy& proxy_;
-        std::string_view propertyName_;
-        std::string_view interfaceName_;
+        const std::string& propertyName_;
+        const std::string* interfaceName_{};
     };
 
     class AsyncPropertySetter
     {
     public:
-        AsyncPropertySetter& onInterface(std::string_view interfaceName);
+        AsyncPropertySetter(IProxy& proxy, const std::string& propertyName);
+        AsyncPropertySetter& onInterface(const std::string& interfaceName);
         template <typename _Value> AsyncPropertySetter& toValue(_Value&& value);
         AsyncPropertySetter& toValue(Variant value);
         template <typename _Function> PendingAsyncCall uponReplyInvoke(_Function&& callback);
-        template <typename _Function> [[nodiscard]] Slot uponReplyInvoke(_Function&& callback, return_slot_t);
         std::future<void> getResultAsFuture();
 
-    private:
-        friend IProxy;
-        AsyncPropertySetter(IProxy& proxy, std::string_view propertyName);
-
-        static constexpr const char* DBUS_PROPERTIES_INTERFACE_NAME = "org.freedesktop.DBus.Properties";
-
     private:
         IProxy& proxy_;
-        std::string_view propertyName_;
-        std::string_view interfaceName_;
+        const std::string& propertyName_;
+        const std::string* interfaceName_{};
         Variant value_;
     };
 
     class AllPropertiesGetter
     {
     public:
-        std::map<PropertyName, Variant> onInterface(std::string_view interfaceName);
-
-    private:
-        friend IProxy;
         AllPropertiesGetter(IProxy& proxy);
-
-        static constexpr const char* DBUS_PROPERTIES_INTERFACE_NAME = "org.freedesktop.DBus.Properties";
+        std::map<std::string, Variant> onInterface(const std::string& interfaceName);
 
     private:
         IProxy& proxy_;
@@ -269,20 +211,14 @@ namespace sdbus {
     class AsyncAllPropertiesGetter
     {
     public:
-        AsyncAllPropertiesGetter& onInterface(std::string_view interfaceName);
-        template <typename _Function> PendingAsyncCall uponReplyInvoke(_Function&& callback);
-        template <typename _Function> [[nodiscard]] Slot uponReplyInvoke(_Function&& callback, return_slot_t);
-        std::future<std::map<PropertyName, Variant>> getResultAsFuture();
-
-    private:
-        friend IProxy;
         AsyncAllPropertiesGetter(IProxy& proxy);
-
-        static constexpr const char* DBUS_PROPERTIES_INTERFACE_NAME = "org.freedesktop.DBus.Properties";
+        AsyncAllPropertiesGetter& onInterface(const std::string& interfaceName);
+        template <typename _Function> PendingAsyncCall uponReplyInvoke(_Function&& callback);
+        std::future<std::map<std::string, Variant>> getResultAsFuture();
 
     private:
         IProxy& proxy_;
-        std::string_view interfaceName_;
+        const std::string* interfaceName_{};
     };
 
 } // namespace sdbus

include/sdbus-c++/ConvenienceApiClasses.inl

@@ -1,6 +1,6 @@
 /**
  * (C) 2016 - 2021 KISTLER INSTRUMENTE AG, Winterthur, Switzerland
- * (C) 2016 - 2024 Stanislav Angelovic <stanislav.angelovic@protonmail.com>
+ * (C) 2016 - 2022 Stanislav Angelovic <stanislav.angelovic@protonmail.com>
  *
  * @file ConvenienceApiClasses.inl
  *
@@ -27,19 +27,18 @@
 #ifndef SDBUS_CPP_CONVENIENCEAPICLASSES_INL_
 #define SDBUS_CPP_CONVENIENCEAPICLASSES_INL_
 
-#include <sdbus-c++/Error.h>
 #include <sdbus-c++/IObject.h>
 #include <sdbus-c++/IProxy.h>
 #include <sdbus-c++/Message.h>
 #include <sdbus-c++/MethodResult.h>
-#include <sdbus-c++/TypeTraits.h>
 #include <sdbus-c++/Types.h>
-
-#include <cassert>
-#include <exception>
+#include <sdbus-c++/TypeTraits.h>
+#include <sdbus-c++/Error.h>
+#include <type_traits>
 #include <string>
 #include <tuple>
-#include <type_traits>
+#include <exception>
+#include <cassert>
 
 namespace sdbus {
 
@@ -53,36 +52,21 @@ namespace sdbus {
     {
     }
 
-    inline void VTableAdder::forInterface(InterfaceName interfaceName)
+    inline void VTableAdder::forInterface(std::string interfaceName)
     {
         object_.addVTable(std::move(interfaceName), std::move(vtable_));
     }
 
-    inline void VTableAdder::forInterface(std::string interfaceName)
-    {
-        forInterface(InterfaceName{std::move(interfaceName)});
-    }
-
-    [[nodiscard]] inline Slot VTableAdder::forInterface(InterfaceName interfaceName, return_slot_t)
-    {
-        return object_.addVTable(std::move(interfaceName), std::move(vtable_), return_slot);
-    }
-
     [[nodiscard]] inline Slot VTableAdder::forInterface(std::string interfaceName, return_slot_t)
     {
-        return forInterface(InterfaceName{std::move(interfaceName)}, return_slot);
+        return object_.addVTable(std::move(interfaceName), std::move(vtable_), return_slot);
     }
 
     /*** ------------- ***/
     /*** SignalEmitter ***/
     /*** ------------- ***/
 
-    inline SignalEmitter::SignalEmitter(IObject& object, const SignalName& signalName)
-        : SignalEmitter(object, signalName.c_str())
-    {
-    }
-
-    inline SignalEmitter::SignalEmitter(IObject& object, const char* signalName)
+    inline SignalEmitter::SignalEmitter(IObject& object, const std::string& signalName)
         : object_(object)
         , signalName_(signalName)
         , exceptions_(std::uncaught_exceptions())
@@ -107,17 +91,7 @@ namespace sdbus {
         object_.emitSignal(signal_);
     }
 
-    inline SignalEmitter& SignalEmitter::onInterface(const InterfaceName& interfaceName)
-    {
-        return onInterface(interfaceName.c_str());
-    }
-
     inline SignalEmitter& SignalEmitter::onInterface(const std::string& interfaceName)
-    {
-        return onInterface(interfaceName.c_str());
-    }
-
-    inline SignalEmitter& SignalEmitter::onInterface(const char* interfaceName)
     {
         signal_ = object_.createSignal(interfaceName, signalName_);
 
@@ -136,12 +110,7 @@ namespace sdbus {
     /*** MethodInvoker ***/
     /*** ------------- ***/
 
-    inline MethodInvoker::MethodInvoker(IProxy& proxy, const MethodName& methodName)
-        : MethodInvoker(proxy, methodName.c_str())
-    {
-    }
-
-    inline MethodInvoker::MethodInvoker(IProxy& proxy, const char* methodName)
+    inline MethodInvoker::MethodInvoker(IProxy& proxy, const std::string& methodName)
         : proxy_(proxy)
         , methodName_(methodName)
         , exceptions_(std::uncaught_exceptions())
@@ -167,17 +136,7 @@ namespace sdbus {
         proxy_.callMethod(method_, timeout_);
     }
 
-    inline MethodInvoker& MethodInvoker::onInterface(const InterfaceName& interfaceName)
-    {
-        return onInterface(interfaceName.c_str());
-    }
-
     inline MethodInvoker& MethodInvoker::onInterface(const std::string& interfaceName)
-    {
-        return onInterface(interfaceName.c_str());
-    }
-
-    inline MethodInvoker& MethodInvoker::onInterface(const char* interfaceName)
     {
         method_ = proxy_.createMethodCall(interfaceName, methodName_);
 
@@ -230,28 +189,13 @@ namespace sdbus {
     /*** AsyncMethodInvoker ***/
     /*** ------------------ ***/
 
-    inline AsyncMethodInvoker::AsyncMethodInvoker(IProxy& proxy, const MethodName& methodName)
-        : AsyncMethodInvoker(proxy, methodName.c_str())
-    {
-    }
-
-    inline AsyncMethodInvoker::AsyncMethodInvoker(IProxy& proxy, const char* methodName)
+    inline AsyncMethodInvoker::AsyncMethodInvoker(IProxy& proxy, const std::string& methodName)
         : proxy_(proxy)
         , methodName_(methodName)
     {
     }
 
-    inline AsyncMethodInvoker& AsyncMethodInvoker::onInterface(const InterfaceName& interfaceName)
-    {
-        return onInterface(interfaceName.c_str());
-    }
-
     inline AsyncMethodInvoker& AsyncMethodInvoker::onInterface(const std::string& interfaceName)
-    {
-        return onInterface(interfaceName.c_str());
-    }
-
-    inline AsyncMethodInvoker& AsyncMethodInvoker::onInterface(const char* interfaceName)
     {
         method_ = proxy_.createMethodCall(interfaceName, methodName_);
 
@@ -287,31 +231,14 @@ namespace sdbus {
     {
         assert(method_.isValid()); // onInterface() must be placed/called prior to this function
 
-        return proxy_.callMethodAsync(method_, makeAsyncReplyHandler(std::forward<_Function>(callback)), timeout_);
-    }
-
-    template <typename _Function>
-    [[nodiscard]] Slot AsyncMethodInvoker::uponReplyInvoke(_Function&& callback, return_slot_t)
-    {
-        assert(method_.isValid()); // onInterface() must be placed/called prior to this function
-
-        return proxy_.callMethodAsync( method_
-                                     , makeAsyncReplyHandler(std::forward<_Function>(callback))
-                                     , timeout_
-                                     , return_slot );
-    }
-
-    template <typename _Function>
-    inline async_reply_handler AsyncMethodInvoker::makeAsyncReplyHandler(_Function&& callback)
-    {
-        return [callback = std::forward<_Function>(callback)](MethodReply reply, std::optional<Error> error)
+        auto asyncReplyHandler = [callback = std::forward<_Function>(callback)](MethodReply reply, const Error* error)
         {
             // Create a tuple of callback input arguments' types, which will be used
             // as a storage for the argument values deserialized from the message.
             tuple_of_function_input_arg_types_t<_Function> args;
 
             // Deserialize input arguments from the message into the tuple (if no error occurred).
-            if (!error)
+            if (error == nullptr)
             {
                 try
                 {
@@ -321,14 +248,16 @@ namespace sdbus {
                 {
                     // Pass message deserialization exceptions to the client via callback error parameter,
                     // instead of propagating them up the message loop call stack.
-                    sdbus::apply(callback, e, args);
+                    sdbus::apply(callback, &e, args);
                     return;
                 }
             }
 
             // Invoke callback with input arguments from the tuple.
-            sdbus::apply(callback, std::move(error), args);
+            sdbus::apply(callback, error, args);
         };
+
+        return proxy_.callMethod(method_, std::move(asyncReplyHandler), timeout_);
     }
 
     template <typename... _Args>
@@ -337,15 +266,15 @@ namespace sdbus {
         auto promise = std::make_shared<std::promise<future_return_t<_Args...>>>();
         auto future = promise->get_future();
 
-        uponReplyInvoke([promise = std::move(promise)](std::optional<Error> error, _Args... args)
+        uponReplyInvoke([promise = std::move(promise)](const Error* error, _Args... args)
         {
-            if (!error)
+            if (error == nullptr)
                 if constexpr (!std::is_void_v<future_return_t<_Args...>>)
                     promise->set_value({std::move(args)...});
                 else
                     promise->set_value();
             else
-                promise->set_exception(std::make_exception_ptr(*std::move(error)));
+                promise->set_exception(std::make_exception_ptr(*error));
         });
 
         // Will be std::future<void> for no D-Bus method return value
@@ -358,28 +287,13 @@ namespace sdbus {
     /*** SignalSubscriber ***/
     /*** ---------------- ***/
 
-    inline SignalSubscriber::SignalSubscriber(IProxy& proxy, const SignalName& signalName)
-        : SignalSubscriber(proxy, signalName.c_str())
-    {
-    }
-
-    inline SignalSubscriber::SignalSubscriber(IProxy& proxy, const char* signalName)
+    inline SignalSubscriber::SignalSubscriber(IProxy& proxy, const std::string& signalName)
         : proxy_(proxy)
         , signalName_(signalName)
     {
     }
 
-    inline SignalSubscriber& SignalSubscriber::onInterface(const InterfaceName& interfaceName)
-    {
-        return onInterface(interfaceName.c_str());
-    }
-
-    inline SignalSubscriber& SignalSubscriber::onInterface(const std::string& interfaceName)
-    {
-        return onInterface(interfaceName.c_str());
-    }
-
-    inline SignalSubscriber& SignalSubscriber::onInterface(const char* interfaceName)
+    inline SignalSubscriber& SignalSubscriber::onInterface(std::string interfaceName)
     {
         interfaceName_ = std::move(interfaceName);
 
@@ -389,7 +303,7 @@ namespace sdbus {
     template <typename _Function>
     inline void SignalSubscriber::call(_Function&& callback)
     {
-        assert(interfaceName_ != nullptr); // onInterface() must be placed/called prior to this function
+        assert(!interfaceName_.empty()); // onInterface() must be placed/called prior to this function
 
         proxy_.registerSignalHandler( interfaceName_
                                     , signalName_
@@ -399,7 +313,7 @@ namespace sdbus {
     template <typename _Function>
     [[nodiscard]] inline Slot SignalSubscriber::call(_Function&& callback, return_slot_t)
     {
-        assert(interfaceName_ != nullptr); // onInterface() must be placed/called prior to this function
+        assert(!interfaceName_.empty()); // onInterface() must be placed/called prior to this function
 
         return proxy_.registerSignalHandler( interfaceName_
                                            , signalName_
@@ -416,10 +330,10 @@ namespace sdbus {
             // as a storage for the argument values deserialized from the signal message.
             tuple_of_function_input_arg_types_t<_Function> signalArgs;
 
-            // The signal handler can take pure signal parameters only, or an additional `std::optional<Error>` as its first
+            // The signal handler can take pure signal parameters only, or an additional `const Error*` as its first
             // parameter. In the former case, if the deserialization fails (e.g. due to signature mismatch),
             // the failure is ignored (and signal simply dropped). In the latter case, the deserialization failure
-            // will be communicated to the client's signal handler as a valid Error object inside the std::optional parameter.
+            // will be communicated as a non-zero Error pointer to the client's signal handler.
             if constexpr (has_error_param_v<_Function>)
             {
                 // Deserialize input arguments from the signal message into the tuple
@@ -431,12 +345,12 @@ namespace sdbus {
                 {
                     // Pass message deserialization exceptions to the client via callback error parameter,
                     // instead of propagating them up the message loop call stack.
-                    sdbus::apply(callback, e, signalArgs);
+                    sdbus::apply(callback, &e, signalArgs);
                     return;
                 }
 
                 // Invoke callback with no error and input arguments from the tuple.
-                sdbus::apply(callback, {}, signalArgs);
+                sdbus::apply(callback, nullptr, signalArgs);
             }
             else
             {
@@ -453,17 +367,17 @@ namespace sdbus {
     /*** PropertyGetter ***/
     /*** -------------- ***/
 
-    inline PropertyGetter::PropertyGetter(IProxy& proxy, std::string_view propertyName)
+    inline PropertyGetter::PropertyGetter(IProxy& proxy, const std::string& propertyName)
         : proxy_(proxy)
-        , propertyName_(std::move(propertyName))
+        , propertyName_(propertyName)
     {
     }
 
-    inline Variant PropertyGetter::onInterface(std::string_view interfaceName)
+    inline Variant PropertyGetter::onInterface(const std::string& interfaceName)
     {
         Variant var;
         proxy_.callMethod("Get")
-              .onInterface(DBUS_PROPERTIES_INTERFACE_NAME)
+              .onInterface("org.freedesktop.DBus.Properties")
               .withArguments(interfaceName, propertyName_)
               .storeResultsTo(var);
         return var;
@@ -473,15 +387,15 @@ namespace sdbus {
     /*** AsyncPropertyGetter ***/
     /*** ------------------- ***/
 
-    inline AsyncPropertyGetter::AsyncPropertyGetter(IProxy& proxy, std::string_view propertyName)
-        : proxy_(proxy)
-        , propertyName_(std::move(propertyName))
+    inline AsyncPropertyGetter::AsyncPropertyGetter(IProxy& proxy, const std::string& propertyName)
+            : proxy_(proxy)
+            , propertyName_(propertyName)
     {
     }
 
-    inline AsyncPropertyGetter& AsyncPropertyGetter::onInterface(std::string_view interfaceName)
+    inline AsyncPropertyGetter& AsyncPropertyGetter::onInterface(const std::string& interfaceName)
     {
-        interfaceName_ = std::move(interfaceName);
+        interfaceName_ = &interfaceName;
 
         return *this;
     }
@@ -489,38 +403,23 @@ namespace sdbus {
     template <typename _Function>
     PendingAsyncCall AsyncPropertyGetter::uponReplyInvoke(_Function&& callback)
     {
-        static_assert( std::is_invocable_r_v<void, _Function, std::optional<Error>, Variant>
-                     , "Property get callback function must accept std::optional<Error> and property value as Variant" );
+        static_assert(std::is_invocable_r_v<void, _Function, const Error*, Variant>, "Property get callback function must accept Error* and property value as Variant");
 
-        assert(!interfaceName_.empty()); // onInterface() must be placed/called prior to this function
+        assert(interfaceName_ != nullptr); // onInterface() must be placed/called prior to this function
 
-        return proxy_.callMethodAsync("Get")
-                     .onInterface(DBUS_PROPERTIES_INTERFACE_NAME)
-                     .withArguments(interfaceName_, propertyName_)
+        return proxy_.callMethod("Get", async)
+                     .onInterface("org.freedesktop.DBus.Properties")
+                     .withArguments(*interfaceName_, propertyName_)
                      .uponReplyInvoke(std::forward<_Function>(callback));
     }
 
-    template <typename _Function>
-    [[nodiscard]] Slot AsyncPropertyGetter::uponReplyInvoke(_Function&& callback, return_slot_t)
-    {
-        static_assert( std::is_invocable_r_v<void, _Function, std::optional<Error>, Variant>
-                     , "Property get callback function must accept std::optional<Error> and property value as Variant" );
-
-        assert(!interfaceName_.empty()); // onInterface() must be placed/called prior to this function
-
-        return proxy_.callMethodAsync("Get")
-                     .onInterface(DBUS_PROPERTIES_INTERFACE_NAME)
-                     .withArguments(interfaceName_, propertyName_)
-                     .uponReplyInvoke(std::forward<_Function>(callback), return_slot);
-    }
-
     inline std::future<Variant> AsyncPropertyGetter::getResultAsFuture()
     {
-        assert(!interfaceName_.empty()); // onInterface() must be placed/called prior to this function
+        assert(interfaceName_ != nullptr); // onInterface() must be placed/called prior to this function
 
-        return proxy_.callMethodAsync("Get")
-                     .onInterface(DBUS_PROPERTIES_INTERFACE_NAME)
-                     .withArguments(interfaceName_, propertyName_)
+        return proxy_.callMethod("Get", async)
+                     .onInterface("org.freedesktop.DBus.Properties")
+                     .withArguments(*interfaceName_, propertyName_)
                      .getResultAsFuture<Variant>();
     }
 
@@ -528,15 +427,15 @@ namespace sdbus {
     /*** PropertySetter ***/
     /*** -------------- ***/
 
-    inline PropertySetter::PropertySetter(IProxy& proxy, std::string_view propertyName)
+    inline PropertySetter::PropertySetter(IProxy& proxy, const std::string& propertyName)
         : proxy_(proxy)
-        , propertyName_(std::move(propertyName))
+        , propertyName_(propertyName)
     {
     }
 
-    inline PropertySetter& PropertySetter::onInterface(std::string_view interfaceName)
+    inline PropertySetter& PropertySetter::onInterface(const std::string& interfaceName)
     {
-        interfaceName_ = std::move(interfaceName);
+        interfaceName_ = &interfaceName;
 
         return *this;
     }
@@ -555,36 +454,36 @@ namespace sdbus {
 
     inline void PropertySetter::toValue(const Variant& value)
     {
-        assert(!interfaceName_.empty()); // onInterface() must be placed/called prior to this function
+        assert(interfaceName_ != nullptr); // onInterface() must be placed/called prior to this function
 
         proxy_.callMethod("Set")
-              .onInterface(DBUS_PROPERTIES_INTERFACE_NAME)
-              .withArguments(interfaceName_, propertyName_, value);
+              .onInterface("org.freedesktop.DBus.Properties")
+              .withArguments(*interfaceName_, propertyName_, value);
     }
 
     inline void PropertySetter::toValue(const Variant& value, dont_expect_reply_t)
     {
-        assert(!interfaceName_.empty()); // onInterface() must be placed/called prior to this function
+        assert(interfaceName_ != nullptr); // onInterface() must be placed/called prior to this function
 
         proxy_.callMethod("Set")
-              .onInterface(DBUS_PROPERTIES_INTERFACE_NAME)
-              .withArguments(interfaceName_, propertyName_, value)
-              .dontExpectReply();
+                .onInterface("org.freedesktop.DBus.Properties")
+                .withArguments(*interfaceName_, propertyName_, value)
+                .dontExpectReply();
     }
 
     /*** ------------------- ***/
     /*** AsyncPropertySetter ***/
     /*** ------------------- ***/
 
-    inline AsyncPropertySetter::AsyncPropertySetter(IProxy& proxy, std::string_view propertyName)
-        : proxy_(proxy)
-        , propertyName_(propertyName)
+    inline AsyncPropertySetter::AsyncPropertySetter(IProxy& proxy, const std::string& propertyName)
+            : proxy_(proxy)
+            , propertyName_(propertyName)
     {
     }
 
-    inline AsyncPropertySetter& AsyncPropertySetter::onInterface(std::string_view interfaceName)
+    inline AsyncPropertySetter& AsyncPropertySetter::onInterface(const std::string& interfaceName)
     {
-        interfaceName_ = std::move(interfaceName);
+        interfaceName_ = &interfaceName;
 
         return *this;
     }
@@ -605,38 +504,23 @@ namespace sdbus {
     template <typename _Function>
     PendingAsyncCall AsyncPropertySetter::uponReplyInvoke(_Function&& callback)
     {
-        static_assert( std::is_invocable_r_v<void, _Function, std::optional<Error>>
-                     , "Property set callback function must accept std::optional<Error> only" );
+        static_assert(std::is_invocable_r_v<void, _Function, const Error*>, "Property set callback function must accept Error* only");
 
-        assert(!interfaceName_.empty()); // onInterface() must be placed/called prior to this function
+        assert(interfaceName_ != nullptr); // onInterface() must be placed/called prior to this function
 
-        return proxy_.callMethodAsync("Set")
-                     .onInterface(DBUS_PROPERTIES_INTERFACE_NAME)
-                     .withArguments(interfaceName_, propertyName_, std::move(value_))
+        return proxy_.callMethod("Set", async)
+                     .onInterface("org.freedesktop.DBus.Properties")
+                     .withArguments(*interfaceName_, propertyName_, std::move(value_))
                      .uponReplyInvoke(std::forward<_Function>(callback));
     }
 
-    template <typename _Function>
-    [[nodiscard]] Slot AsyncPropertySetter::uponReplyInvoke(_Function&& callback, return_slot_t)
-    {
-        static_assert( std::is_invocable_r_v<void, _Function, std::optional<Error>>
-                     , "Property set callback function must accept std::optional<Error> only" );
-
-        assert(!interfaceName_.empty()); // onInterface() must be placed/called prior to this function
-
-        return proxy_.callMethodAsync("Set")
-                     .onInterface(DBUS_PROPERTIES_INTERFACE_NAME)
-                     .withArguments(interfaceName_, propertyName_, std::move(value_))
-                     .uponReplyInvoke(std::forward<_Function>(callback), return_slot);
-    }
-
     inline std::future<void> AsyncPropertySetter::getResultAsFuture()
     {
-        assert(!interfaceName_.empty()); // onInterface() must be placed/called prior to this function
+        assert(interfaceName_ != nullptr); // onInterface() must be placed/called prior to this function
 
-        return proxy_.callMethodAsync("Set")
-                     .onInterface(DBUS_PROPERTIES_INTERFACE_NAME)
-                     .withArguments(interfaceName_, propertyName_, std::move(value_))
+        return proxy_.callMethod("Set", async)
+                     .onInterface("org.freedesktop.DBus.Properties")
+                     .withArguments(*interfaceName_, propertyName_, std::move(value_))
                      .getResultAsFuture<>();
     }
 
@@ -645,17 +529,17 @@ namespace sdbus {
     /*** ------------------- ***/
 
     inline AllPropertiesGetter::AllPropertiesGetter(IProxy& proxy)
-        : proxy_(proxy)
+            : proxy_(proxy)
     {
     }
 
-    inline std::map<PropertyName, Variant> AllPropertiesGetter::onInterface(std::string_view interfaceName)
+    inline std::map<std::string, Variant> AllPropertiesGetter::onInterface(const std::string& interfaceName)
     {
-        std::map<PropertyName, Variant> props;
+        std::map<std::string, Variant> props;
         proxy_.callMethod("GetAll")
-              .onInterface(DBUS_PROPERTIES_INTERFACE_NAME)
-              .withArguments(std::move(interfaceName))
-              .storeResultsTo(props);
+                .onInterface("org.freedesktop.DBus.Properties")
+                .withArguments(interfaceName)
+                .storeResultsTo(props);
         return props;
     }
 
@@ -668,9 +552,9 @@ namespace sdbus {
     {
     }
 
-    inline AsyncAllPropertiesGetter& AsyncAllPropertiesGetter::onInterface(std::string_view interfaceName)
+    inline AsyncAllPropertiesGetter& AsyncAllPropertiesGetter::onInterface(const std::string& interfaceName)
     {
-        interfaceName_ = std::move(interfaceName);
+        interfaceName_ = &interfaceName;
 
         return *this;
     }
@@ -678,39 +562,25 @@ namespace sdbus {
     template <typename _Function>
     PendingAsyncCall AsyncAllPropertiesGetter::uponReplyInvoke(_Function&& callback)
     {
-        static_assert( std::is_invocable_r_v<void, _Function, std::optional<Error>, std::map<PropertyName, Variant>>
-                     , "All properties get callback function must accept std::optional<Error> and a map of property names to their values" );
+        static_assert( std::is_invocable_r_v<void, _Function, const Error*, std::map<std::string, Variant>>
+                     , "All properties get callback function must accept Error* and a map of property names to their values" );
 
-        assert(!interfaceName_.empty()); // onInterface() must be placed/called prior to this function
+        assert(interfaceName_ != nullptr); // onInterface() must be placed/called prior to this function
 
-        return proxy_.callMethodAsync("GetAll")
-                     .onInterface(DBUS_PROPERTIES_INTERFACE_NAME)
-                     .withArguments(interfaceName_)
+        return proxy_.callMethod("GetAll", async)
+                     .onInterface("org.freedesktop.DBus.Properties")
+                     .withArguments(*interfaceName_)
                      .uponReplyInvoke(std::forward<_Function>(callback));
     }
 
-    template <typename _Function>
-    [[nodiscard]] Slot AsyncAllPropertiesGetter::uponReplyInvoke(_Function&& callback, return_slot_t)
+    inline std::future<std::map<std::string, Variant>> AsyncAllPropertiesGetter::getResultAsFuture()
     {
-        static_assert( std::is_invocable_r_v<void, _Function, std::optional<Error>, std::map<PropertyName, Variant>>
-                     , "All properties get callback function must accept std::optional<Error> and a map of property names to their values" );
+        assert(interfaceName_ != nullptr); // onInterface() must be placed/called prior to this function
 
-        assert(!interfaceName_.empty()); // onInterface() must be placed/called prior to this function
-
-        return proxy_.callMethodAsync("GetAll")
-                     .onInterface(DBUS_PROPERTIES_INTERFACE_NAME)
-                     .withArguments(interfaceName_)
-                     .uponReplyInvoke(std::forward<_Function>(callback), return_slot);
-    }
-
-    inline std::future<std::map<PropertyName, Variant>> AsyncAllPropertiesGetter::getResultAsFuture()
-    {
-        assert(!interfaceName_.empty()); // onInterface() must be placed/called prior to this function
-
-        return proxy_.callMethodAsync("GetAll")
-                     .onInterface(DBUS_PROPERTIES_INTERFACE_NAME)
-                     .withArguments(interfaceName_)
-                     .getResultAsFuture<std::map<PropertyName, Variant>>();
+        return proxy_.callMethod("GetAll", async)
+                     .onInterface("org.freedesktop.DBus.Properties")
+                     .withArguments(*interfaceName_)
+                     .getResultAsFuture<std::map<std::string, Variant>>();
     }
 
 } // namespace sdbus

include/sdbus-c++/Error.h

@@ -1,6 +1,6 @@
 /**
  * (C) 2016 - 2021 KISTLER INSTRUMENTE AG, Winterthur, Switzerland
- * (C) 2016 - 2024 Stanislav Angelovic <stanislav.angelovic@protonmail.com>
+ * (C) 2016 - 2022 Stanislav Angelovic <stanislav.angelovic@protonmail.com>
  *
  * @file Error.h
  *
@@ -43,56 +43,41 @@ namespace sdbus {
         : public std::runtime_error
     {
     public:
-        // Strong type representing the D-Bus error name
-        class Name : public std::string
-        {
-        public:
-            Name() = default;
-            explicit Name(std::string value)
-                : std::string(std::move(value))
-            {}
-            explicit Name(const char* value)
-                : std::string(value)
-            {}
-
-            using std::string::operator=;
-        };
-
-        explicit Error(Name name, const char* message = nullptr)
-            : Error(std::move(name), std::string(message ? message : ""))
+        explicit Error(const std::string& name, const char* message = nullptr)
+            : Error(name, std::string(message ? message : ""))
         {
         }
 
-        Error(Name name, std::string message)
+        Error(const std::string& name, const std::string& message)
             : std::runtime_error("[" + name + "] " + message)
-            , name_(std::move(name))
-            , message_(std::move(message))
+            , name_(name)
+            , message_(message)
         {
         }
 
-        [[nodiscard]] const Name& getName() const
+        const std::string& getName() const
         {
             return name_;
         }
 
-        [[nodiscard]] const std::string& getMessage() const
+        const std::string& getMessage() const
         {
             return message_;
         }
 
-        [[nodiscard]] bool isValid() const
+        bool isValid() const
         {
             return !getName().empty();
         }
 
     private:
-        Name name_;
+        std::string name_;
         std::string message_;
     };
 
-    Error createError(int errNo, std::string customMsg);
+    sdbus::Error createError(int errNo, const std::string& customMsg);
 
-    inline const Error::Name SDBUSCPP_ERROR_NAME{"org.sdbuscpp.Error"};
+    inline const char* SDBUSCPP_ERROR_NAME = "org.sdbuscpp.Error";
 }
 
 #define SDBUS_THROW_ERROR(_MSG, _ERRNO)                         \

include/sdbus-c++/Flags.h

@@ -1,6 +1,6 @@
 /**
  * (C) 2016 - 2021 KISTLER INSTRUMENTE AG, Winterthur, Switzerland
- * (C) 2016 - 2024 Stanislav Angelovic <stanislav.angelovic@protonmail.com>
+ * (C) 2016 - 2022 Stanislav Angelovic <stanislav.angelovic@protonmail.com>
  *
  * @file Flags.h
  *
@@ -74,21 +74,21 @@ namespace sdbus {
             flags_.set(flag, value);
         }
 
-        [[nodiscard]] bool test(GeneralFlags flag) const
+        bool test(GeneralFlags flag) const
         {
             return flags_.test(flag);
         }
 
-        [[nodiscard]] bool test(PropertyUpdateBehaviorFlags flag) const
+        bool test(PropertyUpdateBehaviorFlags flag) const
         {
             return flags_.test(flag);
         }
 
-        [[nodiscard]] uint64_t toSdBusInterfaceFlags() const;
-        [[nodiscard]] uint64_t toSdBusMethodFlags() const;
-        [[nodiscard]] uint64_t toSdBusSignalFlags() const;
-        [[nodiscard]] uint64_t toSdBusPropertyFlags() const;
-        [[nodiscard]] uint64_t toSdBusWritablePropertyFlags() const;
+        uint64_t toSdBusInterfaceFlags() const;
+        uint64_t toSdBusMethodFlags() const;
+        uint64_t toSdBusSignalFlags() const;
+        uint64_t toSdBusPropertyFlags() const;
+        uint64_t toSdBusWritablePropertyFlags() const;
 
     private:
         std::bitset<FLAG_COUNT> flags_;

include/sdbus-c++/IConnection.h

@@ -1,6 +1,6 @@
 /**
  * (C) 2016 - 2021 KISTLER INSTRUMENTE AG, Winterthur, Switzerland
- * (C) 2016 - 2024 Stanislav Angelovic <stanislav.angelovic@protonmail.com>
+ * (C) 2016 - 2022 Stanislav Angelovic <stanislav.angelovic@protonmail.com>
  *
  * @file IConnection.h
  *
@@ -28,21 +28,16 @@
 #define SDBUS_CXX_ICONNECTION_H_
 
 #include <sdbus-c++/TypeTraits.h>
-
+#include <string>
+#include <memory>
 #include <chrono>
 #include <cstdint>
-#include <memory>
 #include <optional>
-#include <string>
 
-// Forward declarations
 struct sd_bus;
 struct sd_event;
 namespace sdbus {
-    class Message;
-    class ObjectPath;
-    class BusName;
-    using ServiceName = BusName;
+  class Message;
 }
 
 namespace sdbus {
@@ -64,6 +59,31 @@ namespace sdbus {
 
         virtual ~IConnection() = default;
 
+        /*!
+         * @brief Requests D-Bus name on the connection
+         *
+         * @param[in] name Name to request
+         *
+         * @throws sdbus::Error in case of failure
+         */
+        virtual void requestName(const std::string& name) = 0;
+
+        /*!
+         * @brief Releases D-Bus name on the connection
+         *
+         * @param[in] name Name to release
+         *
+         * @throws sdbus::Error in case of failure
+         */
+        virtual void releaseName(const std::string& name) = 0;
+
+        /*!
+         * @brief Retrieves the unique name of a connection. E.g. ":1.xx"
+         *
+         * @throws sdbus::Error in case of failure
+         */
+        [[nodiscard]] virtual std::string getUniqueName() const = 0;
+
         /*!
          * @brief Enters I/O event loop on this bus connection
          *
@@ -80,7 +100,7 @@ namespace sdbus {
          * The same as enterEventLoop, except that it doesn't block
          * because it runs the loop in a separate, internally managed thread.
          */
-        virtual void enterEventLoopAsync() = 0;
+        virtual void enterEventLoop(async_t) = 0;
 
         /*!
          * @brief Leaves the I/O event loop running on this bus connection
@@ -117,6 +137,23 @@ namespace sdbus {
          */
         virtual sd_event *getSdEventLoop() = 0;
 
+        /*!
+         * @brief Adds an ObjectManager at the specified D-Bus object path
+         *
+         * Creates an ObjectManager interface at the specified object path on
+         * the connection. This is a convenient way to interrogate a connection
+         * to see what objects it has.
+         *
+         * This call creates a floating registration. The ObjectManager will
+         * be there for the object path until the connection is destroyed.
+         *
+         * Another, recommended way to add object managers is directly through
+         * IObject API.
+         *
+         * @throws sdbus::Error in case of failure
+         */
+        [[deprecated("Use one of other addObjectManager overloads")]] virtual void addObjectManager(const std::string& objectPath) = 0;
+
         /*!
          * @brief Returns fd's, I/O events and timeout data to be used in an external event loop
          *
@@ -167,7 +204,7 @@ namespace sdbus {
          *
          * You don't need to directly call this method or getEventLoopPollData() method
          * when using convenient, internal bus connection event loops through
-         * enterEventLoop() or enterEventLoopAsync() calls, or when the bus is
+         * enterEventLoop() or enterEventLoop(async) calls, or when the bus is
          * connected to an sd-event event loop through attachSdEventLoop().
          * It is invoked automatically when necessary.
          *
@@ -223,7 +260,6 @@ namespace sdbus {
 
         /*!
          * @brief Adds an ObjectManager at the specified D-Bus object path
-         * @param[in] objectPath Object path at which the ObjectManager interface shall be installed
          *
          * Creates an ObjectManager interface at the specified object path on
          * the connection. This is a convenient way to interrogate a connection
@@ -232,52 +268,12 @@ namespace sdbus {
          * This call creates a floating registration. The ObjectManager will
          * be there for the object path until the connection is destroyed.
          *
-         * Another, recommended way to add object managers is directly through IObject API.
+         * Another, recommended way to add object managers is directly through
+         * IObject API.
          *
          * @throws sdbus::Error in case of failure
          */
-        virtual void addObjectManager(const ObjectPath& objectPath) = 0;
-
-        /*!
-         * @brief Adds an ObjectManager at the specified D-Bus object path
-         * @param[in] objectPath Object path at which the ObjectManager interface shall be installed
-         * @return Slot handle owning the registration
-         *
-         * Creates an ObjectManager interface at the specified object path on
-         * the connection. This is a convenient way to interrogate a connection
-         * to see what objects it has.
-         *
-         * This call returns an owning slot. The lifetime of the ObjectManager
-         * interface is bound to the lifetime of the returned slot instance.
-         *
-         * Another, recommended way to add object managers is directly through IObject API.
-         *
-         * @throws sdbus::Error in case of failure
-         */
-        [[nodiscard]] virtual Slot addObjectManager(const ObjectPath& objectPath, return_slot_t) = 0;
-
-        /*!
-         * @brief Installs a floating match rule for messages received on this bus connection
-         *
-         * @param[in] match Match expression to filter incoming D-Bus message
-         * @param[in] callback Callback handler to be called upon processing an inbound D-Bus message matching the rule
-         *
-         * The method installs a match rule for messages received on the specified bus connection.
-         * The syntax of the match rule expression passed in match is described in the D-Bus specification.
-         * The specified handler function callback is called for each incoming message matching the specified
-         * expression. The match is installed synchronously when connected to a bus broker, i.e. the call
-         * sends a control message requesting the match to be added to the broker and waits until the broker
-         * confirms the match has been installed successfully.
-         *
-         * The method installs a floating match rule for messages received on the specified bus connection.
-         * Floating means that the bus connection object owns the match rule, i.e. lifetime of the match rule
-         * is bound to the lifetime of the bus connection.
-         *
-         * For more information, consult `man sd_bus_add_match`.
-         *
-         * @throws sdbus::Error in case of failure
-         */
-        virtual void addMatch(const std::string& match, message_handler callback) = 0;
+        virtual void addObjectManager(const std::string& objectPath, floating_slot_t) = 0;
 
         /*!
          * @brief Installs a match rule for messages received on this bus connection
@@ -293,37 +289,31 @@ namespace sdbus {
          * sends a control message requesting the match to be added to the broker and waits until the broker
          * confirms the match has been installed successfully.
          *
-         * The lifetime of the match rule is bound to the lifetime of the returned slot instance. Destroying
-         * the slot instance implies uninstalling of the match rule from the bus connection.
+         * Simply let go of the slot instance to uninstall the match rule from the bus connection. The slot
+         * must not outlive the connection for the slot is associated with it.
          *
          * For more information, consult `man sd_bus_add_match`.
          *
          * @throws sdbus::Error in case of failure
          */
-        [[nodiscard]] virtual Slot addMatch(const std::string& match, message_handler callback, return_slot_t) = 0;
+        [[nodiscard]] virtual Slot addMatch(const std::string& match, message_handler callback) = 0;
 
         /*!
-         * @brief Asynchronously installs a floating match rule for messages received on this bus connection
+         * @brief Installs a floating match rule for messages received on this bus connection
          *
          * @param[in] match Match expression to filter incoming D-Bus message
          * @param[in] callback Callback handler to be called upon processing an inbound D-Bus message matching the rule
-         * @param[in] installCallback Callback handler to be called upon processing an inbound D-Bus message matching the rule
-         *
-         * This method operates the same as `addMatch()` above, just that it installs the match rule asynchronously,
-         * in a non-blocking fashion. A request is sent to the broker, but the call does not wait for a response.
-         * The `installCallback' callable is called when the response is later received, with the response message
-         * from the broker as parameter. If it's an empty function object, a default implementation is used that
-         * terminates the bus connection should installing the match fail.
          *
          * The method installs a floating match rule for messages received on the specified bus connection.
          * Floating means that the bus connection object owns the match rule, i.e. lifetime of the match rule
          * is bound to the lifetime of the bus connection.
          *
-         * For more information, consult `man sd_bus_add_match_async`.
+         * Refer to the @c addMatch(const std::string& match, message_handler callback) documentation for more
+         * information.
          *
          * @throws sdbus::Error in case of failure
          */
-        virtual void addMatchAsync(const std::string& match, message_handler callback, message_handler installCallback) = 0;
+        virtual void addMatch(const std::string& match, message_handler callback, floating_slot_t) = 0;
 
         /*!
          * @brief Asynchronously installs a match rule for messages received on this bus connection
@@ -339,42 +329,60 @@ namespace sdbus {
          * from the broker as parameter. If it's an empty function object, a default implementation is used that
          * terminates the bus connection should installing the match fail.
          *
-         * The lifetime of the match rule is bound to the lifetime of the returned slot instance. Destroying
-         * the slot instance implies the uninstalling of the match rule from the bus connection.
-         *
-         * For more information, consult `man sd_bus_add_match_async`.
+         * Refer to the @c addMatch(const std::string& match, message_handler callback) documentation, and consult
+         * `man sd_bus_add_match`, for more information.
          *
          * @throws sdbus::Error in case of failure
          */
-        [[nodiscard]] virtual Slot addMatchAsync( const std::string& match
-                                                , message_handler callback
-                                                , message_handler installCallback
-                                                , return_slot_t ) = 0;
+        [[nodiscard]] virtual Slot addMatch(const std::string& match, message_handler callback, message_handler installCallback, async_t) = 0;
 
         /*!
-         * @brief Retrieves the unique name of a connection. E.g. ":1.xx"
+         * @brief Asynchronously installs a floating match rule for messages received on this bus connection
+         *
+         * @param[in] match Match expression to filter incoming D-Bus message
+         * @param[in] callback Callback handler to be called upon processing an inbound D-Bus message matching the rule
+         * @param[in] installCallback Callback handler to be called upon processing an inbound D-Bus message matching the rule
+         *
+         * The method installs a floating match rule for messages received on the specified bus connection.
+         * Floating means that the bus connection object owns the match rule, i.e. lifetime of the match rule
+         * is bound to the lifetime of the bus connection.
+         *
+         * Refer to the @c addMatch(const std::string& match, message_handler callback, message_handler installCallback)
+         * documentation for more information.
          *
          * @throws sdbus::Error in case of failure
          */
-        [[nodiscard]] virtual BusName getUniqueName() const = 0;
+        virtual void addMatch(const std::string& match, message_handler callback, message_handler installCallback, async_t, floating_slot_t) = 0;
+
+        // TODO: addMatchAsync with std::future support?
 
         /*!
-         * @brief Requests a well-known D-Bus service name on a bus
+         * @copydoc IConnection::enterEventLoop()
          *
-         * @param[in] name Name to request
-         *
-         * @throws sdbus::Error in case of failure
+         * @deprecated This function has been replaced by enterEventLoop()
          */
-        virtual void requestName(const ServiceName& name) = 0;
+        [[deprecated("This function has been replaced by enterEventLoop()")]] void enterProcessingLoop();
 
         /*!
-         * @brief Releases an acquired well-known D-Bus service name on a bus
+         * @copydoc IConnection::enterEventLoop(sdbus::async_t)
          *
-         * @param[in] name Name to release
-         *
-         * @throws sdbus::Error in case of failure
+         * @deprecated This function has been replaced by enterEventLoop(async_t)
          */
-        virtual void releaseName(const ServiceName& name) = 0;
+        [[deprecated("This function has been replaced by enterEventLoop(async_t)")]] void enterProcessingLoopAsync();
+
+        /*!
+         * @copydoc IConnection::leaveEventLoop()
+         *
+         * @deprecated This function has been replaced by leaveEventLoop()
+         */
+        [[deprecated("This function has been replaced by leaveEventLoop()")]] void leaveProcessingLoop();
+
+        /*!
+         * @copydoc IConnection::getEventLoopPollData()
+         *
+         * @deprecated This function has been replaced by getEventLoopPollData()
+         */
+        [[deprecated("This function has been replaced by getEventLoopPollData()")]] PollData getProcessLoopPollData() const;
 
         /*!
          * @struct PollData
@@ -433,6 +441,45 @@ namespace sdbus {
         return setMethodCallTimeout(microsecs.count());
     }
 
+    inline void IConnection::enterProcessingLoop()
+    {
+        enterEventLoop();
+    }
+
+    inline void IConnection::enterProcessingLoopAsync()
+    {
+        enterEventLoop(async);
+    }
+
+    inline void IConnection::leaveProcessingLoop()
+    {
+        leaveEventLoop();
+    }
+
+    inline IConnection::PollData IConnection::getProcessLoopPollData() const
+    {
+        return getEventLoopPollData();
+    }
+
+    /*!
+     * @brief Creates/opens D-Bus system bus connection
+     *
+     * @return Connection instance
+     *
+     * @throws sdbus::Error in case of failure
+     */
+    [[nodiscard]] std::unique_ptr<sdbus::IConnection> createConnection();
+
+    /*!
+     * @brief Creates/opens D-Bus system bus connection with a name
+     *
+     * @param[in] name Name to request on the connection after its opening
+     * @return Connection instance
+     *
+     * @throws sdbus::Error in case of failure
+     */
+    [[nodiscard]] std::unique_ptr<sdbus::IConnection> createConnection(const std::string& name);
+
     /*!
      * @brief Creates/opens D-Bus session bus connection when in a user context, and a system bus connection, otherwise.
      *
@@ -440,7 +487,7 @@ namespace sdbus {
      *
      * @throws sdbus::Error in case of failure
      */
-    [[nodiscard]] std::unique_ptr<sdbus::IConnection> createBusConnection();
+    [[nodiscard]] std::unique_ptr<sdbus::IConnection> createDefaultBusConnection();
 
     /*!
      * @brief Creates/opens D-Bus session bus connection with a name when in a user context, and a system bus connection with a name, otherwise.
@@ -450,7 +497,7 @@ namespace sdbus {
      *
      * @throws sdbus::Error in case of failure
      */
-    [[nodiscard]] std::unique_ptr<sdbus::IConnection> createBusConnection(const ServiceName& name);
+    [[nodiscard]] std::unique_ptr<sdbus::IConnection> createDefaultBusConnection(const std::string& name);
 
     /*!
      * @brief Creates/opens D-Bus system bus connection
@@ -469,7 +516,7 @@ namespace sdbus {
      *
      * @throws sdbus::Error in case of failure
      */
-    [[nodiscard]] std::unique_ptr<sdbus::IConnection> createSystemBusConnection(const ServiceName& name);
+    [[nodiscard]] std::unique_ptr<sdbus::IConnection> createSystemBusConnection(const std::string& name);
 
     /*!
      * @brief Creates/opens D-Bus session bus connection
@@ -488,7 +535,7 @@ namespace sdbus {
      *
      * @throws sdbus::Error in case of failure
      */
-    [[nodiscard]] std::unique_ptr<sdbus::IConnection> createSessionBusConnection(const ServiceName& name);
+    [[nodiscard]] std::unique_ptr<sdbus::IConnection> createSessionBusConnection(const std::string& name);
 
     /*!
      * @brief Creates/opens D-Bus session bus connection at a custom address

include/sdbus-c++/IObject.h

@@ -1,6 +1,6 @@
 /**
  * (C) 2016 - 2021 KISTLER INSTRUMENTE AG, Winterthur, Switzerland
- * (C) 2016 - 2024 Stanislav Angelovic <stanislav.angelovic@protonmail.com>
+ * (C) 2016 - 2022 Stanislav Angelovic <stanislav.angelovic@protonmail.com>
  *
  * @file IObject.h
  *
@@ -27,21 +27,19 @@
 #ifndef SDBUS_CXX_IOBJECT_H_
 #define SDBUS_CXX_IOBJECT_H_
 
-#include <sdbus-c++/ConvenienceApiClasses.h>
-#include <sdbus-c++/Flags.h>
-#include <sdbus-c++/TypeTraits.h>
 #include <sdbus-c++/VTableItems.h>
-
+#include <sdbus-c++/ConvenienceApiClasses.h>
+#include <sdbus-c++/TypeTraits.h>
+#include <sdbus-c++/Flags.h>
 #include <functional>
-#include <memory>
 #include <string>
+#include <memory>
 #include <vector>
 
 // Forward declarations
 namespace sdbus {
     class Signal;
     class IConnection;
-    class ObjectPath;
 }
 
 namespace sdbus {
@@ -61,67 +59,27 @@ namespace sdbus {
      ***********************************************/
     class IObject
     {
-    public: // High-level, convenience API
+    public:
         virtual ~IObject() = default;
 
         /*!
          * @brief Adds a declaration of methods, properties and signals of the object at a given interface
          *
-         * @param[in] vtable Individual instances of VTable item structures stored in a vector
-         * @return VTableAdder high-level helper class
-         *
-         * This method is used to declare attributes for the object under the given interface.
-         * Parameter `vtable' represents a vtable definition that may contain method declarations
-         * (using MethodVTableItem struct), property declarations (using PropertyVTableItem
-         * struct), signal declarations (using SignalVTableItem struct), or global interface
-         * flags (using InterfaceFlagsVTableItem struct).
-         *
-         * An interface can have any number of vtables attached to it.
-         *
-         * Consult manual pages for the underlying `sd_bus_add_object_vtable` function for more information.
-         *
-         * The method can be called at any time during object's lifetime.
-         *
-         * When called like `addVTable(vtable).forInterface(interface)`, then an internal registration
-         * slot is created for that vtable and its lifetime is tied to the lifetime of the Object instance.
-         * When called like `addVTable(items...).forInterface(interface, sdbus::return_slot)`, then an internal
-         * registration slot is created for the vtable and is returned to the caller. Keeping the slot means
-         * keep the registration "alive". Destroying the slot means that the vtable is not needed anymore,
-         * and the vtable gets removed from the object. This allows for "dynamic" object API where vtables
-         * can be added or removed by the user at runtime.
-         *
-         * The function provides strong exception guarantee. The state of the object remains
-         * unmodified in face of an exception.
-         *
-         * @throws sdbus::Error in case of failure
-         */
-        [[nodiscard]] VTableAdder addVTable(std::vector<VTableItem> vtable);
-
-        /*!
-         * @brief Adds a declaration of methods, properties and signals of the object at a given interface
-         *
+         * @param[in] interfaceName Name of an interface the the vtable is registered for
          * @param[in] items Individual instances of VTable item structures
-         * @return VTableAdder high-level helper class
          *
          * This method is used to declare attributes for the object under the given interface.
-         * Parameter pack contains vtable definition that may contain method declarations
+         * Parameter `items' represents a vtable definition that may contain method declarations
          * (using MethodVTableItem struct), property declarations (using PropertyVTableItem
          * struct), signal declarations (using SignalVTableItem struct), or global interface
          * flags (using InterfaceFlagsVTableItem struct).
          *
          * An interface can have any number of vtables attached to it.
          *
-         * Consult manual pages for the underlying `sd_bus_add_object_vtable` function for more information.
+         * Consult manual pages for underlying `sd_bus_add_object_vtable` function for more information.
          *
-         * The method can be called at any time during object's lifetime.
-         *
-         * When called like `addVTable(items...).forInterface(interface)`, then an internal registration
-         * slot is created for that vtable and its lifetime is tied to the lifetime of the Object instance.
-         * When called like `addVTable(items...).forInterface(interface, sdbus::return_slot)`, then an internal
-         * registration slot is created for the vtable and is returned to the caller. Keeping the slot means
-         * keep the registration "alive". Destroying the slot means that the vtable is not needed anymore,
-         * and the vtable gets removed from the object. This allows for "dynamic" object API where vtables
-         * can be added or removed by the user at runtime.
+         * The method can be called at any time during object's lifetime. For each vtable an internal
+         * match slot is created and its lifetime is tied to the lifetime of the Object instance.
          *
          * The function provides strong exception guarantee. The state of the object remains
          * unmodified in face of an exception.
@@ -130,39 +88,117 @@ namespace sdbus {
          */
         template < typename... VTableItems
                  , typename = std::enable_if_t<(is_one_of_variants_types<VTableItem, std::decay_t<VTableItems>> && ...)> >
-        [[nodiscard]] VTableAdder addVTable(VTableItems&&... items);
+        void addVTable(std::string interfaceName, VTableItems&&... items);
 
         /*!
-         * @brief Emits signal on D-Bus
+         * @brief Adds a declaration of methods, properties and signals of the object at a given interface
          *
-         * @param[in] signalName Name of the signal
-         * @return A helper object for convenient emission of signals
+         * @param[in] interfaceName Name of an interface the the vtable is registered for
+         * @param[in] vtable A list of individual descriptions in the form of VTable item instances
          *
-         * This is a high-level, convenience way of emitting D-Bus signals that abstracts
-         * from the D-Bus message concept. Signal arguments are automatically serialized
-         * in a message and D-Bus signatures automatically deduced from the provided native arguments.
+         * This method is used to declare attributes for the object under the given interface.
+         * The `vtable' parameter may contain method declarations (using MethodVTableItem struct),
+         * property declarations (using PropertyVTableItem struct), signal declarations (using
+         * SignalVTableItem struct), or global interface flags (using InterfaceFlagsVTableItem struct).
          *
-         * Example of use:
-         * @code
-         * int arg1 = ...;
-         * double arg2 = ...;
-         * SignalName fooSignal{"fooSignal"};
-         * object_.emitSignal(fooSignal).onInterface("com.kistler.foo").withArguments(arg1, arg2);
-         * @endcode
+         * An interface can have any number of vtables attached to it.
+         *
+         * Consult manual pages for underlying `sd_bus_add_object_vtable` function for more information.
+         *
+         * The method can be called at any time during object's lifetime. For each vtable an internal
+         * match slot is created and its lifetime is tied to the lifetime of the Object instance.
+         *
+         * The function provides strong exception guarantee. The state of the object remains
+         * unmodified in face of an exception.
          *
          * @throws sdbus::Error in case of failure
          */
-        [[nodiscard]] SignalEmitter emitSignal(const SignalName& signalName);
+        virtual void addVTable(std::string interfaceName, std::vector<VTableItem> vtable) = 0;
 
         /*!
-         * @copydoc IObject::emitSignal(const SignalName&)
+         * @brief Adds a declaration of methods, properties and signals of the object at a given interface
+         *
+         * @param[in] interfaceName Name of an interface the the vtable is registered for
+         * @param[in] vtable A list of individual descriptions in the form of VTable item instances
+         *
+         * This method is used to declare attributes for the object under the given interface.
+         * The `vtable' parameter may contain method declarations (using MethodVTableItem struct),
+         * property declarations (using PropertyVTableItem struct), signal declarations (using
+         * SignalVTableItem struct), or global interface flags (using InterfaceFlagsVTableItem struct).
+         *
+         * An interface can have any number of vtables attached to it.
+         *
+         * Consult manual pages for underlying `sd_bus_add_object_vtable` function for more information.
+         *
+         * The method can be called at any time during object's lifetime. For each vtable an internal
+         * match slot is created and is returned to the caller. The returned slot should be destroyed
+         * when the vtable is not needed anymore. This allows for "dynamic" object API where vtables
+         * can be added or removed by the user at runtime.
+         *
+         * The function provides strong exception guarantee. The state of the object remains
+         * unmodified in face of an exception.
+         *
+         * @throws sdbus::Error in case of failure
          */
-        [[nodiscard]] SignalEmitter emitSignal(const std::string& signalName);
+        [[nodiscard]] virtual Slot addVTable(std::string interfaceName, std::vector<VTableItem> vtable, return_slot_t) = 0;
 
         /*!
-         * @copydoc IObject::emitSignal(const SignalName&)
+         * @brief A little more convenient overload of addVTable() above
+         *
+         * This version allows method chaining for a little safer and more readable VTable registration.
+         *
+         * See addVTable() overloads above for detailed documentation.
          */
-        [[nodiscard]] SignalEmitter emitSignal(const char* signalName);
+        template < typename... VTableItems
+                 , typename = std::enable_if_t<(is_one_of_variants_types<VTableItem, std::decay_t<VTableItems>> && ...)> >
+        [[nodiscard]] VTableAdder addVTable(VTableItems&&... items);
+
+        /*!
+         * @brief A little more convenient overload of addVTable() above
+         *
+         * This version allows method chaining for a little safer and more readable VTable registration.
+         *
+         * See addVTable() overloads above for detailed documentation.
+         */
+        [[nodiscard]] VTableAdder addVTable(std::vector<VTableItem> vtable);
+
+        /*!
+         * @brief Unregisters object's API and removes object from the bus
+         *
+         * This method unregisters the object, its interfaces, methods, signals and properties
+         * from the bus. Unregistration is done automatically also in object's destructor. This
+         * method makes sense if, in the process of object removal, we need to make sure that
+         * callbacks are unregistered explicitly before the final destruction of the object instance.
+         *
+         * @throws sdbus::Error in case of failure
+         */
+        virtual void unregister() = 0;
+
+        /*!
+         * @brief Creates a signal message
+         *
+         * @param[in] interfaceName Name of an interface that the signal belongs under
+         * @param[in] signalName Name of the signal
+         * @return A signal message
+         *
+         * Serialize signal arguments into the returned message and emit the signal by passing
+         * the message with serialized arguments to the @c emitSignal function.
+         * Alternatively, use higher-level API @c emitSignal(const std::string& signalName) defined below.
+         *
+         * @throws sdbus::Error in case of failure
+         */
+        [[nodiscard]] virtual Signal createSignal(const std::string& interfaceName, const std::string& signalName) = 0;
+
+        /*!
+         * @brief Emits signal for this object path
+         *
+         * @param[in] message Signal message to be sent out
+         *
+         * Note: To avoid messing with messages, use higher-level API defined below.
+         *
+         * @throws sdbus::Error in case of failure
+         */
+        virtual void emitSignal(const sdbus::Signal& message) = 0;
 
         /*!
          * @brief Emits PropertyChanged signal for specified properties under a given interface of this object path
@@ -172,12 +208,7 @@ namespace sdbus {
          *
          * @throws sdbus::Error in case of failure
          */
-        virtual void emitPropertiesChangedSignal(const InterfaceName& interfaceName, const std::vector<PropertyName>& propNames) = 0;
-
-        /*!
-         * @copydoc IObject::emitPropertiesChangedSignal(const InterfaceName&,const std::vector<PropertyName>&)
-         */
-        virtual void emitPropertiesChangedSignal(const char* interfaceName, const std::vector<PropertyName>& propNames) = 0;
+        virtual void emitPropertiesChangedSignal(const std::string& interfaceName, const std::vector<std::string>& propNames) = 0;
 
         /*!
          * @brief Emits PropertyChanged signal for all properties on a given interface of this object path
@@ -186,12 +217,7 @@ namespace sdbus {
          *
          * @throws sdbus::Error in case of failure
          */
-        virtual void emitPropertiesChangedSignal(const InterfaceName& interfaceName) = 0;
-
-        /*!
-         * @copydoc IObject::emitPropertiesChangedSignal(const InterfaceName&)
-         */
-        virtual void emitPropertiesChangedSignal(const char* interfaceName) = 0;
+        virtual void emitPropertiesChangedSignal(const std::string& interfaceName) = 0;
 
         /*!
          * @brief Emits InterfacesAdded signal on this object path
@@ -216,7 +242,7 @@ namespace sdbus {
          *
          * @throws sdbus::Error in case of failure
          */
-        virtual void emitInterfacesAddedSignal(const std::vector<InterfaceName>& interfaces) = 0;
+        virtual void emitInterfacesAddedSignal(const std::vector<std::string>& interfaces) = 0;
 
         /*!
          * @brief Emits InterfacesRemoved signal on this object path
@@ -238,7 +264,7 @@ namespace sdbus {
          *
          * @throws sdbus::Error in case of failure
          */
-        virtual void emitInterfacesRemovedSignal(const std::vector<InterfaceName>& interfaces) = 0;
+        virtual void emitInterfacesRemovedSignal(const std::vector<std::string>& interfaces) = 0;
 
         /*!
          * @brief Adds an ObjectManager interface at the path of this D-Bus object
@@ -247,28 +273,22 @@ namespace sdbus {
          * the connection. This is a convenient way to interrogate a connection
          * to see what objects it has.
          *
-         * This call creates a so-called floating registration. This means that
-         * the ObjectManager interface stays there for the lifetime of the object.
-         *
          * @throws sdbus::Error in case of failure
          */
         virtual void addObjectManager() = 0;
 
         /*!
-         * @brief Adds an ObjectManager interface at the path of this D-Bus object
-         *
-         * @return Slot handle owning the registration
-         *
-         * Creates an ObjectManager interface at the specified object path on
-         * the connection. This is a convenient way to interrogate a connection
-         * to see what objects it has.
-         *
-         * The lifetime of the ObjectManager interface is bound to the lifetime
-         * of the returned slot instance.
+         * @brief Removes an ObjectManager interface from the path of this D-Bus object
          *
          * @throws sdbus::Error in case of failure
          */
-        [[nodiscard]] virtual Slot addObjectManager(return_slot_t) = 0;
+        virtual void removeObjectManager() = 0;
+
+        /*!
+         * @brief Tests whether ObjectManager interface is added at the path of this D-Bus object
+         * @return True if ObjectManager interface is there, false otherwise
+         */
+        [[nodiscard]] virtual bool hasObjectManager() const = 0;
 
         /*!
          * @brief Provides D-Bus connection used by the object
@@ -277,10 +297,31 @@ namespace sdbus {
          */
         [[nodiscard]] virtual sdbus::IConnection& getConnection() const = 0;
 
+        /*!
+         * @brief Emits signal on D-Bus
+         *
+         * @param[in] signalName Name of the signal
+         * @return A helper object for convenient emission of signals
+         *
+         * This is a high-level, convenience way of emitting D-Bus signals that abstracts
+         * from the D-Bus message concept. Signal arguments are automatically serialized
+         * in a message and D-Bus signatures automatically deduced from the provided native arguments.
+         *
+         * Example of use:
+         * @code
+         * int arg1 = ...;
+         * double arg2 = ...;
+         * object_.emitSignal("fooSignal").onInterface("com.kistler.foo").withArguments(arg1, arg2);
+         * @endcode
+         *
+         * @throws sdbus::Error in case of failure
+         */
+        [[nodiscard]] SignalEmitter emitSignal(const std::string& signalName);
+
         /*!
          * @brief Returns object path of the underlying DBus object
          */
-        [[nodiscard]] virtual const ObjectPath& getObjectPath() const = 0;
+        [[nodiscard]] virtual const std::string& getObjectPath() const = 0;
 
         /*!
          * @brief Provides access to the currently processed D-Bus message
@@ -296,151 +337,17 @@ namespace sdbus {
          * @return Currently processed D-Bus message
          */
         [[nodiscard]] virtual Message getCurrentlyProcessedMessage() const = 0;
-
-        /*!
-         * @brief Unregisters object's API and removes object from the bus
-         *
-         * This method unregisters the object, its interfaces, methods, signals and properties
-         * from the bus. Unregistration is done automatically also in object's destructor. This
-         * method makes sense if, in the process of object removal, we need to make sure that
-         * callbacks are unregistered explicitly before the final destruction of the object instance.
-         *
-         * @throws sdbus::Error in case of failure
-         */
-        virtual void unregister() = 0;
-
-    public: // Lower-level, message-based API
-        /*!
-         * @brief Adds a declaration of methods, properties and signals of the object at a given interface
-         *
-         * @param[in] interfaceName Name of an interface the the vtable is registered for
-         * @param[in] items Individual instances of VTable item structures
-         *
-         * This method is used to declare attributes for the object under the given interface.
-         * Parameter `items' represents a vtable definition that may contain method declarations
-         * (using MethodVTableItem struct), property declarations (using PropertyVTableItem
-         * struct), signal declarations (using SignalVTableItem struct), or global interface
-         * flags (using InterfaceFlagsVTableItem struct).
-         *
-         * An interface can have any number of vtables attached to it.
-         *
-         * Consult manual pages for the underlying `sd_bus_add_object_vtable` function for more information.
-         *
-         * The method can be called at any time during object's lifetime. For each vtable an internal
-         * registration slot is created and its lifetime is tied to the lifetime of the Object instance.
-         *
-         * The function provides strong exception guarantee. The state of the object remains
-         * unmodified in face of an exception.
-         *
-         * @throws sdbus::Error in case of failure
-         */
-        template < typename... VTableItems
-                 , typename = std::enable_if_t<(is_one_of_variants_types<VTableItem, std::decay_t<VTableItems>> && ...)> >
-        void addVTable(InterfaceName interfaceName, VTableItems&&... items);
-
-        /*!
-         * @brief Adds a declaration of methods, properties and signals of the object at a given interface
-         *
-         * @param[in] interfaceName Name of an interface the the vtable is registered for
-         * @param[in] vtable A list of individual descriptions in the form of VTable item instances
-         *
-         * This method is used to declare attributes for the object under the given interface.
-         * The `vtable' parameter may contain method declarations (using MethodVTableItem struct),
-         * property declarations (using PropertyVTableItem struct), signal declarations (using
-         * SignalVTableItem struct), or global interface flags (using InterfaceFlagsVTableItem struct).
-         *
-         * An interface can have any number of vtables attached to it.
-         *
-         * Consult manual pages for the underlying `sd_bus_add_object_vtable` function for more information.
-         *
-         * The method can be called at any time during object's lifetime. For each vtable an internal
-         * registration slot is created and its lifetime is tied to the lifetime of the Object instance.
-         *
-         * The function provides strong exception guarantee. The state of the object remains
-         * unmodified in face of an exception.
-         *
-         * @throws sdbus::Error in case of failure
-         */
-        virtual void addVTable(InterfaceName interfaceName, std::vector<VTableItem> vtable) = 0;
-
-        /*!
-         * @brief Adds a declaration of methods, properties and signals of the object at a given interface
-         *
-         * @param[in] interfaceName Name of an interface the the vtable is registered for
-         * @param[in] vtable A list of individual descriptions in the form of VTable item instances
-         *
-         * This method is used to declare attributes for the object under the given interface.
-         * The `vtable' parameter may contain method declarations (using MethodVTableItem struct),
-         * property declarations (using PropertyVTableItem struct), signal declarations (using
-         * SignalVTableItem struct), or global interface flags (using InterfaceFlagsVTableItem struct).
-         *
-         * An interface can have any number of vtables attached to it.
-         *
-         * Consult manual pages for the underlying `sd_bus_add_object_vtable` function for more information.
-         *
-         * The method can be called at any time during object's lifetime. For each vtable an internal
-         * registration slot is created and is returned to the caller. The returned slot should be destroyed
-         * when the vtable is not needed anymore. This allows for "dynamic" object API where vtables
-         * can be added or removed by the user at runtime.
-         *
-         * The function provides strong exception guarantee. The state of the object remains
-         * unmodified in face of an exception.
-         *
-         * @throws sdbus::Error in case of failure
-         */
-        [[nodiscard]] virtual Slot addVTable(InterfaceName interfaceName, std::vector<VTableItem> vtable, return_slot_t) = 0;
-
-        /*!
-         * @brief Creates a signal message
-         *
-         * @param[in] interfaceName Name of an interface that the signal belongs under
-         * @param[in] signalName Name of the signal
-         * @return A signal message
-         *
-         * Serialize signal arguments into the returned message and emit the signal by passing
-         * the message with serialized arguments to the @c emitSignal function.
-         * Alternatively, use higher-level API @c emitSignal(const std::string& signalName) defined below.
-         *
-         * @throws sdbus::Error in case of failure
-         */
-        [[nodiscard]] virtual Signal createSignal(const InterfaceName& interfaceName, const SignalName& signalName) const = 0;
-
-        /*!
-         * @brief Emits signal for this object path
-         *
-         * @param[in] message Signal message to be sent out
-         *
-         * Note: To avoid messing with messages, use higher-level API defined below.
-         *
-         * @throws sdbus::Error in case of failure
-         */
-        virtual void emitSignal(const sdbus::Signal& message) = 0;
-
-    protected: // Internal API for efficiency reasons used by high-level API helper classes
-        friend SignalEmitter;
-
-        [[nodiscard]] virtual Signal createSignal(const char* interfaceName, const char* signalName) const = 0;
     };
 
     // Out-of-line member definitions
 
-    inline SignalEmitter IObject::emitSignal(const SignalName& signalName)
-    {
-        return SignalEmitter(*this, signalName);
-    }
-
     inline SignalEmitter IObject::emitSignal(const std::string& signalName)
-    {
-        return SignalEmitter(*this, signalName.c_str());
-    }
-
-    inline SignalEmitter IObject::emitSignal(const char* signalName)
     {
         return SignalEmitter(*this, signalName);
     }
 
     template <typename... VTableItems, typename>
-    void IObject::addVTable(InterfaceName interfaceName, VTableItems&&... items)
+    void IObject::addVTable(std::string interfaceName, VTableItems&&... items)
     {
         addVTable(std::move(interfaceName), {std::forward<VTableItems>(items)...});
     }
@@ -474,11 +381,11 @@ namespace sdbus {
      * auto proxy = sdbus::createObject(connection, "/com/kistler/foo");
      * @endcode
      */
-    [[nodiscard]] std::unique_ptr<sdbus::IObject> createObject(sdbus::IConnection& connection, ObjectPath objectPath);
+    [[nodiscard]] std::unique_ptr<sdbus::IObject> createObject(sdbus::IConnection& connection, std::string objectPath);
 
 }
 
-#include <sdbus-c++/ConvenienceApiClasses.inl>
 #include <sdbus-c++/VTableItems.inl>
+#include <sdbus-c++/ConvenienceApiClasses.inl>
 
 #endif /* SDBUS_CXX_IOBJECT_H_ */

include/sdbus-c++/IProxy.h

@@ -1,6 +1,6 @@
 /**
  * (C) 2016 - 2021 KISTLER INSTRUMENTE AG, Winterthur, Switzerland
- * (C) 2016 - 2024 Stanislav Angelovic <stanislav.angelovic@protonmail.com>
+ * (C) 2016 - 2022 Stanislav Angelovic <stanislav.angelovic@protonmail.com>
  *
  * @file IProxy.h
  *
@@ -29,20 +29,17 @@
 
 #include <sdbus-c++/ConvenienceApiClasses.h>
 #include <sdbus-c++/TypeTraits.h>
-
-#include <chrono>
-#include <functional>
-#include <future>
-#include <memory>
 #include <string>
-#include <string_view>
+#include <memory>
+#include <functional>
+#include <chrono>
+#include <future>
 
 // Forward declarations
 namespace sdbus {
     class MethodCall;
     class MethodReply;
     class IConnection;
-    class ObjectPath;
     class PendingAsyncCall;
     namespace internal {
         class Proxy;
@@ -67,9 +64,179 @@ namespace sdbus {
      ***********************************************/
     class IProxy
     {
-    public: // High-level, convenience API
+    public:
         virtual ~IProxy() = default;
 
+        /*!
+         * @brief Creates a method call message
+         *
+         * @param[in] interfaceName Name of an interface that provides a given method
+         * @param[in] methodName Name of the method
+         * @return A method call message
+         *
+         * Serialize method arguments into the returned message and invoke the method by passing
+         * the message with serialized arguments to the @c callMethod function.
+         * Alternatively, use higher-level API @c callMethod(const std::string& methodName) defined below.
+         *
+         * @throws sdbus::Error in case of failure
+         */
+        [[nodiscard]] virtual MethodCall createMethodCall(const std::string& interfaceName, const std::string& methodName) = 0;
+
+        /*!
+         * @brief Calls method on the remote D-Bus object
+         *
+         * @param[in] message Message representing a method call
+         * @param[in] timeout Timeout for dbus call in microseconds
+         * @return A method reply message
+         *
+         * The call does not block if the method call has dont-expect-reply flag set. In that case,
+         * the call returns immediately and the return value is an empty, invalid method reply.
+         *
+         * The call blocks otherwise, waiting for the remote peer to send back a reply or an error,
+         * or until the call times out.
+         *
+         * While blocking, other concurrent operations (in other threads) on the underlying bus
+         * connection are stalled until the call returns. This is not an issue in vast majority of
+         * (simple, single-threaded) applications. In asynchronous, multi-threaded designs involving
+         * shared bus connections, this may be an issue. It is advised to instead use an asynchronous
+         * callMethod() function overload, which does not block the bus connection, or do the synchronous
+         * call from another Proxy instance created just before the call and then destroyed (which is
+         * anyway quite a typical approach in D-Bus implementations). Such proxy instance must have
+         * its own bus connection. So-called light-weight proxies (ones created with `dont_run_event_loop_thread`
+         * tag are designed for exactly that purpose.
+         *
+         * Note: To avoid messing with messages, use API on a higher level of abstraction defined below.
+         *
+         * @throws sdbus::Error in case of failure (also in case the remote function returned an error)
+         */
+        virtual MethodReply callMethod(const MethodCall& message, uint64_t timeout = 0) = 0;
+
+        /*!
+         * @copydoc IProxy::callMethod(const MethodCall&,uint64_t)
+         */
+        template <typename _Rep, typename _Period>
+        MethodReply callMethod(const MethodCall& message, const std::chrono::duration<_Rep, _Period>& timeout);
+
+        /*!
+         * @brief Calls method on the D-Bus object asynchronously
+         *
+         * @param[in] message Message representing an async method call
+         * @param[in] asyncReplyCallback Handler for the async reply
+         * @param[in] timeout Timeout for dbus call in microseconds
+         * @return Cookie for the the pending asynchronous call
+         *
+         * This is a callback-based way of asynchronously calling a remote D-Bus method.
+         *
+         * The call itself is non-blocking. It doesn't wait for the reply. Once the reply arrives,
+         * the provided async reply handler will get invoked from the context of the bus
+         * connection I/O event loop thread.
+         *
+         * Note: To avoid messing with messages, use API on a higher level of abstraction defined below.
+         *
+         * @throws sdbus::Error in case of failure
+         */
+        virtual PendingAsyncCall callMethod(const MethodCall& message, async_reply_handler asyncReplyCallback, uint64_t timeout = 0) = 0;
+
+        /*!
+         * @copydoc IProxy::callMethod(const MethodCall&,async_reply_handler,uint64_t)
+         */
+        template <typename _Rep, typename _Period>
+        PendingAsyncCall callMethod(const MethodCall& message, async_reply_handler asyncReplyCallback, const std::chrono::duration<_Rep, _Period>& timeout);
+
+        /*!
+         * @brief Calls method on the D-Bus object asynchronously
+         *
+         * @param[in] message Message representing an async method call
+         * @param[in] Tag denoting a std::future-based overload
+         * @return Future object providing access to the future method reply message
+         *
+         * This is a std::future-based way of asynchronously calling a remote D-Bus method.
+         *
+         * The call itself is non-blocking. It doesn't wait for the reply. Once the reply arrives,
+         * the provided future object will be set to contain the reply (or sdbus::Error
+         * in case the remote method threw an exception).
+         *
+         * Note: To avoid messing with messages, use higher-level API defined below.
+         *
+         * @throws sdbus::Error in case of failure
+         */
+        virtual std::future<MethodReply> callMethod(const MethodCall& message, with_future_t) = 0;
+
+        /*!
+         * @brief Calls method on the D-Bus object asynchronously, with custom timeout
+         *
+         * @param[in] message Message representing an async method call
+         * @param[in] timeout Method call timeout
+         * @param[in] Tag denoting a std::future-based overload
+         * @return Future object providing access to the future method reply message
+         *
+         * This is a std::future-based way of asynchronously calling a remote D-Bus method.
+         *
+         * The call itself is non-blocking. It doesn't wait for the reply. Once the reply arrives,
+         * the provided future object will be set to contain the reply (or sdbus::Error
+         * in case the remote method threw an exception, or the call timed out).
+         *
+         * Note: To avoid messing with messages, use higher-level API defined below.
+         *
+         * @throws sdbus::Error in case of failure
+         */
+        virtual std::future<MethodReply> callMethod(const MethodCall& message, uint64_t timeout, with_future_t) = 0;
+
+        /*!
+         * @copydoc IProxy::callMethod(const MethodCall&,uint64_t,with_future_t)
+         */
+        template <typename _Rep, typename _Period>
+        std::future<MethodReply> callMethod( const MethodCall& message
+                                           , const std::chrono::duration<_Rep, _Period>& timeout
+                                           , with_future_t );
+
+        /*!
+         * @brief Registers a handler for the desired signal emitted by the D-Bus object
+         *
+         * @param[in] interfaceName Name of an interface that the signal belongs to
+         * @param[in] signalName Name of the signal
+         * @param[in] signalHandler Callback that implements the body of the signal handler
+         *
+         * A signal can be subscribed to and unsubscribed from at any time during proxy
+         * lifetime. The subscription is active immediately after the call.
+         *
+         * @throws sdbus::Error in case of failure
+         */
+        virtual void registerSignalHandler( const std::string& interfaceName
+                                          , const std::string& signalName
+                                          , signal_handler signalHandler ) = 0;
+
+        /*!
+         * @brief Registers a handler for the desired signal emitted by the D-Bus object
+         *
+         * @param[in] interfaceName Name of an interface that the signal belongs to
+         * @param[in] signalName Name of the signal
+         * @param[in] signalHandler Callback that implements the body of the signal handler
+         *
+         * @return RAII-style slot handle representing the ownership of the subscription
+         *
+         * A signal can be subscribed to and unsubscribed from at any time during proxy
+         * lifetime. The subscription is active immediately after the call. The subscription
+         * is unregistered when the client destroys the returned slot object.
+         *
+         * @throws sdbus::Error in case of failure
+         */
+        [[nodiscard]] virtual Slot registerSignalHandler( const std::string& interfaceName
+                                                        , const std::string& signalName
+                                                        , signal_handler signalHandler
+                                                        , return_slot_t ) = 0;
+
+        /*!
+         * @brief Unregisters proxy's signal handlers and stops receiving replies to pending async calls
+         *
+         * Unregistration is done automatically also in proxy's destructor. This method makes
+         * sense if, in the process of proxy removal, we need to make sure that callbacks
+         * are unregistered explicitly before the final destruction of the proxy instance.
+         *
+         * @throws sdbus::Error in case of failure
+         */
+        virtual void unregister() = 0;
+
         /*!
          * @brief Calls method on the D-Bus object
          *
@@ -84,24 +251,13 @@ namespace sdbus {
          * Example of use:
          * @code
          * int result, a = ..., b = ...;
-         * MethodName multiply{"multiply"};
-         * object_.callMethod(multiply).onInterface(INTERFACE_NAME).withArguments(a, b).storeResultsTo(result);
+         * object_.callMethod("multiply").onInterface(INTERFACE_NAME).withArguments(a, b).storeResultsTo(result);
          * @endcode
          *
          * @throws sdbus::Error in case of failure
          */
-        [[nodiscard]] MethodInvoker callMethod(const MethodName& methodName);
-
-        /*!
-         * @copydoc IProxy::callMethod(const MethodName&)
-         */
         [[nodiscard]] MethodInvoker callMethod(const std::string& methodName);
 
-        /*!
-         * @copydoc IProxy::callMethod(const MethodName&)
-         */
-        [[nodiscard]] MethodInvoker callMethod(const char* methodName);
-
         /*!
          * @brief Calls method on the D-Bus object asynchronously
          *
@@ -116,26 +272,15 @@ namespace sdbus {
          * Example of use:
          * @code
          * int a = ..., b = ...;
-         * MethodName multiply{"multiply"};
-         * object_.callMethodAsync(multiply).onInterface(INTERFACE_NAME).withArguments(a, b).uponReplyInvoke([](int result)
+         * object_.callMethod("multiply").onInterface(INTERFACE_NAME).withArguments(a, b).uponReplyInvoke([](int result)
          * {
          *     std::cout << "Got result of multiplying " << a << " and " << b << ": " << result << std::endl;
-         * });
+         * }, sdbus::async);
          * @endcode
          *
          * @throws sdbus::Error in case of failure
          */
-        [[nodiscard]] AsyncMethodInvoker callMethodAsync(const MethodName& methodName);
-
-        /*!
-         * @copydoc IProxy::callMethodAsync(const MethodName&)
-         */
-        [[nodiscard]] AsyncMethodInvoker callMethodAsync(const std::string& methodName);
-
-        /*!
-         * @copydoc IProxy::callMethodAsync(const MethodName&)
-         */
-        [[nodiscard]] AsyncMethodInvoker callMethodAsync(const char* methodName);
+        [[nodiscard]] AsyncMethodInvoker callMethod(const std::string& methodName, async_t);
 
         /*!
          * @brief Registers signal handler for a given signal of the D-Bus object
@@ -153,26 +298,13 @@ namespace sdbus {
          *
          * Example of use:
          * @code
-         * object_.uponSignal("stateChanged").onInterface("com.kistler.foo").call([this](int arg1, double arg2){ this->onStateChanged(arg1, arg2); });
-         * sdbus::InterfaceName foo{"com.kistler.foo"};
-         * sdbus::SignalName levelChanged{"levelChanged"};
-         * object_.uponSignal(levelChanged).onInterface(foo).call([this](uint16_t level){ this->onLevelChanged(level); });
+         * object_.uponSignal("fooSignal").onInterface("com.kistler.foo").call([this](int arg1, double arg2){ this->onFooSignal(arg1, arg2); });
          * @endcode
          *
          * @throws sdbus::Error in case of failure
          */
-        [[nodiscard]] SignalSubscriber uponSignal(const SignalName& signalName);
-
-        /*!
-         * @copydoc IProxy::uponSignal(const SignalName&)
-         */
         [[nodiscard]] SignalSubscriber uponSignal(const std::string& signalName);
 
-        /*!
-         * @copydoc IProxy::uponSignal(const SignalName&)
-         */
-        [[nodiscard]] SignalSubscriber uponSignal(const char* signalName);
-
         /*!
          * @brief Gets value of a property of the D-Bus object
          *
@@ -186,19 +318,11 @@ namespace sdbus {
          * Example of use:
          * @code
          * int state = object.getProperty("state").onInterface("com.kistler.foo");
-         * sdbus::InterfaceName foo{"com.kistler.foo"};
-         * sdbus::PropertyName level{"level"};
-         * int level = object.getProperty(level).onInterface(foo);
          * @endcode
          *
          * @throws sdbus::Error in case of failure
          */
-        [[nodiscard]] PropertyGetter getProperty(const PropertyName& propertyName);
-
-        /*!
-         * @copydoc IProxy::getProperty(const PropertyName&)
-         */
-        [[nodiscard]] PropertyGetter getProperty(std::string_view propertyName);
+        [[nodiscard]] PropertyGetter getProperty(const std::string& propertyName);
 
         /*!
          * @brief Gets value of a property of the D-Bus object asynchronously
@@ -211,19 +335,14 @@ namespace sdbus {
          *
          * Example of use:
          * @code
-         * std::future<sdbus::Variant> state = object.getPropertyAsync("state").onInterface("com.kistler.foo").getResultAsFuture();
-         * auto callback = [](std::optional<sdbus::Error> err, const sdbus::Variant& value){ ... };
-         * object.getPropertyAsync("state").onInterface("com.kistler.foo").uponReplyInvoke(std::move(callback));
+         * std::future<sdbus::Variant> state = object.getProperty("state", sdbus::async).onInterface("com.kistler.foo").getResultAsFuture();
+         * auto callback = [](const sdbus::Error* err, const sdbus::Variant& value){ ... };
+         * object.getProperty("state", sdbus::async).onInterface("com.kistler.foo").uponReplyInvoke(std::move(callback));
          * @endcode
          *
          * @throws sdbus::Error in case of failure
          */
-        [[nodiscard]] AsyncPropertyGetter getPropertyAsync(const PropertyName& propertyName);
-
-        /*!
-         * @copydoc IProxy::getPropertyAsync(const PropertyName&)
-         */
-        [[nodiscard]] AsyncPropertyGetter getPropertyAsync(std::string_view propertyName);
+        [[nodiscard]] AsyncPropertyGetter getProperty(const std::string& propertyName, async_t);
 
         /*!
          * @brief Sets value of a property of the D-Bus object
@@ -245,12 +364,7 @@ namespace sdbus {
          *
          * @throws sdbus::Error in case of failure
          */
-        [[nodiscard]] PropertySetter setProperty(const PropertyName& propertyName);
-
-        /*!
-         * @copydoc IProxy::setProperty(const PropertyName&)
-         */
-        [[nodiscard]] PropertySetter setProperty(std::string_view propertyName);
+        [[nodiscard]] PropertySetter setProperty(const std::string& propertyName);
 
         /*!
          * @brief Sets value of a property of the D-Bus object asynchronously
@@ -265,17 +379,12 @@ namespace sdbus {
          * @code
          * int state = ...;
          * // We can wait until the set operation finishes by waiting on the future
-         * std::future<void> res = object_.setPropertyAsync("state").onInterface("com.kistler.foo").toValue(state).getResultAsFuture();
+         * std::future<void> res = object_.setProperty("state", sdbus::async).onInterface("com.kistler.foo").toValue(state).getResultAsFuture();
          * @endcode
          *
          * @throws sdbus::Error in case of failure
          */
-        [[nodiscard]] AsyncPropertySetter setPropertyAsync(const PropertyName& propertyName);
-
-        /*!
-         * @copydoc IProxy::setPropertyAsync(const PropertyName&)
-         */
-        [[nodiscard]] AsyncPropertySetter setPropertyAsync(std::string_view propertyName);
+        [[nodiscard]] AsyncPropertySetter setProperty(const std::string& propertyName, async_t);
 
         /*!
          * @brief Gets values of all properties of the D-Bus object
@@ -304,13 +413,13 @@ namespace sdbus {
          *
          * Example of use:
          * @code
-         * auto callback = [](std::optional<sdbus::Error> err, const std::map<PropertyName, Variant>>& properties){ ... };
-         * auto props = object.getAllPropertiesAsync().onInterface("com.kistler.foo").uponReplyInvoke(std::move(callback));
+         * auto callback = [](const sdbus::Error* err, const std::map<std::string, Variant>>& properties){ ... };
+         * auto props = object.getAllProperties(sdbus::async).onInterface("com.kistler.foo").uponReplyInvoke(std::move(callback));
          * @endcode
          *
          * @throws sdbus::Error in case of failure
          */
-        [[nodiscard]] AsyncAllPropertiesGetter getAllPropertiesAsync();
+        [[nodiscard]] AsyncAllPropertiesGetter getAllProperties(async_t);
 
         /*!
          * @brief Provides D-Bus connection used by the proxy
@@ -322,7 +431,7 @@ namespace sdbus {
         /*!
          * @brief Returns object path of the underlying DBus object
          */
-        [[nodiscard]] virtual const ObjectPath& getObjectPath() const = 0;
+        [[nodiscard]] virtual const std::string& getObjectPath() const = 0;
 
         /*!
          * @brief Provides access to the currently processed D-Bus message
@@ -338,328 +447,6 @@ namespace sdbus {
          * @return Currently processed D-Bus message
          */
         [[nodiscard]] virtual Message getCurrentlyProcessedMessage() const = 0;
-
-        /*!
-         * @brief Unregisters proxy's signal handlers and stops receiving replies to pending async calls
-         *
-         * Unregistration is done automatically also in proxy's destructor. This method makes
-         * sense if, in the process of proxy removal, we need to make sure that callbacks
-         * are unregistered explicitly before the final destruction of the proxy instance.
-         *
-         * @throws sdbus::Error in case of failure
-         */
-        virtual void unregister() = 0;
-
-    public: // Lower-level, message-based API
-        /*!
-         * @brief Creates a method call message
-         *
-         * @param[in] interfaceName Name of an interface that provides a given method
-         * @param[in] methodName Name of the method
-         * @return A method call message
-         *
-         * Serialize method arguments into the returned message and invoke the method by passing
-         * the message with serialized arguments to the @c callMethod function.
-         * Alternatively, use higher-level API @c callMethod(const std::string& methodName) defined below.
-         *
-         * @throws sdbus::Error in case of failure
-         */
-        [[nodiscard]] virtual MethodCall createMethodCall(const InterfaceName& interfaceName, const MethodName& methodName) const = 0;
-
-        /*!
-         * @brief Calls method on the remote D-Bus object
-         *
-         * @param[in] message Message representing a method call
-         * @return A method reply message
-         *
-         * The call does not block if the method call has dont-expect-reply flag set. In that case,
-         * the call returns immediately and the return value is an empty, invalid method reply.
-         *
-         * The call blocks otherwise, waiting for the remote peer to send back a reply or an error,
-         * or until the call times out.
-         *
-         * While blocking, other concurrent operations (in other threads) on the underlying bus
-         * connection are stalled until the call returns. This is not an issue in vast majority of
-         * (simple, single-threaded) applications. In asynchronous, multi-threaded designs involving
-         * shared bus connections, this may be an issue. It is advised to instead use an asynchronous
-         * callMethod() function overload, which does not block the bus connection, or do the synchronous
-         * call from another Proxy instance created just before the call and then destroyed (which is
-         * anyway quite a typical approach in D-Bus implementations). Such proxy instance must have
-         * its own bus connection. So-called light-weight proxies (ones running without an event loop thread)
-         * tag are designed for exactly that purpose.
-         *
-         * The default D-Bus method call timeout is used. See IConnection::getMethodCallTimeout().
-         *
-         * Note: To avoid messing with messages, use API on a higher level of abstraction defined below.
-         *
-         * @throws sdbus::Error in case of failure (also in case the remote function returned an error)
-         */
-        virtual MethodReply callMethod(const MethodCall& message) = 0;
-
-        /*!
-         * @brief Calls method on the remote D-Bus object
-         *
-         * @param[in] message Message representing a method call
-         * @param[in] timeout Method call timeout (in microseconds)
-         * @return A method reply message
-         *
-         * The call does not block if the method call has dont-expect-reply flag set. In that case,
-         * the call returns immediately and the return value is an empty, invalid method reply.
-         *
-         * The call blocks otherwise, waiting for the remote peer to send back a reply or an error,
-         * or until the call times out.
-         *
-         * While blocking, other concurrent operations (in other threads) on the underlying bus
-         * connection are stalled until the call returns. This is not an issue in vast majority of
-         * (simple, single-threaded) applications. In asynchronous, multi-threaded designs involving
-         * shared bus connections, this may be an issue. It is advised to instead use an asynchronous
-         * callMethod() function overload, which does not block the bus connection, or do the synchronous
-         * call from another Proxy instance created just before the call and then destroyed (which is
-         * anyway quite a typical approach in D-Bus implementations). Such proxy instance must have
-         * its own bus connection. So-called light-weight proxies (ones running without an event loop thread)
-         * tag are designed for exactly that purpose.
-         *
-         * If timeout is zero, the default D-Bus method call timeout is used. See IConnection::getMethodCallTimeout().
-         *
-         * Note: To avoid messing with messages, use API on a higher level of abstraction defined below.
-         *
-         * @throws sdbus::Error in case of failure (also in case the remote function returned an error)
-         */
-        virtual MethodReply callMethod(const MethodCall& message, uint64_t timeout) = 0;
-
-        /*!
-         * @copydoc IProxy::callMethod(const MethodCall&,uint64_t)
-         */
-        template <typename _Rep, typename _Period>
-        MethodReply callMethod(const MethodCall& message, const std::chrono::duration<_Rep, _Period>& timeout);
-
-        /*!
-         * @brief Calls method on the D-Bus object asynchronously
-         *
-         * @param[in] message Message representing an async method call
-         * @param[in] asyncReplyCallback Handler for the async reply
-         * @return Observing handle for the the pending asynchronous call
-         *
-         * This is a callback-based way of asynchronously calling a remote D-Bus method.
-         *
-         * The call itself is non-blocking. It doesn't wait for the reply. Once the reply arrives,
-         * the provided async reply handler will get invoked from the context of the bus
-         * connection I/O event loop thread.
-         *
-         * An non-owning, observing async call handle is returned that can be used to query call status or cancel the call.
-         *
-         * The default D-Bus method call timeout is used. See IConnection::getMethodCallTimeout().
-         *
-         * Note: To avoid messing with messages, use API on a higher level of abstraction defined below.
-         *
-         * @throws sdbus::Error in case of failure
-         */
-        virtual PendingAsyncCall callMethodAsync(const MethodCall& message, async_reply_handler asyncReplyCallback) = 0;
-
-        /*!
-         * @brief Calls method on the D-Bus object asynchronously
-         *
-         * @param[in] message Message representing an async method call
-         * @param[in] asyncReplyCallback Handler for the async reply
-         * @return RAII-style slot handle representing the ownership of the async call
-         *
-         * This is a callback-based way of asynchronously calling a remote D-Bus method.
-         *
-         * The call itself is non-blocking. It doesn't wait for the reply. Once the reply arrives,
-         * the provided async reply handler will get invoked from the context of the bus
-         * connection I/O event loop thread.
-         *
-         * A slot (an owning handle) is returned for the async call. Lifetime of the call is bound to the lifetime of the slot.
-         * The slot can be used to cancel the method call at a later time by simply destroying it.
-         *
-         * The default D-Bus method call timeout is used. See IConnection::getMethodCallTimeout().
-         *
-         * Note: To avoid messing with messages, use API on a higher level of abstraction defined below.
-         *
-         * @throws sdbus::Error in case of failure
-         */
-        [[nodiscard]] virtual Slot callMethodAsync( const MethodCall& message
-                                                  , async_reply_handler asyncReplyCallback
-                                                  , return_slot_t ) = 0;
-
-        /*!
-         * @brief Calls method on the D-Bus object asynchronously, with custom timeout
-         *
-         * @param[in] message Message representing an async method call
-         * @param[in] asyncReplyCallback Handler for the async reply
-         * @param[in] timeout Method call timeout (in microseconds)
-         * @return Observing handle for the the pending asynchronous call
-         *
-         * This is a callback-based way of asynchronously calling a remote D-Bus method.
-         *
-         * The call itself is non-blocking. It doesn't wait for the reply. Once the reply arrives,
-         * the provided async reply handler will get invoked from the context of the bus
-         * connection I/O event loop thread.
-         *
-         * An non-owning, observing async call handle is returned that can be used to query call status or cancel the call.
-         *
-         * If timeout is zero, the default D-Bus method call timeout is used. See IConnection::getMethodCallTimeout().
-         *
-         * Note: To avoid messing with messages, use API on a higher level of abstraction defined below.
-         *
-         * @throws sdbus::Error in case of failure
-         */
-        virtual PendingAsyncCall callMethodAsync( const MethodCall& message
-                                                , async_reply_handler asyncReplyCallback
-                                                , uint64_t timeout ) = 0;
-
-        /*!
-         * @brief Calls method on the D-Bus object asynchronously, with custom timeout
-         *
-         * @param[in] message Message representing an async method call
-         * @param[in] asyncReplyCallback Handler for the async reply
-         * @param[in] timeout Method call timeout (in microseconds)
-         * @return RAII-style slot handle representing the ownership of the async call
-         *
-         * This is a callback-based way of asynchronously calling a remote D-Bus method.
-         *
-         * The call itself is non-blocking. It doesn't wait for the reply. Once the reply arrives,
-         * the provided async reply handler will get invoked from the context of the bus
-         * connection I/O event loop thread.
-         *
-         * A slot (an owning handle) is returned for the async call. Lifetime of the call is bound to the lifetime of the slot.
-         * The slot can be used to cancel the method call at a later time by simply destroying it.
-         *
-         * If timeout is zero, the default D-Bus method call timeout is used. See IConnection::getMethodCallTimeout().
-         *
-         * Note: To avoid messing with messages, use API on a higher level of abstraction defined below.
-         *
-         * @throws sdbus::Error in case of failure
-         */
-        [[nodiscard]] virtual Slot callMethodAsync( const MethodCall& message
-                                                  , async_reply_handler asyncReplyCallback
-                                                  , uint64_t timeout
-                                                  , return_slot_t ) = 0;
-
-        /*!
-         * @copydoc IProxy::callMethod(const MethodCall&,async_reply_handler,uint64_t)
-         */
-        template <typename _Rep, typename _Period>
-        PendingAsyncCall callMethodAsync( const MethodCall& message
-                                        , async_reply_handler asyncReplyCallback
-                                        , const std::chrono::duration<_Rep, _Period>& timeout );
-
-        /*!
-         * @copydoc IProxy::callMethod(const MethodCall&,async_reply_handler,uint64_t,return_slot_t)
-         */
-        template <typename _Rep, typename _Period>
-        [[nodiscard]] Slot callMethodAsync( const MethodCall& message
-                                          , async_reply_handler asyncReplyCallback
-                                          , const std::chrono::duration<_Rep, _Period>& timeout
-                                          , return_slot_t );
-
-        /*!
-         * @brief Calls method on the D-Bus object asynchronously
-         *
-         * @param[in] message Message representing an async method call
-         * @param[in] Tag denoting a std::future-based overload
-         * @return Future object providing access to the future method reply message
-         *
-         * This is a std::future-based way of asynchronously calling a remote D-Bus method.
-         *
-         * The call itself is non-blocking. It doesn't wait for the reply. Once the reply arrives,
-         * the provided future object will be set to contain the reply (or sdbus::Error
-         * in case the remote method threw an exception).
-         *
-         * The default D-Bus method call timeout is used. See IConnection::getMethodCallTimeout().
-         *
-         * Note: To avoid messing with messages, use higher-level API defined below.
-         *
-         * @throws sdbus::Error in case of failure
-         */
-        virtual std::future<MethodReply> callMethodAsync(const MethodCall& message, with_future_t) = 0;
-
-        /*!
-         * @brief Calls method on the D-Bus object asynchronously, with custom timeout
-         *
-         * @param[in] message Message representing an async method call
-         * @param[in] timeout Method call timeout
-         * @param[in] Tag denoting a std::future-based overload
-         * @return Future object providing access to the future method reply message
-         *
-         * This is a std::future-based way of asynchronously calling a remote D-Bus method.
-         *
-         * The call itself is non-blocking. It doesn't wait for the reply. Once the reply arrives,
-         * the provided future object will be set to contain the reply (or sdbus::Error
-         * in case the remote method threw an exception, or the call timed out).
-         *
-         * If timeout is zero, the default D-Bus method call timeout is used. See IConnection::getMethodCallTimeout().
-         *
-         * Note: To avoid messing with messages, use higher-level API defined below.
-         *
-         * @throws sdbus::Error in case of failure
-         */
-        virtual std::future<MethodReply> callMethodAsync( const MethodCall& message
-                                                        , uint64_t timeout
-                                                        , with_future_t ) = 0;
-
-        /*!
-         * @copydoc IProxy::callMethod(const MethodCall&,uint64_t,with_future_t)
-         */
-        template <typename _Rep, typename _Period>
-        std::future<MethodReply> callMethodAsync( const MethodCall& message
-                                                , const std::chrono::duration<_Rep, _Period>& timeout
-                                                , with_future_t );
-
-        /*!
-         * @brief Registers a handler for the desired signal emitted by the D-Bus object
-         *
-         * @param[in] interfaceName Name of an interface that the signal belongs to
-         * @param[in] signalName Name of the signal
-         * @param[in] signalHandler Callback that implements the body of the signal handler
-         *
-         * A signal can be subscribed to at any time during proxy lifetime. The subscription
-         * is active immediately after the call, and stays active for the entire lifetime
-         * of the Proxy object.
-         *
-         * To be able to unsubscribe from the signal at a later time, use the registerSignalHandler()
-         * overload with request_slot tag.
-         *
-         * @throws sdbus::Error in case of failure
-         */
-        virtual void registerSignalHandler( const InterfaceName& interfaceName
-                                          , const SignalName& signalName
-                                          , signal_handler signalHandler ) = 0;
-
-        /*!
-         * @brief Registers a handler for the desired signal emitted by the D-Bus object
-         *
-         * @param[in] interfaceName Name of an interface that the signal belongs to
-         * @param[in] signalName Name of the signal
-         * @param[in] signalHandler Callback that implements the body of the signal handler
-         *
-         * @return RAII-style slot handle representing the ownership of the subscription
-         *
-         * A signal can be subscribed to and unsubscribed from at any time during proxy
-         * lifetime. The subscription is active immediately after the call. The lifetime
-         * of the subscription is bound to the lifetime of the slot object. The subscription
-         * is unregistered by letting go of the slot object.
-         *
-         * @throws sdbus::Error in case of failure
-         */
-        [[nodiscard]] virtual Slot registerSignalHandler( const InterfaceName& interfaceName
-                                                        , const SignalName& signalName
-                                                        , signal_handler signalHandler
-                                                        , return_slot_t ) = 0;
-
-    protected: // Internal API for efficiency reasons used by high-level API helper classes
-        friend MethodInvoker;
-        friend AsyncMethodInvoker;
-        friend SignalSubscriber;
-
-        [[nodiscard]] virtual MethodCall createMethodCall(const char* interfaceName, const char* methodName) const = 0;
-        virtual void registerSignalHandler( const char* interfaceName
-                                          , const char* signalName
-                                          , signal_handler signalHandler ) = 0;
-        [[nodiscard]] virtual Slot registerSignalHandler( const char* interfaceName
-                                                        , const char* signalName
-                                                        , signal_handler signalHandler
-                                                        , return_slot_t ) = 0;
     };
 
     /********************************************//**
@@ -694,14 +481,14 @@ namespace sdbus {
          * Pending call in this context means a call whose results have not arrived, or
          * have arrived and are currently being processed by the callback handler.
          */
-        [[nodiscard]] bool isPending() const;
+        bool isPending() const;
 
     private:
         friend internal::Proxy;
-        PendingAsyncCall(std::weak_ptr<void> callInfo);
+        PendingAsyncCall(std::weak_ptr<void> callData);
 
     private:
-        std::weak_ptr<void> callInfo_;
+        std::weak_ptr<void> callData_;
     };
 
     // Out-of-line member definitions
@@ -714,124 +501,62 @@ namespace sdbus {
     }
 
     template <typename _Rep, typename _Period>
-    inline PendingAsyncCall IProxy::callMethodAsync( const MethodCall& message
-                                                   , async_reply_handler asyncReplyCallback
-                                                   , const std::chrono::duration<_Rep, _Period>& timeout )
+    inline PendingAsyncCall IProxy::callMethod(const MethodCall& message, async_reply_handler asyncReplyCallback, const std::chrono::duration<_Rep, _Period>& timeout)
     {
         auto microsecs = std::chrono::duration_cast<std::chrono::microseconds>(timeout);
-        return callMethodAsync(message, std::move(asyncReplyCallback), microsecs.count());
+        return callMethod(message, std::move(asyncReplyCallback), microsecs.count());
     }
 
     template <typename _Rep, typename _Period>
-    inline Slot IProxy::callMethodAsync( const MethodCall& message
-                                       , async_reply_handler asyncReplyCallback
-                                       , const std::chrono::duration<_Rep, _Period>& timeout
-                                       , return_slot_t )
+    inline std::future<MethodReply> IProxy::callMethod( const MethodCall& message
+                                                      , const std::chrono::duration<_Rep, _Period>& timeout
+                                                      , with_future_t )
     {
         auto microsecs = std::chrono::duration_cast<std::chrono::microseconds>(timeout);
-        return callMethodAsync(message, std::move(asyncReplyCallback), microsecs.count(), return_slot);
-    }
-
-    template <typename _Rep, typename _Period>
-    inline std::future<MethodReply> IProxy::callMethodAsync( const MethodCall& message
-                                                           , const std::chrono::duration<_Rep, _Period>& timeout
-                                                           , with_future_t )
-    {
-        auto microsecs = std::chrono::duration_cast<std::chrono::microseconds>(timeout);
-        return callMethodAsync(message, microsecs.count(), with_future);
-    }
-
-    inline MethodInvoker IProxy::callMethod(const MethodName& methodName)
-    {
-        return MethodInvoker(*this, methodName);
+        return callMethod(message, microsecs.count(), with_future);
     }
 
     inline MethodInvoker IProxy::callMethod(const std::string& methodName)
-    {
-        return MethodInvoker(*this, methodName.c_str());
-    }
-
-    inline MethodInvoker IProxy::callMethod(const char* methodName)
     {
         return MethodInvoker(*this, methodName);
     }
 
-    inline AsyncMethodInvoker IProxy::callMethodAsync(const MethodName& methodName)
+    inline AsyncMethodInvoker IProxy::callMethod(const std::string& methodName, async_t)
     {
         return AsyncMethodInvoker(*this, methodName);
     }
 
-    inline AsyncMethodInvoker IProxy::callMethodAsync(const std::string& methodName)
-    {
-        return AsyncMethodInvoker(*this, methodName.c_str());
-    }
-
-    inline AsyncMethodInvoker IProxy::callMethodAsync(const char* methodName)
-    {
-        return AsyncMethodInvoker(*this, methodName);
-    }
-
-    inline SignalSubscriber IProxy::uponSignal(const SignalName& signalName)
-    {
-        return SignalSubscriber(*this, signalName);
-    }
-
     inline SignalSubscriber IProxy::uponSignal(const std::string& signalName)
-    {
-        return SignalSubscriber(*this, signalName.c_str());
-    }
-
-    inline SignalSubscriber IProxy::uponSignal(const char* signalName)
     {
         return SignalSubscriber(*this, signalName);
     }
 
-    inline PropertyGetter IProxy::getProperty(const PropertyName& propertyName)
+    inline PropertyGetter IProxy::getProperty(const std::string& propertyName)
     {
         return PropertyGetter(*this, propertyName);
     }
 
-    inline PropertyGetter IProxy::getProperty(std::string_view propertyName)
-    {
-        return PropertyGetter(*this, std::move(propertyName));
-    }
-
-    inline AsyncPropertyGetter IProxy::getPropertyAsync(const PropertyName& propertyName)
+    inline AsyncPropertyGetter IProxy::getProperty(const std::string& propertyName, async_t)
     {
         return AsyncPropertyGetter(*this, propertyName);
     }
 
-    inline AsyncPropertyGetter IProxy::getPropertyAsync(std::string_view propertyName)
-    {
-        return AsyncPropertyGetter(*this, std::move(propertyName));
-    }
-
-    inline PropertySetter IProxy::setProperty(const PropertyName& propertyName)
+    inline PropertySetter IProxy::setProperty(const std::string& propertyName)
     {
         return PropertySetter(*this, propertyName);
     }
 
-    inline PropertySetter IProxy::setProperty(std::string_view propertyName)
-    {
-        return PropertySetter(*this, std::move(propertyName));
-    }
-
-    inline AsyncPropertySetter IProxy::setPropertyAsync(const PropertyName& propertyName)
+    inline AsyncPropertySetter IProxy::setProperty(const std::string& propertyName, async_t)
     {
         return AsyncPropertySetter(*this, propertyName);
     }
 
-    inline AsyncPropertySetter IProxy::setPropertyAsync(std::string_view propertyName)
-    {
-        return AsyncPropertySetter(*this, std::move(propertyName));
-    }
-
     inline AllPropertiesGetter IProxy::getAllProperties()
     {
         return AllPropertiesGetter(*this);
     }
 
-    inline AsyncAllPropertiesGetter IProxy::getAllPropertiesAsync()
+    inline AsyncAllPropertiesGetter IProxy::getAllProperties(async_t)
     {
         return AsyncAllPropertiesGetter(*this);
     }
@@ -859,8 +584,8 @@ namespace sdbus {
      * @endcode
      */
     [[nodiscard]] std::unique_ptr<sdbus::IProxy> createProxy( sdbus::IConnection& connection
-                                                            , ServiceName destination
-                                                            , ObjectPath objectPath );
+                                                            , std::string destination
+                                                            , std::string objectPath );
 
     /*!
      * @brief Creates a proxy object for a specific remote D-Bus object
@@ -885,11 +610,11 @@ namespace sdbus {
      * @endcode
      */
     [[nodiscard]] std::unique_ptr<sdbus::IProxy> createProxy( std::unique_ptr<sdbus::IConnection>&& connection
-                                                            , ServiceName destination
-                                                            , ObjectPath objectPath );
+                                                            , std::string destination
+                                                            , std::string objectPath );
 
     /*!
-     * @brief Creates a light-weight proxy object for a specific remote D-Bus object
+     * @brief Creates a proxy object for a specific remote D-Bus object
      *
      * @param[in] connection D-Bus connection to be used by the proxy object
      * @param[in] destination Bus name that provides the remote D-Bus object
@@ -912,19 +637,10 @@ namespace sdbus {
      * @endcode
      */
     [[nodiscard]] std::unique_ptr<sdbus::IProxy> createProxy( std::unique_ptr<sdbus::IConnection>&& connection
-                                                            , ServiceName destination
-                                                            , ObjectPath objectPath
+                                                            , std::string destination
+                                                            , std::string objectPath
                                                             , dont_run_event_loop_thread_t );
 
-    /*!
-     * @brief Creates a light-weight proxy object for a specific remote D-Bus object
-     *
-     * Does the same thing as createProxy(std::unique_ptr<sdbus::IConnection>&&, ServiceName, ObjectPath, dont_run_event_loop_thread_t);
-     */
-    [[nodiscard]] std::unique_ptr<sdbus::IProxy> createLightWeightProxy( std::unique_ptr<sdbus::IConnection>&& connection
-                                                                       , ServiceName destination
-                                                                       , ObjectPath objectPath );
-
     /*!
      * @brief Creates a proxy object for a specific remote D-Bus object
      *
@@ -942,11 +658,11 @@ namespace sdbus {
      * auto proxy = sdbus::createProxy("com.kistler.foo", "/com/kistler/foo");
      * @endcode
      */
-    [[nodiscard]] std::unique_ptr<sdbus::IProxy> createProxy( ServiceName destination
-                                                            , ObjectPath objectPath );
+    [[nodiscard]] std::unique_ptr<sdbus::IProxy> createProxy( std::string destination
+                                                            , std::string objectPath );
 
     /*!
-     * @brief Creates a light-weight proxy object for a specific remote D-Bus object
+     * @brief Creates a proxy object for a specific remote D-Bus object
      *
      * @param[in] destination Bus name that provides the remote D-Bus object
      * @param[in] objectPath Path of the remote D-Bus object
@@ -963,17 +679,10 @@ namespace sdbus {
      * auto proxy = sdbus::createProxy("com.kistler.foo", "/com/kistler/foo", sdbus::dont_run_event_loop_thread );
      * @endcode
      */
-    [[nodiscard]] std::unique_ptr<sdbus::IProxy> createProxy( ServiceName destination
-                                                            , ObjectPath objectPath
+    [[nodiscard]] std::unique_ptr<sdbus::IProxy> createProxy( std::string destination
+                                                            , std::string objectPath
                                                             , dont_run_event_loop_thread_t );
 
-    /*!
-     * @brief Creates a light-weight proxy object for a specific remote D-Bus object
-     *
-     * Does the same thing as createProxy(ServiceName, ObjectPath, dont_run_event_loop_thread_t);
-     */
-    [[nodiscard]] std::unique_ptr<sdbus::IProxy> createLightWeightProxy(ServiceName destination, ObjectPath objectPath);
-
 }
 
 #include <sdbus-c++/ConvenienceApiClasses.inl>

include/sdbus-c++/Message.h

@@ -1,6 +1,6 @@
 /**
  * (C) 2016 - 2021 KISTLER INSTRUMENTE AG, Winterthur, Switzerland
- * (C) 2016 - 2024 Stanislav Angelovic <stanislav.angelovic@protonmail.com>
+ * (C) 2016 - 2022 Stanislav Angelovic <stanislav.angelovic@protonmail.com>
  *
  * @file Message.h
  *
@@ -27,27 +27,22 @@
 #ifndef SDBUS_CXX_MESSAGE_H_
 #define SDBUS_CXX_MESSAGE_H_
 
-#include <sdbus-c++/Error.h>
 #include <sdbus-c++/TypeTraits.h>
-
-#include <algorithm>
-#include <array>
-#include <cassert>
-#include <cstdint>
-#include <cstring>
-#include <functional>
-#include <map>
-#ifdef __has_include
-#  if __has_include(<span>)
-#    include <span>
-#  endif
-#endif
+#include <sdbus-c++/Error.h>
 #include <string>
-#include <sys/types.h>
+#include <vector>
+#include <array>
+#if __cplusplus >= 202002L
+#include <span>
+#endif
+#include <map>
 #include <unordered_map>
 #include <utility>
-#include <variant>
-#include <vector>
+#include <cstdint>
+#include <cassert>
+#include <functional>
+#include <sys/types.h>
+#include <algorithm>
 
 // Forward declarations
 namespace sdbus {
@@ -58,7 +53,7 @@ namespace sdbus {
     class UnixFd;
     class MethodReply;
     namespace internal {
-        class IConnection;
+        class ISdBus;
     }
 }
 
@@ -97,25 +92,19 @@ namespace sdbus {
         Message& operator<<(double item);
         Message& operator<<(const char *item);
         Message& operator<<(const std::string &item);
-        Message& operator<<(std::string_view item);
         Message& operator<<(const Variant &item);
-        template <typename ...Elements>
-        Message& operator<<(const std::variant<Elements...>& value);
         Message& operator<<(const ObjectPath &item);
         Message& operator<<(const Signature &item);
         Message& operator<<(const UnixFd &item);
+
         template <typename _Element, typename _Allocator>
         Message& operator<<(const std::vector<_Element, _Allocator>& items);
         template <typename _Element, std::size_t _Size>
         Message& operator<<(const std::array<_Element, _Size>& items);
-#ifdef __cpp_lib_span
+#if __cplusplus >= 202002L
         template <typename _Element, std::size_t _Extent>
         Message& operator<<(const std::span<_Element, _Extent>& items);
 #endif
-        template <typename _Enum, typename = std::enable_if_t<std::is_enum_v<_Enum>>>
-        Message& operator<<(const _Enum& item);
-        template <typename _Key, typename _Value>
-        Message& operator<<(const DictEntry<_Key, _Value>& value);
         template <typename _Key, typename _Value, typename _Compare, typename _Allocator>
         Message& operator<<(const std::map<_Key, _Value, _Compare, _Allocator>& items);
         template <typename _Key, typename _Value, typename _Hash, typename _KeyEqual, typename _Allocator>
@@ -137,8 +126,6 @@ namespace sdbus {
         Message& operator>>(char*& item);
         Message& operator>>(std::string &item);
         Message& operator>>(Variant &item);
-        template <typename ...Elements>
-        Message& operator>>(std::variant<Elements...>& value);
         Message& operator>>(ObjectPath &item);
         Message& operator>>(Signature &item);
         Message& operator>>(UnixFd &item);
@@ -146,14 +133,10 @@ namespace sdbus {
         Message& operator>>(std::vector<_Element, _Allocator>& items);
         template <typename _Element, std::size_t _Size>
         Message& operator>>(std::array<_Element, _Size>& items);
-#ifdef __cpp_lib_span
+#if __cplusplus >= 202002L
         template <typename _Element, std::size_t _Extent>
         Message& operator>>(std::span<_Element, _Extent>& items);
 #endif
-        template <typename _Enum, typename = std::enable_if_t<std::is_enum_v<_Enum>>>
-        Message& operator>>(_Enum& item);
-        template <typename _Key, typename _Value>
-        Message& operator>>(DictEntry<_Key, _Value>& value);
         template <typename _Key, typename _Value, typename _Compare, typename _Allocator>
         Message& operator>>(std::map<_Key, _Value, _Compare, _Allocator>& items);
         template <typename _Key, typename _Value, typename _Hash, typename _KeyEqual, typename _Allocator>
@@ -163,61 +146,36 @@ namespace sdbus {
         template <typename... _ValueTypes>
         Message& operator>>(std::tuple<_ValueTypes...>& item);
 
-        template <typename _ElementType>
-        Message& openContainer();
-        Message& openContainer(const char* signature);
+        Message& openContainer(const std::string& signature);
         Message& closeContainer();
-        template <typename _KeyType, typename _ValueType>
-        Message& openDictEntry();
-        Message& openDictEntry(const char* signature);
+        Message& openDictEntry(const std::string& signature);
         Message& closeDictEntry();
-        template <typename _ValueType>
-        Message& openVariant();
-        Message& openVariant(const char* signature);
+        Message& openVariant(const std::string& signature);
         Message& closeVariant();
-        template <typename... _ValueTypes>
-        Message& openStruct();
-        Message& openStruct(const char* signature);
+        Message& openStruct(const std::string& signature);
         Message& closeStruct();
 
-        template <typename _ElementType>
-        Message& enterContainer();
-        Message& enterContainer(const char* signature);
+        Message& enterContainer(const std::string& signature);
         Message& exitContainer();
-        template <typename _KeyType, typename _ValueType>
-        Message& enterDictEntry();
-        Message& enterDictEntry(const char* signature);
+        Message& enterDictEntry(const std::string& signature);
         Message& exitDictEntry();
-        template <typename _ValueType>
-        Message& enterVariant();
-        Message& enterVariant(const char* signature);
+        Message& enterVariant(const std::string& signature);
         Message& exitVariant();
-        template <typename... _ValueTypes>
-        Message& enterStruct();
-        Message& enterStruct(const char* signature);
+        Message& enterStruct(const std::string& signature);
         Message& exitStruct();
 
         Message& appendArray(char type, const void *ptr, size_t size);
         Message& readArray(char type, const void **ptr, size_t *size);
 
-        template <typename _Key, typename _Value, typename _Callback>
-        Message& serializeDictionary(const _Callback& callback);
-        template <typename _Key, typename _Value>
-        Message& serializeDictionary(const std::initializer_list<DictEntry<_Key, _Value>>& dictEntries);
-        template <typename _Key, typename _Value, typename _Callback>
-        Message& deserializeDictionary(const _Callback& callback);
-
         explicit operator bool() const;
         void clearFlags();
 
-        const char* getInterfaceName() const;
-        const char* getMemberName() const;
-        const char* getSender() const;
-        const char* getPath() const;
-        const char* getDestination() const;
-        uint64_t getCookie() const;
-        // TODO: short docs in whole Message API
-        std::pair<char, const char*> peekType() const;
+        std::string getInterfaceName() const;
+        std::string getMemberName() const;
+        std::string getSender() const;
+        std::string getPath() const;
+        std::string getDestination() const;
+        void peekType(std::string& type, std::string& contents) const;
         bool isValid() const;
         bool isEmpty() const;
         bool isAtEnd(bool complete) const;
@@ -250,17 +208,22 @@ namespace sdbus {
         template <typename _Element, typename _Allocator>
         void deserializeArraySlow(std::vector<_Element, _Allocator>& items);
 
+        template <typename _Dictionary>
+        void serializeDictionary(const _Dictionary& items);
+        template <typename _Dictionary>
+        void deserializeDictionary(_Dictionary& items);
+
     protected:
         Message() = default;
-        explicit Message(internal::IConnection* connection) noexcept;
-        Message(void *msg, internal::IConnection* connection) noexcept;
-        Message(void *msg, internal::IConnection* connection, adopt_message_t) noexcept;
+        explicit Message(internal::ISdBus* sdbus) noexcept;
+        Message(void *msg, internal::ISdBus* sdbus) noexcept;
+        Message(void *msg, internal::ISdBus* sdbus, adopt_message_t) noexcept;
 
         friend Factory;
 
     protected:
         void* msg_{};
-        internal::IConnection* connection_{};
+        internal::ISdBus* sdbus_{};
         mutable bool ok_{true};
     };
 
@@ -273,7 +236,8 @@ namespace sdbus {
         MethodCall() = default;
 
         MethodReply send(uint64_t timeout) const;
-        [[nodiscard]] Slot send(void* callback, void* userData, uint64_t timeout, return_slot_t) const;
+        void send(void* callback, void* userData, uint64_t timeout, floating_slot_t) const;
+        [[nodiscard]] Slot send(void* callback, void* userData, uint64_t timeout) const;
 
         MethodReply createReply() const;
         MethodReply createErrorReply(const sdbus::Error& error) const;
@@ -282,7 +246,7 @@ namespace sdbus {
         bool doesntExpectReply() const;
 
     protected:
-        MethodCall(void *msg, internal::IConnection* connection, adopt_message_t) noexcept;
+        MethodCall(void *msg, internal::ISdBus* sdbus, adopt_message_t) noexcept;
 
     private:
         MethodReply sendWithReply(uint64_t timeout = 0) const;
@@ -297,7 +261,6 @@ namespace sdbus {
     public:
         MethodReply() = default;
         void send() const;
-        uint64_t getReplyCookie() const;
     };
 
     class Signal : public Message
@@ -308,7 +271,6 @@ namespace sdbus {
     public:
         Signal() = default;
         void setDestination(const std::string& destination);
-        void setDestination(const char* destination);
         void send() const;
     };
 
@@ -340,21 +302,6 @@ namespace sdbus {
         PlainMessage() = default;
     };
 
-    PlainMessage createPlainMessage();
-
-    template <typename ...Elements>
-    inline Message& Message::operator<<(const std::variant<Elements...>& value)
-    {
-        std::visit([this](const auto& inner)
-        {
-            openVariant<decltype(inner)>();
-            *this << inner;
-            closeVariant();
-        }, value);
-
-        return *this;
-    }
-
     template <typename _Element, typename _Allocator>
     inline Message& Message::operator<<(const std::vector<_Element, _Allocator>& items)
     {
@@ -371,7 +318,7 @@ namespace sdbus {
         return *this;
     }
 
-#ifdef __cpp_lib_span
+#if __cplusplus >= 202002L
     template <typename _Element, std::size_t _Extent>
     inline Message& Message::operator<<(const std::span<_Element, _Extent>& items)
     {
@@ -381,12 +328,6 @@ namespace sdbus {
     }
 #endif
 
-    template <typename _Enum, typename>
-    inline Message& Message::operator<<(const _Enum &item)
-    {
-        return operator<<(static_cast<std::underlying_type_t<_Enum>>(item));
-    }
-
     template <typename _Array>
     inline void Message::serializeArray(const _Array& items)
     {
@@ -396,12 +337,11 @@ namespace sdbus {
         // otherwise use step-by-step serialization of individual elements.
         if constexpr (signature_of<ElementType>::is_trivial_dbus_type && !std::is_same_v<ElementType, bool>)
         {
-            constexpr auto signature = as_null_terminated(signature_of_v<ElementType>);
-            appendArray(*signature.data(), items.data(), items.size() * sizeof(ElementType));
+            appendArray(*signature_of<ElementType>::str().c_str(), items.data(), items.size() * sizeof(ElementType));
         }
         else
         {
-            openContainer<ElementType>();
+            openContainer(signature_of<ElementType>::str());
 
             for (const auto& item : items)
                 *this << item;
@@ -410,21 +350,10 @@ namespace sdbus {
         }
     }
 
-    template <typename _Key, typename _Value>
-    inline Message& Message::operator<<(const DictEntry<_Key, _Value>& value)
-    {
-        openDictEntry<_Key, _Value>();
-        *this << value.first;
-        *this << value.second;
-        closeDictEntry();
-
-        return *this;
-    }
-
     template <typename _Key, typename _Value, typename _Compare, typename _Allocator>
     inline Message& Message::operator<<(const std::map<_Key, _Value, _Compare, _Allocator>& items)
     {
-        serializeDictionary<_Key, _Value>([&items](Message& msg){ for (const auto& item : items) msg << item; });
+        serializeDictionary(items);
 
         return *this;
     }
@@ -432,27 +361,31 @@ namespace sdbus {
     template <typename _Key, typename _Value, typename _Hash, typename _KeyEqual, typename _Allocator>
     inline Message& Message::operator<<(const std::unordered_map<_Key, _Value, _Hash, _KeyEqual, _Allocator>& items)
     {
-        serializeDictionary<_Key, _Value>([&items](Message& msg){ for (const auto& item : items) msg << item; });
+        serializeDictionary(items);
 
         return *this;
     }
 
-    template <typename _Key, typename _Value>
-    inline Message& Message::serializeDictionary(const std::initializer_list<DictEntry<_Key, _Value>>& items)
+    template <typename _Dictionary>
+    inline void Message::serializeDictionary(const _Dictionary& items)
     {
-        serializeDictionary<_Key, _Value>([&](Message& msg){ for (const auto& item : items) msg << item; });
+        using KeyType = typename _Dictionary::key_type;
+        using ValueType = typename _Dictionary::mapped_type;
 
-        return *this;
-    }
+        const std::string dictEntrySignature = signature_of<KeyType>::str() + signature_of<ValueType>::str();
+        const std::string arraySignature = "{" + dictEntrySignature + "}";
+
+        openContainer(arraySignature);
+
+        for (const auto& item : items)
+        {
+            openDictEntry(dictEntrySignature);
+            *this << item.first;
+            *this << item.second;
+            closeDictEntry();
+        }
 
-    template <typename _Key, typename _Value, typename _Callback>
-    inline Message& Message::serializeDictionary(const _Callback& callback)
-    {
-        openContainer<DictEntry<_Key, _Value>>();
-        callback(*this);
         closeContainer();
-
-        return *this;
     }
 
     namespace detail
@@ -475,7 +408,12 @@ namespace sdbus {
     template <typename... _ValueTypes>
     inline Message& Message::operator<<(const Struct<_ValueTypes...>& item)
     {
-        openStruct<_ValueTypes...>();
+        auto structSignature = signature_of<Struct<_ValueTypes...>>::str();
+        assert(structSignature.size() > 2);
+        // Remove opening and closing parenthesis from the struct signature to get contents signature
+        auto structContentSignature = structSignature.substr(1, structSignature.size() - 2);
+
+        openStruct(structContentSignature);
         detail::serialize_tuple(*this, item, std::index_sequence_for<_ValueTypes...>{});
         closeStruct();
 
@@ -489,33 +427,6 @@ namespace sdbus {
         return *this;
     }
 
-    namespace detail
-    {
-        template <typename _Element, typename... _Elements>
-        bool deserialize_variant(Message& msg, std::variant<_Elements...>& value, const char* signature)
-        {
-            constexpr auto elemSignature = as_null_terminated(sdbus::signature_of_v<_Element>);
-            if (std::strcmp(signature, elemSignature.data()) != 0)
-                return false;
-
-            _Element temp;
-            msg.enterVariant(signature);
-            msg >> temp;
-            msg.exitVariant();
-            value = std::move(temp);
-            return true;
-        }
-    }
-
-    template <typename... Elements>
-    inline Message& Message::operator>>(std::variant<Elements...>& value)
-    {
-        auto [type, contents] = peekType();
-        bool result = (detail::deserialize_variant<Elements>(*this, value, contents) || ...);
-        SDBUS_THROW_ERROR_IF(!result, "Failed to deserialize variant: signature did not match any of the variant types", EINVAL);
-        return *this;
-    }
-
     template <typename _Element, typename _Allocator>
     inline Message& Message::operator>>(std::vector<_Element, _Allocator>& items)
     {
@@ -532,7 +443,7 @@ namespace sdbus {
         return *this;
     }
 
-#ifdef __cpp_lib_span
+#if __cplusplus >= 202002L
     template <typename _Element, std::size_t _Extent>
     inline Message& Message::operator>>(std::span<_Element, _Extent>& items)
     {
@@ -542,15 +453,6 @@ namespace sdbus {
     }
 #endif
 
-    template <typename _Enum, typename>
-    inline Message& Message::operator>>(_Enum& item)
-    {
-        std::underlying_type_t<_Enum> val;
-        *this >> val;
-        item = static_cast<_Enum>(val);
-        return *this;
-    }
-
     template <typename _Array>
     inline void Message::deserializeArray(_Array& items)
     {
@@ -576,8 +478,7 @@ namespace sdbus {
         size_t arraySize{};
         const ElementType* arrayPtr{};
 
-        constexpr auto signature = as_null_terminated(sdbus::signature_of_v<ElementType>);
-        readArray(*signature.data(), (const void**)&arrayPtr, &arraySize);
+        readArray(*signature_of<ElementType>::str().c_str(), (const void**)&arrayPtr, &arraySize);
 
         size_t elementsInMsg = arraySize / sizeof(ElementType);
         bool notEnoughSpace = items.size() < elementsInMsg;
@@ -592,8 +493,7 @@ namespace sdbus {
         size_t arraySize{};
         const _Element* arrayPtr{};
 
-        constexpr auto signature = as_null_terminated(sdbus::signature_of_v<_Element>);
-        readArray(*signature.data(), (const void**)&arrayPtr, &arraySize);
+        readArray(*signature_of<_Element>::str().c_str(), (const void**)&arrayPtr, &arraySize);
 
         items.insert(items.end(), arrayPtr, arrayPtr + (arraySize / sizeof(_Element)));
     }
@@ -603,7 +503,7 @@ namespace sdbus {
     {
         using ElementType = typename _Array::value_type;
 
-        if(!enterContainer<ElementType>())
+        if(!enterContainer(signature_of<ElementType>::str()))
             return;
 
         for (auto& elem : items)
@@ -620,7 +520,7 @@ namespace sdbus {
     template <typename _Element, typename _Allocator>
     void Message::deserializeArraySlow(std::vector<_Element, _Allocator>& items)
     {
-        if(!enterContainer<_Element>())
+        if(!enterContainer(signature_of<_Element>::str()))
             return;
 
         while (true)
@@ -637,21 +537,10 @@ namespace sdbus {
         exitContainer();
     }
 
-    template <typename _Key, typename _Value>
-    inline Message& Message::operator>>(DictEntry<_Key, _Value>& value)
-    {
-        if (!enterDictEntry<_Key, _Value>())
-            return *this;
-        *this >> value.first >> value.second;
-        exitDictEntry();
-
-        return *this;
-    }
-
     template <typename _Key, typename _Value, typename _Compare, typename _Allocator>
     inline Message& Message::operator>>(std::map<_Key, _Value, _Compare, _Allocator>& items)
     {
-        deserializeDictionary<_Key, _Value>([&items](auto dictEntry){ items.insert(std::move(dictEntry)); });
+        deserializeDictionary(items);
 
         return *this;
     }
@@ -659,30 +548,40 @@ namespace sdbus {
     template <typename _Key, typename _Value, typename _Hash, typename _KeyEqual, typename _Allocator>
     inline Message& Message::operator>>(std::unordered_map<_Key, _Value, _Hash, _KeyEqual, _Allocator>& items)
     {
-        deserializeDictionary<_Key, _Value>([&items](auto dictEntry){ items.insert(std::move(dictEntry)); });
+        deserializeDictionary(items);
 
         return *this;
     }
 
-    template <typename _Key, typename _Value, typename _Callback>
-    inline Message& Message::deserializeDictionary(const _Callback& callback)
+    template <typename _Dictionary>
+    inline void Message::deserializeDictionary(_Dictionary& items)
     {
-        if (!enterContainer<DictEntry<_Key, _Value>>())
-            return *this;
+        using KeyType = typename _Dictionary::key_type;
+        using ValueType = typename _Dictionary::mapped_type;
+
+        const std::string dictEntrySignature = signature_of<KeyType>::str() + signature_of<ValueType>::str();
+        const std::string arraySignature = "{" + dictEntrySignature + "}";
+
+        if (!enterContainer(arraySignature))
+            return;
 
         while (true)
         {
-            DictEntry<_Key, _Value> dictEntry;
-            *this >> dictEntry;
-            if (!*this)
+            if (!enterDictEntry(dictEntrySignature))
                 break;
-            callback(std::move(dictEntry));
+
+            KeyType key;
+            ValueType value;
+            *this >> key >> value;
+
+            items.emplace(std::move(key), std::move(value));
+
+            exitDictEntry();
         }
+
         clearFlags();
 
         exitContainer();
-
-        return *this;
     }
 
     namespace detail
@@ -705,7 +604,11 @@ namespace sdbus {
     template <typename... _ValueTypes>
     inline Message& Message::operator>>(Struct<_ValueTypes...>& item)
     {
-        if (!enterStruct<_ValueTypes...>())
+        auto structSignature = signature_of<Struct<_ValueTypes...>>::str();
+        // Remove opening and closing parenthesis from the struct signature to get contents signature
+        auto structContentSignature = structSignature.substr(1, structSignature.size()-2);
+
+        if (!enterStruct(structContentSignature))
             return *this;
 
         detail::deserialize_tuple(*this, item, std::index_sequence_for<_ValueTypes...>{});
@@ -722,62 +625,6 @@ namespace sdbus {
         return *this;
     }
 
-    template <typename _ElementType>
-    inline Message& Message::openContainer()
-    {
-        constexpr auto signature = as_null_terminated(signature_of_v<_ElementType>);
-        return openContainer(signature.data());
-    }
-
-    template <typename _KeyType, typename _ValueType>
-    inline Message& Message::openDictEntry()
-    {
-        constexpr auto signature = as_null_terminated(signature_of_v<std::tuple<_KeyType, _ValueType>>);
-        return openDictEntry(signature.data());
-    }
-
-    template <typename _ValueType>
-    inline Message& Message::openVariant()
-    {
-        constexpr auto signature = as_null_terminated(signature_of_v<_ValueType>);
-        return openVariant(signature.data());
-    }
-
-    template <typename... _ValueTypes>
-    inline Message& Message::openStruct()
-    {
-        constexpr auto signature = as_null_terminated(signature_of_v<std::tuple<_ValueTypes...>>);
-        return openStruct(signature.data());
-    }
-
-    template <typename _ElementType>
-    inline Message& Message::enterContainer()
-    {
-        constexpr auto signature = as_null_terminated(signature_of_v<_ElementType>);
-        return enterContainer(signature.data());
-    }
-
-    template <typename _KeyType, typename _ValueType>
-    inline Message& Message::enterDictEntry()
-    {
-        constexpr auto signature = as_null_terminated(signature_of_v<std::tuple<_KeyType, _ValueType>>);
-        return enterDictEntry(signature.data());
-    }
-
-    template <typename _ValueType>
-    inline Message& Message::enterVariant()
-    {
-        constexpr auto signature = as_null_terminated(signature_of_v<_ValueType>);
-        return enterVariant(signature.data());
-    }
-
-    template <typename... _ValueTypes>
-    inline Message& Message::enterStruct()
-    {
-        constexpr auto signature = as_null_terminated(signature_of_v<std::tuple<_ValueTypes...>>);
-        return enterStruct(signature.data());
-    }
-
 }
 
 #endif /* SDBUS_CXX_MESSAGE_H_ */

include/sdbus-c++/MethodResult.h

@@ -1,6 +1,6 @@
 /**
  * (C) 2016 - 2021 KISTLER INSTRUMENTE AG, Winterthur, Switzerland
- * (C) 2016 - 2024 Stanislav Angelovic <stanislav.angelovic@protonmail.com>
+ * (C) 2016 - 2022 Stanislav Angelovic <stanislav.angelovic@protonmail.com>
  *
  * @file MethodResult.h
  *
@@ -28,10 +28,9 @@
 #define SDBUS_CXX_METHODRESULT_H_
 
 #include <sdbus-c++/Message.h>
-
 #include <cassert>
 
-// Forward declarations
+// Forward declaration
 namespace sdbus {
     class Error;
 }

include/sdbus-c++/ProxyInterfaces.h

@@ -1,6 +1,6 @@
 /**
  * (C) 2016 - 2021 KISTLER INSTRUMENTE AG, Winterthur, Switzerland
- * (C) 2016 - 2024 Stanislav Angelovic <stanislav.angelovic@protonmail.com>
+ * (C) 2016 - 2022 Stanislav Angelovic <stanislav.angelovic@protonmail.com>
  *
  * @file ProxyInterfaces.h
  *
@@ -104,7 +104,7 @@ namespace sdbus {
          * This constructor overload creates a proxy that manages its own D-Bus connection(s).
          * For more information on its behavior, consult @ref createProxy(std::string,std::string)
          */
-        ProxyInterfaces(ServiceName destination, ObjectPath objectPath)
+        ProxyInterfaces(std::string destination, std::string objectPath)
             : ProxyObjectHolder(createProxy(std::move(destination), std::move(objectPath)))
             , _Interfaces(getProxy())...
         {
@@ -119,7 +119,7 @@ namespace sdbus {
          * This constructor overload creates a proxy that manages its own D-Bus connection(s).
          * For more information on its behavior, consult @ref createProxy(std::string,std::string,sdbus::dont_run_event_loop_thread_t)
          */
-        ProxyInterfaces(ServiceName destination, ObjectPath objectPath, dont_run_event_loop_thread_t)
+        ProxyInterfaces(std::string destination, std::string objectPath, dont_run_event_loop_thread_t)
             : ProxyObjectHolder(createProxy(std::move(destination), std::move(objectPath), dont_run_event_loop_thread))
             , _Interfaces(getProxy())...
         {
@@ -135,7 +135,7 @@ namespace sdbus {
          * The proxy created this way just references a D-Bus connection owned and managed by the user.
          * For more information on its behavior, consult @ref createProxy(IConnection&,std::string,std::string)
          */
-        ProxyInterfaces(IConnection& connection, ServiceName destination, ObjectPath objectPath)
+        ProxyInterfaces(IConnection& connection, std::string destination, std::string objectPath)
             : ProxyObjectHolder(createProxy(connection, std::move(destination), std::move(objectPath)))
             , _Interfaces(getProxy())...
         {
@@ -151,7 +151,7 @@ namespace sdbus {
          * The proxy created this way becomes an owner of the connection.
          * For more information on its behavior, consult @ref createProxy(std::unique_ptr<sdbus::IConnection>&&,std::string,std::string)
          */
-        ProxyInterfaces(std::unique_ptr<sdbus::IConnection>&& connection, ServiceName destination, ObjectPath objectPath)
+        ProxyInterfaces(std::unique_ptr<sdbus::IConnection>&& connection, std::string destination, std::string objectPath)
             : ProxyObjectHolder(createProxy(std::move(connection), std::move(destination), std::move(objectPath)))
             , _Interfaces(getProxy())...
         {
@@ -167,7 +167,7 @@ namespace sdbus {
          * The proxy created this way becomes an owner of the connection.
          * For more information on its behavior, consult @ref createProxy(std::unique_ptr<sdbus::IConnection>&&,std::string,std::string,sdbus::dont_run_event_loop_thread_t)
          */
-        ProxyInterfaces(std::unique_ptr<sdbus::IConnection>&& connection, ServiceName destination, ObjectPath objectPath, dont_run_event_loop_thread_t)
+        ProxyInterfaces(std::unique_ptr<sdbus::IConnection>&& connection, std::string destination, std::string objectPath, dont_run_event_loop_thread_t)
                 : ProxyObjectHolder(createProxy(std::move(connection), std::move(destination), std::move(objectPath), dont_run_event_loop_thread))
                 , _Interfaces(getProxy())...
         {
@@ -207,8 +207,8 @@ namespace sdbus {
 
         ProxyInterfaces(const ProxyInterfaces&) = delete;
         ProxyInterfaces& operator=(const ProxyInterfaces&) = delete;
-        ProxyInterfaces(ProxyInterfaces&&) = delete;
-        ProxyInterfaces& operator=(ProxyInterfaces&&) = delete;
+        ProxyInterfaces(ProxyInterfaces&&) = default;
+        ProxyInterfaces& operator=(ProxyInterfaces&&) = default;
         ~ProxyInterfaces() = default;
     };
 

include/sdbus-c++/StandardInterfaces.h

@@ -1,6 +1,6 @@
 /**
  * (C) 2016 - 2021 KISTLER INSTRUMENTE AG, Winterthur, Switzerland
- * (C) 2016 - 2024 Stanislav Angelovic <stanislav.angelovic@protonmail.com>
+ * (C) 2016 - 2022 Stanislav Angelovic <stanislav.angelovic@protonmail.com>
  *
  * @file StandardInterfaces.h
  *
@@ -31,7 +31,6 @@
 #include <sdbus-c++/IProxy.h>
 #include <sdbus-c++/Types.h>
 #include <string>
-#include <string_view>
 #include <map>
 #include <vector>
 
@@ -40,18 +39,18 @@ namespace sdbus {
     // Proxy for peer
     class Peer_proxy
     {
-        static inline const char* INTERFACE_NAME = "org.freedesktop.DBus.Peer";
+        static constexpr const char* INTERFACE_NAME = "org.freedesktop.DBus.Peer";
 
     protected:
         Peer_proxy(sdbus::IProxy& proxy)
-            : m_proxy(proxy)
+            : proxy_(&proxy)
         {
         }
 
         Peer_proxy(const Peer_proxy&) = delete;
         Peer_proxy& operator=(const Peer_proxy&) = delete;
-        Peer_proxy(Peer_proxy&&) = delete;
-        Peer_proxy& operator=(Peer_proxy&&) = delete;
+        Peer_proxy(Peer_proxy&&) = default;
+        Peer_proxy& operator=(Peer_proxy&&) = default;
 
         ~Peer_proxy() = default;
 
@@ -62,35 +61,35 @@ namespace sdbus {
     public:
         void Ping()
         {
-            m_proxy.callMethod("Ping").onInterface(INTERFACE_NAME);
+            proxy_->callMethod("Ping").onInterface(INTERFACE_NAME);
         }
 
         std::string GetMachineId()
         {
             std::string machineUUID;
-            m_proxy.callMethod("GetMachineId").onInterface(INTERFACE_NAME).storeResultsTo(machineUUID);
+            proxy_->callMethod("GetMachineId").onInterface(INTERFACE_NAME).storeResultsTo(machineUUID);
             return machineUUID;
         }
 
     private:
-        sdbus::IProxy& m_proxy;
+        sdbus::IProxy* proxy_;
     };
 
     // Proxy for introspection
     class Introspectable_proxy
     {
-        static inline const char* INTERFACE_NAME = "org.freedesktop.DBus.Introspectable";
+        static constexpr const char* INTERFACE_NAME = "org.freedesktop.DBus.Introspectable";
 
     protected:
         Introspectable_proxy(sdbus::IProxy& proxy)
-            : m_proxy(proxy)
+            : proxy_(&proxy)
         {
         }
 
         Introspectable_proxy(const Introspectable_proxy&) = delete;
         Introspectable_proxy& operator=(const Introspectable_proxy&) = delete;
-        Introspectable_proxy(Introspectable_proxy&&) = delete;
-        Introspectable_proxy& operator=(Introspectable_proxy&&) = delete;
+        Introspectable_proxy(Introspectable_proxy&&) = default;
+        Introspectable_proxy& operator=(Introspectable_proxy&&) = default;
 
         ~Introspectable_proxy() = default;
 
@@ -102,267 +101,160 @@ namespace sdbus {
         std::string Introspect()
         {
             std::string xml;
-            m_proxy.callMethod("Introspect").onInterface(INTERFACE_NAME).storeResultsTo(xml);
+            proxy_->callMethod("Introspect").onInterface(INTERFACE_NAME).storeResultsTo(xml);
             return xml;
         }
 
     private:
-        sdbus::IProxy& m_proxy;
+        sdbus::IProxy* proxy_;
     };
 
     // Proxy for properties
     class Properties_proxy
     {
-        static inline const char* INTERFACE_NAME = "org.freedesktop.DBus.Properties";
+        static constexpr const char* INTERFACE_NAME = "org.freedesktop.DBus.Properties";
 
     protected:
         Properties_proxy(sdbus::IProxy& proxy)
-            : m_proxy(proxy)
+            : proxy_(&proxy)
         {
         }
 
         Properties_proxy(const Properties_proxy&) = delete;
         Properties_proxy& operator=(const Properties_proxy&) = delete;
-        Properties_proxy(Properties_proxy&&) = delete;
-        Properties_proxy& operator=(Properties_proxy&&) = delete;
+        Properties_proxy(Properties_proxy&&) = default;
+        Properties_proxy& operator=(Properties_proxy&&) = default;
 
         ~Properties_proxy() = default;
 
         void registerProxy()
         {
-            m_proxy
-                .uponSignal("PropertiesChanged")
+            proxy_
+                ->uponSignal("PropertiesChanged")
                 .onInterface(INTERFACE_NAME)
-                .call([this]( const InterfaceName& interfaceName
-                            , const std::map<PropertyName, sdbus::Variant>& changedProperties
-                            , const std::vector<PropertyName>& invalidatedProperties )
+                .call([this]( const std::string& interfaceName
+                            , const std::map<std::string, sdbus::Variant>& changedProperties
+                            , const std::vector<std::string>& invalidatedProperties )
                             {
                                 this->onPropertiesChanged(interfaceName, changedProperties, invalidatedProperties);
                             });
         }
 
-        virtual void onPropertiesChanged( const InterfaceName& interfaceName
-                                        , const std::map<PropertyName, sdbus::Variant>& changedProperties
-                                        , const std::vector<PropertyName>& invalidatedProperties ) = 0;
+        virtual void onPropertiesChanged( const std::string& interfaceName
+                                        , const std::map<std::string, sdbus::Variant>& changedProperties
+                                        , const std::vector<std::string>& invalidatedProperties ) = 0;
 
     public:
-        sdbus::Variant Get(const InterfaceName& interfaceName, const PropertyName& propertyName)
+        sdbus::Variant Get(const std::string& interfaceName, const std::string& propertyName)
         {
-            return m_proxy.getProperty(propertyName).onInterface(interfaceName);
-        }
-
-        sdbus::Variant Get(std::string_view interfaceName, std::string_view propertyName)
-        {
-            return m_proxy.getProperty(propertyName).onInterface(interfaceName);
+            return proxy_->getProperty(propertyName).onInterface(interfaceName);
         }
 
         template <typename _Function>
-        PendingAsyncCall GetAsync(const InterfaceName& interfaceName, const PropertyName& propertyName, _Function&& callback)
+        PendingAsyncCall Get(const std::string& interfaceName, const std::string& propertyName, _Function&& callback, async_t)
         {
-            return m_proxy.getPropertyAsync(propertyName).onInterface(interfaceName).uponReplyInvoke(std::forward<_Function>(callback));
+            return proxy_->getProperty(propertyName, async).onInterface(interfaceName).uponReplyInvoke(std::forward<_Function>(callback));
+        }
+
+        std::future<sdbus::Variant> Get(const std::string& interfaceName, const std::string& propertyName, async_t, with_future_t)
+        {
+            return proxy_->getProperty(propertyName, async).onInterface(interfaceName).getResultAsFuture();
+        }
+
+        void Set(const std::string& interfaceName, const std::string& propertyName, const sdbus::Variant& value)
+        {
+            proxy_->setProperty(propertyName).onInterface(interfaceName).toValue(value);
+        }
+
+        void Set(const std::string& interfaceName, const std::string& propertyName, const sdbus::Variant& value, dont_expect_reply_t)
+        {
+            proxy_->setProperty(propertyName).onInterface(interfaceName).toValue(value, dont_expect_reply);
         }
 
         template <typename _Function>
-        [[nodiscard]] Slot GetAsync(const InterfaceName& interfaceName, const PropertyName& propertyName, _Function&& callback, return_slot_t)
+        PendingAsyncCall Set(const std::string& interfaceName, const std::string& propertyName, const sdbus::Variant& value, _Function&& callback, async_t)
         {
-            return m_proxy.getPropertyAsync(propertyName).onInterface(interfaceName).uponReplyInvoke(std::forward<_Function>(callback), return_slot);
+            return proxy_->setProperty(propertyName, async).onInterface(interfaceName).toValue(value).uponReplyInvoke(std::forward<_Function>(callback));
         }
 
-        std::future<sdbus::Variant> GetAsync(const InterfaceName& interfaceName, const PropertyName& propertyName, with_future_t)
+        std::future<void> Set(const std::string& interfaceName, const std::string& propertyName, const sdbus::Variant& value, async_t, with_future_t)
         {
-            return m_proxy.getPropertyAsync(propertyName).onInterface(interfaceName).getResultAsFuture();
+            return proxy_->setProperty(propertyName, async).onInterface(interfaceName).toValue(value).getResultAsFuture();
+        }
+
+        std::map<std::string, sdbus::Variant> GetAll(const std::string& interfaceName)
+        {
+            return proxy_->getAllProperties().onInterface(interfaceName);
         }
 
         template <typename _Function>
-        PendingAsyncCall GetAsync(std::string_view interfaceName, std::string_view propertyName, _Function&& callback)
+        PendingAsyncCall GetAll(const std::string& interfaceName, _Function&& callback, async_t)
         {
-            return m_proxy.getPropertyAsync(propertyName).onInterface(interfaceName).uponReplyInvoke(std::forward<_Function>(callback));
+            return proxy_->getAllProperties(async).onInterface(interfaceName).uponReplyInvoke(std::forward<_Function>(callback));
         }
 
-        template <typename _Function>
-        [[nodiscard]] Slot GetAsync(std::string_view interfaceName, std::string_view propertyName, _Function&& callback, return_slot_t)
+        std::future<std::map<std::string, sdbus::Variant>> GetAll(const std::string& interfaceName, async_t, with_future_t)
         {
-            return m_proxy.getPropertyAsync(propertyName).onInterface(interfaceName).uponReplyInvoke(std::forward<_Function>(callback), return_slot);
-        }
-
-        std::future<sdbus::Variant> GetAsync(std::string_view interfaceName, std::string_view propertyName, with_future_t)
-        {
-            return m_proxy.getPropertyAsync(propertyName).onInterface(interfaceName).getResultAsFuture();
-        }
-
-        void Set(const InterfaceName& interfaceName, const PropertyName& propertyName, const sdbus::Variant& value)
-        {
-            m_proxy.setProperty(propertyName).onInterface(interfaceName).toValue(value);
-        }
-
-        void Set(std::string_view interfaceName, const std::string_view propertyName, const sdbus::Variant& value)
-        {
-            m_proxy.setProperty(propertyName).onInterface(interfaceName).toValue(value);
-        }
-
-        void Set(const InterfaceName& interfaceName, const PropertyName& propertyName, const sdbus::Variant& value, dont_expect_reply_t)
-        {
-            m_proxy.setProperty(propertyName).onInterface(interfaceName).toValue(value, dont_expect_reply);
-        }
-
-        void Set(std::string_view interfaceName, const std::string_view propertyName, const sdbus::Variant& value, dont_expect_reply_t)
-        {
-            m_proxy.setProperty(propertyName).onInterface(interfaceName).toValue(value, dont_expect_reply);
-        }
-
-        template <typename _Function>
-        PendingAsyncCall SetAsync(const InterfaceName& interfaceName, const PropertyName& propertyName, const sdbus::Variant& value, _Function&& callback)
-        {
-            return m_proxy.setPropertyAsync(propertyName).onInterface(interfaceName).toValue(value).uponReplyInvoke(std::forward<_Function>(callback));
-        }
-
-        template <typename _Function>
-        [[nodiscard]] Slot SetAsync(const InterfaceName& interfaceName, const PropertyName& propertyName, const sdbus::Variant& value, _Function&& callback, return_slot_t)
-        {
-            return m_proxy.setPropertyAsync(propertyName).onInterface(interfaceName).toValue(value).uponReplyInvoke(std::forward<_Function>(callback), return_slot);
-        }
-
-        std::future<void> SetAsync(const InterfaceName& interfaceName, const PropertyName& propertyName, const sdbus::Variant& value, with_future_t)
-        {
-            return m_proxy.setPropertyAsync(propertyName).onInterface(interfaceName).toValue(value).getResultAsFuture();
-        }
-
-        template <typename _Function>
-        PendingAsyncCall SetAsync(std::string_view interfaceName, std::string_view propertyName, const sdbus::Variant& value, _Function&& callback)
-        {
-            return m_proxy.setPropertyAsync(propertyName).onInterface(interfaceName).toValue(value).uponReplyInvoke(std::forward<_Function>(callback));
-        }
-
-        template <typename _Function>
-        [[nodiscard]] Slot SetAsync(std::string_view interfaceName, std::string_view propertyName, const sdbus::Variant& value, _Function&& callback, return_slot_t)
-        {
-            return m_proxy.setPropertyAsync(propertyName).onInterface(interfaceName).toValue(value).uponReplyInvoke(std::forward<_Function>(callback), return_slot);
-        }
-
-        std::future<void> SetAsync(std::string_view interfaceName, std::string_view propertyName, const sdbus::Variant& value, with_future_t)
-        {
-            return m_proxy.setPropertyAsync(propertyName).onInterface(interfaceName).toValue(value).getResultAsFuture();
-        }
-
-        std::map<PropertyName, sdbus::Variant> GetAll(const InterfaceName& interfaceName)
-        {
-            return m_proxy.getAllProperties().onInterface(interfaceName);
-        }
-
-        std::map<PropertyName, sdbus::Variant> GetAll(std::string_view interfaceName)
-        {
-            return m_proxy.getAllProperties().onInterface(interfaceName);
-        }
-
-        template <typename _Function>
-        PendingAsyncCall GetAllAsync(const InterfaceName& interfaceName, _Function&& callback)
-        {
-            return m_proxy.getAllPropertiesAsync().onInterface(interfaceName).uponReplyInvoke(std::forward<_Function>(callback));
-        }
-
-        template <typename _Function>
-        [[nodiscard]] Slot GetAllAsync(const InterfaceName& interfaceName, _Function&& callback, return_slot_t)
-        {
-            return m_proxy.getAllPropertiesAsync().onInterface(interfaceName).uponReplyInvoke(std::forward<_Function>(callback), return_slot);
-        }
-
-        std::future<std::map<PropertyName, sdbus::Variant>> GetAllAsync(const InterfaceName& interfaceName, with_future_t)
-        {
-            return m_proxy.getAllPropertiesAsync().onInterface(interfaceName).getResultAsFuture();
-        }
-
-        template <typename _Function>
-        PendingAsyncCall GetAllAsync(std::string_view interfaceName, _Function&& callback)
-        {
-            return m_proxy.getAllPropertiesAsync().onInterface(interfaceName).uponReplyInvoke(std::forward<_Function>(callback));
-        }
-
-        template <typename _Function>
-        [[nodiscard]] Slot GetAllAsync(std::string_view interfaceName, _Function&& callback, return_slot_t)
-        {
-            return m_proxy.getAllPropertiesAsync().onInterface(interfaceName).uponReplyInvoke(std::forward<_Function>(callback), return_slot);
-        }
-
-        std::future<std::map<PropertyName, sdbus::Variant>> GetAllAsync(std::string_view interfaceName, with_future_t)
-        {
-            return m_proxy.getAllPropertiesAsync().onInterface(interfaceName).getResultAsFuture();
+            return proxy_->getAllProperties(async).onInterface(interfaceName).getResultAsFuture();
         }
 
     private:
-        sdbus::IProxy& m_proxy;
+        sdbus::IProxy* proxy_;
     };
 
     // Proxy for object manager
     class ObjectManager_proxy
     {
-        static inline const char* INTERFACE_NAME = "org.freedesktop.DBus.ObjectManager";
+        static constexpr const char* INTERFACE_NAME = "org.freedesktop.DBus.ObjectManager";
 
     protected:
         ObjectManager_proxy(sdbus::IProxy& proxy)
-            : m_proxy(proxy)
+            : proxy_(&proxy)
         {
         }
 
         ObjectManager_proxy(const ObjectManager_proxy&) = delete;
         ObjectManager_proxy& operator=(const ObjectManager_proxy&) = delete;
-        ObjectManager_proxy(ObjectManager_proxy&&) = delete;
-        ObjectManager_proxy& operator=(ObjectManager_proxy&&) = delete;
+        ObjectManager_proxy(ObjectManager_proxy&&) = default;
+        ObjectManager_proxy& operator=(ObjectManager_proxy&&) = default;
 
         ~ObjectManager_proxy() = default;
 
         void registerProxy()
         {
-            m_proxy
-                .uponSignal("InterfacesAdded")
+            proxy_
+                ->uponSignal("InterfacesAdded")
                 .onInterface(INTERFACE_NAME)
                 .call([this]( const sdbus::ObjectPath& objectPath
-                            , const std::map<sdbus::InterfaceName, std::map<PropertyName, sdbus::Variant>>& interfacesAndProperties )
+                            , const std::map<std::string, std::map<std::string, sdbus::Variant>>& interfacesAndProperties )
                             {
                                 this->onInterfacesAdded(objectPath, interfacesAndProperties);
                             });
 
-            m_proxy
-                .uponSignal("InterfacesRemoved")
+            proxy_->uponSignal("InterfacesRemoved")
                 .onInterface(INTERFACE_NAME)
                 .call([this]( const sdbus::ObjectPath& objectPath
-                            , const std::vector<sdbus::InterfaceName>& interfaces )
+                            , const std::vector<std::string>& interfaces )
                             {
                                 this->onInterfacesRemoved(objectPath, interfaces);
                             });
         }
 
         virtual void onInterfacesAdded( const sdbus::ObjectPath& objectPath
-                                      , const std::map<sdbus::InterfaceName, std::map<PropertyName, sdbus::Variant>>& interfacesAndProperties) = 0;
+                                      , const std::map<std::string, std::map<std::string, sdbus::Variant>>& interfacesAndProperties) = 0;
         virtual void onInterfacesRemoved( const sdbus::ObjectPath& objectPath
-                                        , const std::vector<sdbus::InterfaceName>& interfaces) = 0;
+                                        , const std::vector<std::string>& interfaces) = 0;
 
     public:
-        std::map<sdbus::ObjectPath, std::map<sdbus::InterfaceName, std::map<PropertyName, sdbus::Variant>>> GetManagedObjects()
+        std::map<sdbus::ObjectPath, std::map<std::string, std::map<std::string, sdbus::Variant>>> GetManagedObjects()
         {
-            std::map<sdbus::ObjectPath, std::map<sdbus::InterfaceName, std::map<PropertyName, sdbus::Variant>>> objectsInterfacesAndProperties;
-            m_proxy.callMethod("GetManagedObjects").onInterface(INTERFACE_NAME).storeResultsTo(objectsInterfacesAndProperties);
+            std::map<sdbus::ObjectPath, std::map<std::string, std::map<std::string, sdbus::Variant>>> objectsInterfacesAndProperties;
+            proxy_->callMethod("GetManagedObjects").onInterface(INTERFACE_NAME).storeResultsTo(objectsInterfacesAndProperties);
             return objectsInterfacesAndProperties;
         }
 
-        template <typename _Function>
-        PendingAsyncCall GetManagedObjectsAsync(_Function&& callback)
-        {
-            return m_proxy.callMethodAsync("GetManagedObjects").onInterface(INTERFACE_NAME).uponReplyInvoke(std::forward<_Function>(callback));
-        }
-
-        template <typename _Function>
-        [[nodiscard]] Slot GetManagedObjectsAsync(_Function&& callback, return_slot_t)
-        {
-            return m_proxy.callMethodAsync("GetManagedObjects").onInterface(INTERFACE_NAME).uponReplyInvoke(std::forward<_Function>(callback), return_slot);
-        }
-
-        std::future<std::map<sdbus::ObjectPath, std::map<sdbus::InterfaceName, std::map<PropertyName, sdbus::Variant>>>> GetManagedObjectsAsync(with_future_t)
-        {
-            return m_proxy.callMethodAsync("GetManagedObjects").onInterface(INTERFACE_NAME).getResultAsFuture<std::map<sdbus::ObjectPath, std::map<sdbus::InterfaceName, std::map<PropertyName, sdbus::Variant>>>>();
-        }
-
     private:
-        sdbus::IProxy& m_proxy;
+        sdbus::IProxy* proxy_;
     };
 
     // Adaptors for the above-listed standard D-Bus interfaces are not necessary because the functionality
@@ -372,17 +264,17 @@ namespace sdbus {
     // Adaptor for properties
     class Properties_adaptor
     {
-        static inline const char* INTERFACE_NAME = "org.freedesktop.DBus.Properties";
+        static constexpr const char* INTERFACE_NAME = "org.freedesktop.DBus.Properties";
 
     protected:
-        Properties_adaptor(sdbus::IObject& object) : m_object(object)
+        Properties_adaptor(sdbus::IObject& object) : object_(&object)
         {
         }
 
         Properties_adaptor(const Properties_adaptor&) = delete;
         Properties_adaptor& operator=(const Properties_adaptor&) = delete;
-        Properties_adaptor(Properties_adaptor&&) = delete;
-        Properties_adaptor& operator=(Properties_adaptor&&) = delete;
+        Properties_adaptor(Properties_adaptor&&) = default;
+        Properties_adaptor& operator=(Properties_adaptor&&) = default;
 
         ~Properties_adaptor() = default;
 
@@ -391,28 +283,18 @@ namespace sdbus {
         }
 
     public:
-        void emitPropertiesChangedSignal(const InterfaceName& interfaceName, const std::vector<PropertyName>& properties)
+        void emitPropertiesChangedSignal(const std::string& interfaceName, const std::vector<std::string>& properties)
         {
-            m_object.emitPropertiesChangedSignal(interfaceName, properties);
+            object_->emitPropertiesChangedSignal(interfaceName, properties);
         }
 
-        void emitPropertiesChangedSignal(const char* interfaceName, const std::vector<PropertyName>& properties)
+        void emitPropertiesChangedSignal(const std::string& interfaceName)
         {
-            m_object.emitPropertiesChangedSignal(interfaceName, properties);
-        }
-
-        void emitPropertiesChangedSignal(const InterfaceName& interfaceName)
-        {
-            m_object.emitPropertiesChangedSignal(interfaceName);
-        }
-
-        void emitPropertiesChangedSignal(const char* interfaceName)
-        {
-            m_object.emitPropertiesChangedSignal(interfaceName);
+            object_->emitPropertiesChangedSignal(interfaceName);
         }
 
     private:
-        sdbus::IObject& m_object;
+        sdbus::IObject* object_;
     };
 
     /*!
@@ -427,27 +309,27 @@ namespace sdbus {
      */
     class ObjectManager_adaptor
     {
-        static inline const char* INTERFACE_NAME = "org.freedesktop.DBus.ObjectManager";
+        static constexpr const char* INTERFACE_NAME = "org.freedesktop.DBus.ObjectManager";
 
     protected:
-        explicit ObjectManager_adaptor(sdbus::IObject& object) : m_object(object)
+        explicit ObjectManager_adaptor(sdbus::IObject& object) : object_(&object)
         {
         }
 
         ObjectManager_adaptor(const ObjectManager_adaptor&) = delete;
         ObjectManager_adaptor& operator=(const ObjectManager_adaptor&) = delete;
-        ObjectManager_adaptor(ObjectManager_adaptor&&) = delete;
-        ObjectManager_adaptor& operator=(ObjectManager_adaptor&&) = delete;
+        ObjectManager_adaptor(ObjectManager_adaptor&&) = default;
+        ObjectManager_adaptor& operator=(ObjectManager_adaptor&&) = default;
 
         ~ObjectManager_adaptor() = default;
 
         void registerAdaptor()
         {
-            m_object.addObjectManager();
+            object_->addObjectManager();
         }
 
     private:
-        sdbus::IObject& m_object;
+        sdbus::IObject* object_;
     };
 
     /*!
@@ -465,14 +347,14 @@ namespace sdbus {
     {
     protected:
         explicit ManagedObject_adaptor(sdbus::IObject& object)
-            : m_object(object)
+            : object_(&object)
         {
         }
 
         ManagedObject_adaptor(const ManagedObject_adaptor&) = delete;
         ManagedObject_adaptor& operator=(const ManagedObject_adaptor&) = delete;
-        ManagedObject_adaptor(ManagedObject_adaptor&&) = delete;
-        ManagedObject_adaptor& operator=(ManagedObject_adaptor&&) = delete;
+        ManagedObject_adaptor(ManagedObject_adaptor&&) = default;
+        ManagedObject_adaptor& operator=(ManagedObject_adaptor&&) = default;
 
         ~ManagedObject_adaptor() = default;
 
@@ -488,7 +370,7 @@ namespace sdbus {
          */
         void emitInterfacesAddedSignal()
         {
-            m_object.emitInterfacesAddedSignal();
+            object_->emitInterfacesAddedSignal();
         }
 
         /*!
@@ -496,9 +378,9 @@ namespace sdbus {
          *
          * See IObject::emitInterfacesAddedSignal().
          */
-        void emitInterfacesAddedSignal(const std::vector<sdbus::InterfaceName>& interfaces)
+        void emitInterfacesAddedSignal(const std::vector<std::string>& interfaces)
         {
-            m_object.emitInterfacesAddedSignal(interfaces);
+            object_->emitInterfacesAddedSignal(interfaces);
         }
 
         /*!
@@ -508,7 +390,7 @@ namespace sdbus {
          */
         void emitInterfacesRemovedSignal()
         {
-            m_object.emitInterfacesRemovedSignal();
+            object_->emitInterfacesRemovedSignal();
         }
 
         /*!
@@ -516,13 +398,13 @@ namespace sdbus {
          *
          * See IObject::emitInterfacesRemovedSignal().
          */
-        void emitInterfacesRemovedSignal(const std::vector<InterfaceName>& interfaces)
+        void emitInterfacesRemovedSignal(const std::vector<std::string>& interfaces)
         {
-            m_object.emitInterfacesRemovedSignal(interfaces);
+            object_->emitInterfacesRemovedSignal(interfaces);
         }
 
     private:
-        sdbus::IObject& m_object;
+        sdbus::IObject* object_;
     };
 
 }

include/sdbus-c++/TypeTraits.h

@@ -1,6 +1,6 @@
 /**
  * (C) 2016 - 2021 KISTLER INSTRUMENTE AG, Winterthur, Switzerland
- * (C) 2016 - 2024 Stanislav Angelovic <stanislav.angelovic@protonmail.com>
+ * (C) 2016 - 2022 Stanislav Angelovic <stanislav.angelovic@protonmail.com>
  *
  * @file TypeTraits.h
  *
@@ -27,27 +27,20 @@
 #ifndef SDBUS_CXX_TYPETRAITS_H_
 #define SDBUS_CXX_TYPETRAITS_H_
 
-#include <sdbus-c++/Error.h>
-
+#include <type_traits>
+#include <string>
+#include <vector>
 #include <array>
+#if __cplusplus >= 202002L
+#include <span>
+#endif
+#include <map>
+#include <unordered_map>
 #include <cstdint>
 #include <functional>
-#include <map>
 #include <memory>
-#include <optional>
-#ifdef __has_include
-#  if __has_include(<span>)
-#    include <span>
-#  endif
-#endif
-#include <string>
-#include <string_view>
 #include <tuple>
-#include <type_traits>
-#include <unordered_map>
-#include <utility>
 #include <variant>
-#include <vector>
 
 // Forward declarations
 namespace sdbus {
@@ -56,10 +49,6 @@ namespace sdbus {
     class ObjectPath;
     class Signature;
     class UnixFd;
-    template<typename _T1, typename _T2> using DictEntry = std::pair<_T1, _T2>;
-    class BusName;
-    class InterfaceName;
-    class MemberName;
     class MethodCall;
     class MethodReply;
     class Signal;
@@ -68,14 +57,13 @@ namespace sdbus {
     class PropertyGetReply;
     template <typename... _Results> class Result;
     class Error;
-    template <typename _T, typename _Enable = void> struct signature_of;
 }
 
 namespace sdbus {
 
     // Callbacks from sdbus-c++
     using method_callback = std::function<void(MethodCall msg)>;
-    using async_reply_handler = std::function<void(MethodReply reply, std::optional<Error> error)>;
+    using async_reply_handler = std::function<void(MethodReply reply, const Error* error)>;
     using signal_handler = std::function<void(Signal signal)>;
     using message_handler = std::function<void(Message msg)>;
     using property_set_callback = std::function<void(PropertySetCall msg)>;
@@ -84,7 +72,13 @@ namespace sdbus {
     // Type-erased RAII-style handle to callbacks/subscriptions registered to sdbus-c++
     using Slot = std::unique_ptr<void, std::function<void(void*)>>;
 
-    // Tag specifying that an owning handle (so-called slot) of the logical resource shall be provided to the client
+    // Tag denoting an asynchronous call or operation
+    struct async_t { explicit async_t() = default; };
+    inline constexpr async_t async{};
+    // Tag denoting a variant of an asynchronous method call that returns std::future instead of accepting
+    struct with_future_t { explicit with_future_t() = default; };
+    inline constexpr with_future_t with_future{};
+    // Tag specifying that an owning slot handle shall be returned from a registration/subscription function to the caller
     struct return_slot_t { explicit return_slot_t() = default; };
     inline constexpr return_slot_t return_slot{};
     // Tag specifying that the library shall own the slot resulting from the call of the function (so-called floating slot)
@@ -100,298 +94,358 @@ namespace sdbus {
     // Such proxies are typically created to carry out a simple synchronous D-Bus call(s) and then are destroyed.
     struct dont_run_event_loop_thread_t { explicit dont_run_event_loop_thread_t() = default; };
     inline constexpr dont_run_event_loop_thread_t dont_run_event_loop_thread{};
-    // Tag denoting an asynchronous call that returns std::future as a handle
-    struct with_future_t { explicit with_future_t() = default; };
-    inline constexpr with_future_t with_future{};
     // Tag denoting a call where the reply shouldn't be waited for
     struct dont_expect_reply_t { explicit dont_expect_reply_t() = default; };
     inline constexpr dont_expect_reply_t dont_expect_reply{};
-    // Tag denoting that the variant shall embed the other variant as its value, instead of creating a copy
-    struct embed_variant_t { explicit embed_variant_t() = default; };
-    inline constexpr embed_variant_t embed_variant{};
-
-    // Helper for static assert
-    template <class... _T> constexpr bool always_false = false;
-
-    // Helper operator+ for concatenation of `std::array`s
-    template <typename _T, std::size_t _N1, std::size_t _N2>
-    constexpr std::array<_T, _N1 + _N2> operator+(std::array<_T, _N1> lhs, std::array<_T, _N2> rhs);
 
     // Template specializations for getting D-Bus signatures from C++ types
     template <typename _T>
-    constexpr auto signature_of_v = signature_of<_T>::value;
-
-    template <typename _T, typename _Enable>
     struct signature_of
     {
         static constexpr bool is_valid = false;
         static constexpr bool is_trivial_dbus_type = false;
 
-        static constexpr void* value = []
+        static const std::string str()
         {
-            // See using-sdbus-c++.md, section "Extending sdbus-c++ type system",
-            // on how to teach sdbus-c++ about your custom types
-            static_assert(always_false<_T>, "Unsupported D-Bus type (specialize `signature_of` for your custom types)");
-        };
+            // sizeof(_T) < 0 is here to make compiler not being able to figure out
+            // the assertion expression before the template instantiation takes place.
+            static_assert(sizeof(_T) < 0, "Unknown DBus type");
+            return "";
+        }
     };
 
     template <typename _T>
-    struct signature_of<const _T> : signature_of<_T>
+    struct signature_of<const _T>
+        : public signature_of<_T>
     {};
 
     template <typename _T>
-    struct signature_of<volatile _T> : signature_of<_T>
-    {};
-
-    template <typename _T>
-    struct signature_of<const volatile _T> : signature_of<_T>
-    {};
-
-    template <typename _T>
-    struct signature_of<_T&> : signature_of<_T>
+    struct signature_of<_T&>
+            : public signature_of<_T>
     {};
 
     template <>
     struct signature_of<void>
     {
-        static constexpr std::array<char, 0> value{};
         static constexpr bool is_valid = true;
         static constexpr bool is_trivial_dbus_type = false;
+
+        static const std::string str()
+        {
+            return "";
+        }
     };
 
     template <>
     struct signature_of<bool>
     {
-        static constexpr std::array value{'b'};
         static constexpr bool is_valid = true;
         static constexpr bool is_trivial_dbus_type = true;
+
+        static const std::string str()
+        {
+            return "b";
+        }
     };
 
     template <>
     struct signature_of<uint8_t>
     {
-        static constexpr std::array value{'y'};
         static constexpr bool is_valid = true;
         static constexpr bool is_trivial_dbus_type = true;
+
+        static const std::string str()
+        {
+            return "y";
+        }
     };
 
     template <>
     struct signature_of<int16_t>
     {
-        static constexpr std::array value{'n'};
         static constexpr bool is_valid = true;
         static constexpr bool is_trivial_dbus_type = true;
+
+        static const std::string str()
+        {
+            return "n";
+        }
     };
 
     template <>
     struct signature_of<uint16_t>
     {
-        static constexpr std::array value{'q'};
         static constexpr bool is_valid = true;
         static constexpr bool is_trivial_dbus_type = true;
+
+        static const std::string str()
+        {
+            return "q";
+        }
     };
 
     template <>
     struct signature_of<int32_t>
     {
-        static constexpr std::array value{'i'};
         static constexpr bool is_valid = true;
         static constexpr bool is_trivial_dbus_type = true;
+
+        static const std::string str()
+        {
+            return "i";
+        }
     };
 
     template <>
     struct signature_of<uint32_t>
     {
-        static constexpr std::array value{'u'};
         static constexpr bool is_valid = true;
         static constexpr bool is_trivial_dbus_type = true;
+
+        static const std::string str()
+        {
+            return "u";
+        }
     };
 
     template <>
     struct signature_of<int64_t>
     {
-        static constexpr std::array value{'x'};
         static constexpr bool is_valid = true;
         static constexpr bool is_trivial_dbus_type = true;
+
+        static const std::string str()
+        {
+            return "x";
+        }
     };
 
     template <>
     struct signature_of<uint64_t>
     {
-        static constexpr std::array value{'t'};
         static constexpr bool is_valid = true;
         static constexpr bool is_trivial_dbus_type = true;
+
+        static const std::string str()
+        {
+            return "t";
+        }
     };
 
     template <>
     struct signature_of<double>
     {
-        static constexpr std::array value{'d'};
         static constexpr bool is_valid = true;
         static constexpr bool is_trivial_dbus_type = true;
+
+        static const std::string str()
+        {
+            return "d";
+        }
+    };
+
+    template <>
+    struct signature_of<char*>
+    {
+        static constexpr bool is_valid = true;
+        static constexpr bool is_trivial_dbus_type = false;
+
+        static const std::string str()
+        {
+            return "s";
+        }
+    };
+
+    template <>
+    struct signature_of<const char*>
+    {
+        static constexpr bool is_valid = true;
+        static constexpr bool is_trivial_dbus_type = false;
+
+        static const std::string str()
+        {
+            return "s";
+        }
+    };
+
+    template <std::size_t _N>
+    struct signature_of<char[_N]>
+    {
+        static constexpr bool is_valid = true;
+        static constexpr bool is_trivial_dbus_type = false;
+
+        static const std::string str()
+        {
+            return "s";
+        }
+    };
+
+    template <std::size_t _N>
+    struct signature_of<const char[_N]>
+    {
+        static constexpr bool is_valid = true;
+        static constexpr bool is_trivial_dbus_type = false;
+
+        static const std::string str()
+        {
+            return "s";
+        }
     };
 
     template <>
     struct signature_of<std::string>
     {
-        static constexpr std::array value{'s'};
         static constexpr bool is_valid = true;
         static constexpr bool is_trivial_dbus_type = false;
+
+        static const std::string str()
+        {
+            return "s";
+        }
     };
 
-    template <>
-    struct signature_of<std::string_view> : signature_of<std::string>
-    {};
-
-    template <>
-    struct signature_of<char*> : signature_of<std::string>
-    {};
-
-    template <>
-    struct signature_of<const char*> : signature_of<std::string>
-    {};
-
-    template <std::size_t _N>
-    struct signature_of<char[_N]> : signature_of<std::string>
-    {};
-
-    template <std::size_t _N>
-    struct signature_of<const char[_N]> : signature_of<std::string>
-    {};
-
-    template <>
-    struct signature_of<BusName> : signature_of<std::string>
-    {};
-
-    template <>
-    struct signature_of<InterfaceName> : signature_of<std::string>
-    {};
-
-    template <>
-    struct signature_of<MemberName> : signature_of<std::string>
-    {};
-
     template <typename... _ValueTypes>
     struct signature_of<Struct<_ValueTypes...>>
     {
-        static constexpr std::array contents = (signature_of_v<_ValueTypes> + ...);
-        static constexpr std::array value = std::array{'('} + contents + std::array{')'};
-        static constexpr char type_value{'r'}; /* Not actually used in signatures on D-Bus, see specs */
         static constexpr bool is_valid = true;
         static constexpr bool is_trivial_dbus_type = false;
+
+        static const std::string str()
+        {
+            std::string signature;
+            signature += "(";
+            (signature += ... += signature_of<_ValueTypes>::str());
+            signature += ")";
+            return signature;
+        }
     };
 
     template <>
     struct signature_of<Variant>
     {
-        static constexpr std::array value{'v'};
         static constexpr bool is_valid = true;
         static constexpr bool is_trivial_dbus_type = false;
-    };
 
-    template <typename... Elements>
-    struct signature_of<std::variant<Elements...>> : signature_of<Variant>
-    {};
+        static const std::string str()
+        {
+            return "v";
+        }
+    };
 
     template <>
     struct signature_of<ObjectPath>
     {
-        static constexpr std::array value{'o'};
         static constexpr bool is_valid = true;
         static constexpr bool is_trivial_dbus_type = false;
+
+        static const std::string str()
+        {
+            return "o";
+        }
     };
 
     template <>
     struct signature_of<Signature>
     {
-        static constexpr std::array value{'g'};
         static constexpr bool is_valid = true;
         static constexpr bool is_trivial_dbus_type = false;
+
+        static const std::string str()
+        {
+            return "g";
+        }
     };
 
     template <>
     struct signature_of<UnixFd>
     {
-        static constexpr std::array value{'h'};
         static constexpr bool is_valid = true;
         static constexpr bool is_trivial_dbus_type = false;
-    };
 
-    template <typename _T1, typename _T2>
-    struct signature_of<DictEntry<_T1, _T2>>
-    {
-        static constexpr std::array value = std::array{'{'} + signature_of_v<std::tuple<_T1, _T2>> + std::array{'}'};
-        static constexpr char type_value{'e'}; /* Not actually used in signatures on D-Bus, see specs */
-        static constexpr bool is_valid = true;
-        static constexpr bool is_trivial_dbus_type = false;
+        static const std::string str()
+        {
+            return "h";
+        }
     };
 
     template <typename _Element, typename _Allocator>
     struct signature_of<std::vector<_Element, _Allocator>>
     {
-        static constexpr std::array value = std::array{'a'} + signature_of_v<_Element>;
         static constexpr bool is_valid = true;
         static constexpr bool is_trivial_dbus_type = false;
+
+        static const std::string str()
+        {
+            return "a" + signature_of<_Element>::str();
+        }
     };
 
     template <typename _Element, std::size_t _Size>
-    struct signature_of<std::array<_Element, _Size>> : signature_of<std::vector<_Element>>
+    struct signature_of<std::array<_Element, _Size>>
     {
+        static constexpr bool is_valid = true;
+        static constexpr bool is_trivial_dbus_type = false;
+
+        static const std::string str()
+        {
+            return "a" + signature_of<_Element>::str();
+        }
     };
 
-#ifdef __cpp_lib_span
+#if __cplusplus >= 202002L
     template <typename _Element, std::size_t _Extent>
-    struct signature_of<std::span<_Element, _Extent>> : signature_of<std::vector<_Element>>
+    struct signature_of<std::span<_Element, _Extent>>
     {
+        static constexpr bool is_valid = true;
+        static constexpr bool is_trivial_dbus_type = false;
+
+        static const std::string str()
+        {
+            return "a" + signature_of<_Element>::str();
+        }
     };
 #endif
 
-    template <typename _Enum> // is_const_v and is_volatile_v to avoid ambiguity conflicts with const and volatile specializations of signature_of
-    struct signature_of<_Enum, typename std::enable_if_t<std::is_enum_v<_Enum> && !std::is_const_v<_Enum> && !std::is_volatile_v<_Enum>>>
-        : signature_of<std::underlying_type_t<_Enum>>
-    {};
-
     template <typename _Key, typename _Value, typename _Compare, typename _Allocator>
     struct signature_of<std::map<_Key, _Value, _Compare, _Allocator>>
     {
-        static constexpr std::array value = std::array{'a'} + signature_of_v<DictEntry<_Key, _Value>>;
         static constexpr bool is_valid = true;
         static constexpr bool is_trivial_dbus_type = false;
+
+        static const std::string str()
+        {
+            return "a{" + signature_of<_Key>::str() + signature_of<_Value>::str() + "}";
+        }
     };
 
     template <typename _Key, typename _Value, typename _Hash, typename _KeyEqual, typename _Allocator>
     struct signature_of<std::unordered_map<_Key, _Value, _Hash, _KeyEqual, _Allocator>>
-        : signature_of<std::map<_Key, _Value>>
     {
-    };
-
-    template <typename... _Types>
-    struct signature_of<std::tuple<_Types...>> // A simple concatenation of signatures of _Types
-    {
-        static constexpr std::array value = (std::array<char, 0>{} + ... + signature_of_v<_Types>);
-        static constexpr bool is_valid = false;
+        static constexpr bool is_valid = true;
         static constexpr bool is_trivial_dbus_type = false;
+
+        static const std::string str()
+        {
+            return "a{" + signature_of<_Key>::str() + signature_of<_Value>::str() + "}";
+        }
     };
 
-    // To simplify conversions of arrays to C strings
-    template <typename _T, std::size_t _N>
-    constexpr auto as_null_terminated(std::array<_T, _N> arr)
-    {
-        return arr + std::array<_T, 1>{0};
-    }
 
     // Function traits implementation inspired by (c) kennytm,
     // https://github.com/kennytm/utils/blob/master/traits.hpp
     template <typename _Type>
-    struct function_traits : function_traits<decltype(&_Type::operator())>
+    struct function_traits
+        : public function_traits<decltype(&_Type::operator())>
     {};
 
     template <typename _Type>
-    struct function_traits<const _Type> : function_traits<_Type>
+    struct function_traits<const _Type>
+        : public function_traits<_Type>
     {};
 
     template <typename _Type>
-    struct function_traits<_Type&> : function_traits<_Type>
+    struct function_traits<_Type&>
+        : public function_traits<_Type>
     {};
 
     template <typename _ReturnType, typename... _Args>
@@ -431,62 +485,72 @@ namespace sdbus {
     };
 
     template <typename _ReturnType, typename... _Args>
-    struct function_traits<_ReturnType(_Args...)> : function_traits_base<_ReturnType, _Args...>
+    struct function_traits<_ReturnType(_Args...)>
+        : public function_traits_base<_ReturnType, _Args...>
     {
         static constexpr bool is_async = false;
         static constexpr bool has_error_param = false;
     };
 
     template <typename... _Args>
-    struct function_traits<void(std::optional<Error>, _Args...)> : function_traits_base<void, _Args...>
+    struct function_traits<void(const Error*, _Args...)>
+        : public function_traits_base<void, _Args...>
     {
         static constexpr bool has_error_param = true;
     };
 
     template <typename... _Args, typename... _Results>
-    struct function_traits<void(Result<_Results...>, _Args...)> : function_traits_base<std::tuple<_Results...>, _Args...>
+    struct function_traits<void(Result<_Results...>, _Args...)>
+        : public function_traits_base<std::tuple<_Results...>, _Args...>
     {
         static constexpr bool is_async = true;
         using async_result_t = Result<_Results...>;
     };
 
     template <typename... _Args, typename... _Results>
-    struct function_traits<void(Result<_Results...>&&, _Args...)> : function_traits_base<std::tuple<_Results...>, _Args...>
+    struct function_traits<void(Result<_Results...>&&, _Args...)>
+        : public function_traits_base<std::tuple<_Results...>, _Args...>
     {
         static constexpr bool is_async = true;
         using async_result_t = Result<_Results...>;
     };
 
     template <typename _ReturnType, typename... _Args>
-    struct function_traits<_ReturnType(*)(_Args...)> : function_traits<_ReturnType(_Args...)>
+    struct function_traits<_ReturnType(*)(_Args...)>
+        : public function_traits<_ReturnType(_Args...)>
     {};
 
     template <typename _ClassType, typename _ReturnType, typename... _Args>
-    struct function_traits<_ReturnType(_ClassType::*)(_Args...)> : function_traits<_ReturnType(_Args...)>
+    struct function_traits<_ReturnType(_ClassType::*)(_Args...)>
+        : public function_traits<_ReturnType(_Args...)>
     {
         typedef _ClassType& owner_type;
     };
 
     template <typename _ClassType, typename _ReturnType, typename... _Args>
-    struct function_traits<_ReturnType(_ClassType::*)(_Args...) const> : function_traits<_ReturnType(_Args...)>
+    struct function_traits<_ReturnType(_ClassType::*)(_Args...) const>
+        : public function_traits<_ReturnType(_Args...)>
     {
         typedef const _ClassType& owner_type;
     };
 
     template <typename _ClassType, typename _ReturnType, typename... _Args>
-    struct function_traits<_ReturnType(_ClassType::*)(_Args...) volatile> : function_traits<_ReturnType(_Args...)>
+    struct function_traits<_ReturnType(_ClassType::*)(_Args...) volatile>
+        : public function_traits<_ReturnType(_Args...)>
     {
         typedef volatile _ClassType& owner_type;
     };
 
     template <typename _ClassType, typename _ReturnType, typename... _Args>
-    struct function_traits<_ReturnType(_ClassType::*)(_Args...) const volatile> : function_traits<_ReturnType(_Args...)>
+    struct function_traits<_ReturnType(_ClassType::*)(_Args...) const volatile>
+        : public function_traits<_ReturnType(_Args...)>
     {
         typedef const volatile _ClassType& owner_type;
     };
 
     template <typename FunctionType>
-    struct function_traits<std::function<FunctionType>> : function_traits<FunctionType>
+    struct function_traits<std::function<FunctionType>>
+        : public function_traits<FunctionType>
     {};
 
     template <class _Function>
@@ -525,33 +589,45 @@ namespace sdbus {
     template <typename _Function>
     using tuple_of_function_output_arg_types_t = typename tuple_of_function_output_arg_types<_Function>::type;
 
-    template <typename _Function>
-    struct signature_of_function_input_arguments : signature_of<tuple_of_function_input_arg_types_t<_Function>>
+    template <typename _Type>
+    struct aggregate_signature
     {
-        static std::string value_as_string()
+        static const std::string str()
         {
-            constexpr auto signature = as_null_terminated(signature_of_v<tuple_of_function_input_arg_types_t<_Function>>);
-            return signature.data();
+            return signature_of<std::decay_t<_Type>>::str();
+        }
+    };
+
+    template <typename... _Types>
+    struct aggregate_signature<std::tuple<_Types...>>
+    {
+        static const std::string str()
+        {
+            std::string signature;
+            (void)(signature += ... += signature_of<std::decay_t<_Types>>::str());
+            return signature;
         }
     };
 
     template <typename _Function>
-    inline auto signature_of_function_input_arguments_v = signature_of_function_input_arguments<_Function>::value_as_string();
-
-    template <typename _Function>
-    struct signature_of_function_output_arguments : signature_of<tuple_of_function_output_arg_types_t<_Function>>
+    struct signature_of_function_input_arguments
     {
-        static std::string value_as_string()
+        static const std::string str()
         {
-            constexpr auto signature = as_null_terminated(signature_of_v<tuple_of_function_output_arg_types_t<_Function>>);
-            return signature.data();
+            return aggregate_signature<tuple_of_function_input_arg_types_t<_Function>>::str();
         }
     };
 
     template <typename _Function>
-    inline auto signature_of_function_output_arguments_v = signature_of_function_output_arguments<_Function>::value_as_string();
+    struct signature_of_function_output_arguments
+    {
+        static const std::string str()
+        {
+            return aggregate_signature<tuple_of_function_output_arg_types_t<_Function>>::str();
+        }
+    };
+
 
-    // std::future stuff for return values of async calls
     template <typename... _Args> struct future_return
     {
         typedef std::tuple<_Args...> type;
@@ -570,6 +646,7 @@ namespace sdbus {
     template <typename... _Args>
     using future_return_t = typename future_return<_Args...>::type;
 
+
     // Credit: Piotr Skotnicki (https://stackoverflow.com/a/57639506)
     template <typename, typename>
     constexpr bool is_one_of_variants_types = false;
@@ -578,35 +655,6 @@ namespace sdbus {
     constexpr bool is_one_of_variants_types<std::variant<_VariantTypes...>, _QueriedType>
         = (std::is_same_v<_QueriedType, _VariantTypes> || ...);
 
-    // Wrapper (tag) denoting we want to serialize user-defined struct
-    // into a D-Bus message as a dictionary of strings to variants.
-    template <typename _Struct>
-    struct as_dictionary
-    {
-        explicit as_dictionary(const _Struct& s) : m_struct(s) {}
-        const _Struct& m_struct;
-    };
-
-    template <typename _Type>
-    const _Type& as_dictionary_if_struct(const _Type& object)
-    {
-        return object; // identity in case _Type is not struct (user-defined structs shall provide an overload)
-    }
-
-    // By default, the dict-as-struct deserialization strategy is strict.
-    // Strict means that every key of the deserialized dictionary must have its counterpart member in the struct, otherwise an exception is thrown.
-    // Relaxed means that a key that does not have a matching struct member is silently ignored.
-    // The behavior can be overridden for user-defined struct by specializing this variable template.
-    template <typename _Struct>
-    constexpr auto strict_dict_as_struct_deserialization_v = true;
-
-    // By default, the struct-as-dict serialization strategy is single-level only (as opposed to nested).
-    // Single-level means that only the specific struct is serialized as a dictionary, serializing members that are structs always as structs.
-    // Nested means that the struct *and* its members that are structs are all serialized as a dictionary. If nested strategy is also
-    // defined for the nested struct, then the same behavior applies for that struct, recursively.
-    // The behavior can be overridden for user-defined struct by specializing this variable template.
-    template <typename _Struct>
-    constexpr auto nested_struct_as_dict_serialization_v = false;
 
     namespace detail
     {
@@ -620,12 +668,12 @@ namespace sdbus {
         }
 
         template <class _Function, class _Tuple, std::size_t... _I>
-        decltype(auto) apply_impl( _Function&& f
-                                 , std::optional<Error> e
-                                 , _Tuple&& t
-                                 , std::index_sequence<_I...> )
+        constexpr decltype(auto) apply_impl( _Function&& f
+                                           , const Error* e
+                                           , _Tuple&& t
+                                           , std::index_sequence<_I...> )
         {
-            return std::forward<_Function>(f)(std::move(e), std::get<_I>(std::forward<_Tuple>(t))...);
+            return std::forward<_Function>(f)(e, std::get<_I>(std::forward<_Tuple>(t))...);
         }
 
         // For non-void returning functions, apply_impl simply returns function return value (a tuple of values).
@@ -666,33 +714,13 @@ namespace sdbus {
     // Convert tuple `t' of values into a list of arguments
     // and invoke function `f' with those arguments.
     template <class _Function, class _Tuple>
-    decltype(auto) apply(_Function&& f, std::optional<Error> e, _Tuple&& t)
+    constexpr decltype(auto) apply(_Function&& f, const Error* e, _Tuple&& t)
     {
         return detail::apply_impl( std::forward<_Function>(f)
-                                 , std::move(e)
+                                 , e
                                  , std::forward<_Tuple>(t)
                                  , std::make_index_sequence<std::tuple_size<std::decay_t<_Tuple>>::value>{} );
     }
-
-    // Convenient concatenation of arrays
-    template <typename _T, std::size_t _N1, std::size_t _N2>
-    constexpr std::array<_T, _N1 + _N2> operator+(std::array<_T, _N1> lhs, std::array<_T, _N2> rhs)
-    {
-        std::array<_T, _N1 + _N2> result{};
-        std::size_t index = 0;
-
-        for (auto& el : lhs) {
-            result[index] = std::move(el);
-            ++index;
-        }
-        for (auto& el : rhs) {
-            result[index] = std::move(el);
-            ++index;
-        }
-
-        return result;
-    }
-
 }
 
 #endif /* SDBUS_CXX_TYPETRAITS_H_ */

include/sdbus-c++/Types.h

@@ -1,6 +1,6 @@
 /**
  * (C) 2016 - 2021 KISTLER INSTRUMENTE AG, Winterthur, Switzerland
- * (C) 2016 - 2024 Stanislav Angelovic <stanislav.angelovic@protonmail.com>
+ * (C) 2016 - 2022 Stanislav Angelovic <stanislav.angelovic@protonmail.com>
  *
  * @file Types.h
  *
@@ -29,14 +29,11 @@
 
 #include <sdbus-c++/Message.h>
 #include <sdbus-c++/TypeTraits.h>
-
-#include <cstring>
-#include <cstddef>
-#include <memory>
 #include <string>
-#include <tuple>
 #include <type_traits>
 #include <typeinfo>
+#include <memory>
+#include <tuple>
 #include <utility>
 
 namespace sdbus {
@@ -59,46 +56,21 @@ namespace sdbus {
         Variant();
 
         template <typename _ValueType>
-        explicit Variant(const _ValueType& value) : Variant()
-        {
-            msg_.openVariant<_ValueType>();
-            msg_ << value;
-            msg_.closeVariant();
-            msg_.seal();
-        }
-
-        Variant(const Variant& value, embed_variant_t) : Variant()
-        {
-            msg_.openVariant<Variant>();
-            msg_ << value;
-            msg_.closeVariant();
-            msg_.seal();
-        }
-
-        template <typename _Struct>
-        explicit Variant(const as_dictionary<_Struct>& value) : Variant()
-        {
-            msg_.openVariant<std::map<std::string, Variant>>();
-            msg_ << as_dictionary(value.m_struct);
-            msg_.closeVariant();
-            msg_.seal();
-        }
-
-        template <typename... _Elements>
-        Variant(const std::variant<_Elements...>& value)
+        explicit Variant(const _ValueType& value)
             : Variant()
         {
+            msg_.openVariant(signature_of<_ValueType>::str());
             msg_ << value;
+            msg_.closeVariant();
             msg_.seal();
         }
 
         template <typename _ValueType>
         _ValueType get() const
         {
-            msg_.rewind(false);
-
-            msg_.enterVariant<_ValueType>();
             _ValueType val;
+            msg_.rewind(false);
+            msg_.enterVariant(signature_of<_ValueType>::str());
             msg_ >> val;
             msg_.exitVariant();
             return val;
@@ -106,32 +78,22 @@ namespace sdbus {
 
         // Only allow conversion operator for true D-Bus type representations in C++
         template <typename _ValueType, typename = std::enable_if_t<signature_of<_ValueType>::is_valid>>
-        explicit operator _ValueType() const
+        operator _ValueType() const
         {
             return get<_ValueType>();
         }
 
-        template <typename... _Elements>
-        operator std::variant<_Elements...>() const
-        {
-            std::variant<_Elements...> result;
-            msg_.rewind(false);
-            msg_ >> result;
-            return result;
-        }
-
         template <typename _Type>
         bool containsValueOfType() const
         {
-            constexpr auto signature = as_null_terminated(signature_of_v<_Type>);
-            return std::strcmp(signature.data(), peekValueType()) == 0;
+            return signature_of<_Type>::str() == peekValueType();
         }
 
         bool isEmpty() const;
 
         void serializeTo(Message& msg) const;
         void deserializeFrom(Message& msg);
-        const char* peekValueType() const;
+        std::string peekValueType() const;
 
     private:
         mutable PlainMessage msg_{};
@@ -154,12 +116,15 @@ namespace sdbus {
     public:
         using std::tuple<_ValueTypes...>::tuple;
 
+        // Disable constructor if an older then 7.1.0 version of GCC is used
+#if !((defined(__GNUC__) || defined(__GNUG__)) && !defined(__clang__) && !(__GNUC__ > 7 || (__GNUC__ == 7 && (__GNUC_MINOR__ > 1 || (__GNUC_MINOR__ == 1 && __GNUC_PATCHLEVEL__ > 0)))))
         Struct() = default;
 
         explicit Struct(const std::tuple<_ValueTypes...>& t)
             : std::tuple<_ValueTypes...>(t)
         {
         }
+#endif
 
         template <std::size_t _I>
         auto& get()
@@ -188,107 +153,42 @@ namespace sdbus {
     /********************************************//**
      * @class ObjectPath
      *
-     * Strong type representing the D-Bus object path
+     * Representation of object path D-Bus type
      *
      ***********************************************/
     class ObjectPath : public std::string
     {
     public:
-        ObjectPath() = default;
-        explicit ObjectPath(std::string value)
-            : std::string(std::move(value))
+        using std::string::string;
+        ObjectPath() = default; // Fixes gcc 6.3 error (default c-tor is not imported in above using declaration)
+        ObjectPath(const ObjectPath&) = default; // Fixes gcc 8.3 error (deleted copy constructor)
+        ObjectPath(ObjectPath&&) = default; // Enable move - user-declared copy ctor prevents implicit creation
+        ObjectPath& operator = (const ObjectPath&) = default; // Fixes gcc 8.3 error (deleted copy assignment)
+        ObjectPath& operator = (ObjectPath&&) = default; // Enable move - user-declared copy assign prevents implicit creation
+        ObjectPath(std::string path)
+            : std::string(std::move(path))
         {}
-        explicit ObjectPath(const char* value)
-            : std::string(value)
-        {}
-
         using std::string::operator=;
     };
 
-    /********************************************//**
-     * @class BusName
-     *
-     * Strong type representing the D-Bus bus/service/connection name
-     *
-     ***********************************************/
-    class BusName : public std::string
-    {
-    public:
-        BusName() = default;
-        explicit BusName(std::string value)
-            : std::string(std::move(value))
-        {}
-        explicit BusName(const char* value)
-            : std::string(value)
-        {}
-
-        using std::string::operator=;
-    };
-
-    using ServiceName = BusName;
-    using ConnectionName = BusName;
-
-    /********************************************//**
-     * @class InterfaceName
-     *
-     * Strong type representing the D-Bus interface name
-     *
-     ***********************************************/
-    class InterfaceName : public std::string
-    {
-    public:
-        InterfaceName() = default;
-        explicit InterfaceName(std::string value)
-            : std::string(std::move(value))
-        {}
-        explicit InterfaceName(const char* value)
-            : std::string(value)
-        {}
-
-        using std::string::operator=;
-    };
-
-    /********************************************//**
-     * @class MemberName
-     *
-     * Strong type representing the D-Bus member name
-     *
-     ***********************************************/
-    class MemberName : public std::string
-    {
-    public:
-        MemberName() = default;
-        explicit MemberName(std::string value)
-                : std::string(std::move(value))
-        {}
-        explicit MemberName(const char* value)
-                : std::string(value)
-        {}
-
-        using std::string::operator=;
-    };
-
-    using MethodName = MemberName;
-    using SignalName = MemberName;
-    using PropertyName = MemberName;
-
     /********************************************//**
      * @class Signature
      *
-     * Strong type representing the D-Bus object path
+     * Representation of Signature D-Bus type
      *
      ***********************************************/
     class Signature : public std::string
     {
     public:
-        Signature() = default;
-        explicit Signature(std::string value)
-            : std::string(std::move(value))
+        using std::string::string;
+        Signature() = default; // Fixes gcc 6.3 error (default c-tor is not imported in above using declaration)
+        Signature(const Signature&) = default; // Fixes gcc 8.3 error (deleted copy constructor)
+        Signature(Signature&&) = default; // Enable move - user-declared copy ctor prevents implicit creation
+        Signature& operator = (const Signature&) = default; // Fixes gcc 8.3 error (deleted copy assignment)
+        Signature& operator = (Signature&&) = default; // Enable move - user-declared copy assign prevents implicit creation
+        Signature(std::string path)
+            : std::string(std::move(path))
         {}
-        explicit Signature(const char* value)
-            : std::string(value)
-        {}
-
         using std::string::operator=;
     };
 
@@ -355,7 +255,7 @@ namespace sdbus {
             close();
         }
 
-        [[nodiscard]] int get() const
+        int get() const
         {
             return fd_;
         }
@@ -375,7 +275,7 @@ namespace sdbus {
             return std::exchange(fd_, -1);
         }
 
-        [[nodiscard]] bool isValid() const
+        bool isValid() const
         {
             return fd_ >= 0;
         }
@@ -391,207 +291,16 @@ namespace sdbus {
         int fd_ = -1;
     };
 
-    /********************************************//**
-     * @typedef DictEntry
-     *
-     * DictEntry is implemented as std::pair, a standard
-     * value_type in STL(-like) associative containers.
-     *
-     ***********************************************/
-    template<typename _T1, typename _T2>
-    using DictEntry = std::pair<_T1, _T2>;
-
 }
 
-// Making sdbus::Struct implement the tuple-protocol, i.e. be a tuple-like type
 template <size_t _I, typename... _ValueTypes>
 struct std::tuple_element<_I, sdbus::Struct<_ValueTypes...>>
     : std::tuple_element<_I, std::tuple<_ValueTypes...>>
 {};
+
 template <typename... _ValueTypes>
 struct std::tuple_size<sdbus::Struct<_ValueTypes...>>
     : std::tuple_size<std::tuple<_ValueTypes...>>
 {};
 
-/********************************************//**
- * @name SDBUSCPP_REGISTER_STRUCT
- *
- * A convenient way to extend sdbus-c++ type system with user-defined structs.
- *
- * The macro teaches sdbus-c++ to recognize the user-defined struct
- * as a valid C++ representation of a D-Bus Struct type, and enables
- * clients to use their struct conveniently instead of the (too
- * generic and less expressive) `sdbus::Struct<...>` in sdbus-c++ API.
- *
- * It also enables to serialize a user-defined struct as an a{sv} dictionary,
- * and to deserialize an a{sv} dictionary into the user-defined struct.
- *
- * The first argument is the struct type name and the remaining arguments
- * are names of struct members. Members must be of types supported by
- * sdbus-c++ (or of user-defined types that sdbus-c++ was taught to support).
- * Members can be other structs (nesting is supported).
- * The macro must be placed in the global namespace.
- *
- * For example, given the user-defined struct `ABC`:
- *
- * namespace foo {
- *     struct ABC
- *     {
- *         int number;
- *         std::string name;
- *         std::vector<double> data;
- *     };
- * }
- *
- * one can teach sdbus-c++ about the contents of this struct simply with:
- *
- * SDBUSCPP_REGISTER_STRUCT(foo::ABC, number, name, data);
- *
- * Up to 16 struct members are supported by the macro.
- *
- ***********************************************/
-#define SDBUSCPP_REGISTER_STRUCT(STRUCT, ...)                                                                                                           \
-    namespace sdbus {                                                                                                                                   \
-        static_assert(SDBUSCPP_PP_NARG(__VA_ARGS__) <= 16,                                                                                              \
-                     "Not more than 16 struct members are supported, please open an issue if you need more");                                           \
-                                                                                                                                                        \
-        template <>                                                                                                                                     \
-        struct signature_of<STRUCT>                                                                                                                     \
-            : signature_of<sdbus::Struct<SDBUSCPP_STRUCT_MEMBER_TYPES(STRUCT, __VA_ARGS__)>>                                                            \
-        {};                                                                                                                                             \
-                                                                                                                                                        \
-        inline auto as_dictionary_if_struct(const STRUCT& object)                                                                                       \
-        {                                                                                                                                               \
-            return as_dictionary<STRUCT>(object);                                                                                                       \
-        }                                                                                                                                               \
-                                                                                                                                                        \
-        inline sdbus::Message& operator<<(sdbus::Message& msg, const STRUCT& items)                                                                     \
-        {                                                                                                                                               \
-            return msg << sdbus::Struct{std::forward_as_tuple(SDBUSCPP_STRUCT_MEMBERS(items, __VA_ARGS__))};                                            \
-        }                                                                                                                                               \
-                                                                                                                                                        \
-        inline Message& operator<<(Message& msg, const as_dictionary<STRUCT>& s)                                                                        \
-        {                                                                                                                                               \
-            if constexpr (!nested_struct_as_dict_serialization_v<STRUCT>)                                                                               \
-                return msg.serializeDictionary<std::string, Variant>({SDBUSCPP_STRUCT_MEMBERS_AS_DICT_ENTRIES(s.m_struct, __VA_ARGS__)});               \
-            else                                                                                                                                        \
-                return msg.serializeDictionary<std::string, Variant>({SDBUSCPP_STRUCT_MEMBERS_AS_NESTED_DICT_ENTRIES(s.m_struct, __VA_ARGS__)});        \
-        }                                                                                                                                               \
-                                                                                                                                                        \
-        inline Message& operator>>(Message& msg, STRUCT& s)                                                                                             \
-        {                                                                                                                                               \
-            /* First, try to deserialize as a struct */                                                                                                 \
-            if (msg.peekType().first == signature_of<STRUCT>::type_value)                                                                               \
-            {                                                                                                                                           \
-                Struct sdbusStruct{std::forward_as_tuple(SDBUSCPP_STRUCT_MEMBERS(s, __VA_ARGS__))};                                                     \
-                return msg >> sdbusStruct;                                                                                                              \
-            }                                                                                                                                           \
-                                                                                                                                                        \
-            /* Otherwise try to deserialize as a dictionary of strings to variants */                                                                   \
-                                                                                                                                                        \
-            return msg.deserializeDictionary<std::string, Variant>([&s](const auto& dictEntry)                                                          \
-            {                                                                                                                                           \
-                const std::string& key = dictEntry.first; /* Intentionally not using structured bindings */                                             \
-                const Variant& value = dictEntry.second;                                                                                                \
-                                                                                                                                                        \
-                using namespace std::string_literals;                                                                                                   \
-                /* This also handles members which are structs serialized as dict of strings to variants, recursively */                                \
-                SDBUSCPP_FIND_AND_DESERIALIZE_STRUCT_MEMBERS(s, __VA_ARGS__)                                                                            \
-                SDBUS_THROW_ERROR_IF( strict_dict_as_struct_deserialization_v<STRUCT>                                                                   \
-                                    , ("Failed to deserialize struct from a dictionary: could not find field '"s += key) += "' in struct 'my::Struct'"  \
-                                    , EINVAL );                                                                                                         \
-            });                                                                                                                                         \
-        }                                                                                                                                               \
-    }                                                                                                                                                   \
-    /**/
-
-/********************************************//**
- * @name SDBUSCPP_ENABLE_RELAXED_DICT2STRUCT_DESERIALIZATION
- *
- * Enables relaxed deserialization of an a{sv} dictionary into a user-defined struct STRUCT.
- *
- * The default (strict) deserialization mode is that if there are entries in the dictionary
- * which do not have a corresponding field in the struct, an exception is thrown.
- * In the relaxed mode, such entries are silently skipped.
- *
- * The macro can only be used in combination with SDBUSCPP_REGISTER_STRUCT macro,
- * and must be placed before SDBUSCPP_REGISTER_STRUCT macro.
- ***********************************************/
-#define SDBUSCPP_ENABLE_RELAXED_DICT2STRUCT_DESERIALIZATION(STRUCT)                                             \
-    template <>                                                                                                 \
-    constexpr auto sdbus::strict_dict_as_struct_deserialization_v<STRUCT> = false;                              \
-    /**/
-
-/********************************************//**
- * @name SDBUSCPP_ENABLE_NESTED_STRUCT2DICT_SERIALIZATION
- *
- * Enables nested serialization of user-defined struct STRUCT as an a{sv} dictionary.
- *
- * By default, STRUCT fields which are structs themselves are serialized as D-Bus structs.
- * This macro tells sdbus-c++ to also serialize nested structs, in a recursive fashion,
- * as a{sv} dictionaries.
- *
- * The macro can only be used in combination with SDBUSCPP_REGISTER_STRUCT macro,
- * and must be placed before SDBUSCPP_REGISTER_STRUCT macro.
- ***********************************************/
-#define SDBUSCPP_ENABLE_NESTED_STRUCT2DICT_SERIALIZATION(STRUCT)                                                \
-    template <>                                                                                                 \
-    constexpr auto sdbus::nested_struct_as_dict_serialization_v<STRUCT> = true                                  \
-    /**/
-
-/*!
- * @cond SDBUSCPP_INTERNAL
- *
- * Internal helper preprocessor facilities
- */
-#define SDBUSCPP_STRUCT_MEMBERS(STRUCT, ...)                                                                                                                    \
-    SDBUSCPP_PP_CAT(SDBUSCPP_FOR_EACH_, SDBUSCPP_PP_NARG(__VA_ARGS__))(SDBUSCPP_STRUCT_MEMBER, SDBUSCPP_PP_COMMA, STRUCT, __VA_ARGS__)                          \
-    /**/
-#define SDBUSCPP_STRUCT_MEMBER(STRUCT, MEMBER) STRUCT.MEMBER
-
-#define SDBUSCPP_STRUCT_MEMBER_TYPES(STRUCT, ...)                                                                                                               \
-    SDBUSCPP_PP_CAT(SDBUSCPP_FOR_EACH_, SDBUSCPP_PP_NARG(__VA_ARGS__))(SDBUSCPP_STRUCT_MEMBER_TYPE, SDBUSCPP_PP_COMMA, STRUCT, __VA_ARGS__)                     \
-    /**/
-#define SDBUSCPP_STRUCT_MEMBER_TYPE(STRUCT, MEMBER) decltype(STRUCT::MEMBER)
-
-#define SDBUSCPP_STRUCT_MEMBERS_AS_DICT_ENTRIES(STRUCT, ...)                                                                                                    \
-    SDBUSCPP_PP_CAT(SDBUSCPP_FOR_EACH_, SDBUSCPP_PP_NARG(__VA_ARGS__))(SDBUSCPP_STRUCT_MEMBER_AS_DICT_ENTRY, SDBUSCPP_PP_COMMA, STRUCT, __VA_ARGS__)            \
-    /**/
-#define SDBUSCPP_STRUCT_MEMBER_AS_DICT_ENTRY(STRUCT, MEMBER) {#MEMBER, Variant{STRUCT.MEMBER}}
-
-#define SDBUSCPP_STRUCT_MEMBERS_AS_NESTED_DICT_ENTRIES(STRUCT, ...)                                                                                             \
-    SDBUSCPP_PP_CAT(SDBUSCPP_FOR_EACH_, SDBUSCPP_PP_NARG(__VA_ARGS__))(SDBUSCPP_STRUCT_MEMBER_AS_NESTED_DICT_ENTRY, SDBUSCPP_PP_COMMA, STRUCT, __VA_ARGS__)     \
-    /**/
-#define SDBUSCPP_STRUCT_MEMBER_AS_NESTED_DICT_ENTRY(STRUCT, MEMBER) {#MEMBER, Variant{as_dictionary_if_struct(STRUCT.MEMBER)}}
-
-#define SDBUSCPP_FIND_AND_DESERIALIZE_STRUCT_MEMBERS(STRUCT, ...)                                                                                               \
-    SDBUSCPP_PP_CAT(SDBUSCPP_FOR_EACH_, SDBUSCPP_PP_NARG(__VA_ARGS__))(SDBUSCPP_FIND_AND_DESERIALIZE_STRUCT_MEMBER, SDBUSCPP_PP_SPACE, STRUCT, __VA_ARGS__)     \
-    /**/
-#define SDBUSCPP_FIND_AND_DESERIALIZE_STRUCT_MEMBER(STRUCT, MEMBER) if (key == #MEMBER) STRUCT.MEMBER = value.get<decltype(STRUCT.MEMBER)>(); else
-
-#define SDBUSCPP_FOR_EACH_1(M, D, S, M1) M(S, M1)
-#define SDBUSCPP_FOR_EACH_2(M, D, S, M1, M2) M(S, M1) D M(S, M2)
-#define SDBUSCPP_FOR_EACH_3(M, D, S, M1, M2, M3) M(S, M1) D M(S, M2) D M(S, M3)
-#define SDBUSCPP_FOR_EACH_4(M, D, S, M1, M2, M3, M4) M(S, M1) D M(S, M2) D M(S, M3) D M(S, M4)
-#define SDBUSCPP_FOR_EACH_5(M, D, S, M1, M2, M3, M4, M5) M(S, M1) D M(S, M2) D M(S, M3) D M(S, M4) D M(S, M5)
-#define SDBUSCPP_FOR_EACH_6(M, D, S, M1, M2, M3, M4, M5, M6) M(S, M1) D M(S, M2) D M(S, M3) D M(S, M4) D M(S, M5) D M(S, M6)
-#define SDBUSCPP_FOR_EACH_7(M, D, S, M1, M2, M3, M4, M5, M6, M7) M(S, M1) D M(S, M2) D M(S, M3) D M(S, M4) D M(S, M5) D M(S, M6) D M(S, M7)
-#define SDBUSCPP_FOR_EACH_8(M, D, S, M1, M2, M3, M4, M5, M6, M7, M8) M(S, M1) D M(S, M2) D M(S, M3) D M(S, M4) D M(S, M5) D M(S, M6) D M(S, M7) D M(S, M8)
-#define SDBUSCPP_FOR_EACH_9(M, D, S, M1, M2, M3, M4, M5, M6, M7, M8, M9) M(S, M1) D M(S, M2) D M(S, M3) D M(S, M4) D M(S, M5) D M(S, M6) D M(S, M7) D M(S, M8) D M(S, M9)
-#define SDBUSCPP_FOR_EACH_10(M, D, S, M1, M2, M3, M4, M5, M6, M7, M8, M9, M10) M(S, M1) D M(S, M2) D M(S, M3) D M(S, M4) D M(S, M5) D M(S, M6) D M(S, M7) D M(S, M8) D M(S, M9) D M(S, M10)
-#define SDBUSCPP_FOR_EACH_11(M, D, S, M1, M2, M3, M4, M5, M6, M7, M8, M9, M10, M11) M(S, M1) D M(S, M2) D M(S, M3) D M(S, M4) D M(S, M5) D M(S, M6) D M(S, M7) D M(S, M8) D M(S, M9) D M(S, M10) D M(S, M11)
-#define SDBUSCPP_FOR_EACH_12(M, D, S, M1, M2, M3, M4, M5, M6, M7, M8, M9, M10, M11, M12) M(S, M1) D M(S, M2) D M(S, M3) D M(S, M4) D M(S, M5) D M(S, M6) D M(S, M7) D M(S, M8) D M(S, M9) D M(S, M10) D M(S, M11) D M(S, M12)
-#define SDBUSCPP_FOR_EACH_13(M, D, S, M1, M2, M3, M4, M5, M6, M7, M8, M9, M10, M11, M12, M13) M(S, M1) D M(S, M2) D M(S, M3) D M(S, M4) D M(S, M5) D M(S, M6) D M(S, M7) D M(S, M8) D M(S, M9) D M(S, M10) D M(S, M11) D M(S, M12) D M(S, M13)
-#define SDBUSCPP_FOR_EACH_14(M, D, S, M1, M2, M3, M4, M5, M6, M7, M8, M9, M10, M11, M12, M13, M14) M(S, M1) D M(S, M2) D M(S, M3) D M(S, M4) D M(S, M5) D M(S, M6) D M(S, M7) D M(S, M8) D M(S, M9) D M(S, M10) D M(S, M11) D M(S, M12) D M(S, M13) D M(S, M14)
-#define SDBUSCPP_FOR_EACH_15(M, D, S, M1, M2, M3, M4, M5, M6, M7, M8, M9, M10, M11, M12, M13, M14, M15) M(S, M1) D M(S, M2) D M(S, M3) D M(S, M4) D M(S, M5) D M(S, M6) D M(S, M7) D M(S, M8) D M(S, M9) D M(S, M10) D M(S, M11) D M(S, M12) D M(S, M13) D M(S, M14) D M(S, M15)
-#define SDBUSCPP_FOR_EACH_16(M, D, S, M1, M2, M3, M4, M5, M6, M7, M8, M9, M10, M11, M12, M13, M14, M15, M16) M(S, M1) D M(S, M2) D M(S, M3) D M(S, M4) D M(S, M5) D M(S, M6) D M(S, M7) D M(S, M8) D M(S, M9) D M(S, M10) D M(S, M11) D M(S, M12) D M(S, M13) D M(S, M14) D M(S, M15) D M(S, M16)
-
-#define SDBUSCPP_PP_CAT(X, Y) SDBUSCPP_PP_CAT_IMPL(X, Y)
-#define SDBUSCPP_PP_CAT_IMPL(X, Y) X##Y
-#define SDBUSCPP_PP_NARG(...) SDBUSCPP_PP_NARG_IMPL(__VA_ARGS__, 32, 31, 30, 29, 28, 27, 26, 25, 24, 23, 22, 21, 20, 19, 18, 17, 16, 15, 14, 13, 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1, 0)
-#define SDBUSCPP_PP_NARG_IMPL(_1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, _16, _17, _18, _19, _20, _21, _22, _23, _24, _25, _26, _27, _28, _29, _30, _31, _32, _N, ...) _N
-
-#define SDBUSCPP_PP_COMMA ,
-#define SDBUSCPP_PP_SPACE
-
 #endif /* SDBUS_CXX_TYPES_H_ */

include/sdbus-c++/VTableItems.h

@@ -1,5 +1,5 @@
 /**
- * (C) 2016 - 2024 Stanislav Angelovic <stanislav.angelovic@protonmail.com>
+ * (C) 2023 Stanislav Angelovic <stanislav.angelovic@protonmail.com>
  *
  * @file VTableItems.h
  *
@@ -26,13 +26,11 @@
 #ifndef SDBUS_CXX_VTABLEITEMS_H_
 #define SDBUS_CXX_VTABLEITEMS_H_
 
-#include <sdbus-c++/Flags.h>
-#include <sdbus-c++/Types.h>
 #include <sdbus-c++/TypeTraits.h>
-
+#include <sdbus-c++/Flags.h>
 #include <string>
-#include <variant>
 #include <vector>
+#include <variant>
 
 namespace sdbus {
 
@@ -47,16 +45,15 @@ namespace sdbus {
         MethodVTableItem& markAsPrivileged();
         MethodVTableItem& withNoReply();
 
-        MethodName name;
-        Signature inputSignature;
+        std::string name;
+        std::string inputSignature;
         std::vector<std::string> inputParamNames;
-        Signature outputSignature;
+        std::string outputSignature;
         std::vector<std::string> outputParamNames;
         method_callback callbackHandler;
         Flags flags;
     };
 
-    MethodVTableItem registerMethod(MethodName methodName);
     MethodVTableItem registerMethod(std::string methodName);
 
     struct SignalVTableItem
@@ -66,13 +63,12 @@ namespace sdbus {
         template <typename... _Args, typename... _String> SignalVTableItem& withParameters(_String... names);
         SignalVTableItem& markAsDeprecated();
 
-        SignalName name;
-        Signature signature;
+        std::string name;
+        std::string signature;
         std::vector<std::string> paramNames;
         Flags flags;
     };
 
-    SignalVTableItem registerSignal(SignalName signalName);
     SignalVTableItem registerSignal(std::string signalName);
 
     struct PropertyVTableItem
@@ -83,14 +79,13 @@ namespace sdbus {
         PropertyVTableItem& markAsPrivileged();
         PropertyVTableItem& withUpdateBehavior(Flags::PropertyUpdateBehaviorFlags behavior);
 
-        PropertyName name;
-        Signature signature;
+        std::string name;
+        std::string signature;
         property_get_callback getter;
         property_set_callback setter;
         Flags flags;
     };
 
-    PropertyVTableItem registerProperty(PropertyName propertyName);
     PropertyVTableItem registerProperty(std::string propertyName);
 
     struct InterfaceFlagsVTableItem

include/sdbus-c++/VTableItems.inl

@@ -1,5 +1,5 @@
 /**
- * (C) 2016 - 2024 Stanislav Angelovic <stanislav.angelovic@protonmail.com>
+ * (C) 2023 Stanislav Angelovic <stanislav.angelovic@protonmail.com>
  *
  * @file VTableItems.inl
  *
@@ -26,11 +26,10 @@
 #ifndef SDBUS_CPP_VTABLEITEMS_INL_
 #define SDBUS_CPP_VTABLEITEMS_INL_
 
-#include <sdbus-c++/Error.h>
 #include <sdbus-c++/TypeTraits.h>
-
-#include <string>
+#include <sdbus-c++/Error.h>
 #include <type_traits>
+#include <string>
 #include <vector>
 
 namespace sdbus {
@@ -42,8 +41,8 @@ namespace sdbus {
     template <typename _Function>
     MethodVTableItem& MethodVTableItem::implementedAs(_Function&& callback)
     {
-        inputSignature = signature_of_function_input_arguments_v<_Function>;
-        outputSignature = signature_of_function_output_arguments_v<_Function>;
+        inputSignature = signature_of_function_input_arguments<_Function>::str();
+        outputSignature = signature_of_function_output_arguments<_Function>::str();
         callbackHandler = [callback = std::forward<_Function>(callback)](MethodCall call)
         {
             // Create a tuple of callback input arguments' types, which will be used
@@ -125,14 +124,9 @@ namespace sdbus {
         return *this;
     }
 
-    inline MethodVTableItem registerMethod(MethodName methodName)
-    {
-        return {std::move(methodName), {}, {}, {}, {}, {}, {}};
-    }
-
     inline MethodVTableItem registerMethod(std::string methodName)
     {
-        return registerMethod(MethodName{std::move(methodName)});
+        return {std::move(methodName), {}, {}, {}, {}, {}, {}};
     }
 
     /*** -------------------- ***/
@@ -142,7 +136,7 @@ namespace sdbus {
     template <typename... _Args>
     inline SignalVTableItem& SignalVTableItem::withParameters()
     {
-        signature = signature_of_function_input_arguments_v<void(_Args...)>;
+        signature = signature_of_function_input_arguments<void(_Args...)>::str();
 
         return *this;
     }
@@ -171,14 +165,9 @@ namespace sdbus {
         return *this;
     }
 
-    inline SignalVTableItem registerSignal(SignalName signalName)
-    {
-        return {std::move(signalName), {}, {}, {}};
-    }
-
     inline SignalVTableItem registerSignal(std::string signalName)
     {
-        return registerSignal(SignalName{std::move(signalName)});
+        return {std::move(signalName), {}, {}, {}};
     }
 
     /*** -------------------- ***/
@@ -192,7 +181,7 @@ namespace sdbus {
         static_assert(!std::is_void<function_result_t<_Function>>::value, "Property getter function must return property value");
 
         if (signature.empty())
-            signature = signature_of_function_output_arguments_v<_Function>;
+            signature = signature_of_function_output_arguments<_Function>::str();
 
         getter = [callback = std::forward<_Function>(callback)](PropertyGetReply& reply)
         {
@@ -210,7 +199,7 @@ namespace sdbus {
         static_assert(std::is_void<function_result_t<_Function>>::value, "Property setter function must not return any value");
 
         if (signature.empty())
-            signature = signature_of_function_input_arguments_v<_Function>;
+            signature = signature_of_function_input_arguments<_Function>::str();
 
         setter = [callback = std::forward<_Function>(callback)](PropertySetCall call)
         {
@@ -249,14 +238,9 @@ namespace sdbus {
         return *this;
     }
 
-    inline PropertyVTableItem registerProperty(PropertyName propertyName)
-    {
-        return {std::move(propertyName), {}, {}, {}, {}};
-    }
-
     inline PropertyVTableItem registerProperty(std::string propertyName)
     {
-        return registerProperty(PropertyName{std::move(propertyName)});
+        return {std::move(propertyName), {}, {}, {}, {}};
     }
 
     /*** --------------------------- ***/

include/sdbus-c++/sdbus-c++.h

@@ -1,6 +1,6 @@
 /**
  * (C) 2016 - 2021 KISTLER INSTRUMENTE AG, Winterthur, Switzerland
- * (C) 2016 - 2024 Stanislav Angelovic <stanislav.angelovic@protonmail.com>
+ * (C) 2016 - 2022 Stanislav Angelovic <stanislav.angelovic@protonmail.com>
  *
  * @file sdbus-c++.h
  *

src/Connection.cpp

@@ -1,6 +1,6 @@
 /**
  * (C) 2016 - 2021 KISTLER INSTRUMENTE AG, Winterthur, Switzerland
- * (C) 2016 - 2024 Stanislav Angelovic <stanislav.angelovic@protonmail.com>
+ * (C) 2016 - 2022 Stanislav Angelovic <stanislav.angelovic@protonmail.com>
  *
  * @file Connection.cpp
  *
@@ -25,23 +25,20 @@
  */
 
 #include "Connection.h"
-
-#include "sdbus-c++/Error.h"
-#include "sdbus-c++/Message.h"
-#include "sdbus-c++/Types.h"
-
-#include "MessageUtils.h"
-#include "ScopeGuard.h"
 #include "SdBus.h"
+#include "MessageUtils.h"
 #include "Utils.h"
-
-#include <poll.h>
-#include <sys/eventfd.h>
+#include <sdbus-c++/Message.h>
+#include <sdbus-c++/Error.h>
+#include "ScopeGuard.h"
 #include SDBUS_HEADER
 #ifndef SDBUS_basu // sd_event integration is not supported in basu-based sdbus-c++
 #include <systemd/sd-event.h>
 #endif
 #include <unistd.h>
+#include <poll.h>
+#include <sys/eventfd.h>
+#include <cstdint>
 
 namespace sdbus::internal {
 
@@ -109,9 +106,9 @@ Connection::~Connection()
     Connection::leaveEventLoop();
 }
 
-void Connection::requestName(const ServiceName& name)
+void Connection::requestName(const std::string& name)
 {
-    SDBUS_CHECK_SERVICE_NAME(name.c_str());
+    SDBUS_CHECK_SERVICE_NAME(name);
 
     auto r = sdbus_->sd_bus_request_name(bus_.get(), name.c_str(), 0);
     SDBUS_THROW_ERROR_IF(r < 0, "Failed to request bus name", -r);
@@ -121,7 +118,7 @@ void Connection::requestName(const ServiceName& name)
     wakeUpEventLoopIfMessagesInQueue();
 }
 
-void Connection::releaseName(const ServiceName& name)
+void Connection::releaseName(const std::string& name)
 {
     auto r = sdbus_->sd_bus_release_name(bus_.get(), name.c_str());
     SDBUS_THROW_ERROR_IF(r < 0, "Failed to release bus name", -r);
@@ -131,12 +128,12 @@ void Connection::releaseName(const ServiceName& name)
     wakeUpEventLoopIfMessagesInQueue();
 }
 
-BusName Connection::getUniqueName() const
+std::string Connection::getUniqueName() const
 {
-    const char* name{};
-    auto r = sdbus_->sd_bus_get_unique_name(bus_.get(), &name);
-    SDBUS_THROW_ERROR_IF(r < 0 || name == nullptr, "Failed to get unique bus name", -r);
-    return BusName{name};
+    const char* unique = nullptr;
+    auto r = sdbus_->sd_bus_get_unique_name(bus_.get(), &unique);
+    SDBUS_THROW_ERROR_IF(r < 0 || unique == nullptr, "Failed to get unique bus name", -r);
+    return unique;
 }
 
 void Connection::enterEventLoop()
@@ -154,7 +151,7 @@ void Connection::enterEventLoop()
     }
 }
 
-void Connection::enterEventLoopAsync()
+void Connection::enterEventLoop(async_t)
 {
     if (!asyncLoopThread_.joinable())
         asyncLoopThread_ = std::thread([this](){ enterEventLoop(); });
@@ -179,14 +176,29 @@ Connection::PollData Connection::getEventLoopPollData() const
     return {pollData.fd, pollData.events, timeout, eventFd_.fd};
 }
 
-void Connection::addObjectManager(const ObjectPath& objectPath)
+const ISdBus& Connection::getSdBusInterface() const
+{
+    return *sdbus_.get();
+}
+
+ISdBus& Connection::getSdBusInterface()
+{
+    return *sdbus_.get();
+}
+
+void Connection::addObjectManager(const std::string& objectPath)
+{
+    Connection::addObjectManager(objectPath, floating_slot);
+}
+
+void Connection::addObjectManager(const std::string& objectPath, floating_slot_t)
 {
     auto r = sdbus_->sd_bus_add_object_manager(bus_.get(), nullptr, objectPath.c_str());
 
     SDBUS_THROW_ERROR_IF(r < 0, "Failed to add object manager", -r);
 }
 
-Slot Connection::addObjectManager(const ObjectPath& objectPath, return_slot_t)
+Slot Connection::addObjectManager(const std::string& objectPath, return_slot_t)
 {
     sd_bus_slot *slot{};
 
@@ -215,12 +227,7 @@ uint64_t Connection::getMethodCallTimeout() const
     return timeout;
 }
 
-void Connection::addMatch(const std::string& match, message_handler callback)
-{
-    floatingMatchRules_.push_back(addMatch(match, std::move(callback), return_slot));
-}
-
-Slot Connection::addMatch(const std::string& match, message_handler callback, return_slot_t)
+Slot Connection::addMatch(const std::string& match, message_handler callback)
 {
     SDBUS_THROW_ERROR_IF(!callback, "Invalid match callback handler provided", EINVAL);
 
@@ -235,15 +242,12 @@ Slot Connection::addMatch(const std::string& match, message_handler callback, re
     return {matchInfo.release(), [](void *ptr){ delete static_cast<MatchInfo*>(ptr); }};
 }
 
-void Connection::addMatchAsync(const std::string& match, message_handler callback, message_handler installCallback)
+void Connection::addMatch(const std::string& match, message_handler callback, floating_slot_t)
 {
-    floatingMatchRules_.push_back(addMatchAsync(match, std::move(callback), std::move(installCallback), return_slot));
+    floatingMatchRules_.push_back(addMatch(match, std::move(callback)));
 }
 
-Slot Connection::addMatchAsync( const std::string& match
-                              , message_handler callback
-                              , message_handler installCallback
-                              , return_slot_t )
+Slot Connection::addMatch(const std::string& match, message_handler callback, message_handler installCallback, async_t)
 {
     SDBUS_THROW_ERROR_IF(!callback, "Invalid match callback handler provided", EINVAL);
 
@@ -264,6 +268,11 @@ Slot Connection::addMatchAsync( const std::string& match
     return {matchInfo.release(), [](void *ptr){ delete static_cast<MatchInfo*>(ptr); }};
 }
 
+void Connection::addMatch(const std::string& match, message_handler callback, message_handler installCallback, async_t, floating_slot_t)
+{
+    floatingMatchRules_.push_back(addMatch(match, std::move(callback), std::move(installCallback), async));
+}
+
 void Connection::attachSdEventLoop(sd_event *event, int priority)
 {
 #ifndef SDBUS_basu
@@ -450,11 +459,10 @@ void Connection::deleteSdEventSource(sd_event_source *s)
 
 #endif // SDBUS_basu
 
-Slot Connection::addObjectVTable( const ObjectPath& objectPath
-                                , const InterfaceName& interfaceName
+Slot Connection::addObjectVTable( const std::string& objectPath
+                                , const std::string& interfaceName
                                 , const sd_bus_vtable* vtable
-                                , void* userData
-                                , return_slot_t )
+                                , void* userData )
 {
     sd_bus_slot *slot{};
 
@@ -478,86 +486,108 @@ PlainMessage Connection::createPlainMessage() const
 
     SDBUS_THROW_ERROR_IF(r < 0, "Failed to create a plain message", -r);
 
-    return Message::Factory::create<PlainMessage>(sdbusMsg, const_cast<Connection*>(this), adopt_message);
+    return Message::Factory::create<PlainMessage>(sdbusMsg, sdbus_.get(), adopt_message);
 }
 
-MethodCall Connection::createMethodCall( const ServiceName& destination
-                                       , const ObjectPath& objectPath
-                                       , const InterfaceName& interfaceName
-                                       , const MethodName& methodName ) const
-{
-    return Connection::createMethodCall(destination.c_str(), objectPath.c_str(), interfaceName.c_str(), methodName.c_str());
-}
-
-MethodCall Connection::createMethodCall( const char* destination
-                                       , const char* objectPath
-                                       , const char* interfaceName
-                                       , const char* methodName ) const
+MethodCall Connection::createMethodCall( const std::string& destination
+                                       , const std::string& objectPath
+                                       , const std::string& interfaceName
+                                       , const std::string& methodName ) const
 {
     sd_bus_message *sdbusMsg{};
 
     auto r = sdbus_->sd_bus_message_new_method_call( bus_.get()
                                                    , &sdbusMsg
-                                                   , !*destination ? nullptr : destination
-                                                   , objectPath
-                                                   , interfaceName
-                                                   , methodName);
+                                                   , destination.empty() ? nullptr : destination.c_str()
+                                                   , objectPath.c_str()
+                                                   , interfaceName.c_str()
+                                                   , methodName.c_str() );
 
     SDBUS_THROW_ERROR_IF(r < 0, "Failed to create method call", -r);
 
-    return Message::Factory::create<MethodCall>(sdbusMsg, const_cast<Connection*>(this), adopt_message);
+    return Message::Factory::create<MethodCall>(sdbusMsg, sdbus_.get(), adopt_message);
 }
 
-Signal Connection::createSignal( const ObjectPath& objectPath
-                               , const InterfaceName& interfaceName
-                               , const SignalName& signalName ) const
-{
-    return Connection::createSignal(objectPath.c_str(), interfaceName.c_str(), signalName.c_str());
-}
-
-Signal Connection::createSignal( const char* objectPath
-                               , const char* interfaceName
-                               , const char* signalName ) const
+Signal Connection::createSignal( const std::string& objectPath
+                               , const std::string& interfaceName
+                               , const std::string& signalName ) const
 {
     sd_bus_message *sdbusMsg{};
 
-    auto r = sdbus_->sd_bus_message_new_signal(bus_.get(), &sdbusMsg, objectPath, interfaceName, signalName);
+    auto r = sdbus_->sd_bus_message_new_signal( bus_.get()
+                                              , &sdbusMsg
+                                              , objectPath.c_str()
+                                              , interfaceName.c_str()
+                                              , signalName.c_str() );
 
     SDBUS_THROW_ERROR_IF(r < 0, "Failed to create signal", -r);
 
-    return Message::Factory::create<Signal>(sdbusMsg, const_cast<Connection*>(this), adopt_message);
+    return Message::Factory::create<Signal>(sdbusMsg, sdbus_.get(), adopt_message);
 }
 
-void Connection::emitPropertiesChangedSignal( const ObjectPath& objectPath
-                                            , const InterfaceName& interfaceName
-                                            , const std::vector<PropertyName>& propNames )
+MethodReply Connection::callMethod(const MethodCall& message, uint64_t timeout)
 {
-    Connection::emitPropertiesChangedSignal(objectPath.c_str(), interfaceName.c_str(), propNames);
+    // If the call expects reply, this call will block the bus connection from
+    // serving other messages until the reply arrives or the call times out.
+    auto reply = message.send(timeout);
+
+    // Wake up event loop to process messages that may have arrived in the meantime...
+    wakeUpEventLoopIfMessagesInQueue();
+
+    return reply;
 }
 
-void Connection::emitPropertiesChangedSignal( const char* objectPath
-                                            , const char* interfaceName
-                                            , const std::vector<PropertyName>& propNames )
+void Connection::callMethod(const MethodCall& message, void* callback, void* userData, uint64_t timeout, floating_slot_t)
+{
+    // TODO: Think of ways of optimizing these three locking/unlocking of sdbus mutex (merge into one call?)
+    auto timeoutBefore = getEventLoopPollData().timeout;
+    message.send(callback, userData, timeout, floating_slot);
+    auto timeoutAfter = getEventLoopPollData().timeout;
+
+    // An event loop may wait in poll with timeout `t1', while in another thread an async call is made with
+    // timeout `t2'. If `t2' < `t1', then we have to wake up the event loop thread to update its poll timeout.
+    if (timeoutAfter < timeoutBefore)
+        notifyEventLoopToWakeUpFromPoll();
+}
+
+Slot Connection::callMethod(const MethodCall& message, void* callback, void* userData, uint64_t timeout)
+{
+    // TODO: Think of ways of optimizing these three locking/unlocking of sdbus mutex (merge into one call?)
+    auto timeoutBefore = getEventLoopPollData().timeout;
+    auto slot = message.send(callback, userData, timeout);
+    auto timeoutAfter = getEventLoopPollData().timeout;
+
+    // An event loop may wait in poll with timeout `t1', while in another thread an async call is made with
+    // timeout `t2'. If `t2' < `t1', then we have to wake up the event loop thread to update its poll timeout.
+    if (timeoutAfter < timeoutBefore)
+        notifyEventLoopToWakeUpFromPoll();
+
+    return slot;
+}
+
+void Connection::emitPropertiesChangedSignal( const std::string& objectPath
+                                            , const std::string& interfaceName
+                                            , const std::vector<std::string>& propNames )
 {
     auto names = to_strv(propNames);
 
     auto r = sdbus_->sd_bus_emit_properties_changed_strv( bus_.get()
-                                                        , objectPath
-                                                        , interfaceName
+                                                        , objectPath.c_str()
+                                                        , interfaceName.c_str()
                                                         , propNames.empty() ? nullptr : &names[0] );
 
     SDBUS_THROW_ERROR_IF(r < 0, "Failed to emit PropertiesChanged signal", -r);
 }
 
-void Connection::emitInterfacesAddedSignal(const ObjectPath& objectPath)
+void Connection::emitInterfacesAddedSignal(const std::string& objectPath)
 {
     auto r = sdbus_->sd_bus_emit_object_added(bus_.get(), objectPath.c_str());
 
     SDBUS_THROW_ERROR_IF(r < 0, "Failed to emit InterfacesAdded signal for all registered interfaces", -r);
 }
 
-void Connection::emitInterfacesAddedSignal( const ObjectPath& objectPath
-                                          , const std::vector<InterfaceName>& interfaces )
+void Connection::emitInterfacesAddedSignal( const std::string& objectPath
+                                          , const std::vector<std::string>& interfaces )
 {
     auto names = to_strv(interfaces);
 
@@ -568,15 +598,15 @@ void Connection::emitInterfacesAddedSignal( const ObjectPath& objectPath
     SDBUS_THROW_ERROR_IF(r < 0, "Failed to emit InterfacesAdded signal", -r);
 }
 
-void Connection::emitInterfacesRemovedSignal(const ObjectPath& objectPath)
+void Connection::emitInterfacesRemovedSignal(const std::string& objectPath)
 {
     auto r = sdbus_->sd_bus_emit_object_removed(bus_.get(), objectPath.c_str());
 
     SDBUS_THROW_ERROR_IF(r < 0, "Failed to emit InterfacesRemoved signal for all registered interfaces", -r);
 }
 
-void Connection::emitInterfacesRemovedSignal( const ObjectPath& objectPath
-                                            , const std::vector<InterfaceName>& interfaces )
+void Connection::emitInterfacesRemovedSignal( const std::string& objectPath
+                                            , const std::vector<std::string>& interfaces )
 {
     auto names = to_strv(interfaces);
 
@@ -587,22 +617,21 @@ void Connection::emitInterfacesRemovedSignal( const ObjectPath& objectPath
     SDBUS_THROW_ERROR_IF(r < 0, "Failed to emit InterfacesRemoved signal", -r);
 }
 
-Slot Connection::registerSignalHandler( const char* sender
-                                      , const char* objectPath
-                                      , const char* interfaceName
-                                      , const char* signalName
+Slot Connection::registerSignalHandler( const std::string& sender
+                                      , const std::string& objectPath
+                                      , const std::string& interfaceName
+                                      , const std::string& signalName
                                       , sd_bus_message_handler_t callback
-                                      , void* userData
-                                      , return_slot_t )
+                                      , void* userData )
 {
     sd_bus_slot *slot{};
 
     auto r = sdbus_->sd_bus_match_signal( bus_.get()
                                         , &slot
-                                        , !*sender ? nullptr : sender
-                                        , !*objectPath ? nullptr : objectPath
-                                        , !*interfaceName ? nullptr : interfaceName
-                                        , !*signalName ? nullptr : signalName
+                                        , !sender.empty() ? sender.c_str() : nullptr
+                                        , !objectPath.empty() ? objectPath.c_str() : nullptr
+                                        , !interfaceName.empty() ? interfaceName.c_str() : nullptr
+                                        , !signalName.empty() ? signalName.c_str() : nullptr
                                         , callback
                                         , userData );
 
@@ -611,105 +640,6 @@ Slot Connection::registerSignalHandler( const char* sender
     return {slot, [this](void *slot){ sdbus_->sd_bus_slot_unref((sd_bus_slot*)slot); }};
 }
 
-sd_bus_message* Connection::incrementMessageRefCount(sd_bus_message* sdbusMsg)
-{
-    return sdbus_->sd_bus_message_ref(sdbusMsg);
-}
-
-sd_bus_message* Connection::decrementMessageRefCount(sd_bus_message* sdbusMsg)
-{
-    return sdbus_->sd_bus_message_unref(sdbusMsg);
-}
-
-int Connection::querySenderCredentials(sd_bus_message* sdbusMsg, uint64_t mask, sd_bus_creds **creds)
-{
-    return sdbus_->sd_bus_query_sender_creds(sdbusMsg, mask, creds);
-}
-
-sd_bus_creds* Connection::incrementCredsRefCount(sd_bus_creds* creds)
-{
-    return sdbus_->sd_bus_creds_ref(creds);
-}
-
-sd_bus_creds* Connection::decrementCredsRefCount(sd_bus_creds* creds)
-{
-    return sdbus_->sd_bus_creds_unref(creds);
-}
-
-sd_bus_message* Connection::callMethod(sd_bus_message* sdbusMsg, uint64_t timeout)
-{
-    sd_bus_error sdbusError = SD_BUS_ERROR_NULL;
-    SCOPE_EXIT{ sd_bus_error_free(&sdbusError); };
-
-    // This call will block the bus connection from serving other messages
-    // until the reply arrives or the call times out.
-    sd_bus_message* sdbusReply{};
-    auto r = sdbus_->sd_bus_call(nullptr, sdbusMsg, timeout, &sdbusError, &sdbusReply);
-
-    if (sd_bus_error_is_set(&sdbusError))
-        throw Error(Error::Name{sdbusError.name}, sdbusError.message);
-
-    SDBUS_THROW_ERROR_IF(r < 0, "Failed to call method", -r);
-
-    // Wake up event loop to process messages that may have arrived in the meantime,
-    // or to dispatch the outbound message that hasn't yet been fully sent out.
-    wakeUpEventLoopIfMessagesInQueue();
-
-    return sdbusReply;
-}
-
-Slot Connection::callMethodAsync(sd_bus_message* sdbusMsg, sd_bus_message_handler_t callback, void* userData, uint64_t timeout, return_slot_t)
-{
-    sd_bus_slot *slot{};
-
-    // TODO: Think of ways of optimizing these three locking/unlocking of sdbus mutex (merge into one call?)
-    auto timeoutBefore = getEventLoopPollData().timeout;
-    auto r = sdbus_->sd_bus_call_async(nullptr, &slot, sdbusMsg, (sd_bus_message_handler_t)callback, userData, timeout);
-    SDBUS_THROW_ERROR_IF(r < 0, "Failed to call method asynchronously", -r);
-    auto timeoutAfter = getEventLoopPollData().timeout;
-
-    // An event loop may wait in poll with timeout `t1', while in another thread an async call is made with
-    // timeout `t2'. If `t2' < `t1', then we have to wake up the event loop thread to update its poll timeout.
-    // We also have to wake up the event loop to process the messages that may be in the read/write queues.
-    if (timeoutAfter < timeoutBefore || arePendingMessagesInQueues())
-        notifyEventLoopToWakeUpFromPoll();
-
-    return {slot, [this](void *slot){ sdbus_->sd_bus_slot_unref((sd_bus_slot*)slot); }};
-}
-
-void Connection::sendMessage(sd_bus_message* sdbusMsg)
-{
-    auto r = sdbus_->sd_bus_send(nullptr, sdbusMsg, nullptr);
-
-    // Wake up event loop to continue dispatching the (fairly large) outbound message that hasn't yet been fully sent
-    wakeUpEventLoopIfMessagesInQueue();
-
-    SDBUS_THROW_ERROR_IF(r < 0, "Failed to send D-Bus message", -r);
-}
-
-sd_bus_message* Connection::createMethodReply(sd_bus_message* sdbusMsg)
-{
-    sd_bus_message* sdbusReply{};
-
-    auto r = sdbus_->sd_bus_message_new_method_return(sdbusMsg, &sdbusReply);
-    SDBUS_THROW_ERROR_IF(r < 0, "Failed to create method reply", -r);
-
-    return sdbusReply;
-}
-
-sd_bus_message* Connection::createErrorReplyMessage(sd_bus_message* sdbusMsg, const Error& error)
-{
-    sd_bus_error sdbusError = SD_BUS_ERROR_NULL;
-    SCOPE_EXIT{ sd_bus_error_free(&sdbusError); };
-    sd_bus_error_set(&sdbusError, error.getName().c_str(), error.getMessage().c_str());
-
-    sd_bus_message* sdbusErrorReply{};
-    auto r = sdbus_->sd_bus_message_new_method_error(sdbusMsg, &sdbusErrorReply, &sdbusError);
-    SDBUS_THROW_ERROR_IF(r < 0, "Failed to create method error reply", -r);
-
-    return sdbusErrorReply;
-}
-
 Connection::BusPtr Connection::openBus(const BusFactory& busFactory)
 {
     sd_bus* bus{};
@@ -763,15 +693,11 @@ void Connection::notifyEventLoopToWakeUpFromPoll()
 
 void Connection::wakeUpEventLoopIfMessagesInQueue()
 {
-    // We need this in two cases:
-    // 1. When doing a sync call, other D-Bus messages may have arrived, waiting in the read queue.
+    // When doing a sync call, other D-Bus messages may have arrived, waiting in the read queue.
     // In case an event loop is inside a poll in another thread, or an external event loop polls in the
     // same thread but as an unrelated event source, then we need to wake up the poll explicitly so the
     // event loop 1. processes all messages in the read queue, 2. updates poll timeout before next poll.
-    // 2. Additionally, when sending out messages, these may be too long to be sent out entirely within
-    // the single sd_bus_send() or sd_bus_call_async() call, in which case they are queued in the write
-    // queue. We need to wake up the event loop to continue sending the message until it's fully sent.
-    if (arePendingMessagesInQueues())
+    if (arePendingMessagesInReadQueue())
         notifyEventLoopToWakeUpFromPoll();
 }
 
@@ -810,8 +736,6 @@ bool Connection::waitForNextEvent()
                           , {loopExitFd_.fd, POLLIN, 0} };
     constexpr auto fdsCount = sizeof(fds)/sizeof(fds[0]);
 
-    // Are there pending messages in the inbound queue? Then sd-bus will set timeout to 0, so poll() will wake up right away.
-    // Are there pending messages in the outbound queue? Then sd-bus will add POLLOUT to events, so poll() will wake up right away.
     auto timeout = sdbusPollData.getPollTimeout();
     auto r = poll(fds, fdsCount, timeout);
 
@@ -825,7 +749,7 @@ bool Connection::waitForNextEvent()
     {
         auto cleared = eventFd_.clear();
         SDBUS_THROW_ERROR_IF(!cleared, "Failed to read from the event descriptor", -errno);
-        // Go poll() again, but with freshly calculated, up-to-date timeout and with up-to-date events to watch
+        // Go poll() again, but with up-to-date timeout (which will wake poll() up right away if there are messages to process)
         return waitForNextEvent();
     }
     // Loop exit notification
@@ -839,26 +763,24 @@ bool Connection::waitForNextEvent()
     return true;
 }
 
-bool Connection::arePendingMessagesInQueues() const
+bool Connection::arePendingMessagesInReadQueue() const
 {
     uint64_t readQueueSize{};
-    uint64_t writeQueueSize{};
 
-    auto r = sdbus_->sd_bus_get_n_queued(bus_.get(), &readQueueSize, &writeQueueSize);
-    SDBUS_THROW_ERROR_IF(r < 0, "Failed to get number of pending messages in sd-bus queues", -r);
+    auto r = sdbus_->sd_bus_get_n_queued_read(bus_.get(), &readQueueSize);
+    SDBUS_THROW_ERROR_IF(r < 0, "Failed to get number of pending messages in read queue", -r);
 
-    return readQueueSize > 0 || writeQueueSize > 0;
+    return readQueueSize > 0;
 }
 
 Message Connection::getCurrentlyProcessedMessage() const
 {
     auto* sdbusMsg = sdbus_->sd_bus_get_current_message(bus_.get());
 
-    return Message::Factory::create<Message>(sdbusMsg, const_cast<Connection*>(this));
+    return Message::Factory::create<Message>(sdbusMsg, sdbus_.get());
 }
 
-template <typename StringBasedType>
-std::vector</*const */char*> Connection::to_strv(const std::vector<StringBasedType>& strings)
+std::vector</*const */char*> Connection::to_strv(const std::vector<std::string>& strings)
 {
     std::vector</*const */char*> strv;
     for (auto& str : strings)
@@ -873,7 +795,7 @@ int Connection::sdbus_match_callback(sd_bus_message *sdbusMessage, void *userDat
     assert(matchInfo != nullptr);
     assert(matchInfo->callback);
 
-    auto message = Message::Factory::create<PlainMessage>(sdbusMessage, &matchInfo->connection);
+    auto message = Message::Factory::create<PlainMessage>(sdbusMessage, &matchInfo->connection.getSdBusInterface());
 
     auto ok = invokeHandlerAndCatchErrors([&](){ matchInfo->callback(std::move(message)); }, retError);
 
@@ -886,7 +808,7 @@ int Connection::sdbus_match_install_callback(sd_bus_message *sdbusMessage, void
     assert(matchInfo != nullptr);
     assert(matchInfo->installCallback);
 
-    auto message = Message::Factory::create<PlainMessage>(sdbusMessage, &matchInfo->connection);
+    auto message = Message::Factory::create<PlainMessage>(sdbusMessage, &matchInfo->connection.getSdBusInterface());
 
     auto ok = invokeHandlerAndCatchErrors([&](){ matchInfo->installCallback(std::move(message)); }, retError);
 
@@ -953,6 +875,14 @@ int IConnection::PollData::getPollTimeout() const
 
 namespace sdbus::internal {
 
+std::unique_ptr<sdbus::internal::IConnection> createConnection()
+{
+    auto connection = sdbus::createConnection();
+    SCOPE_EXIT{ connection.release(); };
+    auto connectionInternal = dynamic_cast<sdbus::internal::IConnection*>(connection.get());
+    return std::unique_ptr<sdbus::internal::IConnection>(connectionInternal);
+}
+
 std::unique_ptr<sdbus::internal::IConnection> createPseudoConnection()
 {
     auto interface = std::make_unique<sdbus::internal::SdBus>();
@@ -965,15 +895,25 @@ namespace sdbus {
 
 using internal::Connection;
 
-std::unique_ptr<sdbus::IConnection> createBusConnection()
+std::unique_ptr<sdbus::IConnection> createConnection()
+{
+    return createSystemBusConnection();
+}
+
+std::unique_ptr<sdbus::IConnection> createConnection(const std::string& name)
+{
+    return createSystemBusConnection(name);
+}
+
+std::unique_ptr<sdbus::IConnection> createDefaultBusConnection()
 {
     auto interface = std::make_unique<sdbus::internal::SdBus>();
     return std::make_unique<sdbus::internal::Connection>(std::move(interface), Connection::default_bus);
 }
 
-std::unique_ptr<sdbus::IConnection> createBusConnection(const ServiceName& name)
+std::unique_ptr<sdbus::IConnection> createDefaultBusConnection(const std::string& name)
 {
-    auto conn = createBusConnection();
+    auto conn = createDefaultBusConnection();
     conn->requestName(name);
     return conn;
 }
@@ -984,7 +924,7 @@ std::unique_ptr<sdbus::IConnection> createSystemBusConnection()
     return std::make_unique<sdbus::internal::Connection>(std::move(interface), Connection::system_bus);
 }
 
-std::unique_ptr<sdbus::IConnection> createSystemBusConnection(const ServiceName& name)
+std::unique_ptr<sdbus::IConnection> createSystemBusConnection(const std::string& name)
 {
     auto conn = createSystemBusConnection();
     conn->requestName(name);
@@ -997,7 +937,7 @@ std::unique_ptr<sdbus::IConnection> createSessionBusConnection()
     return std::make_unique<sdbus::internal::Connection>(std::move(interface), Connection::session_bus);
 }
 
-std::unique_ptr<sdbus::IConnection> createSessionBusConnection(const ServiceName& name)
+std::unique_ptr<sdbus::IConnection> createSessionBusConnection(const std::string& name)
 {
     auto conn = createSessionBusConnection();
     conn->requestName(name);

src/Connection.h

@@ -1,6 +1,6 @@
 /**
  * (C) 2016 - 2021 KISTLER INSTRUMENTE AG, Winterthur, Switzerland
- * (C) 2016 - 2024 Stanislav Angelovic <stanislav.angelovic@protonmail.com>
+ * (C) 2016 - 2022 Stanislav Angelovic <stanislav.angelovic@protonmail.com>
  *
  * @file Connection.h
  *
@@ -27,32 +27,18 @@
 #ifndef SDBUS_CXX_INTERNAL_CONNECTION_H_
 #define SDBUS_CXX_INTERNAL_CONNECTION_H_
 
-#include "sdbus-c++/IConnection.h"
-
-#include "sdbus-c++/Message.h"
-
+#include <sdbus-c++/IConnection.h>
+#include <sdbus-c++/Message.h>
 #include "IConnection.h"
-#include "ISdBus.h"
 #include "ScopeGuard.h"
-
-#include <memory>
-#include <string>
+#include "ISdBus.h"
 #include SDBUS_HEADER
+#include <memory>
 #include <thread>
+#include <string>
 #include <vector>
 
-// Forward declarations
 struct sd_event_source;
-namespace sdbus {
-    class ObjectPath;
-    class InterfaceName;
-    class BusName;
-    using ServiceName = BusName;
-    class MemberName;
-    using MethodName = MemberName;
-    using SignalName = MemberName;
-    using PropertyName = MemberName;
-}
 
 namespace sdbus::internal {
 
@@ -92,90 +78,69 @@ namespace sdbus::internal {
         Connection(std::unique_ptr<ISdBus>&& interface, pseudo_bus_t);
         ~Connection() override;
 
-        void requestName(const ServiceName & name) override;
-        void releaseName(const ServiceName& name) override;
-        [[nodiscard]] BusName getUniqueName() const override;
+        void requestName(const std::string& name) override;
+        void releaseName(const std::string& name) override;
+        std::string getUniqueName() const override;
         void enterEventLoop() override;
-        void enterEventLoopAsync() override;
+        void enterEventLoop(async_t) override;
         void leaveEventLoop() override;
-        [[nodiscard]] PollData getEventLoopPollData() const override;
+        PollData getEventLoopPollData() const override;
         bool processPendingEvent() override;
         Message getCurrentlyProcessedMessage() const override;
 
-        void addObjectManager(const ObjectPath& objectPath) override;
-        Slot addObjectManager(const ObjectPath& objectPath, return_slot_t) override;
+        void addObjectManager(const std::string& objectPath) override;
+        void addObjectManager(const std::string& objectPath, floating_slot_t) override;
+        Slot addObjectManager(const std::string& objectPath, return_slot_t) override;
 
         void setMethodCallTimeout(uint64_t timeout) override;
-        [[nodiscard]] uint64_t getMethodCallTimeout() const override;
+        uint64_t getMethodCallTimeout() const override;
 
-        void addMatch(const std::string& match, message_handler callback) override;
-        [[nodiscard]] Slot addMatch(const std::string& match, message_handler callback, return_slot_t) override;
-        void addMatchAsync(const std::string& match, message_handler callback, message_handler installCallback) override;
-        [[nodiscard]] Slot addMatchAsync( const std::string& match
-                                        , message_handler callback
-                                        , message_handler installCallback
-                                        , return_slot_t ) override;
+        [[nodiscard]] Slot addMatch(const std::string& match, message_handler callback) override;
+        void addMatch(const std::string& match, message_handler callback, floating_slot_t) override;
+        [[nodiscard]] Slot addMatch(const std::string& match, message_handler callback, message_handler installCallback, async_t) override;
+        void addMatch(const std::string& match, message_handler callback, message_handler installCallback, async_t, floating_slot_t) override;
 
         void attachSdEventLoop(sd_event *event, int priority) override;
         void detachSdEventLoop() override;
         sd_event *getSdEventLoop() override;
 
-        Slot addObjectVTable( const ObjectPath& objectPath
-                            , const InterfaceName& interfaceName
+        const ISdBus& getSdBusInterface() const override;
+        ISdBus& getSdBusInterface() override;
+
+        Slot addObjectVTable( const std::string& objectPath
+                            , const std::string& interfaceName
                             , const sd_bus_vtable* vtable
-                            , void* userData
-                            , return_slot_t ) override;
+                            , void* userData ) override;
 
-        [[nodiscard]] PlainMessage createPlainMessage() const override;
-        [[nodiscard]] MethodCall createMethodCall( const ServiceName& destination
-                                                 , const ObjectPath& objectPath
-                                                 , const InterfaceName& interfaceName
-                                                 , const MethodName& methodName ) const override;
-        [[nodiscard]] MethodCall createMethodCall( const char* destination
-                                                 , const char* objectPath
-                                                 , const char* interfaceName
-                                                 , const char* methodName ) const override;
-        [[nodiscard]] Signal createSignal( const ObjectPath& objectPath
-                                         , const InterfaceName& interfaceName
-                                         , const SignalName& signalName ) const override;
-        [[nodiscard]] Signal createSignal( const char* objectPath
-                                         , const char* interfaceName
-                                         , const char* signalName ) const override;
+        PlainMessage createPlainMessage() const override;
+        MethodCall createMethodCall( const std::string& destination
+                                   , const std::string& objectPath
+                                   , const std::string& interfaceName
+                                   , const std::string& methodName ) const override;
+        Signal createSignal( const std::string& objectPath
+                           , const std::string& interfaceName
+                           , const std::string& signalName ) const override;
 
-        void emitPropertiesChangedSignal( const ObjectPath& objectPath
-                                        , const InterfaceName& interfaceName
-                                        , const std::vector<PropertyName>& propNames ) override;
-        void emitPropertiesChangedSignal( const char* objectPath
-                                        , const char* interfaceName
-                                        , const std::vector<PropertyName>& propNames ) override;
-        void emitInterfacesAddedSignal(const ObjectPath& objectPath) override;
-        void emitInterfacesAddedSignal( const ObjectPath& objectPath
-                                      , const std::vector<InterfaceName>& interfaces ) override;
-        void emitInterfacesRemovedSignal(const ObjectPath& objectPath) override;
-        void emitInterfacesRemovedSignal( const ObjectPath& objectPath
-                                        , const std::vector<InterfaceName>& interfaces ) override;
+        MethodReply callMethod(const MethodCall& message, uint64_t timeout) override;
+        void callMethod(const MethodCall& message, void* callback, void* userData, uint64_t timeout, floating_slot_t) override;
+        Slot callMethod(const MethodCall& message, void* callback, void* userData, uint64_t timeout) override;
 
-        Slot registerSignalHandler( const char* sender
-                                  , const char* objectPath
-                                  , const char* interfaceName
-                                  , const char* signalName
+        void emitPropertiesChangedSignal( const std::string& objectPath
+                                        , const std::string& interfaceName
+                                        , const std::vector<std::string>& propNames ) override;
+        void emitInterfacesAddedSignal(const std::string& objectPath) override;
+        void emitInterfacesAddedSignal( const std::string& objectPath
+                                      , const std::vector<std::string>& interfaces ) override;
+        void emitInterfacesRemovedSignal(const std::string& objectPath) override;
+        void emitInterfacesRemovedSignal( const std::string& objectPath
+                                        , const std::vector<std::string>& interfaces ) override;
+
+        Slot registerSignalHandler( const std::string& sender
+                                  , const std::string& objectPath
+                                  , const std::string& interfaceName
+                                  , const std::string& signalName
                                   , sd_bus_message_handler_t callback
-                                  , void* userData
-                                  , return_slot_t ) override;
-
-        sd_bus_message* incrementMessageRefCount(sd_bus_message* sdbusMsg) override;
-        sd_bus_message* decrementMessageRefCount(sd_bus_message* sdbusMsg) override;
-
-        int querySenderCredentials(sd_bus_message* sdbusMsg, uint64_t mask, sd_bus_creds **creds) override;
-        sd_bus_creds* incrementCredsRefCount(sd_bus_creds* creds) override;
-        sd_bus_creds* decrementCredsRefCount(sd_bus_creds* creds) override;
-
-        sd_bus_message* callMethod(sd_bus_message* sdbusMsg, uint64_t timeout) override;
-        Slot callMethodAsync(sd_bus_message* sdbusMsg, sd_bus_message_handler_t callback, void* userData, uint64_t timeout, return_slot_t) override;
-        void sendMessage(sd_bus_message* sdbusMsg) override;
-
-        sd_bus_message* createMethodReply(sd_bus_message* sdbusMsg) override;
-        sd_bus_message* createErrorReplyMessage(sd_bus_message* sdbusMsg, const Error& error) override;
+                                  , void* userData ) override;
 
     private:
         using BusFactory = std::function<int(sd_bus**)>;
@@ -187,15 +152,14 @@ namespace sdbus::internal {
         void finishHandshake(sd_bus* bus);
         bool waitForNextEvent();
 
-        [[nodiscard]] bool arePendingMessagesInQueues() const;
+        bool arePendingMessagesInReadQueue() const;
 
         void notifyEventLoopToExit();
         void notifyEventLoopToWakeUpFromPoll();
         void wakeUpEventLoopIfMessagesInQueue();
         void joinWithEventLoop();
 
-        template <typename StringBasedType>
-        static std::vector</*const */char*> to_strv(const std::vector<StringBasedType>& strings);
+        static std::vector</*const */char*> to_strv(const std::vector<std::string>& strings);
 
         static int sdbus_match_callback(sd_bus_message *sdbusMessage, void *userData, sd_bus_error *retError);
         static int sdbus_match_install_callback(sd_bus_message *sdbusMessage, void *userData, sd_bus_error *retError);

src/Error.cpp

@@ -1,6 +1,6 @@
 /**
  * (C) 2016 - 2021 KISTLER INSTRUMENTE AG, Winterthur, Switzerland
- * (C) 2016 - 2024 Stanislav Angelovic <stanislav.angelovic@protonmail.com>
+ * (C) 2016 - 2022 Stanislav Angelovic <stanislav.angelovic@protonmail.com>
  *
  * @file Error.cpp
  *
@@ -24,26 +24,20 @@
  * along with sdbus-c++. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "sdbus-c++/Error.h"
-
-#include "ScopeGuard.h"
-
+#include <sdbus-c++/Error.h>
 #include SDBUS_HEADER
+#include "ScopeGuard.h"
 
 namespace sdbus
 {
-    sdbus::Error createError(int errNo, std::string customMsg)
+    sdbus::Error createError(int errNo, const std::string& customMsg)
     {
         sd_bus_error sdbusError = SD_BUS_ERROR_NULL;
         sd_bus_error_set_errno(&sdbusError, errNo);
         SCOPE_EXIT{ sd_bus_error_free(&sdbusError); };
 
-        Error::Name name(sdbusError.name);
-        std::string message(std::move(customMsg));
-        message.append(" (");
-        message.append(sdbusError.message);
-        message.append(")");
-
-        return Error(std::move(name), std::move(message));
+        std::string name(sdbusError.name);
+        std::string message(customMsg + " (" + sdbusError.message + ")");
+        return sdbus::Error(name, message);
     }
-} // namespace sdbus
+}

src/Flags.cpp

@@ -1,6 +1,6 @@
 /**
  * (C) 2016 - 2021 KISTLER INSTRUMENTE AG, Winterthur, Switzerland
- * (C) 2016 - 2024 Stanislav Angelovic <stanislav.angelovic@protonmail.com>
+ * (C) 2016 - 2022 Stanislav Angelovic <stanislav.angelovic@protonmail.com>
  *
  * @file Flags.cpp
  *

src/IConnection.h

@@ -1,6 +1,6 @@
 /**
  * (C) 2016 - 2021 KISTLER INSTRUMENTE AG, Winterthur, Switzerland
- * (C) 2016 - 2024 Stanislav Angelovic <stanislav.angelovic@protonmail.com>
+ * (C) 2016 - 2022 Stanislav Angelovic <stanislav.angelovic@protonmail.com>
  *
  * @file IConnection.h
  *
@@ -27,31 +27,20 @@
 #ifndef SDBUS_CXX_INTERNAL_ICONNECTION_H_
 #define SDBUS_CXX_INTERNAL_ICONNECTION_H_
 
-#include "sdbus-c++/IConnection.h"
-
-#include "sdbus-c++/TypeTraits.h"
-
-#include <functional>
-#include <memory>
-#include <string>
+#include <sdbus-c++/IConnection.h>
+#include <sdbus-c++/TypeTraits.h>
 #include SDBUS_HEADER
+#include <string>
+#include <memory>
+#include <functional>
 #include <vector>
 
-// Forward declarations
+// Forward declaration
 namespace sdbus {
     class MethodCall;
     class MethodReply;
     class Signal;
     class PlainMessage;
-    class ObjectPath;
-    class InterfaceName;
-    class BusName;
-    using ServiceName = BusName;
-    class MemberName;
-    using MethodName = MemberName;
-    using SignalName = MemberName;
-    using PropertyName = MemberName;
-    class Error;
     namespace internal {
         class ISdBus;
     }
@@ -65,69 +54,49 @@ namespace sdbus::internal {
     public:
         ~IConnection() override = default;
 
-        [[nodiscard]] virtual Slot addObjectVTable( const ObjectPath& objectPath
-                                                  , const InterfaceName& interfaceName
+        virtual const ISdBus& getSdBusInterface() const = 0;
+        virtual ISdBus& getSdBusInterface() = 0;
+
+        [[nodiscard]] virtual Slot addObjectVTable( const std::string& objectPath
+                                                  , const std::string& interfaceName
                                                   , const sd_bus_vtable* vtable
-                                                  , void* userData
-                                                  , return_slot_t ) = 0;
+                                                  , void* userData ) = 0;
 
-        [[nodiscard]] virtual PlainMessage createPlainMessage() const = 0;
-        [[nodiscard]] virtual MethodCall createMethodCall( const ServiceName& destination
-                                                         , const ObjectPath& objectPath
-                                                         , const InterfaceName& interfaceName
-                                                         , const MethodName& methodName ) const = 0;
-        [[nodiscard]] virtual MethodCall createMethodCall( const char* destination
-                                                         , const char* objectPath
-                                                         , const char* interfaceName
-                                                         , const char* methodName ) const = 0;
-        [[nodiscard]] virtual Signal createSignal( const ObjectPath& objectPath
-                                                 , const InterfaceName& interfaceName
-                                                 , const SignalName& signalName ) const = 0;
-        [[nodiscard]] virtual Signal createSignal( const char* objectPath
-                                                 , const char* interfaceName
-                                                 , const char* signalName ) const = 0;
+        virtual PlainMessage createPlainMessage() const = 0;
+        virtual MethodCall createMethodCall( const std::string& destination
+                                           , const std::string& objectPath
+                                           , const std::string& interfaceName
+                                           , const std::string& methodName ) const = 0;
+        virtual Signal createSignal( const std::string& objectPath
+                                   , const std::string& interfaceName
+                                   , const std::string& signalName ) const = 0;
 
-        virtual void emitPropertiesChangedSignal( const ObjectPath& objectPath
-                                                , const InterfaceName& interfaceName
-                                                , const std::vector<PropertyName>& propNames ) = 0;
-        virtual void emitPropertiesChangedSignal( const char* objectPath
-                                                , const char* interfaceName
-                                                , const std::vector<PropertyName>& propNames ) = 0;
-        virtual void emitInterfacesAddedSignal(const ObjectPath& objectPath) = 0;
-        virtual void emitInterfacesAddedSignal( const ObjectPath& objectPath
-                                              , const std::vector<InterfaceName>& interfaces ) = 0;
-        virtual void emitInterfacesRemovedSignal(const ObjectPath& objectPath) = 0;
-        virtual void emitInterfacesRemovedSignal( const ObjectPath& objectPath
-                                                , const std::vector<InterfaceName>& interfaces ) = 0;
+        virtual MethodReply callMethod(const MethodCall& message, uint64_t timeout) = 0;
+        virtual void callMethod(const MethodCall& message, void* callback, void* userData, uint64_t timeout, floating_slot_t) = 0;
+        [[nodiscard]] virtual Slot callMethod(const MethodCall& message, void* callback, void* userData, uint64_t timeout) = 0;
 
-        [[nodiscard]] virtual Slot registerSignalHandler( const char* sender
-                                                        , const char* objectPath
-                                                        , const char* interfaceName
-                                                        , const char* signalName
+        virtual void emitPropertiesChangedSignal( const std::string& objectPath
+                                                , const std::string& interfaceName
+                                                , const std::vector<std::string>& propNames ) = 0;
+        virtual void emitInterfacesAddedSignal(const std::string& objectPath) = 0;
+        virtual void emitInterfacesAddedSignal( const std::string& objectPath
+                                              , const std::vector<std::string>& interfaces ) = 0;
+        virtual void emitInterfacesRemovedSignal(const std::string& objectPath) = 0;
+        virtual void emitInterfacesRemovedSignal( const std::string& objectPath
+                                                , const std::vector<std::string>& interfaces ) = 0;
+
+        using sdbus::IConnection::addObjectManager;
+        [[nodiscard]] virtual Slot addObjectManager(const std::string& objectPath, return_slot_t) = 0;
+
+        [[nodiscard]] virtual Slot registerSignalHandler( const std::string& sender
+                                                        , const std::string& objectPath
+                                                        , const std::string& interfaceName
+                                                        , const std::string& signalName
                                                         , sd_bus_message_handler_t callback
-                                                        , void* userData
-                                                        , return_slot_t ) = 0;
-
-        virtual sd_bus_message* incrementMessageRefCount(sd_bus_message* sdbusMsg) = 0;
-        virtual sd_bus_message* decrementMessageRefCount(sd_bus_message* sdbusMsg) = 0;
-
-        // TODO: Refactor to higher level (Creds class will ownership handling and getters)
-        virtual int querySenderCredentials(sd_bus_message* sdbusMsg, uint64_t mask, sd_bus_creds **creds) = 0;
-        virtual sd_bus_creds* incrementCredsRefCount(sd_bus_creds* creds) = 0;
-        virtual sd_bus_creds* decrementCredsRefCount(sd_bus_creds* creds) = 0;
-
-        virtual sd_bus_message* callMethod(sd_bus_message* sdbusMsg, uint64_t timeout) = 0;
-        [[nodiscard]] virtual Slot callMethodAsync( sd_bus_message* sdbusMsg
-                                                  , sd_bus_message_handler_t callback
-                                                  , void* userData
-                                                  , uint64_t timeout
-                                                  , return_slot_t ) = 0;
-        virtual void sendMessage(sd_bus_message* sdbusMsg) = 0;
-
-        virtual sd_bus_message* createMethodReply(sd_bus_message* sdbusMsg) = 0;
-        virtual sd_bus_message* createErrorReplyMessage(sd_bus_message* sdbusMsg, const Error& error) = 0;
+                                                        , void* userData ) = 0;
     };
 
+    [[nodiscard]] std::unique_ptr<sdbus::internal::IConnection> createConnection();
     [[nodiscard]] std::unique_ptr<sdbus::internal::IConnection> createPseudoConnection();
 
 }

src/ISdBus.h

@@ -1,6 +1,6 @@
 /**
  * (C) 2016 - 2021 KISTLER INSTRUMENTE AG, Winterthur, Switzerland
- * (C) 2016 - 2024 Stanislav Angelovic <stanislav.angelovic@protonmail.com>
+ * (C) 2016 - 2022 Stanislav Angelovic <stanislav.angelovic@protonmail.com>
  *
  * @file ISdBus.h
  * @author Ardazishvili Roman (ardazishvili.roman@yandex.ru)
@@ -90,7 +90,7 @@ namespace sdbus::internal {
         virtual int sd_bus_process(sd_bus *bus, sd_bus_message **r) = 0;
         virtual sd_bus_message* sd_bus_get_current_message(sd_bus *bus) = 0;
         virtual int sd_bus_get_poll_data(sd_bus *bus, PollData* data) = 0;
-        virtual int sd_bus_get_n_queued(sd_bus *bus, uint64_t *read, uint64_t* write) = 0;
+        virtual int sd_bus_get_n_queued_read(sd_bus *bus, uint64_t *ret) = 0;
         virtual int sd_bus_flush(sd_bus *bus) = 0;
         virtual sd_bus *sd_bus_flush_close_unref(sd_bus *bus) = 0;
         virtual sd_bus *sd_bus_close_unref(sd_bus *bus) = 0;
@@ -98,7 +98,6 @@ namespace sdbus::internal {
         virtual int sd_bus_message_set_destination(sd_bus_message *m, const char *destination) = 0;
 
         virtual int sd_bus_query_sender_creds(sd_bus_message *m, uint64_t mask, sd_bus_creds **c) = 0;
-        virtual sd_bus_creds* sd_bus_creds_ref(sd_bus_creds *c) = 0;
         virtual sd_bus_creds* sd_bus_creds_unref(sd_bus_creds *c) = 0;
 
         virtual int sd_bus_creds_get_pid(sd_bus_creds *c, pid_t *pid) = 0;

src/Message.cpp

@@ -1,6 +1,6 @@
 /**
  * (C) 2016 - 2021 KISTLER INSTRUMENTE AG, Winterthur, Switzerland
- * (C) 2016 - 2024 Stanislav Angelovic <stanislav.angelovic@protonmail.com>
+ * (C) 2016 - 2022 Stanislav Angelovic <stanislav.angelovic@protonmail.com>
  *
  * @file Message.cpp
  *
@@ -24,42 +24,39 @@
  * along with sdbus-c++. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "sdbus-c++/Message.h"
-
-#include "sdbus-c++/Error.h"
-#include "sdbus-c++/Types.h"
-
-#include "IConnection.h"
+#include <sdbus-c++/Message.h>
+#include <sdbus-c++/Types.h>
+#include <sdbus-c++/Error.h>
 #include "MessageUtils.h"
+#include "ISdBus.h"
+#include "IConnection.h"
 #include "ScopeGuard.h"
-
-#include <cassert>
-#include <cstring>
 #include SDBUS_HEADER
+#include <cassert>
 
 namespace sdbus {
 
-Message::Message(internal::IConnection* connection) noexcept
-    : connection_(connection)
+Message::Message(internal::ISdBus* sdbus) noexcept
+    : sdbus_(sdbus)
 {
-    assert(connection_ != nullptr);
+    assert(sdbus_ != nullptr);
 }
 
-Message::Message(void *msg, internal::IConnection* connection) noexcept
+Message::Message(void *msg, internal::ISdBus* sdbus) noexcept
     : msg_(msg)
-    , connection_(connection)
+    , sdbus_(sdbus)
 {
     assert(msg_ != nullptr);
-    assert(connection_ != nullptr);
-    connection_->incrementMessageRefCount((sd_bus_message*)msg_);
+    assert(sdbus_ != nullptr);
+    sdbus_->sd_bus_message_ref((sd_bus_message*)msg_);
 }
 
-Message::Message(void *msg, internal::IConnection* connection, adopt_message_t) noexcept
+Message::Message(void *msg, internal::ISdBus* sdbus, adopt_message_t) noexcept
     : msg_(msg)
-    , connection_(connection)
+    , sdbus_(sdbus)
 {
     assert(msg_ != nullptr);
-    assert(connection_ != nullptr);
+    assert(sdbus_ != nullptr);
 }
 
 Message::Message(const Message& other) noexcept
@@ -70,13 +67,13 @@ Message::Message(const Message& other) noexcept
 Message& Message::operator=(const Message& other) noexcept
 {
     if (msg_)
-        connection_->decrementMessageRefCount((sd_bus_message*)msg_);
+        sdbus_->sd_bus_message_unref((sd_bus_message*)msg_);
 
     msg_ = other.msg_;
-    connection_ = other.connection_;
+    sdbus_ = other.sdbus_;
     ok_ = other.ok_;
 
-    connection_->incrementMessageRefCount((sd_bus_message*)msg_);
+    sdbus_->sd_bus_message_ref((sd_bus_message*)msg_);
 
     return *this;
 }
@@ -89,12 +86,12 @@ Message::Message(Message&& other) noexcept
 Message& Message::operator=(Message&& other) noexcept
 {
     if (msg_)
-        connection_->decrementMessageRefCount((sd_bus_message*)msg_);
+        sdbus_->sd_bus_message_unref((sd_bus_message*)msg_);
 
     msg_ = other.msg_;
     other.msg_ = nullptr;
-    connection_ = other.connection_;
-    other.connection_ = nullptr;
+    sdbus_ = other.sdbus_;
+    other.sdbus_ = nullptr;
     ok_ = other.ok_;
     other.ok_ = true;
 
@@ -104,17 +101,13 @@ Message& Message::operator=(Message&& other) noexcept
 Message::~Message()
 {
     if (msg_)
-        connection_->decrementMessageRefCount((sd_bus_message*)msg_);
+        sdbus_->sd_bus_message_unref((sd_bus_message*)msg_);
 }
 
 Message& Message::operator<<(bool item)
 {
     int intItem = item;
 
-    // Direct sd-bus method, bypassing SdBus mutex, are called here, since Message serialization/deserialization,
-    // as well as getter/setter methods are not thread safe by design. Additionally, they are called frequently,
-    // so some overhead is spared. What is thread-safe in Message class is Message constructors, copy/move operations
-    // and the destructor, so the Message instance can be passed from one thread to another safely.
     auto r = sd_bus_message_append_basic((sd_bus_message*)msg_, SD_BUS_TYPE_BOOLEAN, &intItem);
     SDBUS_THROW_ERROR_IF(r < 0, "Failed to serialize a bool value", -r);
 
@@ -201,17 +194,6 @@ Message& Message::operator<<(const std::string& item)
     return *this;
 }
 
-Message& Message::operator<<(std::string_view item)
-{
-    char* destPtr{};
-    auto r = sd_bus_message_append_string_space((sd_bus_message*)msg_, item.length(), &destPtr);
-    SDBUS_THROW_ERROR_IF(r < 0, "Failed to serialize a string_view value", -r);
-
-    std::memcpy(destPtr, item.data(), item.length());
-
-    return *this;
-}
-
 Message& Message::operator<<(const Variant &item)
 {
     item.serializeTo(*this);
@@ -444,9 +426,10 @@ Message& Message::operator>>(UnixFd &item)
     return *this;
 }
 
-Message& Message::openContainer(const char* signature)
+
+Message& Message::openContainer(const std::string& signature)
 {
-    auto r = sd_bus_message_open_container((sd_bus_message*)msg_, SD_BUS_TYPE_ARRAY, signature);
+    auto r = sd_bus_message_open_container((sd_bus_message*)msg_, SD_BUS_TYPE_ARRAY, signature.c_str());
     SDBUS_THROW_ERROR_IF(r < 0, "Failed to open a container", -r);
 
     return *this;
@@ -460,9 +443,9 @@ Message& Message::closeContainer()
     return *this;
 }
 
-Message& Message::openDictEntry(const char* signature)
+Message& Message::openDictEntry(const std::string& signature)
 {
-    auto r = sd_bus_message_open_container((sd_bus_message*)msg_, SD_BUS_TYPE_DICT_ENTRY, signature);
+    auto r = sd_bus_message_open_container((sd_bus_message*)msg_, SD_BUS_TYPE_DICT_ENTRY, signature.c_str());
     SDBUS_THROW_ERROR_IF(r < 0, "Failed to open a dictionary entry", -r);
 
     return *this;
@@ -476,9 +459,9 @@ Message& Message::closeDictEntry()
     return *this;
 }
 
-Message& Message::openVariant(const char* signature)
+Message& Message::openVariant(const std::string& signature)
 {
-    auto r = sd_bus_message_open_container((sd_bus_message*)msg_, SD_BUS_TYPE_VARIANT, signature);
+    auto r = sd_bus_message_open_container((sd_bus_message*)msg_, SD_BUS_TYPE_VARIANT, signature.c_str());
     SDBUS_THROW_ERROR_IF(r < 0, "Failed to open a variant", -r);
 
     return *this;
@@ -492,9 +475,9 @@ Message& Message::closeVariant()
     return *this;
 }
 
-Message& Message::openStruct(const char* signature)
+Message& Message::openStruct(const std::string& signature)
 {
-    auto r = sd_bus_message_open_container((sd_bus_message*)msg_, SD_BUS_TYPE_STRUCT, signature);
+    auto r = sd_bus_message_open_container((sd_bus_message*)msg_, SD_BUS_TYPE_STRUCT, signature.c_str());
     SDBUS_THROW_ERROR_IF(r < 0, "Failed to open a struct", -r);
 
     return *this;
@@ -508,9 +491,10 @@ Message& Message::closeStruct()
     return *this;
 }
 
-Message& Message::enterContainer(const char* signature)
+
+Message& Message::enterContainer(const std::string& signature)
 {
-    auto r = sd_bus_message_enter_container((sd_bus_message*)msg_, SD_BUS_TYPE_ARRAY, signature);
+    auto r = sd_bus_message_enter_container((sd_bus_message*)msg_, SD_BUS_TYPE_ARRAY, signature.c_str());
     if (r == 0)
         ok_ = false;
 
@@ -527,9 +511,9 @@ Message& Message::exitContainer()
     return *this;
 }
 
-Message& Message::enterDictEntry(const char* signature)
+Message& Message::enterDictEntry(const std::string& signature)
 {
-    auto r = sd_bus_message_enter_container((sd_bus_message*)msg_, SD_BUS_TYPE_DICT_ENTRY, signature);
+    auto r = sd_bus_message_enter_container((sd_bus_message*)msg_, SD_BUS_TYPE_DICT_ENTRY, signature.c_str());
     if (r == 0)
         ok_ = false;
 
@@ -546,9 +530,9 @@ Message& Message::exitDictEntry()
     return *this;
 }
 
-Message& Message::enterVariant(const char* signature)
+Message& Message::enterVariant(const std::string& signature)
 {
-    auto r = sd_bus_message_enter_container((sd_bus_message*)msg_, SD_BUS_TYPE_VARIANT, signature);
+    auto r = sd_bus_message_enter_container((sd_bus_message*)msg_, SD_BUS_TYPE_VARIANT, signature.c_str());
     if (r == 0)
         ok_ = false;
 
@@ -565,9 +549,9 @@ Message& Message::exitVariant()
     return *this;
 }
 
-Message& Message::enterStruct(const char* signature)
+Message& Message::enterStruct(const std::string& signature)
 {
-    auto r = sd_bus_message_enter_container((sd_bus_message*)msg_, SD_BUS_TYPE_STRUCT, signature);
+    auto r = sd_bus_message_enter_container((sd_bus_message*)msg_, SD_BUS_TYPE_STRUCT, signature.c_str());
     if (r == 0)
         ok_ = false;
 
@@ -615,51 +599,48 @@ void Message::rewind(bool complete)
     SDBUS_THROW_ERROR_IF(r < 0, "Failed to rewind the message", -r);
 }
 
-const char* Message::getInterfaceName() const
+std::string Message::getInterfaceName() const
 {
-    return sd_bus_message_get_interface((sd_bus_message*)msg_);
+    auto interface = sd_bus_message_get_interface((sd_bus_message*)msg_);
+    return interface != nullptr ? interface : "";
 }
 
-const char* Message::getMemberName() const
+std::string Message::getMemberName() const
 {
-    return sd_bus_message_get_member((sd_bus_message*)msg_);
+    auto member = sd_bus_message_get_member((sd_bus_message*)msg_);
+    return member != nullptr ? member : "";
 }
 
-const char* Message::getSender() const
+std::string Message::getSender() const
 {
     return sd_bus_message_get_sender((sd_bus_message*)msg_);
 }
 
-const char* Message::getPath() const
+std::string Message::getPath() const
 {
-    return sd_bus_message_get_path((sd_bus_message*)msg_);
+    auto path = sd_bus_message_get_path((sd_bus_message*)msg_);
+    return path != nullptr ? path : "";
 }
 
-const char* Message::getDestination() const
+std::string Message::getDestination() const
 {
-    return sd_bus_message_get_destination((sd_bus_message*)msg_);
+    auto destination = sd_bus_message_get_destination((sd_bus_message*)msg_);
+    return destination != nullptr ? destination : "";
 }
 
-uint64_t Message::getCookie() const
+void Message::peekType(std::string& type, std::string& contents) const
 {
-    uint64_t cookie;
-    auto r =  sd_bus_message_get_cookie((sd_bus_message*)msg_, &cookie);
-    SDBUS_THROW_ERROR_IF(r < 0, "Failed to get cookie", -r);
-    return cookie;
-}
-
-std::pair<char, const char*> Message::peekType() const
-{
-    char typeSignature{};
-    const char* contentsSignature{};
-    auto r = sd_bus_message_peek_type((sd_bus_message*)msg_, &typeSignature, &contentsSignature);
+    char typeSig;
+    const char* contentsSig;
+    auto r = sd_bus_message_peek_type((sd_bus_message*)msg_, &typeSig, &contentsSig);
     SDBUS_THROW_ERROR_IF(r < 0, "Failed to peek message type", -r);
-    return {typeSignature, contentsSignature};
+    type = typeSig;
+    contents = contentsSig ? contentsSig : "";
 }
 
 bool Message::isValid() const
 {
-    return msg_ != nullptr && connection_ != nullptr;
+    return msg_ != nullptr && sdbus_ != nullptr;
 }
 
 bool Message::isEmpty() const
@@ -672,20 +653,17 @@ bool Message::isAtEnd(bool complete) const
     return sd_bus_message_at_end((sd_bus_message*)msg_, complete) > 0;
 }
 
-// TODO: Create a RAII ownership class for creds with copy&move semantics, doing ref()/unref() under the hood.
-//   Create a method Message::querySenderCreds() that will return an object of this class by value, through IConnection and SdBus mutex.
-//   The class will expose methods like getPid(), getUid(), etc. that will directly call sd_bus_creds_* functions, no need for mutex here.
 pid_t Message::getCredsPid() const
 {
     uint64_t mask = SD_BUS_CREDS_PID | SD_BUS_CREDS_AUGMENT;
     sd_bus_creds *creds = nullptr;
-    SCOPE_EXIT{ connection_->decrementCredsRefCount(creds); };
+    SCOPE_EXIT{ sdbus_->sd_bus_creds_unref(creds); };
 
-    int r = connection_->querySenderCredentials((sd_bus_message*)msg_, mask, &creds);
+    int r = sdbus_->sd_bus_query_sender_creds((sd_bus_message*)msg_, mask, &creds);
     SDBUS_THROW_ERROR_IF(r < 0, "Failed to get bus creds", -r);
 
     pid_t pid = 0;
-    r = sd_bus_creds_get_pid(creds, &pid);
+    r = sdbus_->sd_bus_creds_get_pid(creds, &pid);
     SDBUS_THROW_ERROR_IF(r < 0, "Failed to get bus cred pid", -r);
     return pid;
 }
@@ -694,12 +672,12 @@ uid_t Message::getCredsUid() const
 {
     uint64_t mask = SD_BUS_CREDS_UID | SD_BUS_CREDS_AUGMENT;
     sd_bus_creds *creds = nullptr;
-    SCOPE_EXIT{ connection_->decrementCredsRefCount(creds); };
-    int r = connection_->querySenderCredentials((sd_bus_message*)msg_, mask, &creds);
+    SCOPE_EXIT{ sdbus_->sd_bus_creds_unref(creds); };
+    int r = sdbus_->sd_bus_query_sender_creds((sd_bus_message*)msg_, mask, &creds);
     SDBUS_THROW_ERROR_IF(r < 0, "Failed to get bus creds", -r);
 
     uid_t uid = (uid_t)-1;
-    r = sd_bus_creds_get_uid(creds, &uid);
+    r = sdbus_->sd_bus_creds_get_uid(creds, &uid);
     SDBUS_THROW_ERROR_IF(r < 0, "Failed to get bus cred uid", -r);
     return uid;
 }
@@ -708,12 +686,12 @@ uid_t Message::getCredsEuid() const
 {
     uint64_t mask = SD_BUS_CREDS_EUID | SD_BUS_CREDS_AUGMENT;
     sd_bus_creds *creds = nullptr;
-    SCOPE_EXIT{ connection_->decrementCredsRefCount(creds); };
-    int r = connection_->querySenderCredentials((sd_bus_message*)msg_, mask, &creds);
+    SCOPE_EXIT{ sdbus_->sd_bus_creds_unref(creds); };
+    int r = sdbus_->sd_bus_query_sender_creds((sd_bus_message*)msg_, mask, &creds);
     SDBUS_THROW_ERROR_IF(r < 0, "Failed to get bus creds", -r);
 
     uid_t euid = (uid_t)-1;
-    r = sd_bus_creds_get_euid(creds, &euid);
+    r = sdbus_->sd_bus_creds_get_euid(creds, &euid);
     SDBUS_THROW_ERROR_IF(r < 0, "Failed to get bus cred euid", -r);
     return euid;
 }
@@ -722,12 +700,12 @@ gid_t Message::getCredsGid() const
 {
     uint64_t mask = SD_BUS_CREDS_GID | SD_BUS_CREDS_AUGMENT;
     sd_bus_creds *creds = nullptr;
-    SCOPE_EXIT{ connection_->decrementCredsRefCount(creds); };
-    int r = connection_->querySenderCredentials((sd_bus_message*)msg_, mask, &creds);
+    SCOPE_EXIT{ sdbus_->sd_bus_creds_unref(creds); };
+    int r = sdbus_->sd_bus_query_sender_creds((sd_bus_message*)msg_, mask, &creds);
     SDBUS_THROW_ERROR_IF(r < 0, "Failed to get bus creds", -r);
 
     gid_t gid = (gid_t)-1;
-    r = sd_bus_creds_get_gid(creds, &gid);
+    r = sdbus_->sd_bus_creds_get_gid(creds, &gid);
     SDBUS_THROW_ERROR_IF(r < 0, "Failed to get bus cred gid", -r);
     return gid;
 }
@@ -736,12 +714,12 @@ gid_t Message::getCredsEgid() const
 {
     uint64_t mask = SD_BUS_CREDS_EGID | SD_BUS_CREDS_AUGMENT;
     sd_bus_creds *creds = nullptr;
-    SCOPE_EXIT{ connection_->decrementCredsRefCount(creds); };
-    int r = connection_->querySenderCredentials((sd_bus_message*)msg_, mask, &creds);
+    SCOPE_EXIT{ sdbus_->sd_bus_creds_unref(creds); };
+    int r = sdbus_->sd_bus_query_sender_creds((sd_bus_message*)msg_, mask, &creds);
     SDBUS_THROW_ERROR_IF(r < 0, "Failed to get bus creds", -r);
 
     gid_t egid = (gid_t)-1;
-    r = sd_bus_creds_get_egid(creds, &egid);
+    r = sdbus_->sd_bus_creds_get_egid(creds, &egid);
     SDBUS_THROW_ERROR_IF(r < 0, "Failed to get bus cred egid", -r);
     return egid;
 }
@@ -750,12 +728,12 @@ std::vector<gid_t> Message::getCredsSupplementaryGids() const
 {
     uint64_t mask = SD_BUS_CREDS_SUPPLEMENTARY_GIDS | SD_BUS_CREDS_AUGMENT;
     sd_bus_creds *creds = nullptr;
-    SCOPE_EXIT{ connection_->decrementCredsRefCount(creds); };
-    int r = connection_->querySenderCredentials((sd_bus_message*)msg_, mask, &creds);
+    SCOPE_EXIT{ sdbus_->sd_bus_creds_unref(creds); };
+    int r = sdbus_->sd_bus_query_sender_creds((sd_bus_message*)msg_, mask, &creds);
     SDBUS_THROW_ERROR_IF(r < 0, "Failed to get bus creds", -r);
 
     const gid_t *cGids = nullptr;
-    r = sd_bus_creds_get_supplementary_gids(creds, &cGids);
+    r = sdbus_->sd_bus_creds_get_supplementary_gids(creds, &cGids);
     SDBUS_THROW_ERROR_IF(r < 0, "Failed to get bus cred supplementary gids", -r);
 
     std::vector<gid_t> gids{};
@@ -772,21 +750,21 @@ std::string Message::getSELinuxContext() const
 {
     uint64_t mask = SD_BUS_CREDS_AUGMENT | SD_BUS_CREDS_SELINUX_CONTEXT;
     sd_bus_creds *creds = nullptr;
-    SCOPE_EXIT{ connection_->decrementCredsRefCount(creds); };
-    int r = connection_->querySenderCredentials((sd_bus_message*)msg_, mask, &creds);
+    SCOPE_EXIT{ sdbus_->sd_bus_creds_unref(creds); };
+    int r = sdbus_->sd_bus_query_sender_creds((sd_bus_message*)msg_, mask, &creds);
     SDBUS_THROW_ERROR_IF(r < 0, "Failed to get bus creds", -r);
 
     const char *cLabel = nullptr;
-    r = sd_bus_creds_get_selinux_context(creds, &cLabel);
+    r = sdbus_->sd_bus_creds_get_selinux_context(creds, &cLabel);
     SDBUS_THROW_ERROR_IF(r < 0, "Failed to get bus cred selinux context", -r);
     return cLabel;
 }
 
 
 MethodCall::MethodCall( void *msg
-                      , internal::IConnection *connection
+                      , internal::ISdBus *sdbus
                       , adopt_message_t) noexcept
-   : Message(msg, connection, adopt_message)
+   : Message(msg, sdbus, adopt_message)
 {
 }
 
@@ -813,63 +791,81 @@ MethodReply MethodCall::send(uint64_t timeout) const
 
 MethodReply MethodCall::sendWithReply(uint64_t timeout) const
 {
-    auto* sdbusReply = connection_->callMethod((sd_bus_message*)msg_, timeout);
+    sd_bus_error sdbusError = SD_BUS_ERROR_NULL;
+    SCOPE_EXIT{ sd_bus_error_free(&sdbusError); };
 
-    return Factory::create<MethodReply>(sdbusReply, connection_, adopt_message);
+    sd_bus_message* sdbusReply{};
+    auto r = sdbus_->sd_bus_call(nullptr, (sd_bus_message*)msg_, timeout, &sdbusError, &sdbusReply);
+
+    if (sd_bus_error_is_set(&sdbusError))
+        throw sdbus::Error(sdbusError.name, sdbusError.message);
+
+    SDBUS_THROW_ERROR_IF(r < 0, "Failed to call method", -r);
+
+    return Factory::create<MethodReply>(sdbusReply, sdbus_, adopt_message);
 }
 
 MethodReply MethodCall::sendWithNoReply() const
 {
-    connection_->sendMessage((sd_bus_message*)msg_);
+    auto r = sdbus_->sd_bus_send(nullptr, (sd_bus_message*)msg_, nullptr);
+    SDBUS_THROW_ERROR_IF(r < 0, "Failed to call method with no reply", -r);
 
     return Factory::create<MethodReply>(); // No reply
 }
 
-Slot MethodCall::send(void* callback, void* userData, uint64_t timeout, return_slot_t) const
+void MethodCall::send(void* callback, void* userData, uint64_t timeout, floating_slot_t) const
 {
-    return connection_->callMethodAsync((sd_bus_message*)msg_, (sd_bus_message_handler_t)callback, userData, timeout, return_slot);
+    auto r = sdbus_->sd_bus_call_async(nullptr, nullptr, (sd_bus_message*)msg_, (sd_bus_message_handler_t)callback, userData, timeout);
+    SDBUS_THROW_ERROR_IF(r < 0, "Failed to call method", -r);
+}
+
+Slot MethodCall::send(void* callback, void* userData, uint64_t timeout) const
+{
+    sd_bus_slot* slot;
+
+    auto r = sdbus_->sd_bus_call_async(nullptr, &slot, (sd_bus_message*)msg_, (sd_bus_message_handler_t)callback, userData, timeout);
+    SDBUS_THROW_ERROR_IF(r < 0, "Failed to call method asynchronously", -r);
+
+    return {slot, [sdbus_ = sdbus_](void *slot){ sdbus_->sd_bus_slot_unref((sd_bus_slot*)slot); }};
 }
 
 MethodReply MethodCall::createReply() const
 {
-    auto* sdbusReply = connection_->createMethodReply((sd_bus_message*)msg_);
+    sd_bus_message* sdbusReply{};
+    auto r = sdbus_->sd_bus_message_new_method_return((sd_bus_message*)msg_, &sdbusReply);
+    SDBUS_THROW_ERROR_IF(r < 0, "Failed to create method reply", -r);
 
-    return Factory::create<MethodReply>(sdbusReply, connection_, adopt_message);
+    return Factory::create<MethodReply>(sdbusReply, sdbus_, adopt_message);
 }
 
 MethodReply MethodCall::createErrorReply(const Error& error) const
 {
-    sd_bus_message* sdbusErrorReply = connection_->createErrorReplyMessage((sd_bus_message*)msg_, error);
+    sd_bus_error sdbusError = SD_BUS_ERROR_NULL;
+    SCOPE_EXIT{ sd_bus_error_free(&sdbusError); };
+    sd_bus_error_set(&sdbusError, error.getName().c_str(), error.getMessage().c_str());
 
-    return Factory::create<MethodReply>(sdbusErrorReply, connection_, adopt_message);
+    sd_bus_message* sdbusErrorReply{};
+    auto r = sdbus_->sd_bus_message_new_method_error((sd_bus_message*)msg_, &sdbusErrorReply, &sdbusError);
+    SDBUS_THROW_ERROR_IF(r < 0, "Failed to create method error reply", -r);
+
+    return Factory::create<MethodReply>(sdbusErrorReply, sdbus_, adopt_message);
 }
 
 void MethodReply::send() const
 {
-    connection_->sendMessage((sd_bus_message*)msg_);
-}
-
-uint64_t MethodReply::getReplyCookie() const
-{
-    uint64_t cookie;
-    auto r =  sd_bus_message_get_reply_cookie((sd_bus_message*)msg_, &cookie);
-    SDBUS_THROW_ERROR_IF(r < 0, "Failed to get cookie", -r);
-    return cookie;
+    auto r = sdbus_->sd_bus_send(nullptr, (sd_bus_message*)msg_, nullptr);
+    SDBUS_THROW_ERROR_IF(r < 0, "Failed to send reply", -r);
 }
 
 void Signal::send() const
 {
-    connection_->sendMessage((sd_bus_message*)msg_);
+    auto r = sdbus_->sd_bus_send(nullptr, (sd_bus_message*)msg_, nullptr);
+    SDBUS_THROW_ERROR_IF(r < 0, "Failed to emit signal", -r);
 }
 
 void Signal::setDestination(const std::string& destination)
 {
-    return setDestination(destination.c_str());
-}
-
-void Signal::setDestination(const char* destination)
-{
-    auto r = sd_bus_message_set_destination((sd_bus_message*)msg_, destination);
+    auto r = sdbus_->sd_bus_message_set_destination((sd_bus_message*)msg_, destination.c_str());
     SDBUS_THROW_ERROR_IF(r < 0, "Failed to set signal destination", -r);
 }
 
@@ -885,11 +881,7 @@ namespace {
 // Please note that the solution is NOT thread-safe.
 // Another common solution is global sdbus-c++ startup/shutdown functions, but that would be an intrusive change.
 
-#ifdef __cpp_constinit
-constinit static bool pseudoConnectionDestroyed{};
-#else
-static bool pseudoConnectionDestroyed{};
-#endif
+/*constinit (C++20 keyword) */ static bool pseudoConnectionDestroyed{};
 
 std::unique_ptr<sdbus::internal::IConnection, void(*)(sdbus::internal::IConnection*)> createPseudoConnection()
 {
@@ -926,7 +918,7 @@ PlainMessage createPlainMessage()
     // This is a bit of a hack, but it enables use to work with D-Bus message locally without
     // the need of D-Bus daemon. This is especially useful in unit tests of both sdbus-c++ and client code.
     // Additionally, it's light-weight and fast solution.
-    const auto& connection = getPseudoConnectionInstance();
+    auto& connection = getPseudoConnectionInstance();
     return connection.createPlainMessage();
 }
 

src/MessageUtils.h

@@ -1,6 +1,6 @@
 /**
  * (C) 2016 - 2021 KISTLER INSTRUMENTE AG, Winterthur, Switzerland
- * (C) 2016 - 2024 Stanislav Angelovic <stanislav.angelovic@protonmail.com>
+ * (C) 2016 - 2022 Stanislav Angelovic <stanislav.angelovic@protonmail.com>
  *
  * @file MessageUtils.h
  *
@@ -47,17 +47,19 @@ namespace sdbus
         }
 
         template<typename _Msg>
-        static _Msg create(void *msg, internal::IConnection* connection)
+        static _Msg create(void *msg, internal::ISdBus* sdbus)
         {
-            return _Msg{msg, connection};
+            return _Msg{msg, sdbus};
         }
 
         template<typename _Msg>
-        static _Msg create(void *msg, internal::IConnection* connection, adopt_message_t)
+        static _Msg create(void *msg, internal::ISdBus* sdbus, adopt_message_t)
         {
-            return _Msg{msg, connection, adopt_message};
+            return _Msg{msg, sdbus, adopt_message};
         }
     };
+
+    PlainMessage createPlainMessage();
 }
 
 #endif /* SDBUS_CXX_INTERNAL_MESSAGEUTILS_H_ */

src/Object.cpp

@@ -1,6 +1,6 @@
 /**
  * (C) 2016 - 2021 KISTLER INSTRUMENTE AG, Winterthur, Switzerland
- * (C) 2016 - 2024 Stanislav Angelovic <stanislav.angelovic@protonmail.com>
+ * (C) 2016 - 2022 Stanislav Angelovic <stanislav.angelovic@protonmail.com>
  *
  * @file Object.cpp
  *
@@ -25,40 +25,38 @@
  */
 
 #include "Object.h"
-
-#include "sdbus-c++/Error.h"
-#include "sdbus-c++/Flags.h"
-#include "sdbus-c++/IConnection.h"
-#include "sdbus-c++/Message.h"
-
-#include "IConnection.h"
 #include "MessageUtils.h"
+#include <sdbus-c++/IConnection.h>
+#include <sdbus-c++/Message.h>
+#include <sdbus-c++/Error.h>
+#include <sdbus-c++/MethodResult.h>
+#include <sdbus-c++/Flags.h>
 #include "ScopeGuard.h"
+#include "IConnection.h"
 #include "Utils.h"
 #include "VTableUtils.h"
-
-#include <cassert>
 #include SDBUS_HEADER
 #include <utility>
+#include <cassert>
 
 namespace sdbus::internal {
 
-Object::Object(sdbus::internal::IConnection& connection, ObjectPath objectPath)
+Object::Object(sdbus::internal::IConnection& connection, std::string objectPath)
     : connection_(connection), objectPath_(std::move(objectPath))
 {
-    SDBUS_CHECK_OBJECT_PATH(objectPath_.c_str());
+    SDBUS_CHECK_OBJECT_PATH(objectPath_);
 }
 
-void Object::addVTable(InterfaceName interfaceName, std::vector<VTableItem> vtable)
+void Object::addVTable(std::string interfaceName, std::vector<VTableItem> vtable)
 {
     auto slot = Object::addVTable(std::move(interfaceName), std::move(vtable), return_slot);
 
     vtables_.push_back(std::move(slot));
 }
 
-Slot Object::addVTable(InterfaceName interfaceName, std::vector<VTableItem> vtable, return_slot_t)
+Slot Object::addVTable(std::string interfaceName, std::vector<VTableItem> vtable, return_slot_t)
 {
-    SDBUS_CHECK_INTERFACE_NAME(interfaceName.c_str());
+    SDBUS_CHECK_INTERFACE_NAME(interfaceName);
 
     // 1st pass -- create vtable structure for internal sdbus-c++ purposes
     auto internalVTable = std::make_unique<VTable>(createInternalVTable(std::move(interfaceName), std::move(vtable)));
@@ -67,11 +65,7 @@ Slot Object::addVTable(InterfaceName interfaceName, std::vector<VTableItem> vtab
     internalVTable->sdbusVTable = createInternalSdBusVTable(*internalVTable);
 
     // 3rd step -- register the vtable with sd-bus
-    internalVTable->slot = connection_.addObjectVTable( objectPath_
-                                                      , internalVTable->interfaceName
-                                                      , &internalVTable->sdbusVTable[0]
-                                                      , internalVTable.get()
-                                                      , return_slot );
+    internalVTable->slot = connection_.addObjectVTable(objectPath_, internalVTable->interfaceName, &internalVTable->sdbusVTable[0], internalVTable.get());
 
     // Return vtable wrapped in a Slot object
     return {internalVTable.release(), [](void *ptr){ delete static_cast<VTable*>(ptr); }};
@@ -80,19 +74,14 @@ Slot Object::addVTable(InterfaceName interfaceName, std::vector<VTableItem> vtab
 void Object::unregister()
 {
     vtables_.clear();
-    objectManagerSlot_.reset();
+    removeObjectManager();
 }
 
-Signal Object::createSignal(const InterfaceName& interfaceName, const SignalName& signalName) const
+sdbus::Signal Object::createSignal(const std::string& interfaceName, const std::string& signalName)
 {
     return connection_.createSignal(objectPath_, interfaceName, signalName);
 }
 
-Signal Object::createSignal(const char* interfaceName, const char* signalName) const
-{
-    return connection_.createSignal(objectPath_.c_str(), interfaceName, signalName);
-}
-
 void Object::emitSignal(const sdbus::Signal& message)
 {
     SDBUS_THROW_ERROR_IF(!message.isValid(), "Invalid signal message provided", EINVAL);
@@ -100,22 +89,12 @@ void Object::emitSignal(const sdbus::Signal& message)
     message.send();
 }
 
-void Object::emitPropertiesChangedSignal(const InterfaceName& interfaceName, const std::vector<PropertyName>& propNames)
+void Object::emitPropertiesChangedSignal(const std::string& interfaceName, const std::vector<std::string>& propNames)
 {
     connection_.emitPropertiesChangedSignal(objectPath_, interfaceName, propNames);
 }
 
-void Object::emitPropertiesChangedSignal(const char* interfaceName, const std::vector<PropertyName>& propNames)
-{
-    connection_.emitPropertiesChangedSignal(objectPath_.c_str(), interfaceName, propNames);
-}
-
-void Object::emitPropertiesChangedSignal(const InterfaceName& interfaceName)
-{
-    Object::emitPropertiesChangedSignal(interfaceName, {});
-}
-
-void Object::emitPropertiesChangedSignal(const char* interfaceName)
+void Object::emitPropertiesChangedSignal(const std::string& interfaceName)
 {
     Object::emitPropertiesChangedSignal(interfaceName, {});
 }
@@ -125,7 +104,7 @@ void Object::emitInterfacesAddedSignal()
     connection_.emitInterfacesAddedSignal(objectPath_);
 }
 
-void Object::emitInterfacesAddedSignal(const std::vector<InterfaceName>& interfaces)
+void Object::emitInterfacesAddedSignal(const std::vector<std::string>& interfaces)
 {
     connection_.emitInterfacesAddedSignal(objectPath_, interfaces);
 }
@@ -135,7 +114,7 @@ void Object::emitInterfacesRemovedSignal()
     connection_.emitInterfacesRemovedSignal(objectPath_);
 }
 
-void Object::emitInterfacesRemovedSignal(const std::vector<InterfaceName>& interfaces)
+void Object::emitInterfacesRemovedSignal(const std::vector<std::string>& interfaces)
 {
     connection_.emitInterfacesRemovedSignal(objectPath_, interfaces);
 }
@@ -145,9 +124,14 @@ void Object::addObjectManager()
     objectManagerSlot_ = connection_.addObjectManager(objectPath_, return_slot);
 }
 
-Slot Object::addObjectManager(return_slot_t)
+void Object::removeObjectManager()
 {
-    return connection_.addObjectManager(objectPath_, return_slot);
+    objectManagerSlot_.reset();
+}
+
+bool Object::hasObjectManager() const
+{
+    return objectManagerSlot_ != nullptr;
 }
 
 sdbus::IConnection& Object::getConnection() const
@@ -155,7 +139,7 @@ sdbus::IConnection& Object::getConnection() const
     return connection_;
 }
 
-const ObjectPath& Object::getObjectPath() const
+const std::string& Object::getObjectPath() const
 {
     return objectPath_;
 }
@@ -165,7 +149,7 @@ Message Object::getCurrentlyProcessedMessage() const
     return connection_.getCurrentlyProcessedMessage();
 }
 
-Object::VTable Object::createInternalVTable(InterfaceName interfaceName, std::vector<VTableItem> vtable)
+Object::VTable Object::createInternalVTable(std::string interfaceName, std::vector<VTableItem> vtable)
 {
     VTable internalVTable;
 
@@ -197,7 +181,7 @@ void Object::writeInterfaceFlagsToVTable(InterfaceFlagsVTableItem flags, VTable&
 
 void Object::writeMethodRecordToVTable(MethodVTableItem method, VTable& vtable)
 {
-    SDBUS_CHECK_MEMBER_NAME(method.name.c_str());
+    SDBUS_CHECK_MEMBER_NAME(method.name);
     SDBUS_THROW_ERROR_IF(!method.callbackHandler, "Invalid method callback provided", EINVAL);
 
     vtable.methods.push_back({ std::move(method.name)
@@ -210,7 +194,7 @@ void Object::writeMethodRecordToVTable(MethodVTableItem method, VTable& vtable)
 
 void Object::writeSignalRecordToVTable(SignalVTableItem signal, VTable& vtable)
 {
-    SDBUS_CHECK_MEMBER_NAME(signal.name.c_str());
+    SDBUS_CHECK_MEMBER_NAME(signal.name);
 
     vtable.signals.push_back({ std::move(signal.name)
                              , std::move(signal.signature)
@@ -220,7 +204,7 @@ void Object::writeSignalRecordToVTable(SignalVTableItem signal, VTable& vtable)
 
 void Object::writePropertyRecordToVTable(PropertyVTableItem property, VTable& vtable)
 {
-    SDBUS_CHECK_MEMBER_NAME(property.name.c_str());
+    SDBUS_CHECK_MEMBER_NAME(property.name);
     SDBUS_THROW_ERROR_IF(!property.getter && !property.setter, "Invalid property callbacks provided", EINVAL);
 
     vtable.properties.push_back({ std::move(property.name)
@@ -255,8 +239,8 @@ void Object::startSdBusVTable(const Flags& interfaceFlags, std::vector<sd_bus_vt
 void Object::writeMethodRecordToSdBusVTable(const VTable::MethodItem& method, std::vector<sd_bus_vtable>& vtable)
 {
     auto vtableItem = createSdBusVTableMethodItem( method.name.c_str()
-                                                 , method.inputSignature.c_str()
-                                                 , method.outputSignature.c_str()
+                                                 , method.inputArgs.c_str()
+                                                 , method.outputArgs.c_str()
                                                  , method.paramNames.c_str()
                                                  , &Object::sdbus_method_callback
                                                  , method.flags.toSdBusMethodFlags() );
@@ -292,7 +276,7 @@ void Object::finalizeSdBusVTable(std::vector<sd_bus_vtable>& vtable)
     vtable.push_back(createSdBusVTableEndItem());
 }
 
-const Object::VTable::MethodItem* Object::findMethod(const VTable& vtable, std::string_view methodName)
+const Object::VTable::MethodItem* Object::findMethod(const VTable& vtable, const std::string& methodName)
 {
     auto it = std::lower_bound(vtable.methods.begin(), vtable.methods.end(), methodName, [](const auto& methodItem, const auto& methodName)
     {
@@ -302,7 +286,7 @@ const Object::VTable::MethodItem* Object::findMethod(const VTable& vtable, std::
     return it != vtable.methods.end() && it->name == methodName ? &*it : nullptr;
 }
 
-const Object::VTable::PropertyItem* Object::findProperty(const VTable& vtable, std::string_view propertyName)
+const Object::VTable::PropertyItem* Object::findProperty(const VTable& vtable, const std::string& propertyName)
 {
     auto it = std::lower_bound(vtable.properties.begin(), vtable.properties.end(), propertyName, [](const auto& propertyItem, const auto& propertyName)
     {
@@ -326,7 +310,7 @@ int Object::sdbus_method_callback(sd_bus_message *sdbusMessage, void *userData,
     assert(vtable != nullptr);
     assert(vtable->object != nullptr);
 
-    auto message = Message::Factory::create<MethodCall>(sdbusMessage, &vtable->object->connection_);
+    auto message = Message::Factory::create<MethodCall>(sdbusMessage, &vtable->object->connection_.getSdBusInterface());
 
     const auto* methodItem = findMethod(*vtable, message.getMemberName());
     assert(methodItem != nullptr);
@@ -359,7 +343,7 @@ int Object::sdbus_property_get_callback( sd_bus */*bus*/
         return 1;
     }
 
-    auto reply = Message::Factory::create<PropertyGetReply>(sdbusReply, &vtable->object->connection_);
+    auto reply = Message::Factory::create<PropertyGetReply>(sdbusReply, &vtable->object->connection_.getSdBusInterface());
 
     auto ok = invokeHandlerAndCatchErrors([&](){ propertyItem->getCallback(reply); }, retError);
 
@@ -382,7 +366,7 @@ int Object::sdbus_property_set_callback( sd_bus */*bus*/
     assert(propertyItem != nullptr);
     assert(propertyItem->setCallback);
 
-    auto value = Message::Factory::create<PropertySetCall>(sdbusValue, &vtable->object->connection_);
+    auto value = Message::Factory::create<PropertySetCall>(sdbusValue, &vtable->object->connection_.getSdBusInterface());
 
     auto ok = invokeHandlerAndCatchErrors([&](){ propertyItem->setCallback(std::move(value)); }, retError);
 
@@ -393,7 +377,7 @@ int Object::sdbus_property_set_callback( sd_bus */*bus*/
 
 namespace sdbus {
 
-std::unique_ptr<sdbus::IObject> createObject(sdbus::IConnection& connection, ObjectPath objectPath)
+std::unique_ptr<sdbus::IObject> createObject(sdbus::IConnection& connection, std::string objectPath)
 {
     auto* sdbusConnection = dynamic_cast<sdbus::internal::IConnection*>(&connection);
     SDBUS_THROW_ERROR_IF(!sdbusConnection, "Connection is not a real sdbus-c++ connection", EINVAL);

src/Object.h

@@ -1,6 +1,6 @@
 /**
  * (C) 2016 - 2021 KISTLER INSTRUMENTE AG, Winterthur, Switzerland
- * (C) 2016 - 2024 Stanislav Angelovic <stanislav.angelovic@protonmail.com>
+ * (C) 2016 - 2022 Stanislav Angelovic <stanislav.angelovic@protonmail.com>
  *
  * @file Object.h
  *
@@ -27,19 +27,15 @@
 #ifndef SDBUS_CXX_INTERNAL_OBJECT_H_
 #define SDBUS_CXX_INTERNAL_OBJECT_H_
 
-#include "sdbus-c++/IObject.h"
-
+#include <sdbus-c++/IObject.h>
 #include "IConnection.h"
-#include "sdbus-c++/Types.h"
-
-#include <cassert>
-#include <functional>
-#include <list>
-#include <memory>
-#include <string>
-#include <string_view>
 #include SDBUS_HEADER
+#include <string>
+#include <list>
 #include <vector>
+#include <functional>
+#include <memory>
+#include <cassert>
 
 namespace sdbus::internal {
 
@@ -47,30 +43,28 @@ namespace sdbus::internal {
         : public IObject
     {
     public:
-        Object(sdbus::internal::IConnection& connection, ObjectPath objectPath);
+        Object(sdbus::internal::IConnection& connection, std::string objectPath);
 
-        void addVTable(InterfaceName interfaceName, std::vector<VTableItem> vtable) override;
-        Slot addVTable(InterfaceName interfaceName, std::vector<VTableItem> vtable, return_slot_t) override;
+        void addVTable(std::string interfaceName, std::vector<VTableItem> vtable) override;
+        Slot addVTable(std::string interfaceName, std::vector<VTableItem> vtable, return_slot_t) override;
         void unregister() override;
 
-        Signal createSignal(const InterfaceName& interfaceName, const SignalName& signalName) const override;
-        Signal createSignal(const char* interfaceName, const char* signalName) const override;
+        sdbus::Signal createSignal(const std::string& interfaceName, const std::string& signalName) override;
         void emitSignal(const sdbus::Signal& message) override;
-        void emitPropertiesChangedSignal(const InterfaceName& interfaceName, const std::vector<PropertyName>& propNames) override;
-        void emitPropertiesChangedSignal(const char* interfaceName, const std::vector<PropertyName>& propNames) override;
-        void emitPropertiesChangedSignal(const InterfaceName& interfaceName) override;
-        void emitPropertiesChangedSignal(const char* interfaceName) override;
+        void emitPropertiesChangedSignal(const std::string& interfaceName, const std::vector<std::string>& propNames) override;
+        void emitPropertiesChangedSignal(const std::string& interfaceName) override;
         void emitInterfacesAddedSignal() override;
-        void emitInterfacesAddedSignal(const std::vector<InterfaceName>& interfaces) override;
+        void emitInterfacesAddedSignal(const std::vector<std::string>& interfaces) override;
         void emitInterfacesRemovedSignal() override;
-        void emitInterfacesRemovedSignal(const std::vector<InterfaceName>& interfaces) override;
+        void emitInterfacesRemovedSignal(const std::vector<std::string>& interfaces) override;
 
         void addObjectManager() override;
-        [[nodiscard]] Slot addObjectManager(return_slot_t) override;
+        void removeObjectManager() override;
+        bool hasObjectManager() const override;
 
-        [[nodiscard]] sdbus::IConnection& getConnection() const override;
-        [[nodiscard]] const ObjectPath& getObjectPath() const override;
-        [[nodiscard]] Message getCurrentlyProcessedMessage() const override;
+        sdbus::IConnection& getConnection() const override;
+        const std::string& getObjectPath() const override;
+        Message getCurrentlyProcessedMessage() const override;
 
     private:
         // A vtable record comprising methods, signals, properties, flags.
@@ -78,14 +72,14 @@ namespace sdbus::internal {
         // An interface can have any number of vtables attached to it, not only one.
         struct VTable
         {
-            InterfaceName interfaceName;
+            std::string interfaceName;
             Flags interfaceFlags;
 
             struct MethodItem
             {
-                MethodName name;
-                Signature inputSignature;
-                Signature outputSignature;
+                std::string name;
+                std::string inputArgs;
+                std::string outputArgs;
                 std::string paramNames;
                 method_callback callback;
                 Flags flags;
@@ -95,8 +89,8 @@ namespace sdbus::internal {
 
             struct SignalItem
             {
-                SignalName name;
-                Signature signature;
+                std::string name;
+                std::string signature;
                 std::string paramNames;
                 Flags flags;
             };
@@ -105,8 +99,8 @@ namespace sdbus::internal {
 
             struct PropertyItem
             {
-                PropertyName name;
-                Signature signature;
+                std::string name;
+                std::string signature;
                 property_get_callback getCallback;
                 property_set_callback setCallback;
                 Flags flags;
@@ -125,7 +119,7 @@ namespace sdbus::internal {
             Slot slot;
         };
 
-        VTable createInternalVTable(InterfaceName interfaceName, std::vector<VTableItem> vtable);
+        VTable createInternalVTable(std::string interfaceName, std::vector<VTableItem> vtable);
         void writeInterfaceFlagsToVTable(InterfaceFlagsVTableItem flags, VTable& vtable);
         void writeMethodRecordToVTable(MethodVTableItem method, VTable& vtable);
         void writeSignalRecordToVTable(SignalVTableItem signal, VTable& vtable);
@@ -138,8 +132,8 @@ namespace sdbus::internal {
         static void writePropertyRecordToSdBusVTable(const VTable::PropertyItem& property, std::vector<sd_bus_vtable>& vtable);
         static void finalizeSdBusVTable(std::vector<sd_bus_vtable>& vtable);
 
-        static const VTable::MethodItem* findMethod(const VTable& vtable, std::string_view methodName);
-        static const VTable::PropertyItem* findProperty(const VTable& vtable, std::string_view propertyName);
+        static const VTable::MethodItem* findMethod(const VTable& vtable, const std::string& methodName);
+        static const VTable::PropertyItem* findProperty(const VTable& vtable, const std::string& propertyName);
 
         static std::string paramNamesToString(const std::vector<std::string>& paramNames);
 
@@ -161,7 +155,7 @@ namespace sdbus::internal {
 
     private:
         sdbus::internal::IConnection& connection_;
-        ObjectPath objectPath_;
+        std::string objectPath_;
         std::vector<Slot> vtables_;
         Slot objectManagerSlot_;
     };

src/Proxy.cpp

@@ -1,6 +1,6 @@
 /**
  * (C) 2016 - 2021 KISTLER INSTRUMENTE AG, Winterthur, Switzerland
- * (C) 2016 - 2024 Stanislav Angelovic <stanislav.angelovic@protonmail.com>
+ * (C) 2016 - 2022 Stanislav Angelovic <stanislav.angelovic@protonmail.com>
  *
  * @file Proxy.cpp
  *
@@ -25,159 +25,115 @@
  */
 
 #include "Proxy.h"
-
-#include "sdbus-c++/Error.h"
-#include "sdbus-c++/IConnection.h"
-#include "sdbus-c++/Message.h"
-
 #include "IConnection.h"
 #include "MessageUtils.h"
-#include "ScopeGuard.h"
 #include "Utils.h"
-
-#include <cassert>
-#include <cstring>
+#include "sdbus-c++/Message.h"
+#include "sdbus-c++/IConnection.h"
+#include "sdbus-c++/Error.h"
+#include "ScopeGuard.h"
 #include SDBUS_HEADER
+#include <cassert>
+#include <chrono>
 #include <utility>
 
 namespace sdbus::internal {
 
-Proxy::Proxy(sdbus::internal::IConnection& connection, ServiceName destination, ObjectPath objectPath)
+Proxy::Proxy(sdbus::internal::IConnection& connection, std::string destination, std::string objectPath)
     : connection_(&connection, [](sdbus::internal::IConnection *){ /* Intentionally left empty */ })
     , destination_(std::move(destination))
     , objectPath_(std::move(objectPath))
 {
-    SDBUS_CHECK_SERVICE_NAME(destination_.c_str());
-    SDBUS_CHECK_OBJECT_PATH(objectPath_.c_str());
+    SDBUS_CHECK_SERVICE_NAME(destination_);
+    SDBUS_CHECK_OBJECT_PATH(objectPath_);
 
     // The connection is not ours only, it is owned and managed by the user and we just reference
     // it here, so we expect the client to manage the event loop upon this connection themselves.
 }
 
 Proxy::Proxy( std::unique_ptr<sdbus::internal::IConnection>&& connection
-            , ServiceName destination
-            , ObjectPath objectPath )
+            , std::string destination
+            , std::string objectPath )
     : connection_(std::move(connection))
     , destination_(std::move(destination))
     , objectPath_(std::move(objectPath))
 {
-    SDBUS_CHECK_SERVICE_NAME(destination_.c_str());
-    SDBUS_CHECK_OBJECT_PATH(objectPath_.c_str());
+    SDBUS_CHECK_SERVICE_NAME(destination_);
+    SDBUS_CHECK_OBJECT_PATH(objectPath_);
 
     // The connection is ours only, i.e. it's us who has to manage the event loop upon this connection,
     // in order that we get and process signals, async call replies, and other messages from D-Bus.
-    connection_->enterEventLoopAsync();
+    connection_->enterEventLoop(async);
 }
 
 Proxy::Proxy( std::unique_ptr<sdbus::internal::IConnection>&& connection
-            , ServiceName destination
-            , ObjectPath objectPath
+            , std::string destination
+            , std::string objectPath
             , dont_run_event_loop_thread_t )
     : connection_(std::move(connection))
     , destination_(std::move(destination))
     , objectPath_(std::move(objectPath))
 {
-    SDBUS_CHECK_SERVICE_NAME(destination_.c_str());
-    SDBUS_CHECK_OBJECT_PATH(objectPath_.c_str());
+    SDBUS_CHECK_SERVICE_NAME(destination_);
+    SDBUS_CHECK_OBJECT_PATH(objectPath_);
 
     // Even though the connection is ours only, we don't start an event loop thread.
     // This proxy is meant to be created, used for simple synchronous D-Bus call(s) and then dismissed.
 }
 
-MethodCall Proxy::createMethodCall(const InterfaceName& interfaceName, const MethodName& methodName) const
+MethodCall Proxy::createMethodCall(const std::string& interfaceName, const std::string& methodName)
 {
     return connection_->createMethodCall(destination_, objectPath_, interfaceName, methodName);
 }
 
-MethodCall Proxy::createMethodCall(const char* interfaceName, const char* methodName) const
-{
-    return connection_->createMethodCall(destination_.c_str(), objectPath_.c_str(), interfaceName, methodName);
-}
-
-MethodReply Proxy::callMethod(const MethodCall& message)
-{
-    return Proxy::callMethod(message, /*timeout*/ 0);
-}
-
 MethodReply Proxy::callMethod(const MethodCall& message, uint64_t timeout)
 {
     SDBUS_THROW_ERROR_IF(!message.isValid(), "Invalid method call message provided", EINVAL);
 
-    return message.send(timeout);
+    return connection_->callMethod(message, timeout);
 }
 
-PendingAsyncCall Proxy::callMethodAsync(const MethodCall& message, async_reply_handler asyncReplyCallback)
-{
-    return Proxy::callMethodAsync(message, std::move(asyncReplyCallback), /*timeout*/ 0);
-}
-
-Slot Proxy::callMethodAsync(const MethodCall& message, async_reply_handler asyncReplyCallback, return_slot_t)
-{
-    return Proxy::callMethodAsync(message, std::move(asyncReplyCallback), /*timeout*/ 0, return_slot);
-}
-
-PendingAsyncCall Proxy::callMethodAsync(const MethodCall& message, async_reply_handler asyncReplyCallback, uint64_t timeout)
+PendingAsyncCall Proxy::callMethod(const MethodCall& message, async_reply_handler asyncReplyCallback, uint64_t timeout)
 {
     SDBUS_THROW_ERROR_IF(!message.isValid(), "Invalid async method call message provided", EINVAL);
 
-    auto asyncCallInfo = std::make_shared<AsyncCallInfo>(AsyncCallInfo{ .callback = std::move(asyncReplyCallback)
-                                                                      , .proxy = *this
-                                                                      , .floating = false });
+    auto callback = (void*)&Proxy::sdbus_async_reply_handler;
+    auto callData = std::make_shared<AsyncCalls::CallData>(AsyncCalls::CallData{*this, std::move(asyncReplyCallback)});
+    auto weakData = std::weak_ptr<AsyncCalls::CallData>{callData};
 
-    asyncCallInfo->slot = message.send((void*)&Proxy::sdbus_async_reply_handler, asyncCallInfo.get(), timeout, return_slot);
+    callData->slot = connection_->callMethod(message, callback, callData.get(), timeout);
 
-    auto asyncCallInfoWeakPtr = std::weak_ptr{asyncCallInfo};
+    pendingAsyncCalls_.addCall(std::move(callData));
 
-    floatingAsyncCallSlots_.push_back(std::move(asyncCallInfo));
-
-    return {asyncCallInfoWeakPtr};
+    // TODO: Instead of PendingAsyncCall consider using Slot implementation for simplicity and consistency
+    return {weakData};
 }
 
-Slot Proxy::callMethodAsync(const MethodCall& message, async_reply_handler asyncReplyCallback, uint64_t timeout, return_slot_t)
+std::future<MethodReply> Proxy::callMethod(const MethodCall& message, with_future_t)
 {
-    SDBUS_THROW_ERROR_IF(!message.isValid(), "Invalid async method call message provided", EINVAL);
-
-    auto asyncCallInfo = std::make_unique<AsyncCallInfo>(AsyncCallInfo{ .callback = std::move(asyncReplyCallback)
-                                                                      , .proxy = *this
-                                                                      , .floating = true });
-
-    asyncCallInfo->slot = message.send((void*)&Proxy::sdbus_async_reply_handler, asyncCallInfo.get(), timeout, return_slot);
-
-    return {asyncCallInfo.release(), [](void *ptr){ delete static_cast<AsyncCallInfo*>(ptr); }};
+    return Proxy::callMethod(message, {}, with_future);
 }
 
-std::future<MethodReply> Proxy::callMethodAsync(const MethodCall& message, with_future_t)
-{
-    return Proxy::callMethodAsync(message, {}, with_future);
-}
-
-std::future<MethodReply> Proxy::callMethodAsync(const MethodCall& message, uint64_t timeout, with_future_t)
+std::future<MethodReply> Proxy::callMethod(const MethodCall& message, uint64_t timeout, with_future_t)
 {
     auto promise = std::make_shared<std::promise<MethodReply>>();
     auto future = promise->get_future();
 
-    async_reply_handler asyncReplyCallback = [promise = std::move(promise)](MethodReply reply, std::optional<Error> error) noexcept
+    async_reply_handler asyncReplyCallback = [promise = std::move(promise)](MethodReply reply, const Error* error) noexcept
     {
-        if (!error)
+        if (error == nullptr)
             promise->set_value(std::move(reply));
         else
-            promise->set_exception(std::make_exception_ptr(*std::move(error)));
+            promise->set_exception(std::make_exception_ptr(*error));
     };
 
-    (void)Proxy::callMethodAsync(message, std::move(asyncReplyCallback), timeout);
+    (void)Proxy::callMethod(message, std::move(asyncReplyCallback), timeout);
 
     return future;
 }
 
-void Proxy::registerSignalHandler( const InterfaceName& interfaceName
-                                 , const SignalName& signalName
-                                 , signal_handler signalHandler )
-{
-    Proxy::registerSignalHandler(interfaceName.c_str(), signalName.c_str(), std::move(signalHandler));
-}
-
-void Proxy::registerSignalHandler( const char* interfaceName
-                                 , const char* signalName
+void Proxy::registerSignalHandler( const std::string& interfaceName
+                                 , const std::string& signalName
                                  , signal_handler signalHandler )
 {
     auto slot = Proxy::registerSignalHandler(interfaceName, signalName, std::move(signalHandler), return_slot);
@@ -185,16 +141,8 @@ void Proxy::registerSignalHandler( const char* interfaceName
     floatingSignalSlots_.push_back(std::move(slot));
 }
 
-Slot Proxy::registerSignalHandler( const InterfaceName& interfaceName
-                                 , const SignalName& signalName
-                                 , signal_handler signalHandler
-                                 , return_slot_t )
-{
-    return Proxy::registerSignalHandler(interfaceName.c_str(), signalName.c_str(), std::move(signalHandler), return_slot);
-}
-
-Slot Proxy::registerSignalHandler( const char* interfaceName
-                                 , const char* signalName
+Slot Proxy::registerSignalHandler( const std::string& interfaceName
+                                 , const std::string& signalName
                                  , signal_handler signalHandler
                                  , return_slot_t )
 {
@@ -204,20 +152,19 @@ Slot Proxy::registerSignalHandler( const char* interfaceName
 
     auto signalInfo = std::make_unique<SignalInfo>(SignalInfo{std::move(signalHandler), *this, {}});
 
-    signalInfo->slot = connection_->registerSignalHandler( destination_.c_str()
-                                                         , objectPath_.c_str()
+    signalInfo->slot = connection_->registerSignalHandler( destination_
+                                                         , objectPath_
                                                          , interfaceName
                                                          , signalName
                                                          , &Proxy::sdbus_signal_handler
-                                                         , signalInfo.get()
-                                                         , return_slot );
+                                                         , signalInfo.get() );
 
     return {signalInfo.release(), [](void *ptr){ delete static_cast<SignalInfo*>(ptr); }};
 }
 
 void Proxy::unregister()
 {
-    floatingAsyncCallSlots_.clear();
+    pendingAsyncCalls_.clear();
     floatingSignalSlots_.clear();
 }
 
@@ -226,7 +173,7 @@ sdbus::IConnection& Proxy::getConnection() const
     return *connection_;
 }
 
-const ObjectPath& Proxy::getObjectPath() const
+const std::string& Proxy::getObjectPath() const
 {
     return objectPath_;
 }
@@ -238,32 +185,32 @@ Message Proxy::getCurrentlyProcessedMessage() const
 
 int Proxy::sdbus_async_reply_handler(sd_bus_message *sdbusMessage, void *userData, sd_bus_error *retError)
 {
-    auto* asyncCallInfo = static_cast<AsyncCallInfo*>(userData);
-    assert(asyncCallInfo != nullptr);
-    assert(asyncCallInfo->callback);
-    auto& proxy = asyncCallInfo->proxy;
+    auto* asyncCallData = static_cast<AsyncCalls::CallData*>(userData);
+    assert(asyncCallData != nullptr);
+    assert(asyncCallData->callback);
+    auto& proxy = asyncCallData->proxy;
 
     // We are removing the CallData item at the complete scope exit, after the callback has been invoked.
     // We can't do it earlier (before callback invocation for example), because CallBack data (slot release)
     // is the synchronization point between callback invocation and Proxy::unregister.
     SCOPE_EXIT
     {
-        proxy.floatingAsyncCallSlots_.erase(asyncCallInfo);
+        proxy.pendingAsyncCalls_.removeCall(asyncCallData);
     };
 
-    auto message = Message::Factory::create<MethodReply>(sdbusMessage, proxy.connection_.get());
+    auto message = Message::Factory::create<MethodReply>(sdbusMessage, &proxy.connection_->getSdBusInterface());
 
     auto ok = invokeHandlerAndCatchErrors([&]
     {
         const auto* error = sd_bus_message_get_error(sdbusMessage);
         if (error == nullptr)
         {
-            asyncCallInfo->callback(std::move(message), {});
+            asyncCallData->callback(std::move(message), nullptr);
         }
         else
         {
-            Error exception(Error::Name{error->name}, error->message);
-            asyncCallInfo->callback(std::move(message), std::move(exception));
+            Error exception(error->name, error->message);
+            asyncCallData->callback(std::move(message), &exception);
         }
     }, retError);
 
@@ -276,71 +223,29 @@ int Proxy::sdbus_signal_handler(sd_bus_message *sdbusMessage, void *userData, sd
     assert(signalInfo != nullptr);
     assert(signalInfo->callback);
 
-    auto message = Message::Factory::create<Signal>(sdbusMessage, signalInfo->proxy.connection_.get());
+    // TODO: Hide Message factory invocation under Connection API (tell, don't ask principle), then we can remove getSdBusInterface()
+    auto message = Message::Factory::create<Signal>(sdbusMessage, &signalInfo->proxy.connection_->getSdBusInterface());
 
     auto ok = invokeHandlerAndCatchErrors([&](){ signalInfo->callback(std::move(message)); }, retError);
 
     return ok ? 0 : -1;
 }
 
-Proxy::FloatingAsyncCallSlots::~FloatingAsyncCallSlots()
-{
-    clear();
-}
-
-void Proxy::FloatingAsyncCallSlots::push_back(std::shared_ptr<AsyncCallInfo> asyncCallInfo)
-{
-    std::lock_guard lock(mutex_);
-    if (!asyncCallInfo->finished) // The call may have finished in the meantime
-        slots_.emplace_back(std::move(asyncCallInfo));
-}
-
-void Proxy::FloatingAsyncCallSlots::erase(AsyncCallInfo* info)
-{
-    std::unique_lock lock(mutex_);
-    info->finished = true;
-    auto it = std::find_if(slots_.begin(), slots_.end(), [info](auto const& entry){ return entry.get() == info; });
-    if (it != slots_.end())
-    {
-        auto callInfo = std::move(*it);
-        slots_.erase(it);
-        lock.unlock();
-
-        // Releasing call slot pointer acquires global sd-bus mutex. We have to perform the release
-        // out of the `mutex_' critical section here, because if the `removeCall` is called by some
-        // thread and at the same time Proxy's async reply handler (which already holds global sd-bus
-        // mutex) is in progress in a different thread, we get double-mutex deadlock.
-    }
-}
-
-void Proxy::FloatingAsyncCallSlots::clear()
-{
-    std::unique_lock lock(mutex_);
-    auto asyncCallSlots = std::move(slots_);
-    slots_ = {};
-    lock.unlock();
-
-    // Releasing call slot pointer acquires global sd-bus mutex. We have to perform the release
-    // out of the `mutex_' critical section here, because if the `clear` is called by some thread
-    // and at the same time Proxy's async reply handler (which already holds global sd-bus
-    // mutex) is in progress in a different thread, we get double-mutex deadlock.
-}
-
 }
 
 namespace sdbus {
 
-PendingAsyncCall::PendingAsyncCall(std::weak_ptr<void> callInfo)
-    : callInfo_(std::move(callInfo))
+PendingAsyncCall::PendingAsyncCall(std::weak_ptr<void> callData)
+    : callData_(std::move(callData))
 {
 }
 
 void PendingAsyncCall::cancel()
 {
-    if (auto ptr = callInfo_.lock(); ptr != nullptr)
+    if (auto ptr = callData_.lock(); ptr != nullptr)
     {
-        auto* asyncCallInfo = static_cast<internal::Proxy::AsyncCallInfo*>(ptr.get());
-        asyncCallInfo->proxy.floatingAsyncCallSlots_.erase(asyncCallInfo);
+        auto* callData = static_cast<internal::Proxy::AsyncCalls::CallData*>(ptr.get());
+        callData->proxy.pendingAsyncCalls_.removeCall(callData);
 
         // At this point, the callData item is being deleted, leading to the release of the
         // sd-bus slot pointer. This release locks the global sd-bus mutex. If the async
@@ -351,7 +256,7 @@ void PendingAsyncCall::cancel()
 
 bool PendingAsyncCall::isPending() const
 {
-    return !callInfo_.expired();
+    return !callData_.expired();
 }
 
 }
@@ -359,8 +264,8 @@ bool PendingAsyncCall::isPending() const
 namespace sdbus {
 
 std::unique_ptr<sdbus::IProxy> createProxy( IConnection& connection
-                                          , ServiceName destination
-                                          , ObjectPath objectPath )
+                                          , std::string destination
+                                          , std::string objectPath )
 {
     auto* sdbusConnection = dynamic_cast<sdbus::internal::IConnection*>(&connection);
     SDBUS_THROW_ERROR_IF(!sdbusConnection, "Connection is not a real sdbus-c++ connection", EINVAL);
@@ -371,8 +276,8 @@ std::unique_ptr<sdbus::IProxy> createProxy( IConnection& connection
 }
 
 std::unique_ptr<sdbus::IProxy> createProxy( std::unique_ptr<IConnection>&& connection
-                                          , ServiceName destination
-                                          , ObjectPath objectPath )
+                                          , std::string destination
+                                          , std::string objectPath )
 {
     auto* sdbusConnection = dynamic_cast<sdbus::internal::IConnection*>(connection.get());
     SDBUS_THROW_ERROR_IF(!sdbusConnection, "Connection is not a real sdbus-c++ connection", EINVAL);
@@ -385,8 +290,8 @@ std::unique_ptr<sdbus::IProxy> createProxy( std::unique_ptr<IConnection>&& conne
 }
 
 std::unique_ptr<sdbus::IProxy> createProxy( std::unique_ptr<IConnection>&& connection
-                                          , ServiceName destination
-                                          , ObjectPath objectPath
+                                          , std::string destination
+                                          , std::string objectPath
                                           , dont_run_event_loop_thread_t )
 {
     auto* sdbusConnection = dynamic_cast<sdbus::internal::IConnection*>(connection.get());
@@ -400,17 +305,10 @@ std::unique_ptr<sdbus::IProxy> createProxy( std::unique_ptr<IConnection>&& conne
                                                    , dont_run_event_loop_thread );
 }
 
-std::unique_ptr<sdbus::IProxy> createLightWeightProxy( std::unique_ptr<IConnection>&& connection
-                                                     , ServiceName destination
-                                                     , ObjectPath objectPath )
+std::unique_ptr<sdbus::IProxy> createProxy( std::string destination
+                                          , std::string objectPath )
 {
-    return createProxy(std::move(connection), std::move(destination), std::move(objectPath), dont_run_event_loop_thread);
-}
-
-std::unique_ptr<sdbus::IProxy> createProxy( ServiceName destination
-                                          , ObjectPath objectPath )
-{
-    auto connection = sdbus::createBusConnection();
+    auto connection = sdbus::createConnection();
 
     auto sdbusConnection = std::unique_ptr<sdbus::internal::IConnection>(dynamic_cast<sdbus::internal::IConnection*>(connection.release()));
     assert(sdbusConnection != nullptr);
@@ -420,11 +318,11 @@ std::unique_ptr<sdbus::IProxy> createProxy( ServiceName destination
                                                    , std::move(objectPath) );
 }
 
-std::unique_ptr<sdbus::IProxy> createProxy( ServiceName destination
-                                          , ObjectPath objectPath
+std::unique_ptr<sdbus::IProxy> createProxy( std::string destination
+                                          , std::string objectPath
                                           , dont_run_event_loop_thread_t )
 {
-    auto connection = sdbus::createBusConnection();
+    auto connection = sdbus::createConnection();
 
     auto sdbusConnection = std::unique_ptr<sdbus::internal::IConnection>(dynamic_cast<sdbus::internal::IConnection*>(connection.release()));
     assert(sdbusConnection != nullptr);
@@ -435,9 +333,4 @@ std::unique_ptr<sdbus::IProxy> createProxy( ServiceName destination
                                                    , dont_run_event_loop_thread );
 }
 
-std::unique_ptr<sdbus::IProxy> createLightWeightProxy(ServiceName destination, ObjectPath objectPath)
-{
-    return createProxy(std::move(destination), std::move(objectPath), dont_run_event_loop_thread);
-}
-
 }

src/Proxy.h

@@ -1,6 +1,6 @@
 /**
  * (C) 2016 - 2021 KISTLER INSTRUMENTE AG, Winterthur, Switzerland
- * (C) 2016 - 2024 Stanislav Angelovic <stanislav.angelovic@protonmail.com>
+ * (C) 2016 - 2022 Stanislav Angelovic <stanislav.angelovic@protonmail.com>
  *
  * @file Proxy.h
  *
@@ -27,17 +27,14 @@
 #ifndef SDBUS_CXX_INTERNAL_PROXY_H_
 #define SDBUS_CXX_INTERNAL_PROXY_H_
 
-#include "sdbus-c++/IProxy.h"
-
+#include <sdbus-c++/IProxy.h>
 #include "IConnection.h"
-#include "sdbus-c++/Types.h"
-
-#include <deque>
-#include <memory>
-#include <mutex>
-#include <string>
 #include SDBUS_HEADER
+#include <string>
+#include <memory>
+#include <deque>
 #include <vector>
+#include <mutex>
 
 namespace sdbus::internal {
 
@@ -46,53 +43,34 @@ namespace sdbus::internal {
     {
     public:
         Proxy( sdbus::internal::IConnection& connection
-             , ServiceName destination
-             , ObjectPath objectPath );
+             , std::string destination
+             , std::string objectPath );
         Proxy( std::unique_ptr<sdbus::internal::IConnection>&& connection
-             , ServiceName destination
-             , ObjectPath objectPath );
+             , std::string destination
+             , std::string objectPath );
         Proxy( std::unique_ptr<sdbus::internal::IConnection>&& connection
-             , ServiceName destination
-             , ObjectPath objectPath
+             , std::string destination
+             , std::string objectPath
              , dont_run_event_loop_thread_t );
 
-        MethodCall createMethodCall(const InterfaceName& interfaceName, const MethodName& methodName) const override;
-        MethodCall createMethodCall(const char* interfaceName, const char* methodName) const override;
-        MethodReply callMethod(const MethodCall& message) override;
+        MethodCall createMethodCall(const std::string& interfaceName, const std::string& methodName) override;
         MethodReply callMethod(const MethodCall& message, uint64_t timeout) override;
-        PendingAsyncCall callMethodAsync(const MethodCall& message, async_reply_handler asyncReplyCallback) override;
-        Slot callMethodAsync( const MethodCall& message
-                            , async_reply_handler asyncReplyCallback
-                            , return_slot_t ) override;
-        PendingAsyncCall callMethodAsync( const MethodCall& message
-                                        , async_reply_handler asyncReplyCallback
-                                        , uint64_t timeout ) override;
-        Slot callMethodAsync( const MethodCall& message
-                            , async_reply_handler asyncReplyCallback
-                            , uint64_t timeout
-                            , return_slot_t ) override;
-        std::future<MethodReply> callMethodAsync(const MethodCall& message, with_future_t) override;
-        std::future<MethodReply> callMethodAsync(const MethodCall& message, uint64_t timeout, with_future_t) override;
+        PendingAsyncCall callMethod(const MethodCall& message, async_reply_handler asyncReplyCallback, uint64_t timeout) override;
+        std::future<MethodReply> callMethod(const MethodCall& message, with_future_t) override;
+        std::future<MethodReply> callMethod(const MethodCall& message, uint64_t timeout, with_future_t) override;
 
-        void registerSignalHandler( const InterfaceName& interfaceName
-                                  , const SignalName& signalName
+        void registerSignalHandler( const std::string& interfaceName
+                                  , const std::string& signalName
                                   , signal_handler signalHandler ) override;
-        void registerSignalHandler( const char* interfaceName
-                                  , const char* signalName
-                                  , signal_handler signalHandler ) override;
-        Slot registerSignalHandler( const InterfaceName& interfaceName
-                                  , const SignalName& signalName
-                                  , signal_handler signalHandler
-                                  , return_slot_t ) override;
-        Slot registerSignalHandler( const char* interfaceName
-                                  , const char* signalName
+        Slot registerSignalHandler( const std::string& interfaceName
+                                  , const std::string& signalName
                                   , signal_handler signalHandler
                                   , return_slot_t ) override;
         void unregister() override;
 
-        [[nodiscard]] sdbus::IConnection& getConnection() const override;
-        [[nodiscard]] const ObjectPath& getObjectPath() const override;
-        [[nodiscard]] Message getCurrentlyProcessedMessage() const override;
+        sdbus::IConnection& getConnection() const override;
+        const std::string& getObjectPath() const override;
+        Message getCurrentlyProcessedMessage() const override;
 
     private:
         static int sdbus_signal_handler(sd_bus_message *sdbusMessage, void *userData, sd_bus_error *retError);
@@ -104,8 +82,8 @@ namespace sdbus::internal {
         std::unique_ptr< sdbus::internal::IConnection
                        , std::function<void(sdbus::internal::IConnection*)>
                        > connection_;
-        ServiceName destination_;
-        ObjectPath objectPath_;
+        std::string destination_;
+        std::string objectPath_;
 
         std::vector<Slot> floatingSignalSlots_;
 
@@ -116,30 +94,67 @@ namespace sdbus::internal {
             Slot slot;
         };
 
-        struct AsyncCallInfo
-        {
-            async_reply_handler callback;
-            Proxy& proxy;
-            Slot slot{};
-            bool finished{false};
-            bool floating;
-        };
-
-        // Container keeping track of pending async calls
-        class FloatingAsyncCallSlots
+        // We need to keep track of pending async calls. When the proxy is being destructed, we must
+        // remove all slots of these pending calls, otherwise in case when the connection outlives
+        // the proxy, we might get async reply handlers invoked for pending async calls after the proxy
+        // has been destroyed, which is a free ticket into the realm of undefined behavior.
+        class AsyncCalls
         {
         public:
-            ~FloatingAsyncCallSlots();
-            void push_back(std::shared_ptr<AsyncCallInfo> asyncCallInfo);
-            void erase(AsyncCallInfo* info);
-            void clear();
+            struct CallData
+            {
+                Proxy& proxy;
+                async_reply_handler callback;
+                Slot slot{};
+                bool finished{false};
+            };
+
+            ~AsyncCalls()
+            {
+                clear();
+            }
+
+            void addCall(std::shared_ptr<CallData> asyncCallData)
+            {
+                std::lock_guard lock(mutex_);
+                if (!asyncCallData->finished) // The call may have finished in the meantime
+                    calls_.emplace_back(std::move(asyncCallData));
+            }
+
+            void removeCall(CallData* data)
+            {
+                std::unique_lock lock(mutex_);
+                data->finished = true;
+                if (auto it = std::find_if(calls_.begin(), calls_.end(), [data](auto const& entry){ return entry.get() == data; }); it != calls_.end())
+                {
+                    auto callData = std::move(*it);
+                    calls_.erase(it);
+                    lock.unlock();
+
+                    // Releasing call slot pointer acquires global sd-bus mutex. We have to perform the release
+                    // out of the `mutex_' critical section here, because if the `removeCall` is called by some
+                    // thread and at the same time Proxy's async reply handler (which already holds global sd-bus
+                    // mutex) is in progress in a different thread, we get double-mutex deadlock.
+                }
+            }
+
+            void clear()
+            {
+                std::unique_lock lock(mutex_);
+                auto asyncCallSlots = std::move(calls_);
+                calls_ = {};
+                lock.unlock();
+
+                // Releasing call slot pointer acquires global sd-bus mutex. We have to perform the release
+                // out of the `mutex_' critical section here, because if the `clear` is called by some thread
+                // and at the same time Proxy's async reply handler (which already holds global sd-bus
+                // mutex) is in progress in a different thread, we get double-mutex deadlock.
+            }
 
         private:
             std::mutex mutex_;
-            std::deque<std::shared_ptr<AsyncCallInfo>> slots_;
-        };
-
-        FloatingAsyncCallSlots floatingAsyncCallSlots_;
+            std::deque<std::shared_ptr<CallData>> calls_;
+        } pendingAsyncCalls_;
     };
 
 }

src/ScopeGuard.h

@@ -1,6 +1,6 @@
 /**
  * (C) 2016 - 2021 KISTLER INSTRUMENTE AG, Winterthur, Switzerland
- * (C) 2016 - 2024 Stanislav Angelovic <stanislav.angelovic@protonmail.com>
+ * (C) 2016 - 2022 Stanislav Angelovic <stanislav.angelovic@protonmail.com>
  *
  * @file ScopeGuard.h
  *
@@ -27,8 +27,8 @@
 #ifndef SDBUS_CPP_INTERNAL_SCOPEGUARD_H_
 #define SDBUS_CPP_INTERNAL_SCOPEGUARD_H_
 
-#include <exception>
 #include <utility>
+#include <exception>
 
 // Straightforward, modern, easy-to-use RAII utility to perform work on scope exit in an exception-safe manner.
 //

src/SdBus.cpp

@@ -1,6 +1,6 @@
 /**
  * (C) 2016 - 2021 KISTLER INSTRUMENTE AG, Winterthur, Switzerland
- * (C) 2016 - 2024 Stanislav Angelovic <stanislav.angelovic@protonmail.com>
+ * (C) 2016 - 2022 Stanislav Angelovic <stanislav.angelovic@protonmail.com>
  *
  * @file SdBus.cpp
  * @author Ardazishvili Roman (ardazishvili.roman@yandex.ru)
@@ -27,7 +27,6 @@
 
 #include "SdBus.h"
 #include <sdbus-c++/Error.h>
-#include <algorithm>
 
 namespace sdbus::internal {
 
@@ -53,6 +52,11 @@ int SdBus::sd_bus_send(sd_bus *bus, sd_bus_message *m, uint64_t *cookie)
     if (r < 0)
         return r;
 
+    // Make sure long messages are not only stored in outgoing queues but also really sent out
+    // TODO: This is a workaround. We should not block here until everything is physically sent out.
+    //   Refactor: if sd_bus_get_n_queued_write() > 0 then wake up event loop through event fd
+    ::sd_bus_flush(bus != nullptr ? bus : ::sd_bus_message_get_bus(m));
+
     return r;
 }
 
@@ -71,6 +75,11 @@ int SdBus::sd_bus_call_async(sd_bus *bus, sd_bus_slot **slot, sd_bus_message *m,
     if (r < 0)
       return r;
 
+    // Make sure long messages are not only stored in outgoing queues but also really sent out
+    // TODO: This is a workaround. We should not block here until everything is physically sent out.
+    //   Refactor: if sd_bus_get_n_queued_write() > 0 then wake up event loop through event fd
+    ::sd_bus_flush(bus != nullptr ? bus : ::sd_bus_message_get_bus(m));
+
     return r;
 }
 
@@ -118,7 +127,7 @@ int SdBus::sd_bus_set_method_call_timeout(sd_bus *bus, uint64_t usec)
 #else
     (void)bus;
     (void)usec;
-    throw Error(Error::Name{SD_BUS_ERROR_NOT_SUPPORTED}, "Setting general method call timeout not supported by underlying version of libsystemd");
+    throw sdbus::Error(SD_BUS_ERROR_NOT_SUPPORTED, "Setting general method call timeout not supported by underlying version of libsystemd");
 #endif
 }
 
@@ -131,7 +140,7 @@ int SdBus::sd_bus_get_method_call_timeout(sd_bus *bus, uint64_t *ret)
 #else
     (void)bus;
     (void)ret;
-    throw Error(Error::Name{SD_BUS_ERROR_NOT_SUPPORTED}, "Getting general method call timeout not supported by underlying version of libsystemd");
+    throw sdbus::Error(SD_BUS_ERROR_NOT_SUPPORTED, "Getting general method call timeout not supported by underlying version of libsystemd");
 #endif
 }
 
@@ -404,14 +413,11 @@ int SdBus::sd_bus_get_poll_data(sd_bus *bus, PollData* data)
     return r;
 }
 
-int SdBus::sd_bus_get_n_queued(sd_bus *bus, uint64_t *read, uint64_t* write)
+int SdBus::sd_bus_get_n_queued_read(sd_bus *bus, uint64_t *ret)
 {
     std::lock_guard lock(sdbusMutex_);
 
-    auto r1 = ::sd_bus_get_n_queued_read(bus, read);
-    auto r2 = ::sd_bus_get_n_queued_write(bus, write);
-
-    return std::min(r1, r2);
+    return ::sd_bus_get_n_queued_read(bus, ret);
 }
 
 int SdBus::sd_bus_flush(sd_bus *bus)
@@ -448,13 +454,6 @@ int SdBus::sd_bus_query_sender_creds(sd_bus_message *m, uint64_t mask, sd_bus_cr
     return ::sd_bus_query_sender_creds(m, mask, c);
 }
 
-sd_bus_creds* SdBus::sd_bus_creds_ref(sd_bus_creds *c)
-{
-    std::lock_guard lock(sdbusMutex_);
-
-    return ::sd_bus_creds_ref(c);
-}
-
 sd_bus_creds* SdBus::sd_bus_creds_unref(sd_bus_creds *c)
 {
     std::lock_guard lock(sdbusMutex_);

src/SdBus.h

@@ -1,6 +1,6 @@
 /**
  * (C) 2016 - 2021 KISTLER INSTRUMENTE AG, Winterthur, Switzerland
- * (C) 2016 - 2024 Stanislav Angelovic <stanislav.angelovic@protonmail.com>
+ * (C) 2016 - 2022 Stanislav Angelovic <stanislav.angelovic@protonmail.com>
  *
  * @file SdBus.h
  * @author Ardazishvili Roman (ardazishvili.roman@yandex.ru)
@@ -82,7 +82,7 @@ public:
     virtual int sd_bus_process(sd_bus *bus, sd_bus_message **r) override;
     virtual sd_bus_message* sd_bus_get_current_message(sd_bus *bus) override;
     virtual int sd_bus_get_poll_data(sd_bus *bus, PollData* data) override;
-    virtual int sd_bus_get_n_queued(sd_bus *bus, uint64_t *read, uint64_t* write) override;
+    virtual int sd_bus_get_n_queued_read(sd_bus *bus, uint64_t *ret) override;
     virtual int sd_bus_flush(sd_bus *bus) override;
     virtual sd_bus *sd_bus_flush_close_unref(sd_bus *bus) override;
     virtual sd_bus *sd_bus_close_unref(sd_bus *bus) override;
@@ -90,7 +90,6 @@ public:
     virtual int sd_bus_message_set_destination(sd_bus_message *m, const char *destination) override;
 
     virtual int sd_bus_query_sender_creds(sd_bus_message *m, uint64_t mask, sd_bus_creds **c) override;
-    virtual sd_bus_creds* sd_bus_creds_ref(sd_bus_creds *c) override;
     virtual sd_bus_creds* sd_bus_creds_unref(sd_bus_creds *c) override;
 
     virtual int sd_bus_creds_get_pid(sd_bus_creds *c, pid_t *pid) override;

src/Types.cpp

@@ -1,6 +1,6 @@
 /**
  * (C) 2016 - 2021 KISTLER INSTRUMENTE AG, Winterthur, Switzerland
- * (C) 2016 - 2024 Stanislav Angelovic <stanislav.angelovic@protonmail.com>
+ * (C) 2016 - 2022 Stanislav Angelovic <stanislav.angelovic@protonmail.com>
  *
  * @file Types.cpp
  *
@@ -24,15 +24,13 @@
  * along with sdbus-c++. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "sdbus-c++/Types.h"
-
-#include "sdbus-c++/Error.h"
-
+#include <sdbus-c++/Types.h>
+#include <sdbus-c++/Error.h>
 #include "MessageUtils.h"
-
+#include SDBUS_HEADER
+#include <cassert>
 #include <cerrno>
 #include <system_error>
-#include SDBUS_HEADER
 #include <unistd.h>
 
 namespace sdbus {
@@ -55,10 +53,12 @@ void Variant::deserializeFrom(Message& msg)
     msg_.seal();
 }
 
-const char* Variant::peekValueType() const
+std::string Variant::peekValueType() const
 {
     msg_.rewind(false);
-    auto [type, contents] = msg_.peekType();
+    std::string type;
+    std::string contents;
+    msg_.peekType(type, contents);
     return contents;
 }
 
@@ -67,7 +67,7 @@ bool Variant::isEmpty() const
     return msg_.isEmpty();
 }
 
-void UnixFd::close() // NOLINT(readability-make-member-function-const)
+void UnixFd::close()
 {
     if (fd_ >= 0)
     {
@@ -82,7 +82,7 @@ int UnixFd::checkedDup(int fd)
         return fd;
     }
 
-    int ret = ::dup(fd); // NOLINT(android-cloexec-dup) // TODO: verify
+    int ret = ::dup(fd);
     if (ret < 0)
     {
         throw std::system_error(errno, std::generic_category(), "dup failed");
@@ -90,4 +90,4 @@ int UnixFd::checkedDup(int fd)
     return ret;
 }
 
-} // namespace sdbus
+}

src/Utils.h

@@ -1,6 +1,6 @@
 /**
  * (C) 2016 - 2021 KISTLER INSTRUMENTE AG, Winterthur, Switzerland
- * (C) 2016 - 2024 Stanislav Angelovic <stanislav.angelovic@protonmail.com>
+ * (C) 2016 - 2022 Stanislav Angelovic <stanislav.angelovic@protonmail.com>
  *
  * @file Utils.h
  *
@@ -31,17 +31,17 @@
 #include SDBUS_HEADER
 
 #if LIBSYSTEMD_VERSION>=246
-#define SDBUS_CHECK_OBJECT_PATH(_PATH)                                                                                                          \
-    SDBUS_THROW_ERROR_IF(!sd_bus_object_path_is_valid(_PATH), std::string("Invalid object path '") + _PATH + "' provided", EINVAL)              \
+#define SDBUS_CHECK_OBJECT_PATH(_PATH)                                                                                                            \
+    SDBUS_THROW_ERROR_IF(!sd_bus_object_path_is_valid(_PATH.c_str()), "Invalid object path '" + _PATH + "' provided", EINVAL)                     \
     /**/
-#define SDBUS_CHECK_INTERFACE_NAME(_NAME)                                                                                                       \
-    SDBUS_THROW_ERROR_IF(!sd_bus_interface_name_is_valid(_NAME), std::string("Invalid interface name '") + _NAME + "' provided", EINVAL)        \
+#define SDBUS_CHECK_INTERFACE_NAME(_NAME)                                                                                                         \
+    SDBUS_THROW_ERROR_IF(!sd_bus_interface_name_is_valid(_NAME.c_str()), "Invalid interface name '" + _NAME + "' provided", EINVAL)               \
     /**/
-#define SDBUS_CHECK_SERVICE_NAME(_NAME)                                                                                                         \
-    SDBUS_THROW_ERROR_IF(*_NAME && !sd_bus_service_name_is_valid(_NAME), std::string("Invalid service name '") + _NAME + "' provided", EINVAL)  \
+#define SDBUS_CHECK_SERVICE_NAME(_NAME)                                                                                                           \
+    SDBUS_THROW_ERROR_IF(!_NAME.empty() && !sd_bus_service_name_is_valid(_NAME.c_str()), "Invalid service name '" + _NAME + "' provided", EINVAL) \
     /**/
-#define SDBUS_CHECK_MEMBER_NAME(_NAME)                                                                                                          \
-    SDBUS_THROW_ERROR_IF(!sd_bus_member_name_is_valid(_NAME), std::string("Invalid member name '") + _NAME + "' provided", EINVAL)              \
+#define SDBUS_CHECK_MEMBER_NAME(_NAME)                                                                                                            \
+    SDBUS_THROW_ERROR_IF(!sd_bus_member_name_is_valid(_NAME.c_str()), "Invalid member name '" + _NAME + "' provided", EINVAL)                     \
     /**/
 #else
 #define SDBUS_CHECK_OBJECT_PATH(_PATH)
@@ -66,12 +66,12 @@ namespace sdbus::internal {
         }
         catch (const std::exception& e)
         {
-            sd_bus_error_set(retError, SDBUSCPP_ERROR_NAME.c_str(), e.what());
+            sd_bus_error_set(retError, SDBUSCPP_ERROR_NAME, e.what());
             return false;
         }
         catch (...)
         {
-            sd_bus_error_set(retError, SDBUSCPP_ERROR_NAME.c_str(), "Unknown error occurred");
+            sd_bus_error_set(retError, SDBUSCPP_ERROR_NAME, "Unknown error occurred");
             return false;
         }
 

src/VTableUtils.c

@@ -1,6 +1,6 @@
 /**
  * (C) 2016 - 2021 KISTLER INSTRUMENTE AG, Winterthur, Switzerland
- * (C) 2016 - 2024 Stanislav Angelovic <stanislav.angelovic@protonmail.com>
+ * (C) 2016 - 2022 Stanislav Angelovic <stanislav.angelovic@protonmail.com>
  *
  * @file VTableUtils.c
  *

src/VTableUtils.h

@@ -1,6 +1,6 @@
 /**
  * (C) 2016 - 2021 KISTLER INSTRUMENTE AG, Winterthur, Switzerland
- * (C) 2016 - 2024 Stanislav Angelovic <stanislav.angelovic@protonmail.com>
+ * (C) 2016 - 2022 Stanislav Angelovic <stanislav.angelovic@protonmail.com>
  *
  * @file VTableUtils.h
  *
@@ -27,8 +27,8 @@
 #ifndef SDBUS_CXX_INTERNAL_VTABLEUTILS_H_
 #define SDBUS_CXX_INTERNAL_VTABLEUTILS_H_
 
-#include <stdbool.h>
 #include SDBUS_HEADER
+#include <stdbool.h>
 
 #ifdef __cplusplus
 extern "C" {

tests/CMakeLists.txt

@@ -2,12 +2,15 @@
 # DOWNLOAD AND BUILD OF GOOGLETEST
 #-------------------------------
 
-find_package(GTest ${SDBUSCPP_GOOGLETEST_VERSION} CONFIG)
+set(GOOGLETEST_VERSION 1.10.0 CACHE STRING "Version of gmock to use")
+set(GOOGLETEST_GIT_REPO "https://github.com/google/googletest.git" CACHE STRING "A git repo to clone and build googletest from if gmock is not found in the system")
+
+find_package(GTest ${GOOGLETEST_VERSION} CONFIG)
 if (NOT TARGET GTest::gmock)
     # Try pkg-config if GTest was not found through CMake config
     find_package(PkgConfig)
     if (PkgConfig_FOUND)
-        pkg_check_modules(GMock IMPORTED_TARGET GLOBAL gmock>=${SDBUSCPP_GOOGLETEST_VERSION})
+        pkg_check_modules(GMock IMPORTED_TARGET GLOBAL gmock>=${GOOGLETEST_VERSION})
         if(TARGET PkgConfig::GMock)
             add_library(GTest::gmock ALIAS PkgConfig::GMock)
         endif()
@@ -16,15 +19,15 @@ if (NOT TARGET GTest::gmock)
     if (NOT TARGET GTest::gmock)
         include(FetchContent)
 
-        if (SDBUSCPP_GOOGLETEST_VERSION VERSION_GREATER_EQUAL 1.13.0)
-            set(GOOGLETEST_TAG "v${SDBUSCPP_GOOGLETEST_VERSION}")
+        if (GOOGLETEST_VERSION VERSION_GREATER_EQUAL 1.13.0)
+            set(GOOGLETEST_TAG "v${GOOGLETEST_VERSION}")
         else()
-            set(GOOGLETEST_TAG "release-${SDBUSCPP_GOOGLETEST_VERSION}")
+            set(GOOGLETEST_TAG "release-${GOOGLETEST_VERSION}")
         endif()
 
-        message("Manually fetching & building googletest ${GOOGLETEST_TAG}...")
+        message("Manually fetching & building googletest v${GOOGLETEST_VERSION}...")
         FetchContent_Declare(googletest
-                            GIT_REPOSITORY ${SDBUSCPP_GOOGLETEST_GIT_REPO}
+                            GIT_REPOSITORY ${GOOGLETEST_GIT_REPO}
                             GIT_TAG        ${GOOGLETEST_TAG}
                             GIT_SHALLOW    1
                             UPDATE_COMMAND "")
@@ -103,16 +106,16 @@ include_directories(${CMAKE_CURRENT_SOURCE_DIR})
 
 add_executable(sdbus-c++-unit-tests ${UNITTESTS_SRCS})
 target_compile_definitions(sdbus-c++-unit-tests PRIVATE
-    LIBSYSTEMD_VERSION=${SDBUSCPP_LIBSYSTEMD_VERSION}
-    SDBUS_${SDBUS_IMPL}
-    SDBUS_HEADER=<${SDBUS_IMPL}/sd-bus.h>)
+    LIBSYSTEMD_VERSION=${LIBSYSTEMD_VERSION}
+    SDBUS_${LIBSYSTEMD_IMPL}
+    SDBUS_HEADER=<${LIBSYSTEMD_IMPL}/sd-bus.h>)
 target_link_libraries(sdbus-c++-unit-tests sdbus-c++-objlib GTest::gmock)
 
 add_executable(sdbus-c++-integration-tests ${INTEGRATIONTESTS_SRCS})
 target_compile_definitions(sdbus-c++-integration-tests PRIVATE
-    LIBSYSTEMD_VERSION=${SDBUSCPP_LIBSYSTEMD_VERSION}
-    SDBUS_${SDBUS_IMPL})
-if(NOT SDBUS_IMPL STREQUAL "basu")
+    LIBSYSTEMD_VERSION=${LIBSYSTEMD_VERSION}
+    SDBUS_${LIBSYSTEMD})
+if(NOT LIBSYSTEMD STREQUAL "basu")
     # Systemd::Libsystemd is included because integration tests use sd-event. Otherwise sdbus-c++ encapsulates and hides libsystemd.
     target_link_libraries(sdbus-c++-integration-tests sdbus-c++ Systemd::Libsystemd GTest::gmock)
 else()
@@ -120,11 +123,15 @@ else()
     target_link_libraries(sdbus-c++-integration-tests sdbus-c++ GTest::gmock)
 endif()
 
-if(SDBUSCPP_BUILD_PERF_TESTS OR SDBUSCPP_BUILD_STRESS_TESTS)
+# Manual performance and stress tests
+option(ENABLE_PERF_TESTS "Build and install manual performance tests (default OFF)" OFF)
+option(ENABLE_STRESS_TESTS "Build and install manual stress tests (default OFF)" OFF)
+
+if(ENABLE_PERF_TESTS OR ENABLE_STRESS_TESTS)
     set(THREADS_PREFER_PTHREAD_FLAG ON)
     find_package(Threads REQUIRED)
 
-    if(SDBUSCPP_BUILD_PERF_TESTS)
+    if(ENABLE_PERF_TESTS)
         message(STATUS "Building with performance tests")
         add_executable(sdbus-c++-perf-tests-client ${STRESSTESTS_CLIENT_SRCS})
         target_link_libraries(sdbus-c++-perf-tests-client sdbus-c++ Threads::Threads)
@@ -132,7 +139,7 @@ if(SDBUSCPP_BUILD_PERF_TESTS OR SDBUSCPP_BUILD_STRESS_TESTS)
         target_link_libraries(sdbus-c++-perf-tests-server sdbus-c++ Threads::Threads)
     endif()
 
-    if(SDBUSCPP_BUILD_STRESS_TESTS)
+    if(ENABLE_STRESS_TESTS)
         message(STATUS "Building with stress tests")
         add_executable(sdbus-c++-stress-tests ${STRESSTESTS_SRCS})
         target_link_libraries(sdbus-c++-stress-tests sdbus-c++ Threads::Threads)
@@ -143,25 +150,25 @@ endif()
 # INSTALLATION
 #----------------------------------
 
-if(SDBUSCPP_INSTALL)
+option(INSTALL_TESTS "Install tests (default OFF)" OFF)
+
+if(INSTALL_TESTS)
     include(GNUInstallDirs)
-    install(TARGETS sdbus-c++-unit-tests DESTINATION ${SDBUSCPP_TESTS_INSTALL_PATH} COMPONENT sdbus-c++-test)
-    install(TARGETS sdbus-c++-integration-tests DESTINATION ${SDBUSCPP_TESTS_INSTALL_PATH} COMPONENT sdbus-c++-test)
-    install(FILES ${INTEGRATIONTESTS_SOURCE_DIR}/files/org.sdbuscpp.integrationtests.conf
-            DESTINATION ${CMAKE_INSTALL_FULL_SYSCONFDIR}/dbus-1/system.d
-            COMPONENT sdbus-c++-test)
-    if(SDBUSCPP_BUILD_PERF_TESTS)
-        install(TARGETS sdbus-c++-perf-tests-client DESTINATION ${SDBUSCPP_TESTS_INSTALL_PATH} COMPONENT sdbus-c++-test)
-        install(TARGETS sdbus-c++-perf-tests-server DESTINATION ${SDBUSCPP_TESTS_INSTALL_PATH} COMPONENT sdbus-c++-test)
-        install(FILES ${PERFTESTS_SOURCE_DIR}/files/org.sdbuscpp.perftests.conf
-                DESTINATION ${CMAKE_INSTALL_FULL_SYSCONFDIR}/dbus-1/system.d
-                COMPONENT sdbus-c++-test)
+    set(TESTS_INSTALL_PATH "tests/${PROJECT_NAME}" CACHE STRING "Specifies where the test binaries will be installed")
+
+    install(TARGETS sdbus-c++-unit-tests DESTINATION ${TESTS_INSTALL_PATH} COMPONENT test)
+    install(TARGETS sdbus-c++-integration-tests DESTINATION ${TESTS_INSTALL_PATH} COMPONENT test)
+    install(FILES ${INTEGRATIONTESTS_SOURCE_DIR}/files/org.sdbuscpp.integrationtests.conf DESTINATION ${CMAKE_INSTALL_FULL_SYSCONFDIR}/dbus-1/system.d COMPONENT test)
+
+    if(ENABLE_PERF_TESTS)
+        install(TARGETS sdbus-c++-perf-tests-client DESTINATION ${TESTS_INSTALL_PATH} COMPONENT test)
+        install(TARGETS sdbus-c++-perf-tests-server DESTINATION ${TESTS_INSTALL_PATH} COMPONENT test)
+        install(FILES ${PERFTESTS_SOURCE_DIR}/files/org.sdbuscpp.perftests.conf DESTINATION ${CMAKE_INSTALL_FULL_SYSCONFDIR}/dbus-1/system.d COMPONENT test)
     endif()
-    if(SDBUSCPP_BUILD_STRESS_TESTS)
-        install(TARGETS sdbus-c++-stress-tests DESTINATION ${SDBUSCPP_TESTS_INSTALL_PATH} COMPONENT sdbus-c++-test)
-        install(FILES ${STRESSTESTS_SOURCE_DIR}/files/org.sdbuscpp.stresstests.conf
-                DESTINATION ${CMAKE_INSTALL_FULL_SYSCONFDIR}/dbus-1/system.d
-                COMPONENT sdbus-c++-test)
+
+    if(ENABLE_STRESS_TESTS)
+        install(TARGETS sdbus-c++-stress-tests DESTINATION ${TESTS_INSTALL_PATH} COMPONENT test)
+        install(FILES ${STRESSTESTS_SOURCE_DIR}/files/org.sdbuscpp.stresstests.conf DESTINATION ${CMAKE_INSTALL_FULL_SYSCONFDIR}/dbus-1/system.d COMPONENT test)
     endif()
 endif()
 

tests/integrationtests/DBusAsyncMethodsTests.cpp

@@ -1,6 +1,6 @@
 /**
  * (C) 2016 - 2021 KISTLER INSTRUMENTE AG, Winterthur, Switzerland
- * (C) 2016 - 2024 Stanislav Angelovic <stanislav.angelovic@protonmail.com>
+ * (C) 2016 - 2022 Stanislav Angelovic <stanislav.angelovic@protonmail.com>
  *
  * @file DBusAsyncMethodsTests.cpp
  *
@@ -60,12 +60,12 @@ TYPED_TEST(AsyncSdbusTestObject, ThrowsTimeoutErrorWhenClientSideAsyncMethodTime
     {
         std::promise<uint32_t> promise;
         auto future = promise.get_future();
-        this->m_proxy->installDoOperationClientSideAsyncReplyHandler([&](uint32_t res, std::optional<sdbus::Error> err)
+        this->m_proxy->installDoOperationClientSideAsyncReplyHandler([&](uint32_t res, const sdbus::Error* err)
         {
-            if (!err)
+            if (err == nullptr)
                 promise.set_value(res);
             else
-                promise.set_exception(std::make_exception_ptr(*std::move(err)));
+                promise.set_exception(std::make_exception_ptr(*err));
         });
 
         start = std::chrono::steady_clock::now();
@@ -87,7 +87,7 @@ TYPED_TEST(AsyncSdbusTestObject, ThrowsTimeoutErrorWhenClientSideAsyncMethodTime
     }
 }
 
-TYPED_TEST(AsyncSdbusTestObject, RunsServerSideAsynchronousMethodAsynchronously)
+TYPED_TEST(AsyncSdbusTestObject, RunsServerSideAsynchoronousMethodAsynchronously)
 {
     // Yeah, this is kinda timing-dependent test, but times should be safe...
     std::mutex mtx;
@@ -96,7 +96,7 @@ TYPED_TEST(AsyncSdbusTestObject, RunsServerSideAsynchronousMethodAsynchronously)
     std::atomic<int> startedCount{};
     auto call = [&](uint32_t param)
     {
-        TestProxy proxy{SERVICE_NAME, OBJECT_PATH};
+        TestProxy proxy{BUS_NAME, OBJECT_PATH};
         ++startedCount;
         while (!invoke) ;
         auto result = proxy.doOperationAsync(param);
@@ -119,7 +119,7 @@ TYPED_TEST(AsyncSdbusTestObject, HandlesCorrectlyABulkOfParallelServerSideAsyncM
     std::atomic<int> startedCount{};
     auto call = [&]()
     {
-        TestProxy proxy{SERVICE_NAME, OBJECT_PATH};
+        TestProxy proxy{BUS_NAME, OBJECT_PATH};
         ++startedCount;
         while (!invoke) ;
 
@@ -142,29 +142,16 @@ TYPED_TEST(AsyncSdbusTestObject, HandlesCorrectlyABulkOfParallelServerSideAsyncM
     ASSERT_THAT(resultCount, Eq(1500));
 }
 
-TYPED_TEST(AsyncSdbusTestObject, RunsServerSideAsynchronousMethodWithLargeMessage)
-{
-    std::map<int32_t, std::string> largeMap;
-    for (int32_t i = 0; i < 40'000; ++i)
-        largeMap.emplace(i, "This is string nr. " + std::to_string(i+1));
-
-    auto result1 = this->m_proxy->doOperationAsyncWithLargeData(0, largeMap); // Sends large map back in the context of the callback (event loop thread)
-    auto result2 = this->m_proxy->doOperationAsyncWithLargeData(500, largeMap); // Sends large map back outside the context of the event loop thread
-
-    ASSERT_THAT(result1, Eq(largeMap));
-    ASSERT_THAT(result2, Eq(largeMap));
-}
-
 TYPED_TEST(AsyncSdbusTestObject, InvokesMethodAsynchronouslyOnClientSide)
 {
     std::promise<uint32_t> promise;
     auto future = promise.get_future();
-    this->m_proxy->installDoOperationClientSideAsyncReplyHandler([&](uint32_t res, std::optional<sdbus::Error> err)
+    this->m_proxy->installDoOperationClientSideAsyncReplyHandler([&](uint32_t res, const sdbus::Error* err)
     {
-        if (!err)
+        if (err == nullptr)
             promise.set_value(res);
         else
-            promise.set_exception(std::make_exception_ptr(std::move(err)));
+            promise.set_exception(std::make_exception_ptr(*err));
     });
 
     this->m_proxy->doOperationClientSideAsync(100);
@@ -190,20 +177,9 @@ TYPED_TEST(AsyncSdbusTestObject, InvokesMethodAsynchronouslyOnClientSideWithFutu
     ASSERT_THAT(returnValue, Eq(100));
 }
 
-TYPED_TEST(AsyncSdbusTestObject, InvokesMethodWithLargeDataAsynchronouslyOnClientSideWithFuture)
-{
-    std::map<int32_t, std::string> largeMap;
-    for (int32_t i = 0; i < 40'000; ++i)
-        largeMap.emplace(i, "This is string nr. " + std::to_string(i+1));
-
-    auto future = this->m_proxy->doOperationWithLargeDataClientSideAsync(largeMap, sdbus::with_future);
-
-    ASSERT_THAT(future.get(), Eq(largeMap));
-}
-
 TYPED_TEST(AsyncSdbusTestObject, AnswersThatAsyncCallIsPendingIfItIsInProgress)
 {
-    this->m_proxy->installDoOperationClientSideAsyncReplyHandler([&](uint32_t /*res*/, std::optional<sdbus::Error> /*err*/){});
+    this->m_proxy->installDoOperationClientSideAsyncReplyHandler([&](uint32_t /*res*/, const sdbus::Error* /*err*/){});
 
     auto call = this->m_proxy->doOperationClientSideAsync(100);
 
@@ -214,7 +190,7 @@ TYPED_TEST(AsyncSdbusTestObject, CancelsPendingAsyncCallOnClientSide)
 {
     std::promise<uint32_t> promise;
     auto future = promise.get_future();
-    this->m_proxy->installDoOperationClientSideAsyncReplyHandler([&](uint32_t /*res*/, std::optional<sdbus::Error> /*err*/){ promise.set_value(1); });
+    this->m_proxy->installDoOperationClientSideAsyncReplyHandler([&](uint32_t /*res*/, const sdbus::Error* /*err*/){ promise.set_value(1); });
     auto call = this->m_proxy->doOperationClientSideAsync(100);
 
     call.cancel();
@@ -222,25 +198,11 @@ TYPED_TEST(AsyncSdbusTestObject, CancelsPendingAsyncCallOnClientSide)
     ASSERT_THAT(future.wait_for(300ms), Eq(std::future_status::timeout));
 }
 
-TYPED_TEST(AsyncSdbusTestObject, CancelsPendingAsyncCallOnClientSideByDestroyingOwningSlot)
-{
-    std::promise<uint32_t> promise;
-    auto future = promise.get_future();
-    this->m_proxy->installDoOperationClientSideAsyncReplyHandler([&](uint32_t /*res*/, std::optional<sdbus::Error> /*err*/){ promise.set_value(1); });
-
-    {
-        auto slot = this->m_proxy->doOperationClientSideAsync(100, sdbus::return_slot);
-        // Now the slot is destroyed, cancelling the async call
-    }
-
-    ASSERT_THAT(future.wait_for(300ms), Eq(std::future_status::timeout));
-}
-
 TYPED_TEST(AsyncSdbusTestObject, AnswersThatAsyncCallIsNotPendingAfterItHasBeenCancelled)
 {
     std::promise<uint32_t> promise;
     auto future = promise.get_future();
-    this->m_proxy->installDoOperationClientSideAsyncReplyHandler([&](uint32_t /*res*/, std::optional<sdbus::Error> /*err*/){ promise.set_value(1); });
+    this->m_proxy->installDoOperationClientSideAsyncReplyHandler([&](uint32_t /*res*/, const sdbus::Error* /*err*/){ promise.set_value(1); });
     auto call = this->m_proxy->doOperationClientSideAsync(100);
 
     call.cancel();
@@ -252,7 +214,7 @@ TYPED_TEST(AsyncSdbusTestObject, AnswersThatAsyncCallIsNotPendingAfterItHasBeenC
 {
     std::promise<uint32_t> promise;
     auto future = promise.get_future();
-    this->m_proxy->installDoOperationClientSideAsyncReplyHandler([&](uint32_t /*res*/, std::optional<sdbus::Error> /*err*/){ promise.set_value(1); });
+    this->m_proxy->installDoOperationClientSideAsyncReplyHandler([&](uint32_t /*res*/, const sdbus::Error* /*err*/){ promise.set_value(1); });
 
     auto call = this->m_proxy->doOperationClientSideAsync(0);
     (void) future.get(); // Wait for the call to finish
@@ -280,12 +242,12 @@ TYPED_TEST(AsyncSdbusTestObject, ReturnsNonnullErrorWhenAsynchronousMethodCallFa
 {
     std::promise<uint32_t> promise;
     auto future = promise.get_future();
-    this->m_proxy->installDoOperationClientSideAsyncReplyHandler([&](uint32_t res, std::optional<sdbus::Error> err)
+    this->m_proxy->installDoOperationClientSideAsyncReplyHandler([&](uint32_t res, const sdbus::Error* err)
     {
-        if (!err)
+        if (err == nullptr)
             promise.set_value(res);
         else
-            promise.set_exception(std::make_exception_ptr(*std::move(err)));
+            promise.set_exception(std::make_exception_ptr(*err));
     });
 
     this->m_proxy->doErroneousOperationClientSideAsync();

tests/integrationtests/DBusConnectionTests.cpp

@@ -1,6 +1,6 @@
 /**
  * (C) 2016 - 2021 KISTLER INSTRUMENTE AG, Winterthur, Switzerland
- * (C) 2016 - 2024 Stanislav Angelovic <stanislav.angelovic@protonmail.com>
+ * (C) 2016 - 2022 Stanislav Angelovic <stanislav.angelovic@protonmail.com>
  *
  * @file DBusConnectionTests.cpp
  *
@@ -48,46 +48,41 @@ using namespace sdbus::test;
 
 TEST(Connection, CanBeDefaultConstructed)
 {
-    ASSERT_NO_THROW(auto con = sdbus::createBusConnection());
+    ASSERT_NO_THROW(auto con = sdbus::createConnection());
 }
 
-TEST(Connection, CanRequestName)
+TEST(Connection, CanRequestRegisteredDbusName)
 {
-    auto connection = sdbus::createBusConnection();
+    auto connection = sdbus::createConnection();
 
-    // In case of system bus connection, requesting may throw as we need to allow that first through a config file in /etc/dbus-1/system.d
-    ASSERT_NO_THROW(connection->requestName(SERVICE_NAME))
+    ASSERT_NO_THROW(connection->requestName(BUS_NAME))
         << "Perhaps you've forgotten to copy `org.sdbuscpp.integrationtests.conf` file to `/etc/dbus-1/system.d` directory before running the tests?";
 }
 
-TEST(SystemBusConnection, CannotRequestNonregisteredDbusName)
+TEST(Connection, CannotRequestNonregisteredDbusName)
 {
-    auto connection = sdbus::createSystemBusConnection();
-    sdbus::ServiceName notSupportedBusName{"some.random.not.supported.dbus.name"};
-
-    ASSERT_THROW(connection->requestName(notSupportedBusName), sdbus::Error);
+    auto connection = sdbus::createConnection();
+    ASSERT_THROW(connection->requestName("some.random.not.supported.dbus.name"), sdbus::Error);
 }
 
-TEST(Connection, CanReleaseRequestedName)
+TEST(Connection, CanReleasedRequestedName)
 {
-    auto connection = sdbus::createBusConnection();
-    connection->requestName(SERVICE_NAME);
+    auto connection = sdbus::createConnection();
 
-    ASSERT_NO_THROW(connection->releaseName(SERVICE_NAME));
+    connection->requestName(BUS_NAME);
+    ASSERT_NO_THROW(connection->releaseName(BUS_NAME));
 }
 
 TEST(Connection, CannotReleaseNonrequestedName)
 {
-    auto connection = sdbus::createBusConnection();
-    sdbus::ServiceName notAcquiredBusName{"some.random.unacquired.name"};
-
-    ASSERT_THROW(connection->releaseName(notAcquiredBusName), sdbus::Error);
+    auto connection = sdbus::createConnection();
+    ASSERT_THROW(connection->releaseName("some.random.nonrequested.name"), sdbus::Error);
 }
 
 TEST(Connection, CanEnterAndLeaveInternalEventLoop)
 {
-    auto connection = sdbus::createBusConnection();
-    connection->requestName(SERVICE_NAME);
+    auto connection = sdbus::createConnection();
+    connection->requestName(BUS_NAME);
 
     std::thread t([&](){ connection->enterEventLoop(); });
     connection->leaveEventLoop();

tests/integrationtests/DBusGeneralTests.cpp

@@ -1,6 +1,6 @@
 /**
  * (C) 2016 - 2021 KISTLER INSTRUMENTE AG, Winterthur, Switzerland
- * (C) 2016 - 2024 Stanislav Angelovic <stanislav.angelovic@protonmail.com>
+ * (C) 2016 - 2022 Stanislav Angelovic <stanislav.angelovic@protonmail.com>
  *
  * @file DBusGeneralTests.cpp
  *
@@ -44,7 +44,6 @@ using ::testing::ElementsAre;
 using ::testing::Eq;
 using namespace std::chrono_literals;
 using namespace sdbus::test;
-using namespace std::string_view_literals;
 
 using ADirectConnection = TestFixtureWithDirectConnection;
 
@@ -52,38 +51,36 @@ using ADirectConnection = TestFixtureWithDirectConnection;
 /* --          TEST CASES           -- */
 /*-------------------------------------*/
 
-TEST(AdaptorAndProxy, CanBeConstructedSuccessfully)
+TEST(AdaptorAndProxy, CanBeConstructedSuccesfully)
 {
-    auto connection = sdbus::createBusConnection();
-    connection->requestName(SERVICE_NAME);
+    auto connection = sdbus::createConnection();
+    connection->requestName(BUS_NAME);
 
     ASSERT_NO_THROW(TestAdaptor adaptor(*connection, OBJECT_PATH));
-    ASSERT_NO_THROW(TestProxy proxy(SERVICE_NAME, OBJECT_PATH));
-
-    connection->releaseName(SERVICE_NAME);
+    ASSERT_NO_THROW(TestProxy proxy(BUS_NAME, OBJECT_PATH));
 }
 
-TEST(AProxy, DoesNotSupportMoveSemantics)
+TEST(AProxy, SupportsMoveSemantics)
 {
-    static_assert(!std::is_move_constructible_v<DummyTestProxy>);
-    static_assert(!std::is_move_assignable_v<DummyTestProxy>);
+    static_assert(std::is_move_constructible_v<DummyTestProxy>);
+    static_assert(std::is_move_assignable_v<DummyTestProxy>);
 }
 
-TEST(AnAdaptor, DoesNotSupportMoveSemantics)
+TEST(AnAdaptor, SupportsMoveSemantics)
 {
-    static_assert(!std::is_move_constructible_v<DummyTestAdaptor>);
-    static_assert(!std::is_move_assignable_v<DummyTestAdaptor>);
+    static_assert(std::is_move_constructible_v<DummyTestAdaptor>);
+    static_assert(std::is_move_assignable_v<DummyTestAdaptor>);
 }
 
 TYPED_TEST(AConnection, WillCallCallbackHandlerForIncomingMessageMatchingMatchRule)
 {
-    auto matchRule = "sender='" + SERVICE_NAME + "',path='" + OBJECT_PATH + "'";
+    auto matchRule = "sender='" + BUS_NAME + "',path='" + OBJECT_PATH + "'";
     std::atomic<bool> matchingMessageReceived{false};
     auto slot = this->s_proxyConnection->addMatch(matchRule, [&](sdbus::Message msg)
     {
         if(msg.getPath() == OBJECT_PATH)
             matchingMessageReceived = true;
-    }, sdbus::return_slot);
+    });
 
     this->m_adaptor->emitSimpleSignal();
 
@@ -92,20 +89,20 @@ TYPED_TEST(AConnection, WillCallCallbackHandlerForIncomingMessageMatchingMatchRu
 
 TYPED_TEST(AConnection, CanInstallMatchRuleAsynchronously)
 {
-    auto matchRule = "sender='" + SERVICE_NAME + "',path='" + OBJECT_PATH + "'";
+    auto matchRule = "sender='" + BUS_NAME + "',path='" + OBJECT_PATH + "'";
     std::atomic<bool> matchingMessageReceived{false};
     std::atomic<bool> matchRuleInstalled{false};
-    auto slot = this->s_proxyConnection->addMatchAsync( matchRule
-                                                      , [&](sdbus::Message msg)
-                                                        {
-                                                            if(msg.getPath() == OBJECT_PATH)
-                                                                matchingMessageReceived = true;
-                                                        }
-                                                      , [&](sdbus::Message /*msg*/)
-                                                        {
-                                                            matchRuleInstalled = true;
-                                                        }
-                                                      , sdbus::return_slot );
+    auto slot = this->s_proxyConnection->addMatch( matchRule
+                                                 , [&](sdbus::Message msg)
+                                                   {
+                                                       if(msg.getPath() == OBJECT_PATH)
+                                                           matchingMessageReceived = true;
+                                                   }
+                                                 , [&](sdbus::Message /*msg*/)
+                                                   {
+                                                       matchRuleInstalled = true;
+                                                   }
+                                                 , sdbus::async);
 
     EXPECT_TRUE(waitUntil(matchRuleInstalled));
 
@@ -116,13 +113,13 @@ TYPED_TEST(AConnection, CanInstallMatchRuleAsynchronously)
 
 TYPED_TEST(AConnection, WillUnsubscribeMatchRuleWhenClientDestroysTheAssociatedSlot)
 {
-    auto matchRule = "sender='" + SERVICE_NAME + "',path='" + OBJECT_PATH + "'";
+    auto matchRule = "sender='" + BUS_NAME + "',path='" + OBJECT_PATH + "'";
     std::atomic<bool> matchingMessageReceived{false};
     auto slot = this->s_proxyConnection->addMatch(matchRule, [&](sdbus::Message msg)
     {
         if(msg.getPath() == OBJECT_PATH)
             matchingMessageReceived = true;
-    }, sdbus::return_slot);
+    });
     slot.reset();
 
     this->m_adaptor->emitSimpleSignal();
@@ -132,16 +129,16 @@ TYPED_TEST(AConnection, WillUnsubscribeMatchRuleWhenClientDestroysTheAssociatedS
 
 TYPED_TEST(AConnection, CanAddFloatingMatchRule)
 {
-    auto matchRule = "sender='" + SERVICE_NAME + "',path='" + OBJECT_PATH + "'";
+    auto matchRule = "sender='" + BUS_NAME + "',path='" + OBJECT_PATH + "'";
     std::atomic<bool> matchingMessageReceived{false};
-    auto con = sdbus::createBusConnection();
-    con->enterEventLoopAsync();
+    auto con = sdbus::createSystemBusConnection();
+    con->enterEventLoop(sdbus::async);
     auto callback = [&](sdbus::Message msg)
     {
         if(msg.getPath() == OBJECT_PATH)
             matchingMessageReceived = true;
     };
-    con->addMatch(matchRule, std::move(callback));
+    con->addMatch(matchRule, std::move(callback), sdbus::floating_slot);
     this->m_adaptor->emitSimpleSignal();
     [[maybe_unused]] auto gotMessage = waitUntil(matchingMessageReceived, 2s);
     assert(gotMessage);
@@ -159,9 +156,9 @@ TYPED_TEST(AConnection, WillNotPassToMatchCallbackMessagesThatDoNotMatchTheRule)
     std::atomic<size_t> numberOfMatchingMessages{};
     auto slot = this->s_proxyConnection->addMatch(matchRule, [&](sdbus::Message msg)
     {
-        if(msg.getMemberName() == "simpleSignal"sv)
+        if(msg.getMemberName() == "simpleSignal")
             numberOfMatchingMessages++;
-    }, sdbus::return_slot);
+    });
     auto adaptor2 = std::make_unique<TestAdaptor>(*this->s_adaptorConnection, OBJECT_PATH_2);
 
     this->m_adaptor->emitSignalWithMap({});

tests/integrationtests/DBusMethodsTests.cpp

@@ -1,6 +1,6 @@
 /**
  * (C) 2016 - 2021 KISTLER INSTRUMENTE AG, Winterthur, Switzerland
- * (C) 2016 - 2024 Stanislav Angelovic <stanislav.angelovic@protonmail.com>
+ * (C) 2016 - 2022 Stanislav Angelovic <stanislav.angelovic@protonmail.com>
  *
  * @file DBusMethodsTests.cpp
  *
@@ -48,32 +48,18 @@ using ::testing::ElementsAre;
 using ::testing::SizeIs;
 using ::testing::NotNull;
 using namespace std::chrono_literals;
-using namespace std::string_literals;
 using namespace sdbus::test;
 
-namespace my {
-    struct Struct
-    {
-        int i;
-        std::string s;
-        std::vector<double> l;
-
-        friend bool operator==(const Struct &lhs, const Struct &rhs) = default;
-    };
-}
-
-SDBUSCPP_REGISTER_STRUCT(my::Struct, i, s, l);
-
 /*-------------------------------------*/
 /* --          TEST CASES           -- */
 /*-------------------------------------*/
 
-TYPED_TEST(SdbusTestObject, CallsEmptyMethodSuccessfully)
+TYPED_TEST(SdbusTestObject, CallsEmptyMethodSuccesfully)
 {
     ASSERT_NO_THROW(this->m_proxy->noArgNoReturn());
 }
 
-TYPED_TEST(SdbusTestObject, CallsMethodsWithBaseTypesSuccessfully)
+TYPED_TEST(SdbusTestObject, CallsMethodsWithBaseTypesSuccesfully)
 {
     auto resInt = this->m_proxy->getInt();
     ASSERT_THAT(resInt, Eq(INT32_VALUE));
@@ -82,14 +68,14 @@ TYPED_TEST(SdbusTestObject, CallsMethodsWithBaseTypesSuccessfully)
     ASSERT_THAT(multiplyRes, Eq(INT64_VALUE * DOUBLE_VALUE));
 }
 
-TYPED_TEST(SdbusTestObject, CallsMethodsWithTuplesSuccessfully)
+TYPED_TEST(SdbusTestObject, CallsMethodsWithTuplesSuccesfully)
 {
     auto resTuple = this->m_proxy->getTuple();
     ASSERT_THAT(std::get<0>(resTuple), Eq(UINT32_VALUE));
     ASSERT_THAT(std::get<1>(resTuple), Eq(STRING_VALUE));
 }
 
-TYPED_TEST(SdbusTestObject, CallsMethodsWithStructSuccessfully)
+TYPED_TEST(SdbusTestObject, CallsMethodsWithStructSuccesfully)
 {
     sdbus::Struct<uint8_t, int16_t, double, std::string, std::vector<int16_t>> a{};
     auto vectorRes = this->m_proxy->getInts16FromStruct(a);
@@ -102,72 +88,65 @@ TYPED_TEST(SdbusTestObject, CallsMethodsWithStructSuccessfully)
     ASSERT_THAT(vectorRes, Eq(std::vector<int16_t>{INT16_VALUE, INT16_VALUE, -INT16_VALUE}));
 }
 
-TYPED_TEST(SdbusTestObject, CallsMethodWithVariantSuccessfully)
+TYPED_TEST(SdbusTestObject, CallsMethodWithVariantSuccesfully)
 {
     sdbus::Variant v{DOUBLE_VALUE};
     sdbus::Variant variantRes = this->m_proxy->processVariant(v);
     ASSERT_THAT(variantRes.get<int32_t>(), Eq(static_cast<int32_t>(DOUBLE_VALUE)));
 }
 
-TYPED_TEST(SdbusTestObject, CallsMethodWithStdVariantSuccessfully)
-{
-    std::variant<int32_t, double, std::string> v{DOUBLE_VALUE};
-    auto variantRes = this->m_proxy->processVariant(v);
-    ASSERT_THAT(std::get<int32_t>(variantRes), Eq(static_cast<int32_t>(DOUBLE_VALUE)));
-}
-
-TYPED_TEST(SdbusTestObject, CallsMethodWithStructVariantsAndGetMapSuccessfully)
+TYPED_TEST(SdbusTestObject, CallsMethodWithStructVariantsAndGetMapSuccesfully)
 {
     std::vector<int32_t> x{-2, 0, 2};
     sdbus::Struct<sdbus::Variant, sdbus::Variant> y{false, true};
     std::map<int32_t, sdbus::Variant> mapOfVariants = this->m_proxy->getMapOfVariants(x, y);
-    decltype(mapOfVariants) res{ {-2, sdbus::Variant{false}}
-                               , {0, sdbus::Variant{false}}
-                               , {2, sdbus::Variant{true}}};
+    decltype(mapOfVariants) res{ {sdbus::Variant{-2}, sdbus::Variant{false}}
+                               , {sdbus::Variant{0}, sdbus::Variant{false}}
+                               , {sdbus::Variant{2}, sdbus::Variant{true}}};
 
     ASSERT_THAT(mapOfVariants[-2].get<bool>(), Eq(res[-2].get<bool>()));
     ASSERT_THAT(mapOfVariants[0].get<bool>(), Eq(res[0].get<bool>()));
     ASSERT_THAT(mapOfVariants[2].get<bool>(), Eq(res[2].get<bool>()));
 }
 
-TYPED_TEST(SdbusTestObject, CallsMethodWithStructInStructSuccessfully)
+TYPED_TEST(SdbusTestObject, CallsMethodWithStructInStructSuccesfully)
 {
     auto val = this->m_proxy->getStructInStruct();
     ASSERT_THAT(val.template get<0>(), Eq(STRING_VALUE));
     ASSERT_THAT(std::get<0>(std::get<1>(val))[INT32_VALUE], Eq(INT32_VALUE));
 }
 
-TYPED_TEST(SdbusTestObject, CallsMethodWithTwoStructsSuccessfully)
+TYPED_TEST(SdbusTestObject, CallsMethodWithTwoStructsSuccesfully)
 {
     auto val = this->m_proxy->sumStructItems({1, 2}, {3, 4});
     ASSERT_THAT(val, Eq(1 + 2 + 3 + 4));
 }
 
-TYPED_TEST(SdbusTestObject, CallsMethodWithTwoVectorsSuccessfully)
+TYPED_TEST(SdbusTestObject, CallsMethodWithTwoVectorsSuccesfully)
 {
     auto val = this->m_proxy->sumArrayItems({1, 7}, {2, 3, 4});
     ASSERT_THAT(val, Eq(1 + 7 + 2 + 3 + 4));
 }
 
-TYPED_TEST(SdbusTestObject, CallsMethodWithSignatureSuccessfully)
+TYPED_TEST(SdbusTestObject, CallsMethodWithSignatureSuccesfully)
 {
     auto resSignature = this->m_proxy->getSignature();
     ASSERT_THAT(resSignature, Eq(SIGNATURE_VALUE));
 }
 
-TYPED_TEST(SdbusTestObject, CallsMethodWithObjectPathSuccessfully)
+TYPED_TEST(SdbusTestObject, CallsMethodWithObjectPathSuccesfully)
 {
     auto resObjectPath = this->m_proxy->getObjPath();
     ASSERT_THAT(resObjectPath, Eq(OBJECT_PATH_VALUE));
 }
 
-TYPED_TEST(SdbusTestObject, CallsMethodWithUnixFdSuccessfully)
+TYPED_TEST(SdbusTestObject, CallsMethodWithUnixFdSuccesfully)
 {
     auto resUnixFd = this->m_proxy->getUnixFd();
     ASSERT_THAT(resUnixFd.get(), Gt(UNIX_FD_VALUE));
 }
 
-TYPED_TEST(SdbusTestObject, CallsMethodWithComplexTypeSuccessfully)
+TYPED_TEST(SdbusTestObject, CallsMethodWithComplexTypeSuccesfully)
 {
     auto resComplex = this->m_proxy->getComplex();
     ASSERT_THAT(resComplex.count(0), Eq(1));
@@ -245,13 +224,13 @@ TYPED_TEST(SdbusTestObject, FailsCallingMethodOnNonexistentInterface)
 
 TYPED_TEST(SdbusTestObject, FailsCallingMethodOnNonexistentDestination)
 {
-    TestProxy proxy(sdbus::ServiceName{"sdbuscpp.destination.that.does.not.exist"}, OBJECT_PATH);
+    TestProxy proxy("sdbuscpp.destination.that.does.not.exist", OBJECT_PATH);
     ASSERT_THROW(proxy.getInt(), sdbus::Error);
 }
 
 TYPED_TEST(SdbusTestObject, FailsCallingMethodOnNonexistentObject)
 {
-    TestProxy proxy(SERVICE_NAME, sdbus::ObjectPath{"/sdbuscpp/path/that/does/not/exist"});
+    TestProxy proxy(BUS_NAME, "/sdbuscpp/path/that/does/not/exist");
     ASSERT_THROW(proxy.getInt(), sdbus::Error);
 }
 
@@ -263,35 +242,12 @@ TYPED_TEST(SdbusTestObject, CanReceiveSignalWhileMakingMethodCall)
     EXPECT_TRUE(waitUntil(this->m_proxy->m_gotSignalWithMap));
 }
 
-TYPED_TEST(SdbusTestObject, CanSendAndReceiveDictionariesAsCustomStructsImplicitly)
-{
-    // This test demonstrates that sdbus-c++ can send a SDBUSCPP_REGISTER_STRUCT-described struct as a dictionary of strings to variants,
-    // and that sdbus-c++ can automatically deserialize a dictionary of strings to variants into such a struct (instead of a map).
-    const my::Struct structSent{3545342, "hello"s, {3.14, 2.4568546}};
-    my::Struct structReceived;
-
-    this->m_proxy->getProxy().callMethod("returnDictionary")
-                             .onInterface("org.sdbuscpp.integrationtests")
-                             .withArguments(sdbus::as_dictionary(structSent))
-                             .storeResultsTo(structReceived);
-
-    ASSERT_THAT(structReceived, Eq(structSent));
-}
-
 TYPED_TEST(SdbusTestObject, CanAccessAssociatedMethodCallMessageInMethodCallHandler)
 {
     this->m_proxy->doOperation(10); // This will save pointer to method call message on server side
 
     ASSERT_THAT(this->m_adaptor->m_methodCallMsg, NotNull());
-    ASSERT_THAT(this->m_adaptor->m_methodName, Eq("doOperation"));
-}
-
-TYPED_TEST(SdbusTestObject, ProvidesSerialInMethodCallAndMethodReplyMessage)
-{
-    auto reply = this->m_proxy->doOperationOnBasicAPILevel(ANY_UNSIGNED_NUMBER);
-
-    ASSERT_THAT(this->m_proxy->m_methodCallMsg->getCookie(), Gt(0));
-    ASSERT_THAT(reply.getReplyCookie(), Eq(this->m_proxy->m_methodCallMsg->getCookie())); // Pairing method reply with method call message
+    ASSERT_THAT(this->m_adaptor->m_methodCallMemberName, Eq("doOperation"));
 }
 
 TYPED_TEST(SdbusTestObject, CanAccessAssociatedMethodCallMessageInAsyncMethodCallHandler)
@@ -299,31 +255,7 @@ TYPED_TEST(SdbusTestObject, CanAccessAssociatedMethodCallMessageInAsyncMethodCal
     this->m_proxy->doOperationAsync(10); // This will save pointer to method call message on server side
 
     ASSERT_THAT(this->m_adaptor->m_methodCallMsg, NotNull());
-    ASSERT_THAT(this->m_adaptor->m_methodName, Eq("doOperationAsync"));
-}
-
-TYPED_TEST(SdbusTestObject, CallsMethodWithLargeArgument)
-{
-    std::map<int, std::string> collection;
-    //std::size_t totalSize{};
-    for (int i = 0; i < 400'000; i++)
-    {
-        collection[i] = ("This is a string of fifty characters. This is a string of fifty " + std::to_string(i));
-        //totalSize += sizeof(int) + collection[i].size();
-    }
-    //printf("Sending large message with collection of size %zu bytes\n", totalSize);
-    this->m_proxy->sendLargeMessage(collection);
-}
-
-TYPED_TEST(SdbusTestObject, CanSendCallsAndReceiveRepliesWithLargeData)
-{
-    std::map<int32_t, std::string> largeMap;
-    for (int32_t i = 0; i < 40'000; ++i)
-        largeMap.emplace(i, "This is string nr. " + std::to_string(i+1));
-
-    auto returnedMap = this->m_proxy->doOperationWithLargeData(largeMap);
-
-    ASSERT_THAT(returnedMap, Eq(largeMap));
+    ASSERT_THAT(this->m_adaptor->m_methodCallMemberName, Eq("doOperationAsync"));
 }
 
 #if LIBSYSTEMD_VERSION>=240
@@ -342,7 +274,7 @@ TYPED_TEST(SdbusTestObject, CannotSetGeneralMethodTimeoutWithLibsystemdVersionLe
 
 TYPED_TEST(SdbusTestObject, CanCallMethodSynchronouslyWithoutAnEventLoopThread)
 {
-    auto proxy = std::make_unique<TestProxy>(SERVICE_NAME, OBJECT_PATH, sdbus::dont_run_event_loop_thread);
+    auto proxy = std::make_unique<TestProxy>(BUS_NAME, OBJECT_PATH, sdbus::dont_run_event_loop_thread);
 
     auto multiplyRes = proxy->multiply(INT64_VALUE, DOUBLE_VALUE);
 
@@ -352,16 +284,15 @@ TYPED_TEST(SdbusTestObject, CanCallMethodSynchronouslyWithoutAnEventLoopThread)
 TYPED_TEST(SdbusTestObject, CanRegisterAdditionalVTableDynamicallyAtAnyTime)
 {
     auto& object = this->m_adaptor->getObject();
-    sdbus::InterfaceName interfaceName{"org.sdbuscpp.integrationtests2"};
-    auto vtableSlot = object.addVTable( interfaceName
+    auto vtableSlot = object.addVTable( "org.sdbuscpp.integrationtests2"
                                       , { sdbus::registerMethod("add").implementedAs([](const int64_t& a, const double& b){ return a + b; })
                                         , sdbus::registerMethod("subtract").implementedAs([](const int& a, const int& b){ return a - b; }) }
                                       , sdbus::return_slot );
 
     // The new remote vtable is registered as long as we keep vtableSlot, so remote method calls now should pass
-    auto proxy = sdbus::createLightWeightProxy(SERVICE_NAME, OBJECT_PATH);
+    auto proxy = sdbus::createProxy(BUS_NAME, OBJECT_PATH, sdbus::dont_run_event_loop_thread);
     int result{};
-    proxy->callMethod("subtract").onInterface(interfaceName).withArguments(10, 2).storeResultsTo(result);
+    proxy->callMethod("subtract").onInterface("org.sdbuscpp.integrationtests2").withArguments(10, 2).storeResultsTo(result);
 
     ASSERT_THAT(result, Eq(8));
 }
@@ -369,15 +300,14 @@ TYPED_TEST(SdbusTestObject, CanRegisterAdditionalVTableDynamicallyAtAnyTime)
 TYPED_TEST(SdbusTestObject, CanUnregisterAdditionallyRegisteredVTableAtAnyTime)
 {
     auto& object = this->m_adaptor->getObject();
-    sdbus::InterfaceName interfaceName{"org.sdbuscpp.integrationtests2"};
 
-    auto vtableSlot = object.addVTable( interfaceName
+    auto vtableSlot = object.addVTable( "org.sdbuscpp.integrationtests2"
                                       , { sdbus::registerMethod("add").implementedAs([](const int64_t& a, const double& b){ return a + b; })
                                         , sdbus::registerMethod("subtract").implementedAs([](const int& a, const int& b){ return a - b; }) }
                                       , sdbus::return_slot );
     vtableSlot.reset(); // Letting the slot go means letting go the associated vtable registration
 
     // No such remote D-Bus method under given interface exists anymore...
-    auto proxy = sdbus::createLightWeightProxy(SERVICE_NAME, OBJECT_PATH);
-    ASSERT_THROW(proxy->callMethod("subtract").onInterface(interfaceName).withArguments(10, 2), sdbus::Error);
+    auto proxy = sdbus::createProxy(BUS_NAME, OBJECT_PATH, sdbus::dont_run_event_loop_thread);
+    ASSERT_THROW(proxy->callMethod("subtract").onInterface("org.sdbuscpp.integrationtests2").withArguments(10, 2), sdbus::Error);
 }

tests/integrationtests/DBusPropertiesTests.cpp

@@ -1,6 +1,6 @@
 /**
  * (C) 2016 - 2021 KISTLER INSTRUMENTE AG, Winterthur, Switzerland
- * (C) 2016 - 2024 Stanislav Angelovic <stanislav.angelovic@protonmail.com>
+ * (C) 2016 - 2022 Stanislav Angelovic <stanislav.angelovic@protonmail.com>
  *
  * @file DBusPropertiesTests.cpp
  *
@@ -55,7 +55,7 @@ using namespace sdbus::test;
 /* --          TEST CASES           -- */
 /*-------------------------------------*/
 
-TYPED_TEST(SdbusTestObject, ReadsReadOnlyPropertySuccessfully)
+TYPED_TEST(SdbusTestObject, ReadsReadOnlyPropertySuccesfully)
 {
     ASSERT_THAT(this->m_proxy->state(), Eq(DEFAULT_STATE_VALUE));
 }
@@ -65,7 +65,7 @@ TYPED_TEST(SdbusTestObject, FailsWritingToReadOnlyProperty)
     ASSERT_THROW(this->m_proxy->setStateProperty("new_value"), sdbus::Error);
 }
 
-TYPED_TEST(SdbusTestObject, WritesAndReadsReadWritePropertySuccessfully)
+TYPED_TEST(SdbusTestObject, WritesAndReadsReadWritePropertySuccesfully)
 {
     uint32_t newActionValue = 5678;
 
@@ -81,12 +81,3 @@ TYPED_TEST(SdbusTestObject, CanAccessAssociatedPropertySetMessageInPropertySetHa
     ASSERT_THAT(this->m_adaptor->m_propertySetMsg, NotNull());
     ASSERT_THAT(this->m_adaptor->m_propertySetSender, Not(IsEmpty()));
 }
-
-TYPED_TEST(SdbusTestObject, WritesAndReadsReadWriteVariantPropertySuccessfully)
-{
-    sdbus::Variant newActionValue{5678};
-
-    this->m_proxy->actionVariant(newActionValue);
-
-    ASSERT_THAT(this->m_proxy->actionVariant().template get<int>(), Eq(5678));
-}

tests/integrationtests/DBusSignalsTests.cpp

@@ -1,6 +1,6 @@
 /**
  * (C) 2016 - 2021 KISTLER INSTRUMENTE AG, Winterthur, Switzerland
- * (C) 2016 - 2024 Stanislav Angelovic <stanislav.angelovic@protonmail.com>
+ * (C) 2016 - 2022 Stanislav Angelovic <stanislav.angelovic@protonmail.com>
  *
  * @file AdaptorAndProxy_test.cpp
  *
@@ -48,17 +48,17 @@ using namespace sdbus::test;
 /* --          TEST CASES           -- */
 /*-------------------------------------*/
 
-TYPED_TEST(SdbusTestObject, EmitsSimpleSignalSuccessfully)
+TYPED_TEST(SdbusTestObject, EmitsSimpleSignalSuccesfully)
 {
     this->m_adaptor->emitSimpleSignal();
 
     ASSERT_TRUE(waitUntil(this->m_proxy->m_gotSimpleSignal));
 }
 
-TYPED_TEST(SdbusTestObject, EmitsSimpleSignalToMultipleProxiesSuccessfully)
+TYPED_TEST(SdbusTestObject, EmitsSimpleSignalToMultipleProxiesSuccesfully)
 {
-    auto proxy1 = std::make_unique<TestProxy>(*this->s_adaptorConnection, SERVICE_NAME, OBJECT_PATH);
-    auto proxy2 = std::make_unique<TestProxy>(*this->s_adaptorConnection, SERVICE_NAME, OBJECT_PATH);
+    auto proxy1 = std::make_unique<TestProxy>(*this->s_adaptorConnection, BUS_NAME, OBJECT_PATH);
+    auto proxy2 = std::make_unique<TestProxy>(*this->s_adaptorConnection, BUS_NAME, OBJECT_PATH);
 
     this->m_adaptor->emitSimpleSignal();
 
@@ -69,8 +69,8 @@ TYPED_TEST(SdbusTestObject, EmitsSimpleSignalToMultipleProxiesSuccessfully)
 
 TYPED_TEST(SdbusTestObject, ProxyDoesNotReceiveSignalFromOtherBusName)
 {
-    sdbus::ServiceName otherBusName{SERVICE_NAME + "2"};
-    auto connection2 = sdbus::createBusConnection(otherBusName);
+    auto otherBusName = BUS_NAME + "2";
+    auto connection2 = sdbus::createConnection(otherBusName);
     auto adaptor2 = std::make_unique<TestAdaptor>(*connection2, OBJECT_PATH);
 
     adaptor2->emitSimpleSignal();
@@ -78,7 +78,7 @@ TYPED_TEST(SdbusTestObject, ProxyDoesNotReceiveSignalFromOtherBusName)
     ASSERT_FALSE(waitUntil(this->m_proxy->m_gotSimpleSignal, 1s));
 }
 
-TYPED_TEST(SdbusTestObject, EmitsSignalWithMapSuccessfully)
+TYPED_TEST(SdbusTestObject, EmitsSignalWithMapSuccesfully)
 {
     this->m_adaptor->emitSignalWithMap({{0, "zero"}, {1, "one"}});
 
@@ -87,19 +87,19 @@ TYPED_TEST(SdbusTestObject, EmitsSignalWithMapSuccessfully)
     ASSERT_THAT(this->m_proxy->m_mapFromSignal[1], Eq("one"));
 }
 
-TYPED_TEST(SdbusTestObject, EmitsSignalWithLargeMapSuccessfully)
+TYPED_TEST(SdbusTestObject, EmitsSignalWithLargeMapSuccesfully)
 {
-    std::map<int32_t, std::string> largeMap;
-    for (int32_t i = 0; i < 20'000; ++i)
-        largeMap.emplace(i, "This is string nr. " + std::to_string(i+1));
-    this->m_adaptor->emitSignalWithMap(largeMap);
+  std::map<int32_t, std::string> largeMap;
+  for (int32_t i = 0; i < 20'000; ++i)
+      largeMap.emplace(i, "This is string nr. " + std::to_string(i+1));
+  this->m_adaptor->emitSignalWithMap(largeMap);
 
-    ASSERT_TRUE(waitUntil(this->m_proxy->m_gotSignalWithMap));
-    ASSERT_THAT(this->m_proxy->m_mapFromSignal[0], Eq("This is string nr. 1"));
-    ASSERT_THAT(this->m_proxy->m_mapFromSignal[1], Eq("This is string nr. 2"));
+  ASSERT_TRUE(waitUntil(this->m_proxy->m_gotSignalWithMap));
+  ASSERT_THAT(this->m_proxy->m_mapFromSignal[0], Eq("This is string nr. 1"));
+  ASSERT_THAT(this->m_proxy->m_mapFromSignal[1], Eq("This is string nr. 2"));
 }
 
-TYPED_TEST(SdbusTestObject, EmitsSignalWithVariantSuccessfully)
+TYPED_TEST(SdbusTestObject, EmitsSignalWithVariantSuccesfully)
 {
     double d = 3.14;
     this->m_adaptor->emitSignalWithVariant(sdbus::Variant{d});
@@ -108,12 +108,12 @@ TYPED_TEST(SdbusTestObject, EmitsSignalWithVariantSuccessfully)
     ASSERT_THAT(this->m_proxy->m_variantFromSignal, DoubleEq(d));
 }
 
-TYPED_TEST(SdbusTestObject, EmitsSignalWithoutRegistrationSuccessfully)
+TYPED_TEST(SdbusTestObject, EmitsSignalWithoutRegistrationSuccesfully)
 {
-    this->m_adaptor->emitSignalWithoutRegistration({"platform", sdbus::Signature{"av"}});
+    this->m_adaptor->emitSignalWithoutRegistration({"platform", {"av"}});
 
     ASSERT_TRUE(waitUntil(this->m_proxy->m_gotSignalWithSignature));
-    ASSERT_THAT(this->m_proxy->m_signatureFromSignal["platform"], Eq(sdbus::Signature{"av"}));
+    ASSERT_THAT(this->m_proxy->m_signatureFromSignal["platform"], Eq("av"));
 }
 
 TYPED_TEST(SdbusTestObject, CanAccessAssociatedSignalMessageInSignalHandler)
@@ -123,7 +123,7 @@ TYPED_TEST(SdbusTestObject, CanAccessAssociatedSignalMessageInSignalHandler)
     waitUntil(this->m_proxy->m_gotSimpleSignal);
 
     ASSERT_THAT(this->m_proxy->m_signalMsg, NotNull());
-    ASSERT_THAT(this->m_proxy->m_signalName, Eq(std::string("simpleSignal")));
+    ASSERT_THAT(this->m_proxy->m_signalMemberName, Eq("simpleSignal"));
 }
 
 TYPED_TEST(SdbusTestObject, UnregistersSignalHandler)
@@ -137,8 +137,8 @@ TYPED_TEST(SdbusTestObject, UnregistersSignalHandler)
 
 TYPED_TEST(SdbusTestObject, UnregistersSignalHandlerForSomeProxies)
 {
-    auto proxy1 = std::make_unique<TestProxy>(*this->s_adaptorConnection, SERVICE_NAME, OBJECT_PATH);
-    auto proxy2 = std::make_unique<TestProxy>(*this->s_adaptorConnection, SERVICE_NAME, OBJECT_PATH);
+    auto proxy1 = std::make_unique<TestProxy>(*this->s_adaptorConnection, BUS_NAME, OBJECT_PATH);
+    auto proxy2 = std::make_unique<TestProxy>(*this->s_adaptorConnection, BUS_NAME, OBJECT_PATH);
 
     ASSERT_NO_THROW(this->m_proxy->unregisterSimpleSignalHandler());
 

tests/integrationtests/DBusStandardInterfacesTests.cpp

@@ -1,6 +1,6 @@
 /**
  * (C) 2016 - 2021 KISTLER INSTRUMENTE AG, Winterthur, Switzerland
- * (C) 2016 - 2024 Stanislav Angelovic <stanislav.angelovic@protonmail.com>
+ * (C) 2016 - 2022 Stanislav Angelovic <stanislav.angelovic@protonmail.com>
  *
  * @file DBusStandardInterfacesTests.cpp
  *
@@ -81,21 +81,22 @@ TYPED_TEST(SdbusTestObject, GetsPropertyAsynchronouslyViaPropertiesInterface)
 {
     std::promise<std::string> promise;
     auto future = promise.get_future();
-
-    this->m_proxy->GetAsync(INTERFACE_NAME, "state", [&](std::optional<sdbus::Error> err, sdbus::Variant value)
+    auto getCallback = [&](const sdbus::Error* err, sdbus::Variant value)
     {
-        if (!err)
-           promise.set_value(value.get<std::string>());
+        if (err == nullptr)
+            promise.set_value(value.get<std::string>());
         else
-           promise.set_exception(std::make_exception_ptr(*std::move(err)));
-    });
+            promise.set_exception(std::make_exception_ptr(*err));
+    };
+
+    this->m_proxy->Get(INTERFACE_NAME, "state", std::move(getCallback), sdbus::async);
 
     ASSERT_THAT(future.get(), Eq(DEFAULT_STATE_VALUE));
 }
 
 TYPED_TEST(SdbusTestObject, GetsPropertyAsynchronouslyViaPropertiesInterfaceWithFuture)
 {
-    auto future = this->m_proxy->GetAsync(INTERFACE_NAME, "state", sdbus::with_future);
+    auto future = this->m_proxy->Get(INTERFACE_NAME, "state", sdbus::async, sdbus::with_future);
 
     ASSERT_THAT(future.get().template get<std::string>(), Eq(DEFAULT_STATE_VALUE));
 }
@@ -114,44 +115,25 @@ TYPED_TEST(SdbusTestObject, SetsPropertyAsynchronouslyViaPropertiesInterface)
     uint32_t newActionValue = 2346;
     std::promise<void> promise;
     auto future = promise.get_future();
-
-    this->m_proxy->SetAsync(INTERFACE_NAME, "action", sdbus::Variant{newActionValue}, [&](std::optional<sdbus::Error> err)
+    auto setCallback = [&](const sdbus::Error* err)
     {
-        if (!err)
+        if (err == nullptr)
             promise.set_value();
         else
-            promise.set_exception(std::make_exception_ptr(*std::move(err)));
-    });
+            promise.set_exception(std::make_exception_ptr(*err));
+    };
+
+    this->m_proxy->Set(INTERFACE_NAME, "action", sdbus::Variant{newActionValue}, std::move(setCallback), sdbus::async);
 
     ASSERT_NO_THROW(future.get());
     ASSERT_THAT(this->m_proxy->action(), Eq(newActionValue));
 }
 
-TYPED_TEST(SdbusTestObject, CancelsAsynchronousPropertySettingViaPropertiesInterface)
-{
-    uint32_t newActionValue = 2346;
-    std::promise<void> promise;
-    auto future = promise.get_future();
-
-    {
-        auto slot = this->m_proxy->SetAsync(INTERFACE_NAME, "action", sdbus::Variant{newActionValue}, [&](std::optional<sdbus::Error> err)
-        {
-            if (!err)
-                promise.set_value();
-            else
-                promise.set_exception(std::make_exception_ptr(*std::move(err)));
-        }, sdbus::return_slot);
-        // Now the slot is destroyed, cancelling the async call
-    }
-
-    ASSERT_THAT(future.wait_for(300ms), Eq(std::future_status::timeout));
-}
-
 TYPED_TEST(SdbusTestObject, SetsPropertyAsynchronouslyViaPropertiesInterfaceWithFuture)
 {
     uint32_t newActionValue = 2347;
 
-    auto future = this->m_proxy->SetAsync(INTERFACE_NAME, "action", sdbus::Variant{newActionValue}, sdbus::with_future);
+    auto future = this->m_proxy->Set(INTERFACE_NAME, "action", sdbus::Variant{newActionValue}, sdbus::async, sdbus::with_future);
 
     ASSERT_NO_THROW(future.get());
     ASSERT_THAT(this->m_proxy->action(), Eq(newActionValue));
@@ -161,63 +143,61 @@ TYPED_TEST(SdbusTestObject, GetsAllPropertiesViaPropertiesInterface)
 {
     const auto properties = this->m_proxy->GetAll(INTERFACE_NAME);
 
-    ASSERT_THAT(properties, SizeIs(4));
-    EXPECT_THAT(properties.at(STATE_PROPERTY).template get<std::string>(), Eq(DEFAULT_STATE_VALUE));
-    EXPECT_THAT(properties.at(ACTION_PROPERTY).template get<uint32_t>(), Eq(DEFAULT_ACTION_VALUE));
-    EXPECT_THAT(properties.at(ACTION_VARIANT_PROPERTY).template get<sdbus::Variant>().template get<std::string>(), Eq(DEFAULT_ACTION_VARIANT_VALUE));
-    EXPECT_THAT(properties.at(BLOCKING_PROPERTY).template get<bool>(), Eq(DEFAULT_BLOCKING_VALUE));
+    ASSERT_THAT(properties, SizeIs(3));
+    EXPECT_THAT(properties.at("state").template get<std::string>(), Eq(DEFAULT_STATE_VALUE));
+    EXPECT_THAT(properties.at("action").template get<uint32_t>(), Eq(DEFAULT_ACTION_VALUE));
+    EXPECT_THAT(properties.at("blocking").template get<bool>(), Eq(DEFAULT_BLOCKING_VALUE));
 }
 
 TYPED_TEST(SdbusTestObject, GetsAllPropertiesAsynchronouslyViaPropertiesInterface)
 {
-    std::promise<std::map<sdbus::PropertyName, sdbus::Variant>> promise;
+    std::promise<std::map<std::string, sdbus::Variant>> promise;
     auto future = promise.get_future();
-
-    this->m_proxy->GetAllAsync(INTERFACE_NAME, [&](std::optional<sdbus::Error> err, std::map<sdbus::PropertyName, sdbus::Variant> value)
+    auto getCallback = [&](const sdbus::Error* err, std::map<std::string, sdbus::Variant> value)
     {
-        if (!err)
+        if (err == nullptr)
             promise.set_value(std::move(value));
         else
-            promise.set_exception(std::make_exception_ptr(*std::move(err)));
-    });
+            promise.set_exception(std::make_exception_ptr(*err));
+    };
+
+    this->m_proxy->GetAll(INTERFACE_NAME, std::move(getCallback), sdbus::async);
     const auto properties = future.get();
 
-    ASSERT_THAT(properties, SizeIs(4));
-    EXPECT_THAT(properties.at(STATE_PROPERTY).get<std::string>(), Eq(DEFAULT_STATE_VALUE));
-    EXPECT_THAT(properties.at(ACTION_PROPERTY).get<uint32_t>(), Eq(DEFAULT_ACTION_VALUE));
-    EXPECT_THAT(properties.at(ACTION_VARIANT_PROPERTY).template get<sdbus::Variant>().template get<std::string>(), Eq(DEFAULT_ACTION_VARIANT_VALUE));
-    EXPECT_THAT(properties.at(BLOCKING_PROPERTY).get<bool>(), Eq(DEFAULT_BLOCKING_VALUE));
+    ASSERT_THAT(properties, SizeIs(3));
+    EXPECT_THAT(properties.at("state").get<std::string>(), Eq(DEFAULT_STATE_VALUE));
+    EXPECT_THAT(properties.at("action").get<uint32_t>(), Eq(DEFAULT_ACTION_VALUE));
+    EXPECT_THAT(properties.at("blocking").get<bool>(), Eq(DEFAULT_BLOCKING_VALUE));
 }
 
 TYPED_TEST(SdbusTestObject, GetsAllPropertiesAsynchronouslyViaPropertiesInterfaceWithFuture)
 {
-    auto future = this->m_proxy->GetAllAsync(INTERFACE_NAME, sdbus::with_future);
+    auto future = this->m_proxy->GetAll(INTERFACE_NAME, sdbus::async, sdbus::with_future);
 
     auto properties = future.get();
 
-    ASSERT_THAT(properties, SizeIs(4));
-    EXPECT_THAT(properties.at(STATE_PROPERTY).template get<std::string>(), Eq(DEFAULT_STATE_VALUE));
-    EXPECT_THAT(properties.at(ACTION_PROPERTY).template get<uint32_t>(), Eq(DEFAULT_ACTION_VALUE));
-    EXPECT_THAT(properties.at(ACTION_VARIANT_PROPERTY).template get<sdbus::Variant>().template get<std::string>(), Eq(DEFAULT_ACTION_VARIANT_VALUE));
-    EXPECT_THAT(properties.at(BLOCKING_PROPERTY).template get<bool>(), Eq(DEFAULT_BLOCKING_VALUE));
+    ASSERT_THAT(properties, SizeIs(3));
+    EXPECT_THAT(properties.at("state").template get<std::string>(), Eq(DEFAULT_STATE_VALUE));
+    EXPECT_THAT(properties.at("action").template get<uint32_t>(), Eq(DEFAULT_ACTION_VALUE));
+    EXPECT_THAT(properties.at("blocking").template get<bool>(), Eq(DEFAULT_BLOCKING_VALUE));
 }
 
 TYPED_TEST(SdbusTestObject, EmitsPropertyChangedSignalForSelectedProperties)
 {
     std::atomic<bool> signalReceived{false};
-    this->m_proxy->m_onPropertiesChangedHandler = [&signalReceived]( const sdbus::InterfaceName& interfaceName
-                                                                   , const std::map<sdbus::PropertyName, sdbus::Variant>& changedProperties
-                                                                   , const std::vector<sdbus::PropertyName>& /*invalidatedProperties*/ )
+    this->m_proxy->m_onPropertiesChangedHandler = [&signalReceived]( const std::string& interfaceName
+                                                                   , const std::map<std::string, sdbus::Variant>& changedProperties
+                                                                   , const std::vector<std::string>& /*invalidatedProperties*/ )
     {
         EXPECT_THAT(interfaceName, Eq(INTERFACE_NAME));
         EXPECT_THAT(changedProperties, SizeIs(1));
-        EXPECT_THAT(changedProperties.at(BLOCKING_PROPERTY).get<bool>(), Eq(!DEFAULT_BLOCKING_VALUE));
+        EXPECT_THAT(changedProperties.at("blocking").get<bool>(), Eq(!DEFAULT_BLOCKING_VALUE));
         signalReceived = true;
     };
 
     this->m_proxy->blocking(!DEFAULT_BLOCKING_VALUE);
     this->m_proxy->action(DEFAULT_ACTION_VALUE*2);
-    this->m_adaptor->emitPropertiesChangedSignal(INTERFACE_NAME, {BLOCKING_PROPERTY});
+    this->m_adaptor->emitPropertiesChangedSignal(INTERFACE_NAME, {"blocking"});
 
     ASSERT_TRUE(waitUntil(signalReceived));
 }
@@ -225,13 +205,13 @@ TYPED_TEST(SdbusTestObject, EmitsPropertyChangedSignalForSelectedProperties)
 TYPED_TEST(SdbusTestObject, EmitsPropertyChangedSignalForAllProperties)
 {
     std::atomic<bool> signalReceived{false};
-    this->m_proxy->m_onPropertiesChangedHandler = [&signalReceived]( const sdbus::InterfaceName& interfaceName
-                                                                   , const std::map<sdbus::PropertyName, sdbus::Variant>& changedProperties
-                                                                   , const std::vector<sdbus::PropertyName>& invalidatedProperties )
+    this->m_proxy->m_onPropertiesChangedHandler = [&signalReceived]( const std::string& interfaceName
+                                                                   , const std::map<std::string, sdbus::Variant>& changedProperties
+                                                                   , const std::vector<std::string>& invalidatedProperties )
     {
         EXPECT_THAT(interfaceName, Eq(INTERFACE_NAME));
         EXPECT_THAT(changedProperties, SizeIs(1));
-        EXPECT_THAT(changedProperties.at(BLOCKING_PROPERTY).get<bool>(), Eq(DEFAULT_BLOCKING_VALUE));
+        EXPECT_THAT(changedProperties.at("blocking").get<bool>(), Eq(DEFAULT_BLOCKING_VALUE));
         ASSERT_THAT(invalidatedProperties, SizeIs(1));
         EXPECT_THAT(invalidatedProperties[0], Eq("action"));
         signalReceived = true;
@@ -257,74 +237,35 @@ TYPED_TEST(SdbusTestObject, GetsManagedObjectsSuccessfully)
 
     ASSERT_THAT(objectsInterfacesAndProperties, SizeIs(2));
     EXPECT_THAT(objectsInterfacesAndProperties.at(OBJECT_PATH)
-        .at(sdbus::InterfaceName{org::sdbuscpp::integrationtests_adaptor::INTERFACE_NAME})
-        .at(ACTION_PROPERTY).template get<uint32_t>(), Eq(DEFAULT_ACTION_VALUE));
+        .at(org::sdbuscpp::integrationtests_adaptor::INTERFACE_NAME)
+        .at("action").template get<uint32_t>(), Eq(DEFAULT_ACTION_VALUE));
     EXPECT_THAT(objectsInterfacesAndProperties.at(OBJECT_PATH_2)
-        .at(sdbus::InterfaceName{org::sdbuscpp::integrationtests_adaptor::INTERFACE_NAME})
-        .at(ACTION_PROPERTY).template get<uint32_t>(), Eq(DEFAULT_ACTION_VALUE));
-}
-
-TYPED_TEST(SdbusTestObject, GetsManagedObjectsAsynchronously)
-{
-    std::promise<size_t> promise;
-    auto future = promise.get_future();
-    auto adaptor2 = std::make_unique<TestAdaptor>(*this->s_adaptorConnection, OBJECT_PATH_2);
-
-    this->m_objectManagerProxy->GetManagedObjectsAsync([&](std::optional<sdbus::Error> /*err*/, const std::map<sdbus::ObjectPath, std::map<sdbus::InterfaceName, std::map<sdbus::PropertyName, sdbus::Variant>>>& objectsInterfacesAndProperties)
-    {
-        promise.set_value(objectsInterfacesAndProperties.size());
-    });
-
-    ASSERT_THAT(future.get(), Eq(2));
-}
-
-TYPED_TEST(SdbusTestObject, GetsManagedObjectsAsynchronouslyViaSlotReturningOverload)
-{
-    std::promise<size_t> promise;
-    auto future = promise.get_future();
-    auto adaptor2 = std::make_unique<TestAdaptor>(*this->s_adaptorConnection, OBJECT_PATH_2);
-
-    auto slot = this->m_objectManagerProxy->GetManagedObjectsAsync([&](std::optional<sdbus::Error> /*err*/, const std::map<sdbus::ObjectPath, std::map<sdbus::InterfaceName, std::map<sdbus::PropertyName, sdbus::Variant>>>& objectsInterfacesAndProperties)
-    {
-        promise.set_value(objectsInterfacesAndProperties.size());
-    }, sdbus::return_slot);
-
-    ASSERT_THAT(future.get(), Eq(2));
-}
-
-TYPED_TEST(SdbusTestObject, GetsManagedObjectsAsynchronouslyViaFutureOverload)
-{
-    auto adaptor2 = std::make_unique<TestAdaptor>(*this->s_adaptorConnection, OBJECT_PATH_2);
-
-    auto future = this->m_objectManagerProxy->GetManagedObjectsAsync(sdbus::with_future);
-
-    ASSERT_THAT(future.get().size(), Eq(2));
+        .at(org::sdbuscpp::integrationtests_adaptor::INTERFACE_NAME)
+        .at("action").template get<uint32_t>(), Eq(DEFAULT_ACTION_VALUE));
 }
 
 TYPED_TEST(SdbusTestObject, EmitsInterfacesAddedSignalForSelectedObjectInterfaces)
 {
     std::atomic<bool> signalReceived{false};
     this->m_objectManagerProxy->m_onInterfacesAddedHandler = [&signalReceived]( const sdbus::ObjectPath& objectPath
-                                                                              , const std::map<sdbus::InterfaceName, std::map<sdbus::PropertyName, sdbus::Variant>>& interfacesAndProperties )
+                                                                              , const std::map<std::string, std::map<std::string, sdbus::Variant>>& interfacesAndProperties )
     {
         EXPECT_THAT(objectPath, Eq(OBJECT_PATH));
         EXPECT_THAT(interfacesAndProperties, SizeIs(1));
         EXPECT_THAT(interfacesAndProperties.count(INTERFACE_NAME), Eq(1));
 #if LIBSYSTEMD_VERSION<=244
         // Up to sd-bus v244, all properties are added to the list, i.e. `state', `action', and `blocking' in this case.
-        EXPECT_THAT(interfacesAndProperties.at(INTERFACE_NAME), SizeIs(4));
-        EXPECT_TRUE(interfacesAndProperties.at(INTERFACE_NAME).count(STATE_PROPERTY));
-        EXPECT_TRUE(interfacesAndProperties.at(INTERFACE_NAME).count(ACTION_PROPERTY));
-        EXPECT_TRUE(interfacesAndProperties.at(INTERFACE_NAME).count(ACTION_VARIANT_PROPERTY));
-        EXPECT_TRUE(interfacesAndProperties.at(INTERFACE_NAME).count(BLOCKING_PROPERTY));
+        EXPECT_THAT(interfacesAndProperties.at(INTERFACE_NAME), SizeIs(3));
+        EXPECT_TRUE(interfacesAndProperties.at(INTERFACE_NAME).count("state"));
+        EXPECT_TRUE(interfacesAndProperties.at(INTERFACE_NAME).count("action"));
+        EXPECT_TRUE(interfacesAndProperties.at(INTERFACE_NAME).count("blocking"));
 #else
         // Since v245 sd-bus does not add to the InterfacesAdded signal message the values of properties marked only
         // for invalidation on change, which makes the behavior consistent with the PropertiesChangedSignal.
         // So in this specific instance, `action' property is no more added to the list.
-        EXPECT_THAT(interfacesAndProperties.at(INTERFACE_NAME), SizeIs(3));
-        EXPECT_TRUE(interfacesAndProperties.at(INTERFACE_NAME).count(STATE_PROPERTY));
-        EXPECT_TRUE(interfacesAndProperties.at(INTERFACE_NAME).count(BLOCKING_PROPERTY));
-        EXPECT_TRUE(interfacesAndProperties.at(INTERFACE_NAME).count(ACTION_VARIANT_PROPERTY));
+        EXPECT_THAT(interfacesAndProperties.at(INTERFACE_NAME), SizeIs(2));
+        EXPECT_TRUE(interfacesAndProperties.at(INTERFACE_NAME).count("state"));
+        EXPECT_TRUE(interfacesAndProperties.at(INTERFACE_NAME).count("blocking"));
 #endif
         signalReceived = true;
     };
@@ -338,7 +279,7 @@ TYPED_TEST(SdbusTestObject, EmitsInterfacesAddedSignalForAllObjectInterfaces)
 {
     std::atomic<bool> signalReceived{false};
     this->m_objectManagerProxy->m_onInterfacesAddedHandler = [&signalReceived]( const sdbus::ObjectPath& objectPath
-                                                                              , const std::map<sdbus::InterfaceName, std::map<sdbus::PropertyName, sdbus::Variant>>& interfacesAndProperties )
+                                                                              , const std::map<std::string, std::map<std::string, sdbus::Variant>>& interfacesAndProperties )
     {
         EXPECT_THAT(objectPath, Eq(OBJECT_PATH));
 #if LIBSYSTEMD_VERSION<=250
@@ -350,19 +291,17 @@ TYPED_TEST(SdbusTestObject, EmitsInterfacesAddedSignalForAllObjectInterfaces)
 #endif
 #if LIBSYSTEMD_VERSION<=244
         // Up to sd-bus v244, all properties are added to the list, i.e. `state', `action', and `blocking' in this case.
-        EXPECT_THAT(interfacesAndProperties.at(INTERFACE_NAME), SizeIs(4));
-        EXPECT_TRUE(interfacesAndProperties.at(INTERFACE_NAME).count(STATE_PROPERTY));
-        EXPECT_TRUE(interfacesAndProperties.at(INTERFACE_NAME).count(ACTION_PROPERTY));
-        EXPECT_TRUE(interfacesAndProperties.at(INTERFACE_NAME).count(ACTION_VARIANT_PROPERTY));
-        EXPECT_TRUE(interfacesAndProperties.at(INTERFACE_NAME).count(BLOCKING_PROPERTY));
+        EXPECT_THAT(interfacesAndProperties.at(INTERFACE_NAME), SizeIs(3));
+        EXPECT_TRUE(interfacesAndProperties.at(INTERFACE_NAME).count("state"));
+        EXPECT_TRUE(interfacesAndProperties.at(INTERFACE_NAME).count("action"));
+        EXPECT_TRUE(interfacesAndProperties.at(INTERFACE_NAME).count("blocking"));
 #else
         // Since v245 sd-bus does not add to the InterfacesAdded signal message the values of properties marked only
         // for invalidation on change, which makes the behavior consistent with the PropertiesChangedSignal.
         // So in this specific instance, `action' property is no more added to the list.
-        EXPECT_THAT(interfacesAndProperties.at(INTERFACE_NAME), SizeIs(3));
-        EXPECT_TRUE(interfacesAndProperties.at(INTERFACE_NAME).count(STATE_PROPERTY));
-        EXPECT_TRUE(interfacesAndProperties.at(INTERFACE_NAME).count(BLOCKING_PROPERTY));
-        EXPECT_TRUE(interfacesAndProperties.at(INTERFACE_NAME).count(ACTION_VARIANT_PROPERTY));
+        EXPECT_THAT(interfacesAndProperties.at(INTERFACE_NAME), SizeIs(2));
+        EXPECT_TRUE(interfacesAndProperties.at(INTERFACE_NAME).count("state"));
+        EXPECT_TRUE(interfacesAndProperties.at(INTERFACE_NAME).count("blocking"));
 #endif
         signalReceived = true;
     };
@@ -376,7 +315,7 @@ TYPED_TEST(SdbusTestObject, EmitsInterfacesRemovedSignalForSelectedObjectInterfa
 {
     std::atomic<bool> signalReceived{false};
     this->m_objectManagerProxy->m_onInterfacesRemovedHandler = [&signalReceived]( const sdbus::ObjectPath& objectPath
-                                                                                , const std::vector<sdbus::InterfaceName>& interfaces )
+                                                                                , const std::vector<std::string>& interfaces )
     {
         EXPECT_THAT(objectPath, Eq(OBJECT_PATH));
         ASSERT_THAT(interfaces, SizeIs(1));
@@ -393,7 +332,7 @@ TYPED_TEST(SdbusTestObject, EmitsInterfacesRemovedSignalForAllObjectInterfaces)
 {
     std::atomic<bool> signalReceived{false};
     this->m_objectManagerProxy->m_onInterfacesRemovedHandler = [&signalReceived]( const sdbus::ObjectPath& objectPath
-                                                                                , const std::vector<sdbus::InterfaceName>& interfaces )
+                                                                                , const std::vector<std::string>& interfaces )
     {
         EXPECT_THAT(objectPath, Eq(OBJECT_PATH));
 #if LIBSYSTEMD_VERSION<=250

tests/integrationtests/Defs.h

@@ -1,6 +1,6 @@
 /**
  * (C) 2016 - 2021 KISTLER INSTRUMENTE AG, Winterthur, Switzerland
- * (C) 2016 - 2024 Stanislav Angelovic <stanislav.angelovic@protonmail.com>
+ * (C) 2016 - 2022 Stanislav Angelovic <stanislav.angelovic@protonmail.com>
  *
  * @file Defs.h
  *
@@ -34,16 +34,12 @@
 
 namespace sdbus { namespace test {
 
-const InterfaceName INTERFACE_NAME{"org.sdbuscpp.integrationtests"};
-const ServiceName SERVICE_NAME{"org.sdbuscpp.integrationtests"};
-const ServiceName EMPTY_DESTINATION;
-const ObjectPath MANAGER_PATH {"/org/sdbuscpp/integrationtests"};
-const ObjectPath OBJECT_PATH  {"/org/sdbuscpp/integrationtests/ObjectA1"};
-const ObjectPath OBJECT_PATH_2{"/org/sdbuscpp/integrationtests/ObjectB1"};
-const PropertyName STATE_PROPERTY{"state"};
-const PropertyName ACTION_PROPERTY{"action"};
-const PropertyName ACTION_VARIANT_PROPERTY{"actionVariant"};
-const PropertyName BLOCKING_PROPERTY{"blocking"};
+const std::string INTERFACE_NAME{"org.sdbuscpp.integrationtests"};
+const std::string BUS_NAME = INTERFACE_NAME;
+const std::string EMPTY_DESTINATION;
+const std::string MANAGER_PATH {"/org/sdbuscpp/integrationtests"};
+const std::string OBJECT_PATH  {"/org/sdbuscpp/integrationtests/ObjectA1"};
+const std::string OBJECT_PATH_2{"/org/sdbuscpp/integrationtests/ObjectB1"};
 const std::string DIRECT_CONNECTION_SOCKET_PATH{std::filesystem::temp_directory_path() / "sdbus-cpp-direct-connection-test"};
 
 constexpr const uint8_t UINT8_VALUE{1};
@@ -53,13 +49,12 @@ constexpr const int32_t INT32_VALUE{-42};
 constexpr const int32_t INT64_VALUE{-1024};
 
 const std::string STRING_VALUE{"sdbus-c++-testing"};
-const Signature SIGNATURE_VALUE{"a{is}"};
-const ObjectPath OBJECT_PATH_VALUE{"/"};
+const sdbus::Signature SIGNATURE_VALUE{"a{is}"};
+const sdbus::ObjectPath OBJECT_PATH_VALUE{"/"};
 const int UNIX_FD_VALUE = 0;
 
 const std::string DEFAULT_STATE_VALUE{"default-state-value"};
 const uint32_t DEFAULT_ACTION_VALUE{999};
-const std::string DEFAULT_ACTION_VARIANT_VALUE{"ahoj"};
 const bool DEFAULT_BLOCKING_VALUE{true};
 
 constexpr const double DOUBLE_VALUE{3.24L};

tests/integrationtests/TestAdaptor.cpp

@@ -1,6 +1,6 @@
 /**
  * (C) 2016 - 2021 KISTLER INSTRUMENTE AG, Winterthur, Switzerland
- * (C) 2016 - 2024 Stanislav Angelovic <stanislav.angelovic@protonmail.com>
+ * (C) 2016 - 2022 Stanislav Angelovic <stanislav.angelovic@protonmail.com>
  *
  * @file TestAdaptor.cpp
  *
@@ -31,8 +31,8 @@
 
 namespace sdbus { namespace test {
 
-TestAdaptor::TestAdaptor(sdbus::IConnection& connection, sdbus::ObjectPath path) :
-    AdaptorInterfaces(connection, std::move(path))
+TestAdaptor::TestAdaptor(sdbus::IConnection& connection, const std::string& path) :
+    AdaptorInterfaces(connection, path)
 {
     registerAdaptor();
 }
@@ -75,9 +75,9 @@ std::vector<int16_t> TestAdaptor::getInts16FromStruct(const sdbus::Struct<uint8_
     return res;
 }
 
-sdbus::Variant TestAdaptor::processVariant(const std::variant<int32_t, double, std::string>& v)
+sdbus::Variant TestAdaptor::processVariant(const sdbus::Variant& v)
 {
-    sdbus::Variant res{static_cast<int32_t>(std::get<double>(v))};
+    sdbus::Variant res{static_cast<int32_t>(v.get<double>())};
     return res;
 }
 
@@ -123,23 +123,15 @@ uint32_t TestAdaptor::doOperation(const uint32_t& param)
     std::this_thread::sleep_for(std::chrono::milliseconds(param));
 
     m_methodCallMsg = std::make_unique<const Message>(getObject().getCurrentlyProcessedMessage());
-    m_methodName = m_methodCallMsg->getMemberName();
+    m_methodCallMemberName = m_methodCallMsg->getMemberName();
 
     return param;
 }
 
-std::map<int32_t, std::string> TestAdaptor::doOperationWithLargeData(const std::map<int32_t, std::string>& largeParam)
-{
-    m_methodCallMsg = std::make_unique<const Message>(getObject().getCurrentlyProcessedMessage());
-    m_methodName = m_methodCallMsg->getMemberName();
-
-    return largeParam;
-}
-
 void TestAdaptor::doOperationAsync(sdbus::Result<uint32_t>&& result, uint32_t param)
 {
     m_methodCallMsg = std::make_unique<const Message>(getObject().getCurrentlyProcessedMessage());
-    m_methodName = m_methodCallMsg->getMemberName();
+    m_methodCallMemberName = m_methodCallMsg->getMemberName();
 
     if (param == 0)
     {
@@ -157,27 +149,6 @@ void TestAdaptor::doOperationAsync(sdbus::Result<uint32_t>&& result, uint32_t pa
     }
 }
 
-void TestAdaptor::doOperationAsyncWithLargeData(sdbus::Result<std::map<int32_t, std::string>>&& result, uint32_t param, const std::map<int32_t, std::string>& largeMap)
-{
-    m_methodCallMsg = std::make_unique<const Message>(getObject().getCurrentlyProcessedMessage());
-    m_methodName = m_methodCallMsg->getMemberName();
-
-    if (param == 0)
-    {
-        // Don't sleep and return the result from this thread
-        result.returnResults(largeMap);
-    }
-    else
-    {
-        // Process asynchronously in another thread and return the result from there
-        std::thread([param, largeMap, result = std::move(result)]()
-                    {
-                        std::this_thread::sleep_for(std::chrono::milliseconds(param));
-                        result.returnResults(largeMap);
-                    }).detach();
-    }
-}
-
 sdbus::Signature TestAdaptor::getSignature()
 {
     return SIGNATURE_VALUE;
@@ -202,7 +173,7 @@ std::unordered_map<uint64_t, sdbus::Struct<std::map<uint8_t, std::vector<sdbus::
                         23,  // uint8_t
                         {   // vector
                             {   // struct
-                                    sdbus::ObjectPath{"/object/path"}, // object path
+                                    "/object/path", // object path
                                     false,
                                     Variant{3.14},
                                     {   // map
@@ -212,7 +183,7 @@ std::unordered_map<uint64_t, sdbus::Struct<std::map<uint8_t, std::vector<sdbus::
                         }
                     }
                 },
-                sdbus::Signature{"a{t(a{ya(obva{is})}gs)}"}, // signature
+                "a{t(a{ya(obva{is})}gs)}", // signature
                 std::string{}
             }
         }
@@ -241,16 +212,6 @@ void TestAdaptor::emitTwoSimpleSignals()
     emitSignalWithMap({});
 }
 
-void TestAdaptor::sendLargeMessage(const std::map<int, std::string>& /*collection*/)
-{
-    //printf("Adaptor: got collection with %zu items", collection.size());
-}
-
-std::map<std::string, sdbus::Variant> TestAdaptor::returnDictionary(const std::map<std::string, sdbus::Variant>& dict)
-{
-    return dict;
-}
-
 std::string TestAdaptor::state()
 {
     return m_state;
@@ -266,16 +227,6 @@ void TestAdaptor::action(const uint32_t& value)
     m_action = value;
 }
 
-sdbus::Variant TestAdaptor::actionVariant()
-{
-    return m_actionVariant;
-}
-
-void TestAdaptor::actionVariant(const sdbus::Variant& value)
-{
-    m_actionVariant = value;
-}
-
 bool TestAdaptor::blocking()
 {
     return m_blocking;

tests/integrationtests/TestAdaptor.h

@@ -1,6 +1,6 @@
 /**
  * (C) 2016 - 2021 KISTLER INSTRUMENTE AG, Winterthur, Switzerland
- * (C) 2016 - 2024 Stanislav Angelovic <stanislav.angelovic@protonmail.com>
+ * (C) 2016 - 2022 Stanislav Angelovic <stanislav.angelovic@protonmail.com>
  *
  * @file TestAdaptor.h
  *
@@ -40,7 +40,7 @@ namespace sdbus { namespace test {
 class ObjectManagerTestAdaptor final : public sdbus::AdaptorInterfaces< sdbus::ObjectManager_adaptor >
 {
 public:
-    ObjectManagerTestAdaptor(sdbus::IConnection& connection, sdbus::ObjectPath path) :
+    ObjectManagerTestAdaptor(sdbus::IConnection& connection, std::string path) :
         AdaptorInterfaces(connection, std::move(path))
     {
         registerAdaptor();
@@ -57,7 +57,7 @@ class TestAdaptor final : public sdbus::AdaptorInterfaces< org::sdbuscpp::integr
                                                          , sdbus::ManagedObject_adaptor >
 {
 public:
-    TestAdaptor(sdbus::IConnection& connection, sdbus::ObjectPath path);
+    TestAdaptor(sdbus::IConnection& connection, const std::string& path);
     ~TestAdaptor();
 
 protected:
@@ -67,15 +67,13 @@ protected:
     double multiply(const int64_t& a, const double& b) override;
     void multiplyWithNoReply(const int64_t& a, const double& b) override;
     std::vector<int16_t> getInts16FromStruct(const sdbus::Struct<uint8_t, int16_t, double, std::string, std::vector<int16_t>>& arg0) override;
-    sdbus::Variant processVariant(const std::variant<int32_t, double, std::string>& variant) override;
+    sdbus::Variant processVariant(const sdbus::Variant& variant) override;
     std::map<int32_t, sdbus::Variant> getMapOfVariants(const std::vector<int32_t>& x, const sdbus::Struct<sdbus::Variant, sdbus::Variant>& y) override;
     sdbus::Struct<std::string, sdbus::Struct<std::map<int32_t, int32_t>>> getStructInStruct() override;
     int32_t sumStructItems(const sdbus::Struct<uint8_t, uint16_t>& arg0, const sdbus::Struct<int32_t, int64_t>& arg1) override;
     uint32_t sumArrayItems(const std::vector<uint16_t>& arg0, const std::array<uint64_t, 3>& arg1) override;
     uint32_t doOperation(const uint32_t& arg0) override;
-    std::map<int32_t, std::string> doOperationWithLargeData(const std::map<int32_t, std::string>& largeParam) override;
     void doOperationAsync(sdbus::Result<uint32_t>&& result, uint32_t arg0) override;
-    void doOperationAsyncWithLargeData(sdbus::Result<std::map<int32_t, std::string>>&& result, uint32_t arg0, const std::map<int32_t, std::string>& largeParam) override;
     sdbus::Signature getSignature() override;
     sdbus::ObjectPath getObjPath() override;
     sdbus::UnixFd getUnixFd() override;
@@ -84,13 +82,9 @@ protected:
     void throwErrorWithNoReply() override;
     void doPrivilegedStuff() override;
     void emitTwoSimpleSignals() override;
-    void sendLargeMessage(const std::map<int, std::string>& collection) override;
-    std::map<std::string, sdbus::Variant> returnDictionary(const std::map<std::string, sdbus::Variant>& dict) override;
 
     uint32_t action() override;
     void action(const uint32_t& value) override;
-    sdbus::Variant actionVariant() override;
-    void actionVariant(const sdbus::Variant& value) override;
     bool blocking() override;
     void blocking(const bool& value) override;
     std::string state() override;
@@ -103,7 +97,6 @@ private:
     const std::string m_state{DEFAULT_STATE_VALUE};
     uint32_t m_action{DEFAULT_ACTION_VALUE};
     bool m_blocking{DEFAULT_BLOCKING_VALUE};
-    sdbus::Variant m_actionVariant{"ahoj"};
 
 public: // for tests
     // For dont-expect-reply method call verifications
@@ -112,7 +105,7 @@ public: // for tests
     mutable std::atomic<bool> m_wasThrowErrorCalled{false};
 
     std::unique_ptr<const Message> m_methodCallMsg;
-    MethodName m_methodName;
+    std::string m_methodCallMemberName;
     std::unique_ptr<const Message> m_propertySetMsg;
     std::string m_propertySetSender;
 };
@@ -122,9 +115,7 @@ class DummyTestAdaptor final : public sdbus::AdaptorInterfaces< org::sdbuscpp::i
                                                               , sdbus::ManagedObject_adaptor >
 {
 public:
-    DummyTestAdaptor(sdbus::IConnection& connection, sdbus::ObjectPath path)
-        : AdaptorInterfaces(connection, std::move(path))
-    {}
+    DummyTestAdaptor(sdbus::IConnection& connection, const std::string& path) : AdaptorInterfaces(connection, path) {}
 
 protected:
     void noArgNoReturn() override {}
@@ -133,15 +124,13 @@ protected:
     double multiply(const int64_t&, const double&) override { return {}; }
     void multiplyWithNoReply(const int64_t&, const double&) override {}
     std::vector<int16_t> getInts16FromStruct(const sdbus::Struct<uint8_t, int16_t, double, std::string, std::vector<int16_t>>&) override { return {}; }
-    sdbus::Variant processVariant(const std::variant<int32_t, double, std::string>&) override { return {}; }
+    sdbus::Variant processVariant(const sdbus::Variant&) override { return {}; }
     std::map<int32_t, sdbus::Variant> getMapOfVariants(const std::vector<int32_t>&, const sdbus::Struct<sdbus::Variant, sdbus::Variant>&) override { return {}; }
     sdbus::Struct<std::string, sdbus::Struct<std::map<int32_t, int32_t>>> getStructInStruct() override { return {}; }
     int32_t sumStructItems(const sdbus::Struct<uint8_t, uint16_t>&, const sdbus::Struct<int32_t, int64_t>&) override { return {}; }
     uint32_t sumArrayItems(const std::vector<uint16_t>&, const std::array<uint64_t, 3>&) override { return {}; }
     uint32_t doOperation(const uint32_t&) override { return {}; }
-    std::map<int32_t, std::string> doOperationWithLargeData(const std::map<int32_t, std::string>&) override { return {}; }
     void doOperationAsync(sdbus::Result<uint32_t>&&, uint32_t) override {}
-    void doOperationAsyncWithLargeData(sdbus::Result<std::map<int32_t, std::string>>&&, uint32_t, const std::map<int32_t, std::string>&) override {}
     sdbus::Signature getSignature() override { return {}; }
     sdbus::ObjectPath getObjPath() override { return {}; }
     sdbus::UnixFd getUnixFd() override { return {}; }
@@ -150,13 +139,9 @@ protected:
     void throwErrorWithNoReply() override {}
     void doPrivilegedStuff() override {}
     void emitTwoSimpleSignals() override {}
-    void sendLargeMessage(const std::map<int, std::string>&) override {}
-    std::map<std::string, sdbus::Variant> returnDictionary(const std::map<std::string, sdbus::Variant>&) override { return {}; }
 
     uint32_t action() override { return {}; }
     void action(const uint32_t&) override {}
-    sdbus::Variant actionVariant() override { return {}; }
-    void actionVariant(const sdbus::Variant&) override {}
     bool blocking() override { return {}; }
     void blocking(const bool&) override {}
     std::string state() override { return {}; }

tests/integrationtests/TestFixture.cpp

@@ -1,6 +1,6 @@
 /**
  * (C) 2016 - 2021 KISTLER INSTRUMENTE AG, Winterthur, Switzerland
- * (C) 2016 - 2024 Stanislav Angelovic <stanislav.angelovic@protonmail.com>
+ * (C) 2016 - 2022 Stanislav Angelovic <stanislav.angelovic@protonmail.com>
  *
  * @file TestFixture.cpp
  *
@@ -28,8 +28,8 @@
 
 namespace sdbus { namespace test {
 
-std::unique_ptr<sdbus::IConnection> BaseTestFixture::s_adaptorConnection = sdbus::createBusConnection();
-std::unique_ptr<sdbus::IConnection> BaseTestFixture::s_proxyConnection = sdbus::createBusConnection();
+std::unique_ptr<sdbus::IConnection> BaseTestFixture::s_adaptorConnection = sdbus::createSystemBusConnection();
+std::unique_ptr<sdbus::IConnection> BaseTestFixture::s_proxyConnection = sdbus::createSystemBusConnection();
 
 #ifndef SDBUS_basu // sd_event integration is not supported in basu-based sdbus-c++
 

tests/integrationtests/TestFixture.h

@@ -1,6 +1,6 @@
 /**
  * (C) 2016 - 2021 KISTLER INSTRUMENTE AG, Winterthur, Switzerland
- * (C) 2016 - 2024 Stanislav Angelovic <stanislav.angelovic@protonmail.com>
+ * (C) 2016 - 2022 Stanislav Angelovic <stanislav.angelovic@protonmail.com>
  *
  * @file TestFixture.h
  *
@@ -50,26 +50,24 @@
 
 namespace sdbus { namespace test {
 
-inline const uint32_t ANY_UNSIGNED_NUMBER{123};
-
 class BaseTestFixture : public ::testing::Test
 {
 public:
     static void SetUpTestCase()
     {
-        s_adaptorConnection->requestName(SERVICE_NAME);
+        s_adaptorConnection->requestName(BUS_NAME);
     }
 
     static void TearDownTestCase()
     {
-        s_adaptorConnection->releaseName(SERVICE_NAME);
+        s_adaptorConnection->releaseName(BUS_NAME);
     }
 
 private:
     void SetUp() override
     {
-        m_objectManagerProxy = std::make_unique<ObjectManagerTestProxy>(*s_proxyConnection, SERVICE_NAME, MANAGER_PATH);
-        m_proxy = std::make_unique<TestProxy>(*s_proxyConnection, SERVICE_NAME, OBJECT_PATH);
+        m_objectManagerProxy = std::make_unique<ObjectManagerTestProxy>(*s_proxyConnection, BUS_NAME, MANAGER_PATH);
+        m_proxy = std::make_unique<TestProxy>(*s_proxyConnection, BUS_NAME, OBJECT_PATH);
 
         m_objectManagerAdaptor = std::make_unique<ObjectManagerTestAdaptor>(*s_adaptorConnection, MANAGER_PATH);
         m_adaptor = std::make_unique<TestAdaptor>(*s_adaptorConnection, OBJECT_PATH);
@@ -104,8 +102,8 @@ public:
     static void SetUpTestCase()
     {
         BaseTestFixture::SetUpTestCase();
-        s_proxyConnection->enterEventLoopAsync();
-        s_adaptorConnection->enterEventLoopAsync();
+        s_proxyConnection->enterEventLoop(async);
+        s_adaptorConnection->enterEventLoop(async);
         std::this_thread::sleep_for(std::chrono::milliseconds(50)); // Give time for the proxy connection to start listening to signals
     }
 
@@ -239,11 +237,11 @@ private:
             auto fd = accept4(sock, NULL, NULL, /*SOCK_NONBLOCK|*/SOCK_CLOEXEC);
             m_adaptorConnection = sdbus::createServerBus(fd);
             // This is necessary so that createDirectBusConnection() below does not block
-            m_adaptorConnection->enterEventLoopAsync();
+            m_adaptorConnection->enterEventLoop(async);
         });
 
         m_proxyConnection = sdbus::createDirectBusConnection("unix:path=" + DIRECT_CONNECTION_SOCKET_PATH);
-        m_proxyConnection->enterEventLoopAsync();
+        m_proxyConnection->enterEventLoop(async);
 
         t.join();
     }

tests/integrationtests/TestProxy.cpp

@@ -1,6 +1,6 @@
 /**
  * (C) 2016 - 2021 KISTLER INSTRUMENTE AG, Winterthur, Switzerland
- * (C) 2016 - 2024 Stanislav Angelovic <stanislav.angelovic@protonmail.com>
+ * (C) 2016 - 2022 Stanislav Angelovic <stanislav.angelovic@protonmail.com>
  *
  * @file TestProxy.cpp
  *
@@ -31,7 +31,7 @@
 
 namespace sdbus { namespace test {
 
-TestProxy::TestProxy(ServiceName destination, ObjectPath objectPath)
+TestProxy::TestProxy(std::string destination, std::string objectPath)
     : ProxyInterfaces(std::move(destination), std::move(objectPath))
 {
     getProxy().uponSignal("signalWithoutRegistration").onInterface(sdbus::test::INTERFACE_NAME).call([this](const sdbus::Struct<std::string, sdbus::Struct<sdbus::Signature>>& s){ this->onSignalWithoutRegistration(s); });
@@ -39,14 +39,14 @@ TestProxy::TestProxy(ServiceName destination, ObjectPath objectPath)
     registerProxy();
 }
 
-TestProxy::TestProxy(ServiceName destination, ObjectPath objectPath, dont_run_event_loop_thread_t)
+TestProxy::TestProxy(std::string destination, std::string objectPath, dont_run_event_loop_thread_t)
     : ProxyInterfaces(std::move(destination), std::move(objectPath), dont_run_event_loop_thread)
 {
     // It doesn't make sense to register any signals here since proxy upon a D-Bus connection with no event loop thread
     // will not receive any incoming messages except replies to synchronous D-Bus calls.
 }
 
-TestProxy::TestProxy(sdbus::IConnection& connection, ServiceName destination, ObjectPath objectPath)
+TestProxy::TestProxy(sdbus::IConnection& connection, std::string destination, std::string objectPath)
     : ProxyInterfaces(connection, std::move(destination), std::move(objectPath))
 {
     getProxy().uponSignal("signalWithoutRegistration").onInterface(sdbus::test::INTERFACE_NAME).call([this](const sdbus::Struct<std::string, sdbus::Struct<sdbus::Signature>>& s){ this->onSignalWithoutRegistration(s); });
@@ -62,7 +62,7 @@ TestProxy::~TestProxy()
 void TestProxy::onSimpleSignal()
 {
     m_signalMsg = std::make_unique<sdbus::Message>(getProxy().getCurrentlyProcessedMessage());
-    m_signalName = m_signalMsg->getMemberName();
+    m_signalMemberName = m_signalMsg->getMemberName();
 
     m_gotSimpleSignal = true;
 }
@@ -81,26 +81,25 @@ void TestProxy::onSignalWithVariant(const sdbus::Variant& aVariant)
 
 void TestProxy::onSignalWithoutRegistration(const sdbus::Struct<std::string, sdbus::Struct<sdbus::Signature>>& s)
 {
-    // Static cast to std::string is a workaround for gcc 11.4 false positive warning (which later gcc versions nor Clang emit)
     m_signatureFromSignal[std::get<0>(s)] = static_cast<std::string>(std::get<0>(std::get<1>(s)));
     m_gotSignalWithSignature = true;
 }
 
-void TestProxy::onDoOperationReply(uint32_t returnValue, std::optional<sdbus::Error> error)
+void TestProxy::onDoOperationReply(uint32_t returnValue, const sdbus::Error* error)
 {
     if (m_DoOperationClientSideAsyncReplyHandler)
         m_DoOperationClientSideAsyncReplyHandler(returnValue, error);
 }
 
-void TestProxy::onPropertiesChanged( const sdbus::InterfaceName& interfaceName
-                                   , const std::map<PropertyName, sdbus::Variant>& changedProperties
-                                   , const std::vector<PropertyName>& invalidatedProperties )
+void TestProxy::onPropertiesChanged( const std::string& interfaceName
+                                   , const std::map<std::string, sdbus::Variant>& changedProperties
+                                   , const std::vector<std::string>& invalidatedProperties )
 {
     if (m_onPropertiesChangedHandler)
         m_onPropertiesChangedHandler(interfaceName, changedProperties, invalidatedProperties);
 }
 
-void TestProxy::installDoOperationClientSideAsyncReplyHandler(std::function<void(uint32_t res, std::optional<sdbus::Error> err)> handler)
+void TestProxy::installDoOperationClientSideAsyncReplyHandler(std::function<void(uint32_t res, const sdbus::Error* err)> handler)
 {
     m_DoOperationClientSideAsyncReplyHandler = std::move(handler);
 }
@@ -113,41 +112,20 @@ uint32_t TestProxy::doOperationWithTimeout(const std::chrono::microseconds &time
     return result;
 }
 
-MethodReply TestProxy::doOperationOnBasicAPILevel(uint32_t param)
-{
-    auto methodCall = getProxy().createMethodCall(test::INTERFACE_NAME, MethodName{"doOperation"});
-    methodCall << param;
-
-    m_methodCallMsg = std::make_unique<MethodCall>(methodCall);
-
-    return getProxy().callMethod(methodCall);
-}
-
 sdbus::PendingAsyncCall TestProxy::doOperationClientSideAsync(uint32_t param)
 {
-    return getProxy().callMethodAsync("doOperation")
+    return getProxy().callMethod("doOperation", async)
                      .onInterface(sdbus::test::INTERFACE_NAME)
                      .withArguments(param)
-                     .uponReplyInvoke([this](std::optional<sdbus::Error> error, uint32_t returnValue)
+                     .uponReplyInvoke([this](const sdbus::Error* error, uint32_t returnValue)
                                       {
-                                          this->onDoOperationReply(returnValue, std::move(error));
+                                          this->onDoOperationReply(returnValue, error);
                                       });
 }
 
-Slot TestProxy::doOperationClientSideAsync(uint32_t param, sdbus::return_slot_t)
-{
-    return getProxy().callMethodAsync("doOperation")
-                     .onInterface(sdbus::test::INTERFACE_NAME)
-                     .withArguments(param)
-                     .uponReplyInvoke([this](std::optional<sdbus::Error> error, uint32_t returnValue)
-                                      {
-                                          this->onDoOperationReply(returnValue, std::move(error));
-                                      }, sdbus::return_slot);
-}
-
 std::future<uint32_t> TestProxy::doOperationClientSideAsync(uint32_t param, with_future_t)
 {
-    return getProxy().callMethodAsync("doOperation")
+    return getProxy().callMethod("doOperation", async)
                      .onInterface(sdbus::test::INTERFACE_NAME)
                      .withArguments(param)
                      .getResultAsFuture<uint32_t>();
@@ -155,33 +133,25 @@ std::future<uint32_t> TestProxy::doOperationClientSideAsync(uint32_t param, with
 
 std::future<MethodReply> TestProxy::doOperationClientSideAsyncOnBasicAPILevel(uint32_t param)
 {
-    auto methodCall = getProxy().createMethodCall(sdbus::test::INTERFACE_NAME, sdbus::MethodName{"doOperation"});
+    auto methodCall = getProxy().createMethodCall(sdbus::test::INTERFACE_NAME, "doOperation");
     methodCall << param;
 
-    return getProxy().callMethodAsync(methodCall, sdbus::with_future);
-}
-
-std::future<std::map<int32_t, std::string>> TestProxy::doOperationWithLargeDataClientSideAsync(const std::map<int32_t, std::string>& largeParam, with_future_t)
-{
-    return getProxy().callMethodAsync("doOperationWithLargeData")
-                     .onInterface(sdbus::test::INTERFACE_NAME)
-                     .withArguments(largeParam)
-                     .getResultAsFuture<std::map<int32_t, std::string>>();
+    return getProxy().callMethod(methodCall, sdbus::with_future);
 }
 
 void TestProxy::doErroneousOperationClientSideAsync()
 {
-    getProxy().callMethodAsync("throwError")
+    getProxy().callMethod("throwError", async)
               .onInterface(sdbus::test::INTERFACE_NAME)
-              .uponReplyInvoke([this](std::optional<sdbus::Error> error)
+              .uponReplyInvoke([this](const sdbus::Error* error)
                                {
-                                   this->onDoOperationReply(0, std::move(error));
+                                   this->onDoOperationReply(0, error);
                                });
 }
 
 std::future<void> TestProxy::doErroneousOperationClientSideAsync(with_future_t)
 {
-    return getProxy().callMethodAsync("throwError")
+    return getProxy().callMethod("throwError", async)
                      .onInterface(sdbus::test::INTERFACE_NAME)
                      .getResultAsFuture<>();
 }
@@ -189,13 +159,13 @@ std::future<void> TestProxy::doErroneousOperationClientSideAsync(with_future_t)
 void TestProxy::doOperationClientSideAsyncWithTimeout(const std::chrono::microseconds &timeout, uint32_t param)
 {
     using namespace std::chrono_literals;
-    getProxy().callMethodAsync("doOperation")
+    getProxy().callMethod("doOperation", async)
               .onInterface(sdbus::test::INTERFACE_NAME)
               .withTimeout(timeout)
               .withArguments(param)
-              .uponReplyInvoke([this](std::optional<sdbus::Error> error, uint32_t returnValue)
+              .uponReplyInvoke([this](const sdbus::Error* error, uint32_t returnValue)
                                {
-                                   this->onDoOperationReply(returnValue, std::move(error));
+                                   this->onDoOperationReply(returnValue, error);
                                });
 }
 
@@ -208,9 +178,8 @@ int32_t TestProxy::callNonexistentMethod()
 
 int32_t TestProxy::callMethodOnNonexistentInterface()
 {
-    sdbus::InterfaceName nonexistentInterfaceName{"sdbuscpp.interface.that.does.not.exist"};
     int32_t result;
-    getProxy().callMethod("someMethod").onInterface(nonexistentInterfaceName).storeResultsTo(result);
+    getProxy().callMethod("someMethod").onInterface("sdbuscpp.interface.that.does.not.exist").storeResultsTo(result);
     return result;
 }
 

tests/integrationtests/TestProxy.h

@@ -1,6 +1,6 @@
 /**
  * (C) 2016 - 2021 KISTLER INSTRUMENTE AG, Winterthur, Switzerland
- * (C) 2016 - 2024 Stanislav Angelovic <stanislav.angelovic@protonmail.com>
+ * (C) 2016 - 2022 Stanislav Angelovic <stanislav.angelovic@protonmail.com>
  *
  * @file TestProxy.h
  *
@@ -40,7 +40,7 @@ namespace sdbus { namespace test {
 class ObjectManagerTestProxy final : public sdbus::ProxyInterfaces< sdbus::ObjectManager_proxy >
 {
 public:
-    ObjectManagerTestProxy(sdbus::IConnection& connection, ServiceName destination, ObjectPath objectPath)
+    ObjectManagerTestProxy(sdbus::IConnection& connection, std::string destination, std::string objectPath)
         : ProxyInterfaces(connection, std::move(destination), std::move(objectPath))
     {
         registerProxy();
@@ -51,21 +51,21 @@ public:
         unregisterProxy();
     }
 protected:
-    void onInterfacesAdded(const sdbus::ObjectPath& objectPath, const std::map<sdbus::InterfaceName, std::map<PropertyName, sdbus::Variant>>& interfacesAndProperties) override
+    void onInterfacesAdded(const sdbus::ObjectPath& objectPath, const std::map<std::string, std::map<std::string, sdbus::Variant>>& interfacesAndProperties) override
     {
         if (m_onInterfacesAddedHandler)
             m_onInterfacesAddedHandler(objectPath, interfacesAndProperties);
     }
 
-    void onInterfacesRemoved(const sdbus::ObjectPath& objectPath, const std::vector<sdbus::InterfaceName>& interfaces) override
+    void onInterfacesRemoved(const sdbus::ObjectPath& objectPath, const std::vector<std::string>& interfaces) override
     {
         if (m_onInterfacesRemovedHandler)
             m_onInterfacesRemovedHandler(objectPath, interfaces);
     }
 
 public: // for tests
-    std::function<void(const sdbus::ObjectPath&, const std::map<sdbus::InterfaceName, std::map<PropertyName, sdbus::Variant>>&)> m_onInterfacesAddedHandler;
-    std::function<void(const sdbus::ObjectPath&, const std::vector<sdbus::InterfaceName>&)> m_onInterfacesRemovedHandler;
+    std::function<void(const sdbus::ObjectPath&, const std::map<std::string, std::map<std::string, sdbus::Variant>>&)> m_onInterfacesAddedHandler;
+    std::function<void(const sdbus::ObjectPath&, const std::vector<std::string>&)> m_onInterfacesRemovedHandler;
 };
 
 class TestProxy final : public sdbus::ProxyInterfaces< org::sdbuscpp::integrationtests_proxy
@@ -74,9 +74,9 @@ class TestProxy final : public sdbus::ProxyInterfaces< org::sdbuscpp::integratio
                                                      , sdbus::Properties_proxy >
 {
 public:
-    TestProxy(ServiceName destination, ObjectPath objectPath);
-    TestProxy(ServiceName destination, ObjectPath objectPath, dont_run_event_loop_thread_t);
-    TestProxy(sdbus::IConnection& connection, ServiceName destination, ObjectPath objectPath);
+    TestProxy(std::string destination, std::string objectPath);
+    TestProxy(std::string destination, std::string objectPath, dont_run_event_loop_thread_t);
+    TestProxy(sdbus::IConnection& connection, std::string destination, std::string objectPath);
     ~TestProxy();
 
 protected:
@@ -85,21 +85,18 @@ protected:
     void onSignalWithVariant(const sdbus::Variant& aVariant) override;
 
     void onSignalWithoutRegistration(const sdbus::Struct<std::string, sdbus::Struct<sdbus::Signature>>& s);
-    void onDoOperationReply(uint32_t returnValue, std::optional<sdbus::Error> error);
+    void onDoOperationReply(uint32_t returnValue, const sdbus::Error* error);
 
     // Signals of standard D-Bus interfaces
-    void onPropertiesChanged( const sdbus::InterfaceName& interfaceName
-                            , const std::map<PropertyName, sdbus::Variant>& changedProperties
-                            , const std::vector<PropertyName>& invalidatedProperties ) override;
+    void onPropertiesChanged( const std::string& interfaceName
+                            , const std::map<std::string, sdbus::Variant>& changedProperties
+                            , const std::vector<std::string>& invalidatedProperties ) override;
 
 public:
-    void installDoOperationClientSideAsyncReplyHandler(std::function<void(uint32_t res, std::optional<sdbus::Error> err)> handler);
+    void installDoOperationClientSideAsyncReplyHandler(std::function<void(uint32_t res, const sdbus::Error* err)> handler);
     uint32_t doOperationWithTimeout(const std::chrono::microseconds &timeout, uint32_t param);
-    MethodReply doOperationOnBasicAPILevel(uint32_t param);
     sdbus::PendingAsyncCall doOperationClientSideAsync(uint32_t param);
-    [[nodiscard]] sdbus::Slot doOperationClientSideAsync(uint32_t param, sdbus::return_slot_t);
     std::future<uint32_t> doOperationClientSideAsync(uint32_t param, with_future_t);
-    std::future<std::map<int32_t, std::string>> doOperationWithLargeDataClientSideAsync(const std::map<int32_t, std::string>& largeParam, with_future_t);
     std::future<MethodReply> doOperationClientSideAsyncOnBasicAPILevel(uint32_t param);
     std::future<void> doErroneousOperationClientSideAsync(with_future_t);
     void doErroneousOperationClientSideAsync();
@@ -117,14 +114,13 @@ public: // for tests
     std::atomic<bool> m_gotSignalWithVariant{false};
     double m_variantFromSignal;
     std::atomic<bool> m_gotSignalWithSignature{false};
-    std::map<std::string, Signature> m_signatureFromSignal;
+    std::map<std::string, std::string> m_signatureFromSignal;
 
-    std::function<void(uint32_t res, std::optional<sdbus::Error> err)> m_DoOperationClientSideAsyncReplyHandler;
-    std::function<void(const sdbus::InterfaceName&, const std::map<PropertyName, sdbus::Variant>&, const std::vector<PropertyName>&)> m_onPropertiesChangedHandler;
+    std::function<void(uint32_t res, const sdbus::Error* err)> m_DoOperationClientSideAsyncReplyHandler;
+    std::function<void(const std::string&, const std::map<std::string, sdbus::Variant>&, const std::vector<std::string>&)> m_onPropertiesChangedHandler;
 
-    std::unique_ptr<const MethodCall> m_methodCallMsg;
     std::unique_ptr<const Message> m_signalMsg;
-    SignalName m_signalName;
+    std::string m_signalMemberName;
 };
 
 class DummyTestProxy final : public sdbus::ProxyInterfaces< org::sdbuscpp::integrationtests_proxy
@@ -133,7 +129,7 @@ class DummyTestProxy final : public sdbus::ProxyInterfaces< org::sdbuscpp::integ
                                                           , sdbus::Properties_proxy >
 {
 public:
-    DummyTestProxy(ServiceName destination, ObjectPath objectPath)
+    DummyTestProxy(std::string destination, std::string objectPath)
         : ProxyInterfaces(destination, objectPath)
     {
     }
@@ -144,10 +140,10 @@ protected:
     void onSignalWithVariant(const sdbus::Variant&) override {}
 
     void onSignalWithoutRegistration(const sdbus::Struct<std::string, sdbus::Struct<sdbus::Signature>>&) {}
-    void onDoOperationReply(uint32_t, std::optional<sdbus::Error>) {}
+    void onDoOperationReply(uint32_t, const sdbus::Error*) {}
 
     // Signals of standard D-Bus interfaces
-    void onPropertiesChanged(const InterfaceName&, const std::map<PropertyName, sdbus::Variant>&, const std::vector<PropertyName>&) override {}
+    void onPropertiesChanged( const std::string&, const std::map<std::string, sdbus::Variant>&, const std::vector<std::string>& ) override {}
 };
 
 }}

tests/integrationtests/integrationtests-adaptor.h

@@ -20,35 +20,33 @@ public:
 
 protected:
     integrationtests_adaptor(sdbus::IObject& object)
-        : m_object(object)
+        : object_(&object)
     {
     }
 
     integrationtests_adaptor(const integrationtests_adaptor&) = delete;
     integrationtests_adaptor& operator=(const integrationtests_adaptor&) = delete;
-    integrationtests_adaptor(integrationtests_adaptor&&) = delete;
-    integrationtests_adaptor& operator=(integrationtests_adaptor&&) = delete;
+    integrationtests_adaptor(integrationtests_adaptor&&) = default;
+    integrationtests_adaptor& operator=(integrationtests_adaptor&&) = default;
 
     ~integrationtests_adaptor() = default;
 
     void registerAdaptor()
     {
-        m_object.addVTable( sdbus::setInterfaceFlags().markAsDeprecated().withPropertyUpdateBehavior(sdbus::Flags::EMITS_NO_SIGNAL)
+        object_->addVTable( sdbus::setInterfaceFlags().markAsDeprecated().withPropertyUpdateBehavior(sdbus::Flags::EMITS_NO_SIGNAL)
                           , sdbus::registerMethod("noArgNoReturn").implementedAs([this](){ return this->noArgNoReturn(); })
                           , sdbus::registerMethod("getInt").withOutputParamNames("anInt").implementedAs([this](){ return this->getInt(); })
                           , sdbus::registerMethod("getTuple").withOutputParamNames("arg0", "arg1").implementedAs([this](){ return this->getTuple(); })
                           , sdbus::registerMethod("multiply").withInputParamNames("a", "b").withOutputParamNames("result").implementedAs([this](const int64_t& a, const double& b){ return this->multiply(a, b); })
                           , sdbus::registerMethod("multiplyWithNoReply").withInputParamNames("a", "b").implementedAs([this](const int64_t& a, const double& b){ return this->multiplyWithNoReply(a, b); }).markAsDeprecated().withNoReply()
                           , sdbus::registerMethod("getInts16FromStruct").withInputParamNames("arg0").withOutputParamNames("arg0").implementedAs([this](const sdbus::Struct<uint8_t, int16_t, double, std::string, std::vector<int16_t>>& arg0){ return this->getInts16FromStruct(arg0); })
-                          , sdbus::registerMethod("processVariant").withInputParamNames("variant").withOutputParamNames("result").implementedAs([this](const std::variant<int32_t, double, std::string>& variant){ return this->processVariant(variant); })
+                          , sdbus::registerMethod("processVariant").withInputParamNames("variant").withOutputParamNames("result").implementedAs([this](const sdbus::Variant& variant){ return this->processVariant(variant); })
                           , sdbus::registerMethod("getMapOfVariants").withInputParamNames("x", "y").withOutputParamNames("aMapOfVariants").implementedAs([this](const std::vector<int32_t>& x, const sdbus::Struct<sdbus::Variant, sdbus::Variant>& y){ return this->getMapOfVariants(x, y); })
                           , sdbus::registerMethod("getStructInStruct").withOutputParamNames("aMapOfVariants").implementedAs([this](){ return this->getStructInStruct(); })
                           , sdbus::registerMethod("sumStructItems").withInputParamNames("arg0", "arg1").withOutputParamNames("arg0").implementedAs([this](const sdbus::Struct<uint8_t, uint16_t>& arg0, const sdbus::Struct<int32_t, int64_t>& arg1){ return this->sumStructItems(arg0, arg1); })
                           , sdbus::registerMethod("sumArrayItems").withInputParamNames("arg0", "arg1").withOutputParamNames("arg0").implementedAs([this](const std::vector<uint16_t>& arg0, const std::array<uint64_t, 3>& arg1){ return this->sumArrayItems(arg0, arg1); })
                           , sdbus::registerMethod("doOperation").withInputParamNames("arg0").withOutputParamNames("arg0").implementedAs([this](const uint32_t& arg0){ return this->doOperation(arg0); })
-                          , sdbus::registerMethod("doOperationWithLargeData").withInputParamNames("largeMap").withOutputParamNames("largeMap").implementedAs([this](const std::map<int32_t, std::string>& largeMap){ return this->doOperationWithLargeData(largeMap); })
                           , sdbus::registerMethod("doOperationAsync").withInputParamNames("arg0").withOutputParamNames("arg0").implementedAs([this](sdbus::Result<uint32_t>&& result, uint32_t arg0){ this->doOperationAsync(std::move(result), std::move(arg0)); })
-                          , sdbus::registerMethod("doOperationAsyncWithLargeData").withInputParamNames("arg0", "largeMap").withOutputParamNames("largeMap").implementedAs([this](sdbus::Result<std::map<int32_t, std::string>>&& result, uint32_t arg0, const std::map<int32_t, std::string>& largeMap){ this->doOperationAsyncWithLargeData(std::move(result), std::move(arg0), largeMap); })
                           , sdbus::registerMethod("getSignature").withOutputParamNames("arg0").implementedAs([this](){ return this->getSignature(); })
                           , sdbus::registerMethod("getObjPath").withOutputParamNames("arg0").implementedAs([this](){ return this->getObjPath(); })
                           , sdbus::registerMethod("getUnixFd").withOutputParamNames("arg0").implementedAs([this](){ return this->getUnixFd(); })
@@ -57,13 +55,10 @@ protected:
                           , sdbus::registerMethod("throwErrorWithNoReply").implementedAs([this](){ return this->throwErrorWithNoReply(); }).withNoReply()
                           , sdbus::registerMethod("doPrivilegedStuff").implementedAs([this](){ return this->doPrivilegedStuff(); }).markAsPrivileged()
                           , sdbus::registerMethod("emitTwoSimpleSignals").implementedAs([this](){ return this->emitTwoSimpleSignals(); })
-                          , sdbus::registerMethod("sendLargeMessage").implementedAs([this](const std::map<int, std::string>& collection){ this->sendLargeMessage(collection); })
-                          , sdbus::registerMethod("returnDictionary").implementedAs([this](const std::map<std::string, sdbus::Variant>& dictionary){ return this->returnDictionary(dictionary); })
                           , sdbus::registerSignal("simpleSignal").markAsDeprecated()
                           , sdbus::registerSignal("signalWithMap").withParameters<std::map<int32_t, std::string>>("aMap")
                           , sdbus::registerSignal("signalWithVariant").withParameters<sdbus::Variant>("aVariant")
                           , sdbus::registerProperty("action").withGetter([this](){ return this->action(); }).withSetter([this](const uint32_t& value){ this->action(value); }).withUpdateBehavior(sdbus::Flags::EMITS_INVALIDATION_SIGNAL)
-                          , sdbus::registerProperty("actionVariant").withGetter([this](){ return this->actionVariant(); }).withSetter([this](const sdbus::Variant& value){ this->actionVariant(value); }).withUpdateBehavior(sdbus::Flags::EMITS_NO_SIGNAL)
                           , sdbus::registerProperty("blocking").withGetter([this](){ return this->blocking(); }).withSetter([this](const bool& value){ this->blocking(value); })
                           , sdbus::registerProperty("state").withGetter([this](){ return this->state(); }).markAsDeprecated().withUpdateBehavior(sdbus::Flags::CONST_PROPERTY_VALUE)
                           ).forInterface(INTERFACE_NAME);
@@ -72,17 +67,17 @@ protected:
 public:
     void emitSimpleSignal()
     {
-        m_object.emitSignal("simpleSignal").onInterface(INTERFACE_NAME);
+        object_->emitSignal("simpleSignal").onInterface(INTERFACE_NAME);
     }
 
     void emitSignalWithMap(const std::map<int32_t, std::string>& aMap)
     {
-        m_object.emitSignal("signalWithMap").onInterface(INTERFACE_NAME).withArguments(aMap);
+        object_->emitSignal("signalWithMap").onInterface(INTERFACE_NAME).withArguments(aMap);
     }
 
     void emitSignalWithVariant(const sdbus::Variant& aVariant)
     {
-        m_object.emitSignal("signalWithVariant").onInterface(INTERFACE_NAME).withArguments(aVariant);
+        object_->emitSignal("signalWithVariant").onInterface(INTERFACE_NAME).withArguments(aVariant);
     }
 
 private:
@@ -92,15 +87,13 @@ private:
     virtual double multiply(const int64_t& a, const double& b) = 0;
     virtual void multiplyWithNoReply(const int64_t& a, const double& b) = 0;
     virtual std::vector<int16_t> getInts16FromStruct(const sdbus::Struct<uint8_t, int16_t, double, std::string, std::vector<int16_t>>& arg0) = 0;
-    virtual sdbus::Variant processVariant(const std::variant<int32_t, double, std::string>& variant) = 0;
+    virtual sdbus::Variant processVariant(const sdbus::Variant& variant) = 0;
     virtual std::map<int32_t, sdbus::Variant> getMapOfVariants(const std::vector<int32_t>& x, const sdbus::Struct<sdbus::Variant, sdbus::Variant>& y) = 0;
     virtual sdbus::Struct<std::string, sdbus::Struct<std::map<int32_t, int32_t>>> getStructInStruct() = 0;
     virtual int32_t sumStructItems(const sdbus::Struct<uint8_t, uint16_t>& arg0, const sdbus::Struct<int32_t, int64_t>& arg1) = 0;
     virtual uint32_t sumArrayItems(const std::vector<uint16_t>& arg0, const std::array<uint64_t, 3>& arg1) = 0;
     virtual uint32_t doOperation(const uint32_t& arg0) = 0;
-    virtual std::map<int32_t, std::string> doOperationWithLargeData(const std::map<int32_t, std::string>& largeParam) = 0;
     virtual void doOperationAsync(sdbus::Result<uint32_t>&& result, uint32_t arg0) = 0;
-    virtual void doOperationAsyncWithLargeData(sdbus::Result<std::map<int32_t, std::string>>&& result, uint32_t arg0, const std::map<int32_t, std::string>& largeParam) = 0;
     virtual sdbus::Signature getSignature() = 0;
     virtual sdbus::ObjectPath getObjPath() = 0;
     virtual sdbus::UnixFd getUnixFd() = 0;
@@ -109,20 +102,16 @@ private:
     virtual void throwErrorWithNoReply() = 0;
     virtual void doPrivilegedStuff() = 0;
     virtual void emitTwoSimpleSignals() = 0;
-    virtual void sendLargeMessage(const std::map<int, std::string>& collection) = 0;
-    virtual std::map<std::string, sdbus::Variant> returnDictionary(const std::map<std::string, sdbus::Variant>& dict) = 0;
 
 private:
     virtual uint32_t action() = 0;
-    virtual sdbus::Variant actionVariant() = 0;
     virtual void action(const uint32_t& value) = 0;
-    virtual void actionVariant(const sdbus::Variant& value) = 0;
     virtual bool blocking() = 0;
     virtual void blocking(const bool& value) = 0;
     virtual std::string state() = 0;
 
 private:
-    sdbus::IObject& m_object;
+    sdbus::IObject* object_;
 };
 
 }} // namespaces

tests/integrationtests/integrationtests-proxy.h

@@ -20,22 +20,22 @@ public:
 
 protected:
     integrationtests_proxy(sdbus::IProxy& proxy)
-        : m_proxy(proxy)
+        : proxy_(&proxy)
     {
     }
 
     integrationtests_proxy(const integrationtests_proxy&) = delete;
     integrationtests_proxy& operator=(const integrationtests_proxy&) = delete;
-    integrationtests_proxy(integrationtests_proxy&&) = delete;
-    integrationtests_proxy& operator=(integrationtests_proxy&&) = delete;
+    integrationtests_proxy(integrationtests_proxy&&) = default;
+    integrationtests_proxy& operator=(integrationtests_proxy&&) = default;
 
     ~integrationtests_proxy() = default;
 
     void registerProxy()
     {
-        simpleSignalSlot_ = m_proxy.uponSignal("simpleSignal").onInterface(INTERFACE_NAME).call([this](){ this->onSimpleSignal(); }, sdbus::return_slot);
-        m_proxy.uponSignal("signalWithMap").onInterface(INTERFACE_NAME).call([this](const std::map<int32_t, std::string>& aMap){ this->onSignalWithMap(aMap); });
-        m_proxy.uponSignal("signalWithVariant").onInterface(INTERFACE_NAME).call([this](const sdbus::Variant& aVariant){ this->onSignalWithVariant(aVariant); });
+        simpleSignalSlot_ = proxy_->uponSignal("simpleSignal").onInterface(INTERFACE_NAME).call([this](){ this->onSimpleSignal(); }, sdbus::return_slot);
+        proxy_->uponSignal("signalWithMap").onInterface(INTERFACE_NAME).call([this](const std::map<int32_t, std::string>& aMap){ this->onSignalWithMap(aMap); });
+        proxy_->uponSignal("signalWithVariant").onInterface(INTERFACE_NAME).call([this](const sdbus::Variant& aVariant){ this->onSignalWithVariant(aVariant); });
     }
 
     virtual void onSimpleSignal() = 0;
@@ -45,163 +45,137 @@ protected:
 public:
     void noArgNoReturn()
     {
-        m_proxy.callMethod("noArgNoReturn").onInterface(INTERFACE_NAME);
+        proxy_->callMethod("noArgNoReturn").onInterface(INTERFACE_NAME);
     }
 
     int32_t getInt()
     {
         int32_t result;
-        m_proxy.callMethod("getInt").onInterface(INTERFACE_NAME).storeResultsTo(result);
+        proxy_->callMethod("getInt").onInterface(INTERFACE_NAME).storeResultsTo(result);
         return result;
     }
 
     std::tuple<uint32_t, std::string> getTuple()
     {
         std::tuple<uint32_t, std::string> result;
-        m_proxy.callMethod("getTuple").onInterface(INTERFACE_NAME).storeResultsTo(result);
+        proxy_->callMethod("getTuple").onInterface(INTERFACE_NAME).storeResultsTo(result);
         return result;
     }
 
     double multiply(const int64_t& a, const double& b)
     {
         double result;
-        m_proxy.callMethod("multiply").onInterface(INTERFACE_NAME).withArguments(a, b).storeResultsTo(result);
+        proxy_->callMethod("multiply").onInterface(INTERFACE_NAME).withArguments(a, b).storeResultsTo(result);
         return result;
     }
 
     void multiplyWithNoReply(const int64_t& a, const double& b)
     {
-        m_proxy.callMethod("multiplyWithNoReply").onInterface(INTERFACE_NAME).withArguments(a, b).dontExpectReply();
+        proxy_->callMethod("multiplyWithNoReply").onInterface(INTERFACE_NAME).withArguments(a, b).dontExpectReply();
     }
 
     std::vector<int16_t> getInts16FromStruct(const sdbus::Struct<uint8_t, int16_t, double, std::string, std::vector<int16_t>>& arg0)
     {
         std::vector<int16_t> result;
-        m_proxy.callMethod("getInts16FromStruct").onInterface(INTERFACE_NAME).withArguments(arg0).storeResultsTo(result);
+        proxy_->callMethod("getInts16FromStruct").onInterface(INTERFACE_NAME).withArguments(arg0).storeResultsTo(result);
         return result;
     }
 
     sdbus::Variant processVariant(const sdbus::Variant& variant)
     {
         sdbus::Variant result;
-        m_proxy.callMethod("processVariant").onInterface(INTERFACE_NAME).withArguments(variant).storeResultsTo(result);
-        return result;
-    }
-
-    std::variant<int32_t, double, std::string> processVariant(const std::variant<int32_t, double, std::string>& variant)
-    {
-        std::variant<int32_t, double, std::string> result;
-        m_proxy.callMethod("processVariant").onInterface(INTERFACE_NAME).withArguments(variant).storeResultsTo(result);
+        proxy_->callMethod("processVariant").onInterface(INTERFACE_NAME).withArguments(variant).storeResultsTo(result);
         return result;
     }
 
     std::map<int32_t, sdbus::Variant> getMapOfVariants(const std::vector<int32_t>& x, const sdbus::Struct<sdbus::Variant, sdbus::Variant>& y)
     {
         std::map<int32_t, sdbus::Variant> result;
-        m_proxy.callMethod("getMapOfVariants").onInterface(INTERFACE_NAME).withArguments(x, y).storeResultsTo(result);
+        proxy_->callMethod("getMapOfVariants").onInterface(INTERFACE_NAME).withArguments(x, y).storeResultsTo(result);
         return result;
     }
 
     sdbus::Struct<std::string, sdbus::Struct<std::map<int32_t, int32_t>>> getStructInStruct()
     {
         sdbus::Struct<std::string, sdbus::Struct<std::map<int32_t, int32_t>>> result;
-        m_proxy.callMethod("getStructInStruct").onInterface(INTERFACE_NAME).storeResultsTo(result);
+        proxy_->callMethod("getStructInStruct").onInterface(INTERFACE_NAME).storeResultsTo(result);
         return result;
     }
 
     int32_t sumStructItems(const sdbus::Struct<uint8_t, uint16_t>& arg0, const sdbus::Struct<int32_t, int64_t>& arg1)
     {
         int32_t result;
-        m_proxy.callMethod("sumStructItems").onInterface(INTERFACE_NAME).withArguments(arg0, arg1).storeResultsTo(result);
+        proxy_->callMethod("sumStructItems").onInterface(INTERFACE_NAME).withArguments(arg0, arg1).storeResultsTo(result);
         return result;
     }
 
     uint32_t sumArrayItems(const std::vector<uint16_t>& arg0, const std::array<uint64_t, 3>& arg1)
     {
         uint32_t result;
-        m_proxy.callMethod("sumArrayItems").onInterface(INTERFACE_NAME).withArguments(arg0, arg1).storeResultsTo(result);
+        proxy_->callMethod("sumArrayItems").onInterface(INTERFACE_NAME).withArguments(arg0, arg1).storeResultsTo(result);
         return result;
     }
 
     uint32_t doOperation(const uint32_t& arg0)
     {
         uint32_t result;
-        m_proxy.callMethod("doOperation").onInterface(INTERFACE_NAME).withArguments(arg0).storeResultsTo(result);
-        return result;
-    }
-
-    std::map<int32_t, std::string> doOperationWithLargeData(const std::map<int32_t, std::string>& largeParam)
-    {
-        std::map<int32_t, std::string> result;
-        m_proxy.callMethod("doOperationWithLargeData").onInterface(INTERFACE_NAME).withArguments(largeParam).storeResultsTo(result);
+        proxy_->callMethod("doOperation").onInterface(INTERFACE_NAME).withArguments(arg0).storeResultsTo(result);
         return result;
     }
 
     uint32_t doOperationAsync(const uint32_t& arg0)
     {
         uint32_t result;
-        m_proxy.callMethod("doOperationAsync").onInterface(INTERFACE_NAME).withArguments(arg0).storeResultsTo(result);
-        return result;
-    }
-
-    std::map<int32_t, std::string> doOperationAsyncWithLargeData(const uint32_t& arg0, const std::map<int32_t, std::string>& largeParam)
-    {
-        std::map<int32_t, std::string> result;
-        m_proxy.callMethod("doOperationAsyncWithLargeData").onInterface(INTERFACE_NAME).withArguments(arg0, largeParam).storeResultsTo(result);
+        proxy_->callMethod("doOperationAsync").onInterface(INTERFACE_NAME).withArguments(arg0).storeResultsTo(result);
         return result;
     }
 
     sdbus::Signature getSignature()
     {
         sdbus::Signature result;
-        m_proxy.callMethod("getSignature").onInterface(INTERFACE_NAME).storeResultsTo(result);
+        proxy_->callMethod("getSignature").onInterface(INTERFACE_NAME).storeResultsTo(result);
         return result;
     }
 
     sdbus::ObjectPath getObjPath()
     {
         sdbus::ObjectPath result;
-        m_proxy.callMethod("getObjPath").onInterface(INTERFACE_NAME).storeResultsTo(result);
+        proxy_->callMethod("getObjPath").onInterface(INTERFACE_NAME).storeResultsTo(result);
         return result;
     }
 
     sdbus::UnixFd getUnixFd()
     {
         sdbus::UnixFd result;
-        m_proxy.callMethod("getUnixFd").onInterface(INTERFACE_NAME).storeResultsTo(result);
+        proxy_->callMethod("getUnixFd").onInterface(INTERFACE_NAME).storeResultsTo(result);
         return result;
     }
 
     std::map<uint64_t, sdbus::Struct<std::map<uint8_t, std::vector<sdbus::Struct<sdbus::ObjectPath, bool, sdbus::Variant, std::unordered_map<int32_t, std::string>>>>, sdbus::Signature, std::string>> getComplex()
     {
         std::map<uint64_t, sdbus::Struct<std::map<uint8_t, std::vector<sdbus::Struct<sdbus::ObjectPath, bool, sdbus::Variant, std::unordered_map<int32_t, std::string>>>>, sdbus::Signature, std::string>> result;
-        m_proxy.callMethod("getComplex").onInterface(INTERFACE_NAME).storeResultsTo(result);
+        proxy_->callMethod("getComplex").onInterface(INTERFACE_NAME).storeResultsTo(result);
         return result;
     }
 
     void throwError()
     {
-        m_proxy.callMethod("throwError").onInterface(INTERFACE_NAME);
+        proxy_->callMethod("throwError").onInterface(INTERFACE_NAME);
     }
 
     void throwErrorWithNoReply()
     {
-        m_proxy.callMethod("throwErrorWithNoReply").onInterface(INTERFACE_NAME).dontExpectReply();
+        proxy_->callMethod("throwErrorWithNoReply").onInterface(INTERFACE_NAME).dontExpectReply();
     }
 
     void doPrivilegedStuff()
     {
-        m_proxy.callMethod("doPrivilegedStuff").onInterface(INTERFACE_NAME);
+        proxy_->callMethod("doPrivilegedStuff").onInterface(INTERFACE_NAME);
     }
 
     void emitTwoSimpleSignals()
     {
-        m_proxy.callMethod("emitTwoSimpleSignals").onInterface(INTERFACE_NAME);
-    }
-
-    void sendLargeMessage(const std::map<int, std::string>& collection)
-    {
-        m_proxy.callMethod("sendLargeMessage").onInterface(INTERFACE_NAME).withArguments(collection);
+        proxy_->callMethod("emitTwoSimpleSignals").onInterface(INTERFACE_NAME);
     }
 
     void unregisterSimpleSignalHandler()
@@ -211,47 +185,37 @@ public:
 
     void reRegisterSimpleSignalHandler()
     {
-        simpleSignalSlot_ = m_proxy.uponSignal("simpleSignal").onInterface(INTERFACE_NAME).call([this](){ this->onSimpleSignal(); }, sdbus::return_slot);
+        simpleSignalSlot_ = proxy_->uponSignal("simpleSignal").onInterface(INTERFACE_NAME).call([this](){ this->onSimpleSignal(); }, sdbus::return_slot);
     }
 
 public:
     uint32_t action()
     {
-        return m_proxy.getProperty("action").onInterface(INTERFACE_NAME).get<uint32_t>();
+        return proxy_->getProperty("action").onInterface(INTERFACE_NAME);
     }
 
     void action(const uint32_t& value)
     {
-        m_proxy.setProperty("action").onInterface(INTERFACE_NAME).toValue(value);
-    }
-
-    sdbus::Variant actionVariant()
-    {
-        return m_proxy.getProperty("actionVariant").onInterface(INTERFACE_NAME).get<sdbus::Variant>();
-    }
-
-    void actionVariant(const sdbus::Variant& value)
-    {
-        m_proxy.setProperty("actionVariant").onInterface(INTERFACE_NAME).toValue({value, sdbus::embed_variant});
+        proxy_->setProperty("action").onInterface(INTERFACE_NAME).toValue(value);
     }
 
     bool blocking()
     {
-        return m_proxy.getProperty("blocking").onInterface(INTERFACE_NAME).get<bool>();
+        return proxy_->getProperty("blocking").onInterface(INTERFACE_NAME);
     }
 
     void blocking(const bool& value)
     {
-        m_proxy.setProperty("blocking").onInterface(INTERFACE_NAME).toValue(value);
+        proxy_->setProperty("blocking").onInterface(INTERFACE_NAME).toValue(value);
     }
 
     std::string state()
     {
-        return m_proxy.getProperty("state").onInterface(INTERFACE_NAME).get<std::string>();
+        return proxy_->getProperty("state").onInterface(INTERFACE_NAME);
     }
 
 private:
-    sdbus::IProxy& m_proxy;
+    sdbus::IProxy* proxy_;
     sdbus::Slot simpleSignalSlot_;
 };
 

tests/integrationtests/sdbus-c++-integration-tests.cpp

@@ -1,6 +1,6 @@
 /**
  * (C) 2016 - 2021 KISTLER INSTRUMENTE AG, Winterthur, Switzerland
- * (C) 2016 - 2024 Stanislav Angelovic <stanislav.angelovic@protonmail.com>
+ * (C) 2016 - 2022 Stanislav Angelovic <stanislav.angelovic@protonmail.com>
  *
  * @file sdbus-c++-integration-tests.cpp
  *

tests/perftests/client.cpp

@@ -1,6 +1,5 @@
 /**
- * (C) 2016 - 2021 KISTLER INSTRUMENTE AG, Winterthur, Switzerland
- * (C) 2016 - 2024 Stanislav Angelovic <stanislav.angelovic@protonmail.com>
+ * (C) 2019 KISTLER INSTRUMENTE AG, Winterthur, Switzerland
  *
  * @file client.cpp
  *
@@ -43,7 +42,7 @@ uint64_t totalDuration = 0;
 class PerftestProxy final : public sdbus::ProxyInterfaces<org::sdbuscpp::perftests_proxy>
 {
 public:
-    PerftestProxy(sdbus::ServiceName destination, sdbus::ObjectPath objectPath)
+    PerftestProxy(std::string destination, std::string objectPath)
         : ProxyInterfaces(std::move(destination), std::move(objectPath))
     {
         registerProxy();
@@ -101,9 +100,9 @@ std::string createRandomString(size_t length)
 //-----------------------------------------
 int main(int /*argc*/, char */*argv*/[])
 {
-    sdbus::ServiceName destination{"org.sdbuscpp.perftests"};
-    sdbus::ObjectPath objectPath{"/org/sdbuscpp/perftests"};
-    PerftestProxy client(std::move(destination), std::move(objectPath));
+    const char* destinationName = "org.sdbuscpp.perftests";
+    const char* objectPath = "/org/sdbuscpp/perftests";
+    PerftestProxy client(destinationName, objectPath);
 
     const unsigned int repetitions{20};
     unsigned int msgCount = 1000;

tests/perftests/perftests-adaptor.h

@@ -20,20 +20,20 @@ public:
 
 protected:
     perftests_adaptor(sdbus::IObject& object)
-        : m_object(object)
+        : object_(&object)
     {
     }
 
     perftests_adaptor(const perftests_adaptor&) = delete;
     perftests_adaptor& operator=(const perftests_adaptor&) = delete;
-    perftests_adaptor(perftests_adaptor&&) = delete;
-    perftests_adaptor& operator=(perftests_adaptor&&) = delete;
+    perftests_adaptor(perftests_adaptor&&) = default;
+    perftests_adaptor& operator=(perftests_adaptor&&) = default;
 
     ~perftests_adaptor() = default;
 
     void registerAdaptor()
     {
-        m_object.addVTable( sdbus::registerMethod("sendDataSignals").withInputParamNames("numberOfSignals", "signalMsgSize").implementedAs([this](const uint32_t& numberOfSignals, const uint32_t& signalMsgSize){ return this->sendDataSignals(numberOfSignals, signalMsgSize); })
+        object_->addVTable( sdbus::registerMethod("sendDataSignals").withInputParamNames("numberOfSignals", "signalMsgSize").implementedAs([this](const uint32_t& numberOfSignals, const uint32_t& signalMsgSize){ return this->sendDataSignals(numberOfSignals, signalMsgSize); })
                           , sdbus::registerMethod("concatenateTwoStrings").withInputParamNames("string1", "string2").withOutputParamNames("result").implementedAs([this](const std::string& string1, const std::string& string2){ return this->concatenateTwoStrings(string1, string2); })
                           , sdbus::registerSignal("dataSignal").withParameters<std::string>("data")
                           ).forInterface(INTERFACE_NAME);
@@ -42,7 +42,7 @@ protected:
 public:
     void emitDataSignal(const std::string& data)
     {
-        m_object.emitSignal("dataSignal").onInterface(INTERFACE_NAME).withArguments(data);
+        object_->emitSignal("dataSignal").onInterface(INTERFACE_NAME).withArguments(data);
     }
 
 private:
@@ -50,7 +50,7 @@ private:
     virtual std::string concatenateTwoStrings(const std::string& string1, const std::string& string2) = 0;
 
 private:
-    sdbus::IObject& m_object;
+    sdbus::IObject* object_;
 };
 
 }} // namespaces

tests/perftests/perftests-proxy.h

@@ -20,20 +20,20 @@ public:
 
 protected:
     perftests_proxy(sdbus::IProxy& proxy)
-        : m_proxy(proxy)
+        : proxy_(&proxy)
     {
     }
 
     perftests_proxy(const perftests_proxy&) = delete;
     perftests_proxy& operator=(const perftests_proxy&) = delete;
-    perftests_proxy(perftests_proxy&&) = delete;
-    perftests_proxy& operator=(perftests_proxy&&) = delete;
+    perftests_proxy(perftests_proxy&&) = default;
+    perftests_proxy& operator=(perftests_proxy&&) = default;
 
     ~perftests_proxy() = default;
 
     void registerProxy()
     {
-        m_proxy.uponSignal("dataSignal").onInterface(INTERFACE_NAME).call([this](const std::string& data){ this->onDataSignal(data); });
+        proxy_->uponSignal("dataSignal").onInterface(INTERFACE_NAME).call([this](const std::string& data){ this->onDataSignal(data); });
     }
 
     virtual void onDataSignal(const std::string& data) = 0;
@@ -41,18 +41,18 @@ protected:
 public:
     void sendDataSignals(const uint32_t& numberOfSignals, const uint32_t& signalMsgSize)
     {
-        m_proxy.callMethod("sendDataSignals").onInterface(INTERFACE_NAME).withArguments(numberOfSignals, signalMsgSize);
+        proxy_->callMethod("sendDataSignals").onInterface(INTERFACE_NAME).withArguments(numberOfSignals, signalMsgSize);
     }
 
     std::string concatenateTwoStrings(const std::string& string1, const std::string& string2)
     {
         std::string result;
-        m_proxy.callMethod("concatenateTwoStrings").onInterface(INTERFACE_NAME).withArguments(string1, string2).storeResultsTo(result);
+        proxy_->callMethod("concatenateTwoStrings").onInterface(INTERFACE_NAME).withArguments(string1, string2).storeResultsTo(result);
         return result;
     }
 
 private:
-    sdbus::IProxy& m_proxy;
+    sdbus::IProxy* proxy_;
 };
 
 }} // namespaces

tests/perftests/server.cpp

@@ -1,6 +1,5 @@
 /**
- * (C) 2016 - 2021 KISTLER INSTRUMENTE AG, Winterthur, Switzerland
- * (C) 2016 - 2024 Stanislav Angelovic <stanislav.angelovic@protonmail.com>
+ * (C) 2019 KISTLER INSTRUMENTE AG, Winterthur, Switzerland
  *
  * @file server.cpp
  *
@@ -40,7 +39,7 @@ std::string createRandomString(size_t length);
 class PerftestAdaptor final : public sdbus::AdaptorInterfaces<org::sdbuscpp::perftests_adaptor>
 {
 public:
-    PerftestAdaptor(sdbus::IConnection& connection, sdbus::ObjectPath objectPath)
+    PerftestAdaptor(sdbus::IConnection& connection, std::string objectPath)
         : AdaptorInterfaces(connection, std::move(objectPath))
     {
         registerAdaptor();
@@ -92,11 +91,11 @@ std::string createRandomString(size_t length)
 //-----------------------------------------
 int main(int /*argc*/, char */*argv*/[])
 {
-    sdbus::ServiceName serviceName{"org.sdbuscpp.perftests"};
+    const char* serviceName = "org.sdbuscpp.perftests";
     auto connection = sdbus::createSystemBusConnection(serviceName);
 
-    sdbus::ObjectPath objectPath{"/org/sdbuscpp/perftests"};
-    PerftestAdaptor server(*connection, std::move(objectPath));
+    const char* objectPath = "/org/sdbuscpp/perftests";
+    PerftestAdaptor server(*connection, objectPath);
 
     connection->enterEventLoop();
 }

tests/stresstests/celsius-thermometer-adaptor.h

@@ -22,27 +22,27 @@ public:
 
 protected:
     thermometer_adaptor(sdbus::IObject& object)
-        : m_object(object)
+        : object_(&object)
     {
     }
 
     thermometer_adaptor(const thermometer_adaptor&) = delete;
     thermometer_adaptor& operator=(const thermometer_adaptor&) = delete;
-    thermometer_adaptor(thermometer_adaptor&&) = delete;
-    thermometer_adaptor& operator=(thermometer_adaptor&&) = delete;
+    thermometer_adaptor(thermometer_adaptor&&) = default;
+    thermometer_adaptor& operator=(thermometer_adaptor&&) = default;
 
     ~thermometer_adaptor() = default;
 
     void registerAdaptor()
     {
-        m_object.addVTable(sdbus::registerMethod("getCurrentTemperature").withOutputParamNames("result").implementedAs([this](){ return this->getCurrentTemperature(); })).forInterface(INTERFACE_NAME);
+        object_->addVTable(sdbus::registerMethod("getCurrentTemperature").withOutputParamNames("result").implementedAs([this](){ return this->getCurrentTemperature(); })).forInterface(INTERFACE_NAME);
     }
 
 private:
     virtual uint32_t getCurrentTemperature() = 0;
 
 private:
-    sdbus::IObject& m_object;
+    sdbus::IObject* object_;
 };
 
 }}}} // namespaces

tests/stresstests/celsius-thermometer-proxy.h

@@ -22,14 +22,14 @@ public:
 
 protected:
     thermometer_proxy(sdbus::IProxy& proxy)
-        : m_proxy(proxy)
+        : proxy_(&proxy)
     {
     }
 
     thermometer_proxy(const thermometer_proxy&) = delete;
     thermometer_proxy& operator=(const thermometer_proxy&) = delete;
-    thermometer_proxy(thermometer_proxy&&) = delete;
-    thermometer_proxy& operator=(thermometer_proxy&&) = delete;
+    thermometer_proxy(thermometer_proxy&&) = default;
+    thermometer_proxy& operator=(thermometer_proxy&&) = default;
 
     ~thermometer_proxy() = default;
 
@@ -41,12 +41,12 @@ public:
     uint32_t getCurrentTemperature()
     {
         uint32_t result;
-        m_proxy.callMethod("getCurrentTemperature").onInterface(INTERFACE_NAME).storeResultsTo(result);
+        proxy_->callMethod("getCurrentTemperature").onInterface(INTERFACE_NAME).storeResultsTo(result);
         return result;
     }
 
 private:
-    sdbus::IProxy& m_proxy;
+    sdbus::IProxy* proxy_;
 };
 
 }}}} // namespaces

tests/stresstests/concatenator-adaptor.h

@@ -21,20 +21,20 @@ public:
 
 protected:
     concatenator_adaptor(sdbus::IObject& object)
-        : m_object(object)
+        : object_(&object)
     {
     }
 
     concatenator_adaptor(const concatenator_adaptor&) = delete;
     concatenator_adaptor& operator=(const concatenator_adaptor&) = delete;
-    concatenator_adaptor(concatenator_adaptor&&) = delete;
-    concatenator_adaptor& operator=(concatenator_adaptor&&) = delete;
+    concatenator_adaptor(concatenator_adaptor&&) = default;
+    concatenator_adaptor& operator=(concatenator_adaptor&&) = default;
 
     ~concatenator_adaptor() = default;
 
     void registerAdaptor()
     {
-        m_object.addVTable( sdbus::registerMethod("concatenate").withInputParamNames("params").withOutputParamNames("result").implementedAs([this](sdbus::Result<std::string>&& result, std::map<std::string, sdbus::Variant> params){ this->concatenate(std::move(result), std::move(params)); })
+        object_->addVTable( sdbus::registerMethod("concatenate").withInputParamNames("params").withOutputParamNames("result").implementedAs([this](sdbus::Result<std::string>&& result, std::map<std::string, sdbus::Variant> params){ this->concatenate(std::move(result), std::move(params)); })
                           , sdbus::registerSignal("concatenatedSignal").withParameters<std::string>("concatenatedString")
                           ).forInterface(INTERFACE_NAME);
     }
@@ -42,14 +42,14 @@ protected:
 public:
     void emitConcatenatedSignal(const std::string& concatenatedString)
     {
-        m_object.emitSignal("concatenatedSignal").onInterface(INTERFACE_NAME).withArguments(concatenatedString);
+        object_->emitSignal("concatenatedSignal").onInterface(INTERFACE_NAME).withArguments(concatenatedString);
     }
 
 private:
     virtual void concatenate(sdbus::Result<std::string>&& result, std::map<std::string, sdbus::Variant> params) = 0;
 
 private:
-    sdbus::IObject& m_object;
+    sdbus::IObject* object_;
 };
 
 }}} // namespaces

tests/stresstests/concatenator-proxy.h

@@ -21,34 +21,35 @@ public:
 
 protected:
     concatenator_proxy(sdbus::IProxy& proxy)
-        : m_proxy(proxy)
+        : proxy_(&proxy)
     {
     }
 
     concatenator_proxy(const concatenator_proxy&) = delete;
     concatenator_proxy& operator=(const concatenator_proxy&) = delete;
-    concatenator_proxy(concatenator_proxy&&) = delete;
-    concatenator_proxy& operator=(concatenator_proxy&&) = delete;
+    concatenator_proxy(concatenator_proxy&&) = default;
+    concatenator_proxy& operator=(concatenator_proxy&&) = default;
 
     ~concatenator_proxy() = default;
 
     void registerProxy()
     {
-        m_proxy.uponSignal("concatenatedSignal").onInterface(INTERFACE_NAME).call([this](const std::string& concatenatedString){ this->onConcatenatedSignal(concatenatedString); });
+        proxy_->uponSignal("concatenatedSignal").onInterface(INTERFACE_NAME).call([this](const std::string& concatenatedString){ this->onConcatenatedSignal(concatenatedString); });
     }
 
     virtual void onConcatenatedSignal(const std::string& concatenatedString) = 0;
 
-    virtual void onConcatenateReply(const std::string& result, std::optional<sdbus::Error> error) = 0;
+    virtual void onConcatenateReply(const std::string& result, const sdbus::Error* error) = 0;
 
 public:
     sdbus::PendingAsyncCall concatenate(const std::map<std::string, sdbus::Variant>& params)
     {
-        return m_proxy.callMethodAsync("concatenate").onInterface(INTERFACE_NAME).withArguments(params).uponReplyInvoke([this](std::optional<sdbus::Error> error, const std::string& result){ this->onConcatenateReply(result, std::move(error)); });
+        using sdbus::async;
+        return proxy_->callMethod("concatenate", async).onInterface(INTERFACE_NAME).withArguments(params).uponReplyInvoke([this](const sdbus::Error* error, const std::string& result){ this->onConcatenateReply(result, error); });
     }
 
 private:
-    sdbus::IProxy& m_proxy;
+    sdbus::IProxy* proxy_;
 };
 
 }}} // namespaces

tests/stresstests/fahrenheit-thermometer-adaptor.h

@@ -22,27 +22,27 @@ public:
 
 protected:
     thermometer_adaptor(sdbus::IObject& object)
-        : m_object(object)
+        : object_(&object)
     {
     }
 
     thermometer_adaptor(const thermometer_adaptor&) = delete;
     thermometer_adaptor& operator=(const thermometer_adaptor&) = delete;
-    thermometer_adaptor(thermometer_adaptor&&) = delete;
-    thermometer_adaptor& operator=(thermometer_adaptor&&) = delete;
+    thermometer_adaptor(thermometer_adaptor&&) = default;
+    thermometer_adaptor& operator=(thermometer_adaptor&&) = default;
 
     ~thermometer_adaptor() = default;
 
     void registerAdaptor()
     {
-        m_object.addVTable(sdbus::registerMethod("getCurrentTemperature").withOutputParamNames("result").implementedAs([this](){ return this->getCurrentTemperature(); })).forInterface(INTERFACE_NAME);
+        object_->addVTable(sdbus::registerMethod("getCurrentTemperature").withOutputParamNames("result").implementedAs([this](){ return this->getCurrentTemperature(); })).forInterface(INTERFACE_NAME);
     }
 
 private:
     virtual uint32_t getCurrentTemperature() = 0;
 
 private:
-    sdbus::IObject& m_object;
+    sdbus::IObject* object_;
 };
 
 }}}} // namespaces
@@ -60,20 +60,20 @@ public:
 
 protected:
     factory_adaptor(sdbus::IObject& object)
-        : m_object(object)
+        : object_(&object)
     {
     }
 
     factory_adaptor(const factory_adaptor&) = delete;
     factory_adaptor& operator=(const factory_adaptor&) = delete;
-    factory_adaptor(factory_adaptor&&) = delete;
-    factory_adaptor& operator=(factory_adaptor&&) = delete;
+    factory_adaptor(factory_adaptor&&) = default;
+    factory_adaptor& operator=(factory_adaptor&&) = default;
 
     ~factory_adaptor() = default;
 
     void registerAdaptor()
     {
-        m_object.addVTable( sdbus::registerMethod("createDelegateObject").withOutputParamNames("delegate").implementedAs([this](sdbus::Result<sdbus::ObjectPath>&& result){ this->createDelegateObject(std::move(result)); })
+        object_->addVTable( sdbus::registerMethod("createDelegateObject").withOutputParamNames("delegate").implementedAs([this](sdbus::Result<sdbus::ObjectPath>&& result){ this->createDelegateObject(std::move(result)); })
                           , sdbus::registerMethod("destroyDelegateObject").withInputParamNames("delegate").implementedAs([this](sdbus::Result<>&& result, sdbus::ObjectPath delegate){ this->destroyDelegateObject(std::move(result), std::move(delegate)); }).withNoReply()
                           ).forInterface(INTERFACE_NAME);
     }
@@ -83,7 +83,7 @@ private:
     virtual void destroyDelegateObject(sdbus::Result<>&& result, sdbus::ObjectPath delegate) = 0;
 
 private:
-    sdbus::IObject& m_object;
+    sdbus::IObject* object_;
 };
 
 }}}}} // namespaces

tests/stresstests/fahrenheit-thermometer-proxy.h

@@ -22,14 +22,14 @@ public:
 
 protected:
     thermometer_proxy(sdbus::IProxy& proxy)
-        : m_proxy(proxy)
+        : proxy_(&proxy)
     {
     }
 
     thermometer_proxy(const thermometer_proxy&) = delete;
     thermometer_proxy& operator=(const thermometer_proxy&) = delete;
-    thermometer_proxy(thermometer_proxy&&) = delete;
-    thermometer_proxy& operator=(thermometer_proxy&&) = delete;
+    thermometer_proxy(thermometer_proxy&&) = default;
+    thermometer_proxy& operator=(thermometer_proxy&&) = default;
 
     ~thermometer_proxy() = default;
 
@@ -41,12 +41,12 @@ public:
     uint32_t getCurrentTemperature()
     {
         uint32_t result;
-        m_proxy.callMethod("getCurrentTemperature").onInterface(INTERFACE_NAME).storeResultsTo(result);
+        proxy_->callMethod("getCurrentTemperature").onInterface(INTERFACE_NAME).storeResultsTo(result);
         return result;
     }
 
 private:
-    sdbus::IProxy& m_proxy;
+    sdbus::IProxy* proxy_;
 };
 
 }}}} // namespaces
@@ -64,14 +64,14 @@ public:
 
 protected:
     factory_proxy(sdbus::IProxy& proxy)
-        : m_proxy(proxy)
+        : proxy_(&proxy)
     {
     }
 
     factory_proxy(const factory_proxy&) = delete;
     factory_proxy& operator=(const factory_proxy&) = delete;
-    factory_proxy(factory_proxy&&) = delete;
-    factory_proxy& operator=(factory_proxy&&) = delete;
+    factory_proxy(factory_proxy&&) = default;
+    factory_proxy& operator=(factory_proxy&&) = default;
 
     ~factory_proxy() = default;
 
@@ -83,17 +83,17 @@ public:
     sdbus::ObjectPath createDelegateObject()
     {
         sdbus::ObjectPath result;
-        m_proxy.callMethod("createDelegateObject").onInterface(INTERFACE_NAME).storeResultsTo(result);
+        proxy_->callMethod("createDelegateObject").onInterface(INTERFACE_NAME).storeResultsTo(result);
         return result;
     }
 
     void destroyDelegateObject(const sdbus::ObjectPath& delegate)
     {
-        m_proxy.callMethod("destroyDelegateObject").onInterface(INTERFACE_NAME).withArguments(delegate).dontExpectReply();
+        proxy_->callMethod("destroyDelegateObject").onInterface(INTERFACE_NAME).withArguments(delegate).dontExpectReply();
     }
 
 private:
-    sdbus::IProxy& m_proxy;
+    sdbus::IProxy* proxy_;
 };
 
 }}}}} // namespaces

tests/stresstests/sdbus-c++-stress-tests.cpp

@@ -1,6 +1,5 @@
 /**
- * (C) 2016 - 2021 KISTLER INSTRUMENTE AG, Winterthur, Switzerland
- * (C) 2016 - 2024 Stanislav Angelovic <stanislav.angelovic@protonmail.com>
+ * (C) 2019 KISTLER INSTRUMENTE AG, Winterthur, Switzerland
  *
  * @file sdbus-c++-stress-tests.cpp
  *
@@ -46,17 +45,18 @@
 #include <queue>
 
 using namespace std::chrono_literals;
+using namespace std::string_literals;
 
-const sdbus::ServiceName SERVICE_1_BUS_NAME{"org.sdbuscpp.stresstests.service1"};
-const sdbus::ServiceName SERVICE_2_BUS_NAME{"org.sdbuscpp.stresstests.service2"};
-const sdbus::ObjectPath CELSIUS_THERMOMETER_OBJECT_PATH{"/org/sdbuscpp/stresstests/celsius/thermometer"};
-const sdbus::ObjectPath FAHRENHEIT_THERMOMETER_OBJECT_PATH{"/org/sdbuscpp/stresstests/fahrenheit/thermometer"};
-const sdbus::ObjectPath CONCATENATOR_OBJECT_PATH{"/org/sdbuscpp/stresstests/concatenator"};
+#define SERVICE_1_BUS_NAME "org.sdbuscpp.stresstests.service1"s
+#define SERVICE_2_BUS_NAME "org.sdbuscpp.stresstests.service2"s
+#define CELSIUS_THERMOMETER_OBJECT_PATH "/org/sdbuscpp/stresstests/celsius/thermometer"s
+#define FAHRENHEIT_THERMOMETER_OBJECT_PATH "/org/sdbuscpp/stresstests/fahrenheit/thermometer"s
+#define CONCATENATOR_OBJECT_PATH "/org/sdbuscpp/stresstests/concatenator"s
 
 class CelsiusThermometerAdaptor final : public sdbus::AdaptorInterfaces<org::sdbuscpp::stresstests::celsius::thermometer_adaptor>
 {
 public:
-    CelsiusThermometerAdaptor(sdbus::IConnection& connection, sdbus::ObjectPath objectPath)
+    CelsiusThermometerAdaptor(sdbus::IConnection& connection, std::string objectPath)
         : AdaptorInterfaces(connection, std::move(objectPath))
     {
         registerAdaptor();
@@ -80,7 +80,7 @@ private:
 class CelsiusThermometerProxy : public sdbus::ProxyInterfaces<org::sdbuscpp::stresstests::celsius::thermometer_proxy>
 {
 public:
-    CelsiusThermometerProxy(sdbus::IConnection& connection, sdbus::ServiceName destination, sdbus::ObjectPath objectPath)
+    CelsiusThermometerProxy(sdbus::IConnection& connection, std::string destination, std::string objectPath)
         : ProxyInterfaces(connection, std::move(destination), std::move(objectPath))
     {
         registerProxy();
@@ -96,7 +96,7 @@ class FahrenheitThermometerAdaptor final : public sdbus::AdaptorInterfaces< org:
                                                                           , org::sdbuscpp::stresstests::fahrenheit::thermometer::factory_adaptor >
 {
 public:
-    FahrenheitThermometerAdaptor(sdbus::IConnection& connection, sdbus::ObjectPath objectPath, bool isDelegate)
+    FahrenheitThermometerAdaptor(sdbus::IConnection& connection, std::string objectPath, bool isDelegate)
         : AdaptorInterfaces(connection, std::move(objectPath))
         , celsiusProxy_(connection, SERVICE_2_BUS_NAME, CELSIUS_THERMOMETER_OBJECT_PATH)
     {
@@ -127,7 +127,7 @@ public:
                         {
                             // Create new delegate object
                             auto& connection = getObject().getConnection();
-                            sdbus::ObjectPath newObjectPath{FAHRENHEIT_THERMOMETER_OBJECT_PATH + "/" + std::to_string(request.objectNr)};
+                            sdbus::ObjectPath newObjectPath = FAHRENHEIT_THERMOMETER_OBJECT_PATH + "/" + std::to_string(request.objectNr);
 
                             // Here we are testing dynamic creation of a D-Bus object in an async way
                             auto adaptor = std::make_unique<FahrenheitThermometerAdaptor>(connection, newObjectPath, true);
@@ -175,7 +175,7 @@ protected:
         objectCounter++;
 
         std::unique_lock<std::mutex> lock(mutex_);
-        requests_.push(WorkItem{objectCounter, {}, std::move(result)});
+        requests_.push(WorkItem{objectCounter, std::string{}, std::move(result)});
         lock.unlock();
         cond_.notify_one();
     }
@@ -190,7 +190,7 @@ protected:
 
 private:
     CelsiusThermometerProxy celsiusProxy_;
-    std::map<sdbus::ObjectPath, std::unique_ptr<FahrenheitThermometerAdaptor>> children_;
+    std::map<std::string, std::unique_ptr<FahrenheitThermometerAdaptor>> children_;
     std::mutex childrenMutex_;
 
     struct WorkItem
@@ -210,7 +210,7 @@ class FahrenheitThermometerProxy : public sdbus::ProxyInterfaces< org::sdbuscpp:
                                                                 , org::sdbuscpp::stresstests::fahrenheit::thermometer::factory_proxy >
 {
 public:
-    FahrenheitThermometerProxy(sdbus::IConnection& connection, sdbus::ServiceName destination, sdbus::ObjectPath objectPath)
+    FahrenheitThermometerProxy(sdbus::IConnection& connection, std::string destination, std::string objectPath)
         : ProxyInterfaces(connection, std::move(destination), std::move(objectPath))
     {
         registerProxy();
@@ -225,7 +225,7 @@ public:
 class ConcatenatorAdaptor final : public sdbus::AdaptorInterfaces<org::sdbuscpp::stresstests::concatenator_adaptor>
 {
 public:
-    ConcatenatorAdaptor(sdbus::IConnection& connection, sdbus::ObjectPath objectPath)
+    ConcatenatorAdaptor(sdbus::IConnection& connection, std::string objectPath)
         : AdaptorInterfaces(connection, std::move(objectPath))
     {
         unsigned int workers = std::thread::hardware_concurrency();
@@ -297,7 +297,7 @@ private:
 class ConcatenatorProxy final : public sdbus::ProxyInterfaces<org::sdbuscpp::stresstests::concatenator_proxy>
 {
 public:
-    ConcatenatorProxy(sdbus::IConnection& connection, sdbus::ServiceName destination, sdbus::ObjectPath objectPath)
+    ConcatenatorProxy(sdbus::IConnection& connection, std::string destination, std::string objectPath)
         : ProxyInterfaces(connection, std::move(destination), std::move(objectPath))
     {
         registerProxy();
@@ -309,9 +309,9 @@ public:
     }
 
 private:
-    virtual void onConcatenateReply(const std::string& result, [[maybe_unused]] std::optional<sdbus::Error> error) override
+    virtual void onConcatenateReply(const std::string& result, [[maybe_unused]] const sdbus::Error* error) override
     {
-        assert(error == std::nullopt);
+        assert(error == nullptr);
 
         std::stringstream str(result);
         std::string aString;
@@ -481,7 +481,7 @@ int main(int argc, char *argv[])
             // We could run the loop in a sync way, but we want it to run also when proxies are destroyed for better
             // coverage of multi-threaded scenarios, so we run it async and use condition variable for exit notification
             //con.enterEventLoop();
-            con.enterEventLoopAsync();
+            con.enterEventLoop(sdbus::async);
 
             std::unique_lock<std::mutex> lock(clientThreadExitMutex);
             clientThreadExitCond.wait(lock, [&]{return clientThreadExit;});

tests/unittests/Connection_test.cpp

@@ -1,6 +1,6 @@
 /**
  * (C) 2016 - 2021 KISTLER INSTRUMENTE AG, Winterthur, Switzerland
- * (C) 2016 - 2024 Stanislav Angelovic <stanislav.angelovic@protonmail.com>
+ * (C) 2016 - 2022 Stanislav Angelovic <stanislav.angelovic@protonmail.com>
  *
  * @file Connection_test.cpp
  * @author Ardazishvili Roman (ardazishvili.roman@yandex.ru)
@@ -26,7 +26,6 @@
  */
 
 #include "Connection.h"
-#include "sdbus-c++/Types.h"
 #include "unittests/mocks/SdBusMock.h"
 
 #include <gtest/gtest.h>
@@ -208,16 +207,12 @@ TYPED_TEST_SUITE(AConnectionNameRequest, BusTypeTags);
 TYPED_TEST(AConnectionNameRequest, DoesNotThrowOnSuccess)
 {
     EXPECT_CALL(*this->sdBusIntfMock_, sd_bus_request_name(_, _, _)).WillOnce(Return(1));
-    sdbus::ConnectionName name{"org.sdbuscpp.somename"};
-
-    this->con_->requestName(name);
+    this->con_->requestName("org.sdbuscpp.somename");
 }
 
 TYPED_TEST(AConnectionNameRequest, ThrowsOnFail)
 {
-    sdbus::ConnectionName name{"org.sdbuscpp.somename"};
-
     EXPECT_CALL(*this->sdBusIntfMock_, sd_bus_request_name(_, _, _)).WillOnce(Return(-1));
 
-    ASSERT_THROW(this->con_->requestName(name), sdbus::Error);
+    ASSERT_THROW(this->con_->requestName("org.sdbuscpp.somename"), sdbus::Error);
 }

tests/unittests/Message_test.cpp

@@ -1,6 +1,6 @@
 /**
  * (C) 2016 - 2021 KISTLER INSTRUMENTE AG, Winterthur, Switzerland
- * (C) 2016 - 2024 Stanislav Angelovic <stanislav.angelovic@protonmail.com>
+ * (C) 2016 - 2022 Stanislav Angelovic <stanislav.angelovic@protonmail.com>
  *
  * @file Message_test.cpp
  *
@@ -32,12 +32,8 @@
 #include <list>
 
 using ::testing::Eq;
-using ::testing::StrEq;
 using ::testing::Gt;
 using ::testing::DoubleEq;
-using ::testing::IsNull;
-using ::testing::SizeIs;
-using ::testing::ElementsAre;
 using namespace std::string_literals;
 
 namespace
@@ -55,8 +51,7 @@ namespace sdbus {
     template <typename _ElementType>
     sdbus::Message& operator<<(sdbus::Message& msg, const std::list<_ElementType>& items)
     {
-        // TODO: This can also be simplified on the basis of a callback (see dictionary...)
-        msg.openContainer<_ElementType>();
+        msg.openContainer(sdbus::signature_of<_ElementType>::str());
 
         for (const auto& item : items)
             msg << item;
@@ -69,7 +64,7 @@ namespace sdbus {
     template <typename _ElementType>
     sdbus::Message& operator>>(sdbus::Message& msg, std::list<_ElementType>& items)
     {
-        if(!msg.enterContainer<_ElementType>())
+        if(!msg.enterContainer(sdbus::signature_of<_ElementType>::str()))
             return msg;
 
         while (true)
@@ -92,55 +87,40 @@ namespace sdbus {
 
 template <typename _Element, typename _Allocator>
 struct sdbus::signature_of<std::list<_Element, _Allocator>>
-    : sdbus::signature_of<std::vector<_Element, _Allocator>>
+        : sdbus::signature_of<std::vector<_Element, _Allocator>>
 {};
 
 namespace my {
-    enum class Enum
-    {
-        Value1,
-        Value2,
-        Value3
-    };
 
     struct Struct
     {
         int i;
         std::string s;
         std::list<double> l;
-        Enum e;
-
-        friend bool operator==(const Struct& lhs, const Struct& rhs) = default;
     };
 
-    struct RelaxedStruct
+    bool operator==(const Struct& lhs, const Struct& rhs)
     {
-        int i;
-        std::string s;
-        std::list<double> l;
-        Enum e;
+        return lhs.i == rhs.i && lhs.s == rhs.s && lhs.l == rhs.l;
+    }
 
-        friend bool operator==(const RelaxedStruct& lhs, const RelaxedStruct& rhs) = default;
-    };
-
-    struct NestedStruct
+    sdbus::Message& operator<<(sdbus::Message& msg, const Struct& items)
     {
-        int i;
-        std::string s;
-        Enum e;
-        Struct x;
+        return msg << sdbus::Struct{std::forward_as_tuple(items.i, items.s, items.l)};
+    }
+
+    sdbus::Message& operator>>(sdbus::Message& msg, Struct& items)
+    {
+        sdbus::Struct s{std::forward_as_tuple(items.i, items.s, items.l)};
+        return msg >> s;
+    }
 
-        friend bool operator==(const NestedStruct& lhs, const NestedStruct& rhs) = default;
-    };
 }
 
-SDBUSCPP_REGISTER_STRUCT(my::Struct, i, s, l, e);
-
-SDBUSCPP_ENABLE_RELAXED_DICT2STRUCT_DESERIALIZATION(my::RelaxedStruct);
-SDBUSCPP_REGISTER_STRUCT(my::RelaxedStruct, i, s, l, e);
-
-SDBUSCPP_ENABLE_NESTED_STRUCT2DICT_SERIALIZATION(my::NestedStruct);
-SDBUSCPP_REGISTER_STRUCT(my::NestedStruct, i, s, e, x);
+template <>
+struct sdbus::signature_of<my::Struct>
+        : sdbus::signature_of<sdbus::Struct<int, std::string, std::list<double>>>
+{};
 
 /*-------------------------------------*/
 /* --          TEST CASES           -- */
@@ -224,21 +204,6 @@ TEST(AMessage, CanCarryASimpleInteger)
     ASSERT_THAT(dataRead, Eq(dataWritten));
 }
 
-TEST(AMessage, CanCarryAStringAsAStringView)
-{
-    auto msg = sdbus::createPlainMessage();
-
-    const std::string_view dataWritten = "Hello";
-
-    msg << dataWritten;
-    msg.seal();
-
-    std::string dataRead;
-    msg >> dataRead;
-
-    ASSERT_THAT(dataRead, Eq(dataWritten));
-}
-
 TEST(AMessage, CanCarryAUnixFd)
 {
     auto msg = sdbus::createPlainMessage();
@@ -305,7 +270,7 @@ TEST(AMessage, CanCarryDBusArrayOfNontrivialTypesGivenAsStdVector)
 {
     auto msg = sdbus::createPlainMessage();
 
-    const std::vector dataWritten{sdbus::Signature{"s"}, sdbus::Signature{"u"}, sdbus::Signature{"b"}};
+    const std::vector<sdbus::Signature> dataWritten{"s", "u", "b"};
 
     msg << dataWritten;
     msg.seal();
@@ -335,7 +300,7 @@ TEST(AMessage, CanCarryDBusArrayOfNontrivialTypesGivenAsStdArray)
 {
     auto msg = sdbus::createPlainMessage();
 
-    const std::array dataWritten{sdbus::Signature{"s"}, sdbus::Signature{"u"}, sdbus::Signature{"b"}};
+    const std::array<sdbus::Signature, 3> dataWritten{"s", "u", "b"};
 
     msg << dataWritten;
     msg.seal();
@@ -346,7 +311,7 @@ TEST(AMessage, CanCarryDBusArrayOfNontrivialTypesGivenAsStdArray)
     ASSERT_THAT(dataRead, Eq(dataWritten));
 }
 
-#ifdef __cpp_lib_span
+#if __cplusplus >= 202002L
 TEST(AMessage, CanCarryDBusArrayOfTrivialTypesGivenAsStdSpan)
 {
     auto msg = sdbus::createPlainMessage();
@@ -368,7 +333,7 @@ TEST(AMessage, CanCarryDBusArrayOfNontrivialTypesGivenAsStdSpan)
 {
     auto msg = sdbus::createPlainMessage();
 
-    const std::array sourceArray{sdbus::Signature{"s"}, sdbus::Signature{"u"}, sdbus::Signature{"b"}};
+    const std::array<sdbus::Signature, 3> sourceArray{"s", "u", "b"};
     const std::span dataWritten{sourceArray};
 
     msg << dataWritten;
@@ -382,24 +347,6 @@ TEST(AMessage, CanCarryDBusArrayOfNontrivialTypesGivenAsStdSpan)
 }
 #endif
 
-TEST(AMessage, CanCarryAnEnumValue)
-{
-    auto msg = sdbus::createPlainMessage();
-
-    enum class EnumA : int16_t {X = 5} aWritten{EnumA::X};
-    enum EnumB {Y = 11} bWritten{EnumB::Y};
-
-    msg << aWritten << bWritten;
-    msg.seal();
-
-    EnumA aRead{};
-    EnumB bRead{};
-    msg >> aRead >> bRead;
-
-    ASSERT_THAT(aRead, Eq(aWritten));
-    ASSERT_THAT(bRead, Eq(bWritten));
-}
-
 TEST(AMessage, ThrowsWhenDestinationStdArrayIsTooSmallDuringDeserialization)
 {
     auto msg = sdbus::createPlainMessage();
@@ -413,7 +360,7 @@ TEST(AMessage, ThrowsWhenDestinationStdArrayIsTooSmallDuringDeserialization)
     ASSERT_THROW(msg >> dataRead, sdbus::Error);
 }
 
-#ifdef __cpp_lib_span
+#if __cplusplus >= 202002L
 TEST(AMessage, ThrowsWhenDestinationStdSpanIsTooSmallDuringDeserialization)
 {
     auto msg = sdbus::createPlainMessage();
@@ -468,7 +415,7 @@ TEST(AMessage, CanCarryAComplexType)
                             >
                         >;
 
-    ComplexType dataWritten = { {1, {{{5, {{sdbus::ObjectPath{"/some/object"}, true, 45, {{6, "hello"}, {7, "world"}}}}}}, sdbus::Signature{"av"}, 3.14}}};
+    ComplexType dataWritten = { {1, {{{5, {{"/some/object", true, 45, {{6, "hello"}, {7, "world"}}}}}}, "av", 3.14}}};
 
     msg << dataWritten;
     msg.seal();
@@ -485,10 +432,11 @@ TEST(AMessage, CanPeekASimpleType)
     msg << 123;
     msg.seal();
 
-    auto [type, contents] = msg.peekType();
-
-    ASSERT_THAT(type, Eq('i'));
-    ASSERT_THAT(contents, IsNull());
+    std::string type;
+    std::string contents;
+    msg.peekType(type, contents);
+    ASSERT_THAT(type, "i");
+    ASSERT_THAT(contents, "");
 }
 
 TEST(AMessage, CanPeekContainerContents)
@@ -497,10 +445,11 @@ TEST(AMessage, CanPeekContainerContents)
     msg << std::map<int, std::string>{{1, "one"}, {2, "two"}};
     msg.seal();
 
-    auto [type, contents] = msg.peekType();
-
-    ASSERT_THAT(type, Eq('a'));
-    ASSERT_THAT(contents, StrEq("{is}"));
+    std::string type;
+    std::string contents;
+    msg.peekType(type, contents);
+    ASSERT_THAT(type, "a");
+    ASSERT_THAT(contents, "{is}");
 }
 
 TEST(AMessage, CanCarryDBusArrayGivenAsCustomType)
@@ -520,11 +469,11 @@ TEST(AMessage, CanCarryDBusArrayGivenAsCustomType)
     ASSERT_THAT(dataRead, Eq(dataWritten));
 }
 
-TEST(AMessage, CanCarryUserDefinedStruct)
+TEST(AMessage, CanCarryDBusStructGivenAsCustomType)
 {
     auto msg = sdbus::createPlainMessage();
 
-    const my::Struct dataWritten{3545342, "hello"s, {3.14, 2.4568546}, my::Enum::Value2};
+    const my::Struct dataWritten{3545342, "hello"s, {3.14, 2.4568546}};
 
     msg << dataWritten;
     msg.seal();
@@ -534,149 +483,3 @@ TEST(AMessage, CanCarryUserDefinedStruct)
 
     ASSERT_THAT(dataRead, Eq(dataWritten));
 }
-
-TEST(AMessage, CanCarryNestedUserDefinedStruct)
-{
-    auto msg = sdbus::createPlainMessage();
-
-    const my::NestedStruct dataWritten{3545342, "hello"s, my::Enum::Value2, {12, "world"s, {3.14, 2.4568546}, my::Enum::Value3}};
-
-    msg << dataWritten;
-    msg.seal();
-
-    my::NestedStruct dataRead;
-    msg >> dataRead;
-
-    ASSERT_THAT(dataRead, Eq(dataWritten));
-}
-
-TEST(AMessage, CanSerializeUserDefinedStructAsDictionaryOfStringsToVariants)
-{
-    auto msg = sdbus::createPlainMessage();
-
-    const my::Struct dataWritten{3545342, "hello"s, {3.14, 2.4568546}, my::Enum::Value2};
-
-    msg << sdbus::as_dictionary{dataWritten};
-    msg.seal();
-
-    std::map<std::string, sdbus::Variant> dataRead;
-    msg >> dataRead;
-
-    ASSERT_THAT(dataRead, SizeIs(4));
-    ASSERT_THAT(dataRead.at("i").get<int>(), Eq(3545342));
-    ASSERT_THAT(dataRead.at("s").get<std::string>(), Eq("hello"));
-    ASSERT_THAT(dataRead.at("l").get<std::list<double>>(), ElementsAre(3.14, 2.4568546));
-    ASSERT_THAT(dataRead.at("e").get<my::Enum>(), Eq(my::Enum::Value2));
-}
-
-TEST(AMessage, CanRecursivelySerializeUserDefinedStructAsDictionaryOfStringsToVariants)
-{
-    auto msg = sdbus::createPlainMessage();
-
-    const my::NestedStruct dataWritten{3545342, "hello"s, my::Enum::Value2, {12, "world"s, {3.14, 2.4568546}, my::Enum::Value3}};
-
-    msg << sdbus::as_dictionary{dataWritten};
-    msg.seal();
-
-    std::map<std::string, sdbus::Variant> dataRead;
-    msg >> dataRead;
-
-    ASSERT_THAT(dataRead, SizeIs(4));
-    ASSERT_THAT(dataRead.at("i").get<int>(), Eq(3545342));
-    ASSERT_THAT(dataRead.at("s").get<std::string>(), Eq("hello"));
-    ASSERT_THAT(dataRead.at("e").get<my::Enum>(), Eq(my::Enum::Value2));
-    auto nestedStructRead = dataRead.at("x").get<std::map<std::string, sdbus::Variant>>(); // Nested struct serialized as dict
-    ASSERT_THAT(nestedStructRead.at("i").get<int>(), Eq(12));
-    ASSERT_THAT(nestedStructRead.at("s").get<std::string>(), Eq("world"));
-    ASSERT_THAT(nestedStructRead.at("l").get<std::list<double>>(), ElementsAre(3.14, 2.4568546));
-    ASSERT_THAT(nestedStructRead.at("e").get<my::Enum>(), Eq(my::Enum::Value3));
-}
-
-TEST(AMessage, CanDeserializeDictionaryOfStringsToVariantsIntoUserDefinedStruct)
-{
-    auto msg = sdbus::createPlainMessage();
-
-    std::map<std::string, sdbus::Variant> dataWritten{ {"i", sdbus::Variant{3545342}}
-                                                     , {"s", sdbus::Variant{"hello"s}}
-                                                     , {"l", sdbus::Variant{std::list<double>{3.14, 2.4568546}}}
-                                                     , {"e", sdbus::Variant{my::Enum::Value2}} };
-
-    msg << dataWritten;
-    msg.seal();
-
-    my::Struct dataRead;
-    msg >> dataRead;
-
-    ASSERT_THAT(dataRead, Eq(my::Struct{3545342, "hello"s, {3.14, 2.4568546}, my::Enum::Value2}));
-}
-
-TEST(AMessage, FailsDeserializingDictionaryIntoUserDefinedStructIfStructMemberIsNotFound)
-{
-    auto msg = sdbus::createPlainMessage();
-
-    std::map<std::string, sdbus::Variant> dataWritten{ {"i", sdbus::Variant{3545342}}
-                                                     , {"nonexistent", sdbus::Variant{"hello"s}}
-                                                     , {"l", sdbus::Variant{std::list<double>{3.14, 2.4568546}}}
-                                                     , {"e", sdbus::Variant{my::Enum::Value2}} };
-
-    msg << dataWritten;
-    msg.seal();
-
-    my::Struct dataRead;
-
-    ASSERT_THROW(msg >> dataRead, sdbus::Error);
-}
-
-TEST(AMessage, DeserializesDictionaryIntoStructWithMissingMembersSuccessfullyIfRelaxedOptionIsSet)
-{
-    auto msg = sdbus::createPlainMessage();
-
-    std::map<std::string, sdbus::Variant> dataWritten{ {"some_nonexistent_struct_member", sdbus::Variant{3545342}}
-                                                     , {"another_nonexistent_struct_member", sdbus::Variant{"hello"s}}
-                                                     , {"l", sdbus::Variant{std::list<double>{3.14, 2.4568546}}}
-                                                     , {"e", sdbus::Variant{my::Enum::Value2}} };
-
-    msg << dataWritten;
-    msg.seal();
-
-    my::RelaxedStruct dataRead{};
-    msg >> dataRead;
-
-    ASSERT_THAT(dataRead, Eq(my::RelaxedStruct{{}, {}, {3.14, 2.4568546}, my::Enum::Value2}));
-}
-
-class AMessage : public ::testing::TestWithParam<std::variant<int32_t, std::string, my::Struct>>
-{
-};
-
-TEST_P(AMessage, CanCarryDBusVariantGivenAsStdVariant)
-{
-    auto msg = sdbus::createPlainMessage();
-
-    const std::variant<int32_t, std::string, my::Struct> dataWritten{GetParam()};
-
-    msg << dataWritten;
-    msg.seal();
-
-    std::variant<int32_t, std::string, my::Struct> dataRead;
-    msg >> dataRead;
-
-    ASSERT_THAT(dataRead, Eq(dataWritten));
-}
-
-TEST_P(AMessage, ThrowsWhenDestinationStdVariantHasWrongTypeDuringDeserialization)
-{
-    auto msg = sdbus::createPlainMessage();
-
-    const std::variant<int32_t, std::string, my::Struct> dataWritten{GetParam()};
-
-    msg << dataWritten;
-    msg.seal();
-
-    std::variant<std::vector<bool>> dataRead;
-    ASSERT_THROW(msg >> dataRead, sdbus::Error);
-}
-
-INSTANTIATE_TEST_SUITE_P( StringIntStruct
-                        , AMessage
-                        , ::testing::Values("hello"s, 1, my::Struct{}));

tests/unittests/PollData_test.cpp

@@ -1,6 +1,6 @@
 /**
  * (C) 2016 - 2021 KISTLER INSTRUMENTE AG, Winterthur, Switzerland
- * (C) 2016 - 2024 Stanislav Angelovic <stanislav.angelovic@protonmail.com>
+ * (C) 2016 - 2022 Stanislav Angelovic <stanislav.angelovic@protonmail.com>
  *
  * @file PollData_test.cpp
  *

tests/unittests/TypeTraits_test.cpp

@@ -1,6 +1,6 @@
 /**
  * (C) 2016 - 2021 KISTLER INSTRUMENTE AG, Winterthur, Switzerland
- * (C) 2016 - 2024 Stanislav Angelovic <stanislav.angelovic@protonmail.com>
+ * (C) 2016 - 2022 Stanislav Angelovic <stanislav.angelovic@protonmail.com>
  *
  * @file TypeTraits_test.cpp
  *
@@ -49,21 +49,6 @@ namespace
         static std::string getDBusTypeSignature();
     };
 
-    enum class SomeEnumClass : uint8_t
-    {
-        A, B, C
-    };
-
-    enum struct SomeEnumStruct : int64_t
-    {
-        A, B, C
-    };
-
-    enum SomeClassicEnum
-    {
-        A, B, C
-    };
-
 #define TYPE(...)                                                                       \
     template <>                                                                         \
     std::string Type2DBusTypeSignatureConversion<__VA_ARGS__>::getDBusTypeSignature()   \
@@ -85,28 +70,17 @@ namespace
     TYPE(double)HAS_DBUS_TYPE_SIGNATURE("d")
     TYPE(const char*)HAS_DBUS_TYPE_SIGNATURE("s")
     TYPE(std::string)HAS_DBUS_TYPE_SIGNATURE("s")
-    TYPE(std::string_view)HAS_DBUS_TYPE_SIGNATURE("s")
-    TYPE(sdbus::BusName)HAS_DBUS_TYPE_SIGNATURE("s")
-    TYPE(sdbus::InterfaceName)HAS_DBUS_TYPE_SIGNATURE("s")
-    TYPE(sdbus::MemberName)HAS_DBUS_TYPE_SIGNATURE("s")
     TYPE(sdbus::ObjectPath)HAS_DBUS_TYPE_SIGNATURE("o")
     TYPE(sdbus::Signature)HAS_DBUS_TYPE_SIGNATURE("g")
     TYPE(sdbus::Variant)HAS_DBUS_TYPE_SIGNATURE("v")
-    TYPE(std::variant<int16_t, std::string>)HAS_DBUS_TYPE_SIGNATURE("v")
     TYPE(sdbus::UnixFd)HAS_DBUS_TYPE_SIGNATURE("h")
     TYPE(sdbus::Struct<bool>)HAS_DBUS_TYPE_SIGNATURE("(b)")
     TYPE(sdbus::Struct<uint16_t, double, std::string, sdbus::Variant>)HAS_DBUS_TYPE_SIGNATURE("(qdsv)")
     TYPE(std::vector<int16_t>)HAS_DBUS_TYPE_SIGNATURE("an")
     TYPE(std::array<int16_t, 3>)HAS_DBUS_TYPE_SIGNATURE("an")
-#ifdef __cpp_lib_span
-    TYPE(std::span<int16_t>)HAS_DBUS_TYPE_SIGNATURE("an")
+#if __cplusplus >= 202002L
+    TYPE(std::span<int16_t>)HAS_DBUS_TYPE_SIGNATURE("ao")
 #endif
-    TYPE(SomeEnumClass)HAS_DBUS_TYPE_SIGNATURE("y")
-    TYPE(const SomeEnumClass)HAS_DBUS_TYPE_SIGNATURE("y")
-    TYPE(volatile SomeEnumClass)HAS_DBUS_TYPE_SIGNATURE("y")
-    TYPE(const volatile SomeEnumClass)HAS_DBUS_TYPE_SIGNATURE("y")
-    TYPE(SomeEnumStruct)HAS_DBUS_TYPE_SIGNATURE("x")
-    TYPE(SomeClassicEnum)HAS_DBUS_TYPE_SIGNATURE("u")
     TYPE(std::map<int32_t, int64_t>)HAS_DBUS_TYPE_SIGNATURE("a{ix}")
     TYPE(std::unordered_map<int32_t, int64_t>)HAS_DBUS_TYPE_SIGNATURE("a{ix}")
     using ComplexType = std::map<
@@ -126,11 +100,10 @@ namespace
                                 >,
                                 sdbus::Signature,
                                 sdbus::UnixFd,
-                                const char*,
-                                std::string_view
+                                const char*
                             >
                         >;
-    TYPE(ComplexType)HAS_DBUS_TYPE_SIGNATURE("a{t(a{ya(oanbva{is})}ghss)}")
+    TYPE(ComplexType)HAS_DBUS_TYPE_SIGNATURE("a{t(a{ya(oanbva{is})}ghs)}")
 
     typedef ::testing::Types< bool
                             , uint8_t
@@ -143,28 +116,17 @@ namespace
                             , double
                             , const char*
                             , std::string
-                            , std::string_view
-                            , sdbus::BusName
-                            , sdbus::InterfaceName
-                            , sdbus::MemberName
                             , sdbus::ObjectPath
                             , sdbus::Signature
                             , sdbus::Variant
-                            , std::variant<int16_t, std::string>
                             , sdbus::UnixFd
                             , sdbus::Struct<bool>
                             , sdbus::Struct<uint16_t, double, std::string, sdbus::Variant>
                             , std::vector<int16_t>
                             , std::array<int16_t, 3>
-#ifdef __cpp_lib_span
+#if __cplusplus >= 202002L
                             , std::span<int16_t>
 #endif
-                            , SomeEnumClass
-                            , const SomeEnumClass
-                            , volatile SomeEnumClass
-                            , const volatile SomeEnumClass
-                            , SomeEnumStruct
-                            , SomeClassicEnum
                             , std::map<int32_t, int64_t>
                             , std::unordered_map<int32_t, int64_t>
                             , ComplexType
@@ -179,8 +141,7 @@ namespace
 
 TYPED_TEST(Type2DBusTypeSignatureConversion, ConvertsTypeToProperDBusSignature)
 {
-    constexpr auto signature = sdbus::as_null_terminated(sdbus::signature_of_v<TypeParam>);
-    ASSERT_THAT(signature.data(), Eq(this->dbusTypeSignature_));
+    ASSERT_THAT(sdbus::signature_of<TypeParam>::str(), Eq(this->dbusTypeSignature_));
 }
 
 TEST(FreeFunctionTypeTraits, DetectsTraitsOfTrivialSignatureFunction)

tests/unittests/Types_test.cpp

@@ -1,6 +1,6 @@
 /**
  * (C) 2016 - 2021 KISTLER INSTRUMENTE AG, Winterthur, Switzerland
- * (C) 2016 - 2024 Stanislav Angelovic <stanislav.angelovic@protonmail.com>
+ * (C) 2016 - 2022 Stanislav Angelovic <stanislav.angelovic@protonmail.com>
  *
  * @file Types_test.cpp
  *
@@ -72,19 +72,6 @@ TEST(AVariant, CanBeConstructedFromAComplexValue)
     ASSERT_NO_THROW(sdbus::Variant{value});
 }
 
-TEST(AVariant, CanBeConstructedFromAnStdVariant)
-{
-    using ComplexType = std::vector<sdbus::Struct<std::string, double>>;
-    using StdVariantType = std::variant<std::string, uint64_t, ComplexType>;
-    ComplexType value{{"hello"s, ANY_DOUBLE}, {"world"s, ANY_DOUBLE}};
-    StdVariantType stdVariant{value};
-
-    sdbus::Variant sdbusVariant{stdVariant};
-
-    ASSERT_TRUE(sdbusVariant.containsValueOfType<ComplexType>());
-    ASSERT_THAT(sdbusVariant.get<ComplexType>(), Eq(value));
-}
-
 TEST(AVariant, CanBeCopied)
 {
     auto value = "hello"s;
@@ -143,30 +130,6 @@ TEST(AVariant, ReturnsTrueWhenAskedIfItContainsTheTypeItReallyContains)
     ASSERT_TRUE(variant.containsValueOfType<ComplexType>());
 }
 
-TEST(AVariant, CanBeConvertedIntoAnStdVariant)
-{
-    using ComplexType = std::vector<sdbus::Struct<std::string, double>>;
-    using StdVariantType = std::variant<std::string, uint64_t, ComplexType>;
-    ComplexType value{{"hello"s, ANY_DOUBLE}, {"world"s, ANY_DOUBLE}};
-    sdbus::Variant sdbusVariant{value};
-    StdVariantType stdVariant{sdbusVariant};
-
-    ASSERT_TRUE(std::holds_alternative<ComplexType>(stdVariant));
-    ASSERT_THAT(std::get<ComplexType>(stdVariant), Eq(value));
-}
-
-TEST(AVariant, IsImplicitlyInterchangeableWithStdVariant)
-{
-    using ComplexType = std::vector<sdbus::Struct<std::string, double>>;
-    using StdVariantType = std::variant<std::string, uint64_t, ComplexType>;
-    ComplexType value{{"hello"s, ANY_DOUBLE}, {"world"s, ANY_DOUBLE}};
-    StdVariantType stdVariant{value};
-
-    auto stdVariantCopy = [](const sdbus::Variant &v) -> StdVariantType { return v; }(stdVariant);
-
-    ASSERT_THAT(stdVariantCopy, Eq(stdVariant));
-}
-
 TEST(ASimpleVariant, ReturnsFalseWhenAskedIfItContainsTypeItDoesntReallyContain)
 {
     int value = 5;
@@ -322,6 +285,7 @@ TEST(ASignature, CanBeMovedLikeAStdString)
     sdbus::Signature oSignature{aSignature};
 
     ASSERT_THAT(sdbus::Signature{std::move(oSignature)}, Eq(sdbus::Signature(std::move(aSignature))));
+    ASSERT_THAT(std::string(oSignature), Eq(aSignature));
 }
 
 TEST(AUnixFd, DuplicatesAndOwnsFdUponStandardConstruction)
@@ -427,17 +391,17 @@ TEST(AUnixFd, TakesOverNewFdAndClosesOriginalFdOnAdoptingReset)
 
 TEST(AnError, CanBeConstructedFromANameAndAMessage)
 {
-    auto error = sdbus::Error(sdbus::Error::Name{"org.sdbuscpp.error"}, "message");
-    EXPECT_THAT(error.getName(), Eq<std::string>("org.sdbuscpp.error"));
+    auto error = sdbus::Error("name", "message");
+    EXPECT_THAT(error.getName(), Eq<std::string>("name"));
     EXPECT_THAT(error.getMessage(), Eq<std::string>("message"));
 }
 
 TEST(AnError, CanBeConstructedFromANameOnly)
 {
-    auto error1 = sdbus::Error(sdbus::Error::Name{"org.sdbuscpp.error"});
-    auto error2 = sdbus::Error(sdbus::Error::Name{"org.sdbuscpp.error"}, nullptr);
-    EXPECT_THAT(error1.getName(), Eq<std::string>("org.sdbuscpp.error"));
-    EXPECT_THAT(error2.getName(), Eq<std::string>("org.sdbuscpp.error"));
+    auto error1 = sdbus::Error("name");
+    auto error2 = sdbus::Error("name", nullptr);
+    EXPECT_THAT(error1.getName(), Eq<std::string>("name"));
+    EXPECT_THAT(error2.getName(), Eq<std::string>("name"));
 
     EXPECT_THAT(error1.getMessage(), Eq<std::string>(""));
     EXPECT_THAT(error2.getMessage(), Eq<std::string>(""));

tests/unittests/mocks/SdBusMock.h

@@ -1,6 +1,6 @@
 /**
  * (C) 2016 - 2021 KISTLER INSTRUMENTE AG, Winterthur, Switzerland
- * (C) 2016 - 2024 Stanislav Angelovic <stanislav.angelovic@protonmail.com>
+ * (C) 2016 - 2022 Stanislav Angelovic <stanislav.angelovic@protonmail.com>
  *
  * @file SdBusMock.h
  * @author Ardazishvili Roman (ardazishvili.roman@yandex.ru)
@@ -81,7 +81,7 @@ public:
     MOCK_METHOD2(sd_bus_process, int(sd_bus *bus, sd_bus_message **r));
     MOCK_METHOD1(sd_bus_get_current_message, sd_bus_message*(sd_bus *bus));
     MOCK_METHOD2(sd_bus_get_poll_data, int(sd_bus *bus, PollData* data));
-    MOCK_METHOD3(sd_bus_get_n_queued, int(sd_bus *bus, uint64_t *read, uint64_t* write));
+    MOCK_METHOD2(sd_bus_get_n_queued_read, int(sd_bus *bus, uint64_t *ret));
     MOCK_METHOD1(sd_bus_flush, int(sd_bus *bus));
     MOCK_METHOD1(sd_bus_flush_close_unref, sd_bus *(sd_bus *bus));
     MOCK_METHOD1(sd_bus_close_unref, sd_bus *(sd_bus *bus));
@@ -89,7 +89,6 @@ public:
     MOCK_METHOD2(sd_bus_message_set_destination, int(sd_bus_message *m, const char *destination));
 
     MOCK_METHOD3(sd_bus_query_sender_creds, int(sd_bus_message *, uint64_t, sd_bus_creds **));
-    MOCK_METHOD1(sd_bus_creds_ref, sd_bus_creds*(sd_bus_creds *));
     MOCK_METHOD1(sd_bus_creds_unref, sd_bus_creds*(sd_bus_creds *));
 
     MOCK_METHOD2(sd_bus_creds_get_pid, int(sd_bus_creds *, pid_t *));

tests/unittests/sdbus-c++-unit-tests.cpp

@@ -1,6 +1,6 @@
 /**
  * (C) 2016 - 2021 KISTLER INSTRUMENTE AG, Winterthur, Switzerland
- * (C) 2016 - 2024 Stanislav Angelovic <stanislav.angelovic@protonmail.com>
+ * (C) 2016 - 2022 Stanislav Angelovic <stanislav.angelovic@protonmail.com>
  *
  * @file sdbus-c++-unit-tests.cpp
  *

tools/CMakeLists.txt

@@ -4,7 +4,7 @@
 
 cmake_minimum_required(VERSION 3.5)
 
-project(sdbus-c++-tools VERSION 2.1.0)
+project(sdbus-c++-tools VERSION 2.0.0)
 
 include(GNUInstallDirs)
 
@@ -44,7 +44,12 @@ set(CMAKE_CXX_STANDARD 14)
 add_executable(sdbus-c++-xml2cpp ${SDBUSCPP_XML2CPP_SRCS})
 target_link_libraries (sdbus-c++-xml2cpp ${EXPAT_LIBRARIES})
 target_include_directories(sdbus-c++-xml2cpp PRIVATE ${EXPAT_INCLUDE_DIRS})
-target_compile_definitions(sdbus-c++-xml2cpp PRIVATE SDBUS_XML2CPP_VERSION="${CMAKE_PROJECT_VERSION}")
+
+#----------------------------------
+# INSTALLATION
+#----------------------------------
+
+install(TARGETS sdbus-c++-xml2cpp EXPORT sdbus-c++-tools-targets DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT dev)
 
 #----------------------------------
 # CMAKE CONFIG & PACKAGE CONFIG
@@ -52,32 +57,19 @@ target_compile_definitions(sdbus-c++-xml2cpp PRIVATE SDBUS_XML2CPP_VERSION="${CM
 
 include(CMakePackageConfigHelpers)
 
+install(EXPORT sdbus-c++-tools-targets
+        DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/sdbus-c++-tools
+        NAMESPACE SDBusCpp::
+        COMPONENT dev)
+
 configure_package_config_file(cmake/sdbus-c++-tools-config.cmake.in cmake/sdbus-c++-tools-config.cmake
                               INSTALL_DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/sdbus-c++)
 write_basic_package_version_file(cmake/sdbus-c++-tools-config-version.cmake COMPATIBILITY SameMajorVersion)
+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/cmake/sdbus-c++-tools-config.cmake
+              ${CMAKE_CURRENT_BINARY_DIR}/cmake/sdbus-c++-tools-config-version.cmake
+        DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/sdbus-c++-tools
+        COMPONENT dev)
 
 configure_file(pkgconfig/sdbus-c++-tools.pc.in pkgconfig/sdbus-c++-tools.pc @ONLY)
-
-#----------------------------------
-# INSTALLATION
-#----------------------------------
-
-if(NOT DEFINED SDBUSCPP_INSTALL)
-    set(SDBUSCPP_INSTALL ON)
-endif()
-
-if (SDBUSCPP_INSTALL)
-    install(TARGETS sdbus-c++-xml2cpp
-            EXPORT sdbus-c++-tools-targets
-            DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT sdbus-c++-dev)
-    install(EXPORT sdbus-c++-tools-targets
-            DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/sdbus-c++-tools
-            NAMESPACE SDBusCpp::
-            COMPONENT sdbus-c++-dev)
-    install(FILES ${CMAKE_CURRENT_BINARY_DIR}/cmake/sdbus-c++-tools-config.cmake
-            ${CMAKE_CURRENT_BINARY_DIR}/cmake/sdbus-c++-tools-config-version.cmake
-            DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/sdbus-c++-tools
-            COMPONENT sdbus-c++-dev)
-    install(FILES ${CMAKE_CURRENT_BINARY_DIR}/pkgconfig/sdbus-c++-tools.pc
-            DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig COMPONENT sdbus-c++-dev)
-endif()
+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/pkgconfig/sdbus-c++-tools.pc
+        DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig COMPONENT dev)

tools/xml2cpp-codegen/AdaptorGenerator.cpp

@@ -1,6 +1,6 @@
 /**
  * (C) 2016 - 2021 KISTLER INSTRUMENTE AG, Winterthur, Switzerland
- * (C) 2016 - 2024 Stanislav Angelovic <stanislav.angelovic@protonmail.com>
+ * (C) 2016 - 2022 Stanislav Angelovic <stanislav.angelovic@protonmail.com>
  *
  * @file AdaptorGenerator.cpp
  *
@@ -85,15 +85,15 @@ std::string AdaptorGenerator::processInterface(Node& interface) const
             << tab << "static constexpr const char* INTERFACE_NAME = \"" << ifaceName << "\";" << endl << endl
             << "protected:" << endl
             << tab << className << "(sdbus::IObject& object)" << endl
-            << tab << tab << ": m_object(object)" << endl
+            << tab << tab << ": object_(&object)" << endl
             << tab << "{" << endl
             << tab << "}" << endl << endl;
 
     // Rule of Five
     body << tab << className << "(const " << className << "&) = delete;" << endl;
     body << tab << className << "& operator=(const " << className << "&) = delete;" << endl;
-    body << tab << className << "(" << className << "&&) = delete;" << endl;
-    body << tab << className << "& operator=(" << className << "&&) = delete;" << endl << endl;
+    body << tab << className << "(" << className << "&&) = default;" << endl;
+    body << tab << className << "& operator=(" << className << "&&) = default;" << endl << endl;
 
     body << tab << "~" << className << "() = default;" << endl << endl;
 
@@ -121,7 +121,7 @@ std::string AdaptorGenerator::processInterface(Node& interface) const
     if(!annotationRegistration.empty())
     {
         std::stringstream str;
-        str << "sdbus::setInterfaceFlags()" << annotationRegistration;
+        str << "sdbus::setInterfaceFlags()" << annotationRegistration << ";";
         annotationRegistration = str.str();
     }
 
@@ -160,7 +160,7 @@ std::string AdaptorGenerator::processInterface(Node& interface) const
     }
 
     body << "private:" << endl
-            << tab << "sdbus::IObject& m_object;" << endl
+            << tab << "sdbus::IObject* object_;" << endl
             << "};" << endl << endl
             << std::string(namespacesCount, '}') << " // namespaces" << endl << endl;
 
@@ -303,7 +303,7 @@ std::tuple<std::vector<std::string>, std::string> AdaptorGenerator::processSigna
 
         signalMethodSS << tab << "void emit" << nameWithCapFirstLetter << "(" << argTypeStr << ")" << endl
                 << tab << "{" << endl
-                << tab << tab << "m_object.emitSignal(\"" << name << "\")"
+                << tab << tab << "object_->emitSignal(\"" << name << "\")"
                         ".onInterface(INTERFACE_NAME)";
 
         if (!argStr.empty())
@@ -402,11 +402,11 @@ std::string AdaptorGenerator::createVTableRegistration(const std::string& annota
     std::ostringstream registrationSS;
     if (allRegistrations.size() == 1)
     {
-        registrationSS << tab << tab << "m_object.addVTable(" << allRegistrations[0] << ").forInterface(INTERFACE_NAME);";
+        registrationSS << tab << tab << "object_->addVTable(" << allRegistrations[0] << ").forInterface(INTERFACE_NAME);";
     }
     else
     {
-        registrationSS     << tab << tab << "m_object.addVTable( " << allRegistrations[0] << endl;
+        registrationSS     << tab << tab << "object_->addVTable( " << allRegistrations[0] << endl;
         for (size_t i = 1; i < allRegistrations.size(); ++i)
             registrationSS << tab << tab << "                  , " << allRegistrations[i] << endl;
         registrationSS     << tab << tab << "                  ).forInterface(INTERFACE_NAME);";

tools/xml2cpp-codegen/AdaptorGenerator.h

@@ -1,6 +1,6 @@
 /**
  * (C) 2016 - 2021 KISTLER INSTRUMENTE AG, Winterthur, Switzerland
- * (C) 2016 - 2024 Stanislav Angelovic <stanislav.angelovic@protonmail.com>
+ * (C) 2016 - 2022 Stanislav Angelovic <stanislav.angelovic@protonmail.com>
  *
  * @file AdaptorGenerator.h
  *

tools/xml2cpp-codegen/BaseGenerator.cpp

@@ -1,6 +1,6 @@
 /**
  * (C) 2016 - 2021 KISTLER INSTRUMENTE AG, Winterthur, Switzerland
- * (C) 2016 - 2024 Stanislav Angelovic <stanislav.angelovic@protonmail.com>
+ * (C) 2016 - 2022 Stanislav Angelovic <stanislav.angelovic@protonmail.com>
  *
  * @file BaseGenerator.cpp
  *
@@ -53,7 +53,7 @@ int BaseGenerator::transformXmlToFile(const Document& doc, const char* filename)
 int BaseGenerator::writeToFile(const char* filename, const std::string& data) const
 {
     std::ofstream file(filename);
-    if (file.fail())
+    if (file.bad())
     {
         std::cerr << "Unable to write file " << filename << endl;
         return 1;

tools/xml2cpp-codegen/BaseGenerator.h

@@ -1,6 +1,6 @@
 /**
  * (C) 2016 - 2021 KISTLER INSTRUMENTE AG, Winterthur, Switzerland
- * (C) 2016 - 2024 Stanislav Angelovic <stanislav.angelovic@protonmail.com>
+ * (C) 2016 - 2022 Stanislav Angelovic <stanislav.angelovic@protonmail.com>
  *
  * @file BaseGenerator.h
  *

tools/xml2cpp-codegen/ProxyGenerator.cpp

@@ -1,6 +1,6 @@
 /**
  * (C) 2016 - 2021 KISTLER INSTRUMENTE AG, Winterthur, Switzerland
- * (C) 2016 - 2024 Stanislav Angelovic <stanislav.angelovic@protonmail.com>
+ * (C) 2016 - 2022 Stanislav Angelovic <stanislav.angelovic@protonmail.com>
  *
  * @file ProxyGenerator.cpp
  *
@@ -84,15 +84,15 @@ std::string ProxyGenerator::processInterface(Node& interface) const
             << tab << "static constexpr const char* INTERFACE_NAME = \"" << ifaceName << "\";" << endl << endl
             << "protected:" << endl
             << tab << className << "(sdbus::IProxy& proxy)" << endl
-            << tab << tab << ": m_proxy(proxy)" << endl
+            << tab << tab << ": proxy_(&proxy)" << endl
             << tab << "{" << endl
             << tab << "}" << endl << endl;
 
     // Rule of Five
     body << tab << className << "(const " << className << "&) = delete;" << endl;
     body << tab << className << "& operator=(const " << className << "&) = delete;" << endl;
-    body << tab << className << "(" << className << "&&) = delete;" << endl;
-    body << tab << className << "& operator=(" << className << "&&) = delete;" << endl << endl;
+    body << tab << className << "(" << className << "&&) = default;" << endl;
+    body << tab << className << "& operator=(" << className << "&&) = default;" << endl << endl;
 
     body << tab << "~" << className << "() = default;" << endl << endl;
 
@@ -136,7 +136,7 @@ std::string ProxyGenerator::processInterface(Node& interface) const
     }
 
     body << "private:" << endl
-            << tab << "sdbus::IProxy& m_proxy;" << endl
+            << tab << "sdbus::IProxy* proxy_;" << endl
             << "};" << endl << endl
             << std::string(namespacesCount, '}') << " // namespaces" << endl << endl;
 
@@ -226,7 +226,7 @@ std::tuple<std::string, std::string> ProxyGenerator::processMethods(const Nodes&
         }
 
         definitionSS << tab << tab << (async && !dontExpectReply ? "return " : "")
-                     << "m_proxy.callMethod" << (async ? "Async" : "") << "(\"" << name << "\").onInterface(INTERFACE_NAME)";
+                     << "proxy_->callMethod" << (async ? "Async" : "") << "(\"" << name << "\").onInterface(INTERFACE_NAME)";
 
         if (!timeoutValue.empty())
         {
@@ -251,11 +251,11 @@ std::tuple<std::string, std::string> ProxyGenerator::processMethods(const Nodes&
             }
             else // Async methods implemented through callbacks
             {
-                definitionSS << ".uponReplyInvoke([this](std::optional<sdbus::Error> error" << (outArgTypeStr.empty() ? "" : ", ") << outArgTypeStr << ")"
-                                                 "{ this->on" << nameBigFirst << "Reply(" << outArgStr << (outArgStr.empty() ? "" : ", ") << "std::move(error)); })";
+                definitionSS << ".uponReplyInvoke([this](const sdbus::Error* error" << (outArgTypeStr.empty() ? "" : ", ") << outArgTypeStr << ")"
+                                                 "{ this->on" << nameBigFirst << "Reply(" << outArgStr << (outArgStr.empty() ? "" : ", ") << "error); })";
 
                 asyncDeclarationSS << tab << "virtual void on" << nameBigFirst << "Reply("
-                                   << outArgTypeStr << (outArgTypeStr.empty() ? "" : ", ")  << "std::optional<sdbus::Error> error) = 0;" << endl;
+                                   << outArgTypeStr << (outArgTypeStr.empty() ? "" : ", ")  << "const sdbus::Error* error) = 0;" << endl;
             }
         }
         else if (outArgs.size() > 0)
@@ -289,8 +289,8 @@ std::tuple<std::string, std::string> ProxyGenerator::processSignals(const Nodes&
         std::string argStr, argTypeStr;
         std::tie(argStr, argTypeStr, std::ignore, std::ignore) = argsToNamesAndTypes(args);
 
-        registrationSS << tab << tab << "m_proxy"
-                ".uponSignal(\"" << name << "\")"
+        registrationSS << tab << tab << "proxy_"
+                "->uponSignal(\"" << name << "\")"
                 ".onInterface(INTERFACE_NAME)"
                 ".call([this](" << argTypeStr << ")"
                 "{ this->on" << nameBigFirst << "(" << argStr << "); });" << endl;
@@ -346,13 +346,9 @@ std::tuple<std::string, std::string> ProxyGenerator::processProperties(const Nod
 
             propertySS << tab << realRetType << " " << propertyNameSafe << "()" << endl
                     << tab << "{" << endl;
-            propertySS << tab << tab << "return m_proxy.getProperty" << (asyncGet ? "Async" : "") << "(\"" << propertyName << "\")"
+            propertySS << tab << tab << "return proxy_->getProperty" << (asyncGet ? "Async" : "") << "(\"" << propertyName << "\")"
                             ".onInterface(INTERFACE_NAME)";
-            if (!asyncGet)
-            {
-                propertySS << ".get<" << realRetType << ">()";
-            }
-            else
+            if (asyncGet)
             {
                 auto nameBigFirst = propertyName;
                 nameBigFirst[0] = islower(nameBigFirst[0]) ? nameBigFirst[0] + 'A' - 'a' : nameBigFirst[0];
@@ -363,11 +359,11 @@ std::tuple<std::string, std::string> ProxyGenerator::processProperties(const Nod
                 }
                 else // Async methods implemented through callbacks
                 {
-                    propertySS << ".uponReplyInvoke([this](std::optional<sdbus::Error> error, const sdbus::Variant& value)"
-                                                   "{ this->on" << nameBigFirst << "PropertyGetReply(value.get<" << propertyType << ">(), std::move(error)); })";
+                    propertySS << ".uponReplyInvoke([this](const sdbus::Error* error, const sdbus::Variant& value)"
+                                                   "{ this->on" << nameBigFirst << "PropertyGetReply(value.get<" << propertyType << ">(), error); })";
 
                     asyncDeclarationSS << tab << "virtual void on" << nameBigFirst << "PropertyGetReply("
-                                       << "const " << propertyType << "& value, std::optional<sdbus::Error> error) = 0;" << endl;
+                                       << "const " << propertyType << "& value, const sdbus::Error* error) = 0;" << endl;
                 }
             }
             propertySS << ";" << endl << tab << "}" << endl << endl;
@@ -375,14 +371,11 @@ std::tuple<std::string, std::string> ProxyGenerator::processProperties(const Nod
 
         if (propertyAccess == "readwrite" || propertyAccess == "write")
         {
-            if (propertySignature == "v")
-                propertyArg = "{" + propertyArg + ", sdbus::embed_variant}";
-
             const std::string realRetType = (asyncSet ? (futureSet ? "std::future<void>" : "sdbus::PendingAsyncCall") : "void");
 
             propertySS << tab << realRetType << " " << propertyNameSafe << "(" << propertyTypeArg << ")" << endl
                        << tab << "{" << endl;
-            propertySS << tab << tab << (asyncSet ? "return " : "") << "m_proxy.setProperty" << (asyncSet ? "Async" : "")
+            propertySS << tab << tab << (asyncSet ? "return " : "") << "proxy_->setProperty" << (asyncSet ? "Async" : "")
                        << "(\"" << propertyName << "\")"
                             ".onInterface(INTERFACE_NAME)"
                             ".toValue(" << propertyArg << ")";
@@ -398,11 +391,11 @@ std::tuple<std::string, std::string> ProxyGenerator::processProperties(const Nod
                 }
                 else // Async methods implemented through callbacks
                 {
-                    propertySS << ".uponReplyInvoke([this](std::optional<sdbus::Error> error)"
-                                  "{ this->on" << nameBigFirst << "PropertySetReply(std::move(error)); })";
+                    propertySS << ".uponReplyInvoke([this](const sdbus::Error* error)"
+                                  "{ this->on" << nameBigFirst << "PropertySetReply(error); })";
 
                     asyncDeclarationSS << tab << "virtual void on" << nameBigFirst << "PropertySetReply("
-                                       << "std::optional<sdbus::Error> error) = 0;" << endl;
+                                       << "const sdbus::Error* error) = 0;" << endl;
                 }
             }
 

tools/xml2cpp-codegen/ProxyGenerator.h

@@ -1,6 +1,6 @@
 /**
  * (C) 2016 - 2021 KISTLER INSTRUMENTE AG, Winterthur, Switzerland
- * (C) 2016 - 2024 Stanislav Angelovic <stanislav.angelovic@protonmail.com>
+ * (C) 2016 - 2022 Stanislav Angelovic <stanislav.angelovic@protonmail.com>
  *
  * @file ProxyGenerator.h
  *

tools/xml2cpp-codegen/xml2cpp.cpp

@@ -1,6 +1,6 @@
 /**
  * (C) 2016 - 2021 KISTLER INSTRUMENTE AG, Winterthur, Switzerland
- * (C) 2016 - 2024 Stanislav Angelovic <stanislav.angelovic@protonmail.com>
+ * (C) 2016 - 2022 Stanislav Angelovic <stanislav.angelovic@protonmail.com>
  *
  * @file xml2cpp.cpp
  *
@@ -51,7 +51,6 @@ void usage(std::ostream& output, const char* programName)
             "      --adaptor=FILE   Generate header file FILE with stub class (server)" << endl <<
             "  -h, --help           " << endl <<
             "      --verbose        Explain what is being done" << endl <<
-            "  -v, --version        Prints out sdbus-c++ version used by the tool" << endl <<
             endl <<
             "The stub generator takes an XML file describing DBus interface and creates" << endl <<
             "C++ header files to be used by C++ code wanting to cumminicate through that" << endl <<
@@ -105,11 +104,6 @@ int main(int argc, char **argv)
             usage(std::cout, programName);
             return 0;
         }
-        else if (!strcmp(*argv, "--version") || !strcmp(*argv, "-v"))
-        {
-            std::cout << "Version: " << SDBUS_XML2CPP_VERSION << std::endl;
-            return 0;
-        }
         else if (!strcmp(*argv, "--verbose"))
         {
             verbose = true;
@@ -192,10 +186,7 @@ int main(int argc, char **argv)
             std::cerr << "Generating proxy header " << proxy << endl;
         }
         ProxyGenerator pg;
-        if(pg.transformXmlToFile(doc, proxy)) {
-            std::cerr << "Failed to generate proxy header" << endl;
-            return 1;
-        }
+        pg.transformXmlToFile(doc, proxy);
     }
 
     if (adaptor)
@@ -205,11 +196,7 @@ int main(int argc, char **argv)
             std::cerr << "Generating adaptor header " << adaptor << endl;
         }
         AdaptorGenerator ag;
-        if(ag.transformXmlToFile(doc, adaptor)) {
-            std::cerr << "Failed to generate adaptor header" << endl;
-            return 1;
-        }
-
+        ag.transformXmlToFile(doc, adaptor);
     }
 
     return 0;