properties.hpp (b243298071cea595f58cdc40025497f3f33f070c) properties.hpp (70d534bf3cf7fd95c9f000f96bb1e5f8b690499b)
1#ifndef DBUS_PROPERTIES_HPP
2#define DBUS_PROPERTIES_HPP
3
4#include <dbus/connection.hpp>
5#include <dbus/filter.hpp>
6#include <dbus/match.hpp>
7#include <functional>
8#include <tuple>

--- 505 unchanged lines hidden (view full) ---

514 void on_get_managed_objects(const boost::system::error_code ec,
515 dbus::message m) {
516 typedef std::vector<std::pair<std::string, dbus::dbus_variant>>
517 properties_dict;
518
519 typedef std::vector<std::pair<std::string, properties_dict>>
520 interfaces_dict;
521
1#ifndef DBUS_PROPERTIES_HPP
2#define DBUS_PROPERTIES_HPP
3
4#include <dbus/connection.hpp>
5#include <dbus/filter.hpp>
6#include <dbus/match.hpp>
7#include <functional>
8#include <tuple>

--- 505 unchanged lines hidden (view full) ---

514 void on_get_managed_objects(const boost::system::error_code ec,
515 dbus::message m) {
516 typedef std::vector<std::pair<std::string, dbus::dbus_variant>>
517 properties_dict;
518
519 typedef std::vector<std::pair<std::string, properties_dict>>
520 interfaces_dict;
521
522 std::vector<std::pair<std::string, interfaces_dict>> dict;
522 std::vector<std::pair<object_path, interfaces_dict>> dict;
523
524 for (auto& object : objects) {
525 interfaces_dict i;
526 for (auto& interface : object->get_interfaces()) {
527 properties_dict p;
528
529 for (auto& property : interface.second->get_properties_map()) {
530 p.push_back(property);
531 }
523
524 for (auto& object : objects) {
525 interfaces_dict i;
526 for (auto& interface : object->get_interfaces()) {
527 properties_dict p;
528
529 for (auto& property : interface.second->get_properties_map()) {
530 p.push_back(property);
531 }
532
533 i.emplace_back(interface.second->get_interface_name(), std::move(p));
534 }
532 i.emplace_back(interface.second->get_interface_name(), std::move(p));
533 }
535 dict.emplace_back(object->object_name, std::move(i));
534 dict.emplace_back(object_path{object->object_name}, std::move(i));
536 }
537 auto ret = dbus::message::new_return(m);
538 ret.pack(dict);
539 conn->async_send(
540 ret, [](const boost::system::error_code ec, dbus::message r) {});
541
542 object_manager_filter->async_dispatch(
543 [&](const boost::system::error_code ec, dbus::message m) {

--- 147 unchanged lines hidden --- 		535 }
536 auto ret = dbus::message::new_return(m);
537 ret.pack(dict);
538 conn->async_send(
539 ret, [](const boost::system::error_code ec, dbus::message r) {});
540
541 object_manager_filter->async_dispatch(
542 [&](const boost::system::error_code ec, dbus::message m) {

--- 147 unchanged lines hidden ---