Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

sdbus-cpp 2.1 fixes #8

Open
wants to merge 6 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion bin/dbus/dbusconfigurationmanager.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ class DBusConfigurationManager : public sdbus::AdaptorInterfaces<cx::ring::Ring:
public:
using DBusSwarmMessage = sdbus::Struct<std::string, std::string, std::string, std::map<std::string, std::string>, std::vector<std::map<std::string, std::string>>, std::vector<std::map<std::string, std::string>>, std::map<std::string, int32_t>>;
DBusConfigurationManager(sdbus::IConnection& connection)
: AdaptorInterfaces(connection, "/cx/ring/Ring/ConfigurationManager")
: AdaptorInterfaces(connection, sdbus::ObjectPath{"/cx/ring/Ring/ConfigurationManager"})
{
registerAdaptor();
registerSignalHandlers();
Expand Down
2 changes: 1 addition & 1 deletion bin/dbus/dbusinstance.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ class DBusInstance : public sdbus::AdaptorInterfaces<cx::ring::Ring::Instance_ad
{
public:
DBusInstance(sdbus::IConnection& connection)
: AdaptorInterfaces(connection, "/cx/ring/Ring/Instance")
: AdaptorInterfaces(connection, sdbus::ObjectPath{"/cx/ring/Ring/Instance"})
{
registerAdaptor();
}
Expand Down
2 changes: 1 addition & 1 deletion bin/dbus/dbuspluginmanagerinterface.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ class DBusPluginManagerInterface : public sdbus::AdaptorInterfaces<cx::ring::Rin
{
public:
DBusPluginManagerInterface(sdbus::IConnection& connection)
: AdaptorInterfaces(connection, "/cx/ring/Ring/PluginManagerInterface")
: AdaptorInterfaces(connection, sdbus::ObjectPath{"/cx/ring/Ring/PluginManagerInterface"})
{
registerAdaptor();
registerSignalHandlers();
Expand Down
2 changes: 1 addition & 1 deletion bin/dbus/dbuspresencemanager.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ class DBusPresenceManager : public sdbus::AdaptorInterfaces<cx::ring::Ring::Pres
{
public:
DBusPresenceManager(sdbus::IConnection& connection)
: AdaptorInterfaces(connection, "/cx/ring/Ring/PresenceManager")
: AdaptorInterfaces(connection, sdbus::ObjectPath{"/cx/ring/Ring/PresenceManager"})
{
registerAdaptor();
registerSignalHandlers();
Expand Down
2 changes: 1 addition & 1 deletion bin/dbus/dbusvideomanager.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ class DBusVideoManager : public sdbus::AdaptorInterfaces<cx::ring::Ring::VideoMa
{
public:
DBusVideoManager(sdbus::IConnection& connection)
: AdaptorInterfaces(connection, "/cx/ring/Ring/VideoManager")
: AdaptorInterfaces(connection, sdbus::ObjectPath{"/cx/ring/Ring/VideoManager"})
{
registerAdaptor();
registerSignalHandlers();
Expand Down
2 changes: 1 addition & 1 deletion bin/dbus/main.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,7 @@ main(int argc, char *argv [])
}

try {
connection = sdbus::createSessionBusConnection("cx.ring.Ring");
connection = sdbus::createSessionBusConnection(sdbus::ServiceName{"cx.ring.Ring"});
DBusCallManager callManager(*connection);
DBusConfigurationManager configurationManager(*connection);
DBusInstance instanceManager(*connection);
Expand Down