daemon: update adaptor factory to use new constructors

This commit is contained in:
Jussi Kuokkanen 2020-06-01 17:25:26 +03:00
parent 703ff9d3bb
commit 70d2cdb6d3

View File

@ -16,14 +16,14 @@ public:
/* Returns a raw pointer since smart pointers caused some scope issues.
* TODO: try to use smart pointers instead? */
static std::optional<QDBusAbstractAdaptor*> adaptor(QObject *obj,
DeviceInterface iface, DeviceNode devNode) {
DeviceInterface iface) {
std::optional<QDBusAbstractAdaptor*> retval = std::nullopt;
match(iface)
(pattern(as<DynamicReadable>(arg)) = [&](auto dr) {
retval = new DynamicReadableAdaptor(obj, dr, devNode);
retval = new DynamicReadableAdaptor(obj, dr);
},
pattern(as<Assignable>(arg)) = [&](auto a) {
retval = new AssignableAdaptor(obj, a, devNode);
retval = new AssignableAdaptor(obj, a);
},
pattern(_) = []{});
return retval;