merge from freedesktop.org
Merge git://anongit.freedesktop.org/git/dbus/dbus-c++ Conflicts: examples/echo/echo-server.cpp examples/properties/props-server.cpp
This commit is contained in:
commit
13219dd9fc
18 changed files with 124 additions and 167 deletions
|
@ -76,10 +76,10 @@ public:
|
|||
|
||||
protected:
|
||||
|
||||
virtual void on_get_property(InterfaceAdaptor &interface, const std::string &property, Variant &value)
|
||||
virtual void on_get_property(InterfaceAdaptor &/*interface*/, const std::string &/*property*/, Variant &/*value*/)
|
||||
{}
|
||||
|
||||
virtual void on_set_property(InterfaceAdaptor &interface, const std::string &property, const Variant &value)
|
||||
virtual void on_set_property(InterfaceAdaptor &/*interface*/, const std::string &/*property*/, const Variant &/*value*/)
|
||||
{}
|
||||
|
||||
IntrospectedInterface *const introspect() const;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue