test

2024-01-08 08:00:39 +01:00
71 changed files with 84 additions and 324 deletions
@@ -4,7 +4,7 @@

 cmake_minimum_required(VERSION 3.13)

-project(sdbus-c++ VERSION 1.6.0 LANGUAGES C CXX)
+project(sdbus-c++ VERSION 1.4.0 LANGUAGES C CXX)

 include(GNUInstallDirs) # Installation directories for `install` command and pkgconfig file

@@ -221,6 +221,7 @@ endif()

 include(CMakePackageConfigHelpers)

+
 install(EXPORT sdbus-c++-targets
        DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/sdbus-c++
        NAMESPACE SDBusCpp::
@@ -239,18 +239,3 @@ v1.4.0
 - Add support for direct, peer-to-peer connections
 - 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
@@ -1516,7 +1516,7 @@ sdbus-c++ provides many default, pre-defined C++ type representations for D-Bus
 | 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           | 118         | v          | VARIANT            | `sdbus::Variant`                  |
 | container           | 101,123,125 | e{}        | DICT_ENTRY         | -                               |
 | fixed, basic        | 104         | h          | UNIX_FD            | `sdbus::UnixFd`                   |
 | reserved            | 109         | m          | (reserved)         | -                               |
@@ -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
 *
@@ -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
 *
@@ -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
 *
@@ -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
 *
@@ -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
 *
@@ -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
 *
@@ -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
 *
@@ -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
 *
@@ -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
 *
@@ -29,10 +29,9 @@

 #include <sdbus-c++/TypeTraits.h>
 #include <sdbus-c++/Error.h>
-#include <array>
 #include <string>
-#include <utility>
 #include <vector>
+#include <array>
 #if __cplusplus >= 202002L
 #include <span>
 #endif
@@ -44,7 +43,6 @@
 #include <functional>
 #include <sys/types.h>
 #include <algorithm>
-#include <variant>

 // Forward declarations
 namespace sdbus {
@@ -90,11 +88,10 @@ namespace sdbus {
        Message& operator<<(const char *item);
        Message& operator<<(const std::string &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>
@@ -103,8 +100,6 @@ namespace sdbus {
        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, 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>
@@ -126,8 +121,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);
@@ -139,8 +132,6 @@ namespace sdbus {
        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, typename _Compare, typename _Allocator>
        Message& operator>>(std::map<_Key, _Value, _Compare, _Allocator>& items);
        template <typename _Key, typename _Value, typename _Hash, typename _KeyEqual, typename _Allocator>
@@ -315,18 +306,6 @@ namespace sdbus {
        PlainMessage() = default;
    };

-    template <typename ...Elements>
-    inline Message& Message::operator<<(const std::variant<Elements...>& value)
-    {
-        std::visit([this](const auto& inner){
-            openVariant(signature_of<decltype(inner)>::str());
-            *this << inner;
-            closeVariant();
-        }, value);
-
-        return *this;
-    }
-
    template <typename _Element, typename _Allocator>
    inline Message& Message::operator<<(const std::vector<_Element, _Allocator>& items)
    {
@@ -353,12 +332,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)
    {
@@ -458,34 +431,6 @@ namespace sdbus {
        return *this;
    }

-    namespace detail
-    {
-        template <typename _Element, typename... _Elements>
-        bool deserialize_variant(Message& msg, std::variant<_Elements...>& value, const std::string& signature)
-        {
-            if (signature != signature_of<_Element>::str())
-                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)
-    {
-        std::string type;
-        std::string contentType;
-        peekType(type, contentType);
-        bool result = (detail::deserialize_variant<Elements>(*this, value, contentType) || ...);
-        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)
    {
@@ -512,15 +457,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)
    {
@@ -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
 *
@@ -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
 *
@@ -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
 *
@@ -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
 *
@@ -31,7 +31,6 @@
 #include <string>
 #include <vector>
 #include <array>
-#include <variant>
 #if __cplusplus >= 202002L
 #include <span>
 #endif
@@ -98,11 +97,8 @@ namespace sdbus {
    struct dont_expect_reply_t { explicit dont_expect_reply_t() = default; };
    inline constexpr dont_expect_reply_t dont_expect_reply{};

-    // Helper for static assert
-    template <class... _T> constexpr bool always_false = false;
-
    // Template specializations for getting D-Bus signatures from C++ types
-    template <typename _T, typename _Enable = void>
+    template <typename _T>
    struct signature_of
    {
        static constexpr bool is_valid = false;
@@ -110,9 +106,9 @@ namespace sdbus {

        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 DBus type (template specializations are needed 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 "";
        }
    };
@@ -124,7 +120,7 @@ namespace sdbus {

    template <typename _T>
    struct signature_of<_T&>
-        : public signature_of<_T>
+            : public signature_of<_T>
    {};

    template <>
@@ -335,10 +331,6 @@ namespace sdbus {
        }
    };

-    template <typename... Elements>
-    struct signature_of<std::variant<Elements...>> : signature_of<Variant>
-    {};
-
    template <>
    struct signature_of<ObjectPath>
    {
@@ -413,12 +405,6 @@ namespace sdbus {
    };
 #endif

-    template <typename _Enum>
-    struct signature_of<_Enum, typename std::enable_if_t<std::is_enum_v<_Enum>>>
-        : public 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>>
    {
@@ -443,6 +429,7 @@ namespace sdbus {
        }
    };

+
    // Function traits implementation inspired by (c) kennytm,
    // https://github.com/kennytm/utils/blob/master/traits.hpp
    template <typename _Type>
@@ -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
 *
@@ -65,14 +65,6 @@ namespace sdbus {
            msg_.seal();
        }

-        template <typename... _Elements>
-        Variant(const std::variant<_Elements...>& value)
-            : Variant()
-        {
-            msg_ << value;
-            msg_.seal();
-        }
-
        template <typename _ValueType>
        _ValueType get() const
        {
@@ -91,15 +83,6 @@ namespace sdbus {
            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
        {
@@ -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
 *
@@ -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
 *
@@ -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
 *
@@ -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
 *
@@ -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
 *
@@ -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
 *
@@ -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)
@@ -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
 *
@@ -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
 *
@@ -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
 *
@@ -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
 *
@@ -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
 *
@@ -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
 *
@@ -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,7 +27,6 @@
 #ifndef SDBUS_CPP_INTERNAL_SCOPEGUARD_H_
 #define SDBUS_CPP_INTERNAL_SCOPEGUARD_H_

-#include <exception>
 #include <utility>

 // Straightforward, modern, easy-to-use RAII utility to perform work on scope exit in an exception-safe manner.
@@ -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)
@@ -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)
@@ -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
 *
@@ -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
 *
@@ -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
 *
@@ -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
 *
@@ -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
 *
@@ -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
 *
@@ -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
 *
@@ -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
 *
@@ -98,13 +98,6 @@ TEST_F(SdbusTestObject, CallsMethodWithVariantSuccesfully)
    ASSERT_THAT(variantRes.get<int32_t>(), Eq(static_cast<int32_t>(DOUBLE_VALUE)));
 }

-TEST_F(SdbusTestObject, CallsMethodWithStdVariantSuccesfully)
-{
-    std::variant<int32_t, double, std::string> v{DOUBLE_VALUE};
-    auto variantRes = m_proxy->processVariant(v);
-    ASSERT_THAT(std::get<int32_t>(variantRes), Eq(static_cast<int32_t>(DOUBLE_VALUE)));
-}
-
 TEST_F(SdbusTestObject, CallsMethodWithStructVariantsAndGetMapSuccesfully)
 {
    std::vector<int32_t> x{-2, 0, 2};
@@ -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
 *
@@ -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
 *
@@ -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
 *
@@ -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
 *
@@ -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
 *
@@ -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;
 }

@@ -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
 *
@@ -66,7 +66,7 @@ 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;
@@ -123,7 +123,7 @@ 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 {}; }
@@ -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
 *
@@ -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
 *
@@ -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
 *
@@ -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
 *
@@ -29,7 +29,7 @@ protected:
        object_->registerMethod("multiply").onInterface(INTERFACE_NAME).withInputParamNames("a", "b").withOutputParamNames("result").implementedAs([this](const int64_t& a, const double& b){ return this->multiply(a, b); });
        object_->registerMethod("multiplyWithNoReply").onInterface(INTERFACE_NAME).withInputParamNames("a", "b").implementedAs([this](const int64_t& a, const double& b){ return this->multiplyWithNoReply(a, b); }).markAsDeprecated().withNoReply();
        object_->registerMethod("getInts16FromStruct").onInterface(INTERFACE_NAME).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); });
-        object_->registerMethod("processVariant").onInterface(INTERFACE_NAME).withInputParamNames("variant").withOutputParamNames("result").implementedAs([this](const std::variant<int32_t, double, std::string>& variant){ return this->processVariant(variant); });
+        object_->registerMethod("processVariant").onInterface(INTERFACE_NAME).withInputParamNames("variant").withOutputParamNames("result").implementedAs([this](const sdbus::Variant& variant){ return this->processVariant(variant); });
        object_->registerMethod("getMapOfVariants").onInterface(INTERFACE_NAME).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); });
        object_->registerMethod("getStructInStruct").onInterface(INTERFACE_NAME).withOutputParamNames("aMapOfVariants").implementedAs([this](){ return this->getStructInStruct(); });
        object_->registerMethod("sumStructItems").onInterface(INTERFACE_NAME).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); });
@@ -82,7 +82,7 @@ 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;
@@ -84,13 +84,6 @@ public:
        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;
-        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;
@@ -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
 *
@@ -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
 *
@@ -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
 *
@@ -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
 *
@@ -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)
@@ -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
 *
@@ -347,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();
@@ -501,39 +483,3 @@ TEST(AMessage, CanCarryDBusStructGivenAsCustomType)

    ASSERT_THAT(dataRead, Eq(dataWritten));
 }
-
-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{}));
@@ -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()   \
@@ -93,13 +78,9 @@ namespace
    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")
-    TYPE(std::variant<int16_t, std::string>)HAS_DBUS_TYPE_SIGNATURE("v")
 #if __cplusplus >= 202002L
-    TYPE(std::span<int16_t>)HAS_DBUS_TYPE_SIGNATURE("an")
+    TYPE(std::span<int16_t>)HAS_DBUS_TYPE_SIGNATURE("ao")
 #endif
-    TYPE(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<
@@ -143,13 +124,9 @@ namespace
                            , sdbus::Struct<uint16_t, double, std::string, sdbus::Variant>
                            , std::vector<int16_t>
                            , std::array<int16_t, 3>
-                            , std::variant<int16_t, std::string>
 #if __cplusplus >= 202002L
                            , std::span<int16_t>
 #endif
-                            , SomeEnumClass
-                            , SomeEnumStruct
-                            , SomeClassicEnum
                            , std::map<int32_t, int64_t>
                            , std::unordered_map<int32_t, int64_t>
                            , ComplexType
@@ -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;
@@ -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)
@@ -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
 *
@@ -4,7 +4,7 @@

 cmake_minimum_required(VERSION 3.5)

-project(sdbus-c++-tools VERSION 1.6.0)
+project(sdbus-c++-tools VERSION 1.4.0)

 include(GNUInstallDirs)

@@ -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
 *
@@ -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
 *
@@ -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
 *
@@ -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
 *
@@ -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
 *
@@ -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
 *
@@ -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
 *