]>
Commit | Line | Data |
---|---|---|
fd047d0d JB |
1 | --- libdbus-c++-0.9.0/include/dbus-c++/interface.h.orig 2011-11-28 16:03:19.000000000 +0100 |
2 | +++ libdbus-c++-0.9.0/include/dbus-c++/interface.h 2016-02-16 21:11:10.523884413 +0100 | |
3 | @@ -177,17 +177,17 @@ | |
4 | SignalTable _signals; | |
5 | }; | |
6 | ||
7 | -# define register_method(interface, method, callback) \ | |
8 | +# define DBus_register_method(interface, method, callback) \ | |
9 | InterfaceAdaptor::_methods[ #method ] = \ | |
10 | new ::DBus::Callback< interface, ::DBus::Message, const ::DBus::CallMessage &>(this, & interface :: callback); | |
11 | ||
12 | -# define bind_property(variable, type, can_read, can_write) \ | |
13 | +# define DBus_bind_property(variable, type, can_read, can_write) \ | |
14 | InterfaceAdaptor::_properties[ #variable ].read = can_read; \ | |
15 | InterfaceAdaptor::_properties[ #variable ].write = can_write; \ | |
16 | InterfaceAdaptor::_properties[ #variable ].sig = type; \ | |
17 | variable.bind(InterfaceAdaptor::_properties[ #variable ]); | |
18 | ||
19 | -# define connect_signal(interface, signal, callback) \ | |
20 | +# define DBus_connect_signal(interface, signal, callback) \ | |
21 | InterfaceProxy::_signals[ #signal ] = \ | |
22 | new ::DBus::Callback< interface, void, const ::DBus::SignalMessage &>(this, & interface :: callback); | |
23 | ||
24 | --- libdbus-c++-0.9.0/examples/hal/hal-listen.cpp.orig 2011-11-28 16:03:19.000000000 +0100 | |
25 | +++ libdbus-c++-0.9.0/examples/hal/hal-listen.cpp 2016-02-16 21:23:04.877690640 +0100 | |
26 | @@ -11,8 +11,8 @@ HalManagerProxy::HalManagerProxy(DBus::C | |
27 | : DBus::InterfaceProxy("org.freedesktop.Hal.Manager"), | |
28 | DBus::ObjectProxy(connection, "/org/freedesktop/Hal/Manager", "org.freedesktop.Hal") | |
29 | { | |
30 | - connect_signal(HalManagerProxy, DeviceAdded, DeviceAddedCb); | |
31 | - connect_signal(HalManagerProxy, DeviceRemoved, DeviceRemovedCb); | |
32 | + DBus_connect_signal(HalManagerProxy, DeviceAdded, DeviceAddedCb); | |
33 | + DBus_connect_signal(HalManagerProxy, DeviceRemoved, DeviceRemovedCb); | |
34 | ||
35 | std::vector< std::string > devices = GetAllDevices(); | |
36 | ||
37 | @@ -70,8 +70,8 @@ HalDeviceProxy::HalDeviceProxy(DBus::Con | |
38 | : DBus::InterfaceProxy("org.freedesktop.Hal.Device"), | |
39 | DBus::ObjectProxy(connection, udi, "org.freedesktop.Hal") | |
40 | { | |
41 | - connect_signal(HalDeviceProxy, PropertyModified, PropertyModifiedCb); | |
42 | - connect_signal(HalDeviceProxy, Condition, ConditionCb); | |
43 | + DBus_connect_signal(HalDeviceProxy, PropertyModified, PropertyModifiedCb); | |
44 | + DBus_connect_signal(HalDeviceProxy, Condition, ConditionCb); | |
45 | } | |
46 | ||
47 | void HalDeviceProxy::PropertyModifiedCb(const DBus::SignalMessage &sig) | |
48 | --- libdbus-c++-0.9.0/src/introspection.cpp.orig 2011-11-28 16:03:19.000000000 +0100 | |
49 | +++ libdbus-c++-0.9.0/src/introspection.cpp 2016-02-16 21:12:54.849303200 +0100 | |
50 | @@ -40,7 +40,7 @@ static const char *introspectable_name = | |
51 | IntrospectableAdaptor::IntrospectableAdaptor() | |
52 | : InterfaceAdaptor(introspectable_name) | |
53 | { | |
54 | - register_method(IntrospectableAdaptor, Introspect, Introspect); | |
55 | + DBus_register_method(IntrospectableAdaptor, Introspect, Introspect); | |
56 | } | |
57 | ||
58 | Message IntrospectableAdaptor::Introspect(const CallMessage &call) | |
59 | --- libdbus-c++-0.9.0/src/property.cpp.orig 2011-11-28 16:03:19.000000000 +0100 | |
60 | +++ libdbus-c++-0.9.0/src/property.cpp 2016-02-16 21:13:35.914769521 +0100 | |
61 | @@ -37,8 +37,8 @@ static const char *properties_name = "or | |
62 | PropertiesAdaptor::PropertiesAdaptor() | |
63 | : InterfaceAdaptor(properties_name) | |
64 | { | |
65 | - register_method(PropertiesAdaptor, Get, Get); | |
66 | - register_method(PropertiesAdaptor, Set, Set); | |
67 | + DBus_register_method(PropertiesAdaptor, Get, Get); | |
68 | + DBus_register_method(PropertiesAdaptor, Set, Set); | |
69 | } | |
70 | ||
71 | Message PropertiesAdaptor::Get(const CallMessage &call) | |
72 | --- libdbus-c++-0.9.0/test/functional/Test1/TestAppIntroPrivate.h.orig 2011-11-30 10:23:40.000000000 +0100 | |
73 | +++ libdbus-c++-0.9.0/test/functional/Test1/TestAppIntroPrivate.h 2016-02-16 21:24:30.505478325 +0100 | |
74 | @@ -21,8 +21,8 @@ public: | |
75 | Intro_proxy() | |
76 | : ::DBus::InterfaceProxy("DBusCpp.Test.Com.Intro") | |
77 | { | |
78 | - connect_signal(Intro_proxy, test1Result, _test1Result_stub); | |
79 | - connect_signal(Intro_proxy, testByteResult, _testByteResult_stub); | |
80 | + DBus_connect_signal(Intro_proxy, test1Result, _test1Result_stub); | |
81 | + DBus_connect_signal(Intro_proxy, testByteResult, _testByteResult_stub); | |
82 | } | |
83 | ||
84 | public: | |
85 | --- libdbus-c++-0.9.0/test/functional/Test1/TestAppIntroProviderPrivate.h.orig 2011-11-30 10:23:40.000000000 +0100 | |
86 | +++ libdbus-c++-0.9.0/test/functional/Test1/TestAppIntroProviderPrivate.h 2016-02-16 21:24:10.574441511 +0100 | |
87 | @@ -21,8 +21,8 @@ public: | |
88 | Intro_adaptor() | |
89 | : ::DBus::InterfaceAdaptor("DBusCpp.Test.Com.Intro") | |
90 | { | |
91 | - register_method(Intro_adaptor, test1, _test1_stub); | |
92 | - register_method(Intro_adaptor, testByte, _testByte_stub); | |
93 | + DBus_register_method(Intro_adaptor, test1, _test1_stub); | |
94 | + DBus_register_method(Intro_adaptor, testByte, _testByte_stub); | |
95 | } | |
96 | ||
97 | ::DBus::IntrospectedInterface *introspect() const | |
98 | --- libdbus-c++-0.9.0/tools/generate_adaptor.cpp.orig 2011-11-28 16:03:19.000000000 +0100 | |
99 | +++ libdbus-c++-0.9.0/tools/generate_adaptor.cpp 2016-02-16 21:16:59.725362107 +0100 | |
100 | @@ -119,7 +119,7 @@ void generate_adaptor(Xml::Document &doc | |
101 | { | |
102 | Xml::Node &property = **pi; | |
103 | ||
104 | - body << tab << tab << "bind_property(" | |
105 | + body << tab << tab << "DBus_bind_property(" | |
106 | << property.get("name") << ", " | |
107 | << "\"" << property.get("type") << "\", " | |
108 | << (property.get("access").find("read") != string::npos | |
109 | @@ -137,7 +137,7 @@ void generate_adaptor(Xml::Document &doc | |
110 | { | |
111 | Xml::Node &method = **mi; | |
112 | ||
113 | - body << tab << tab << "register_method(" | |
114 | + body << tab << tab << "DBus_register_method(" | |
115 | << ifaceclass << ", " << method.get("name") << ", " << stub_name(method.get("name")) | |
116 | << ");" << endl; | |
117 | } | |
118 | --- libdbus-c++-0.9.0/tools/generate_proxy.cpp.orig 2011-11-28 16:03:19.000000000 +0100 | |
119 | +++ libdbus-c++-0.9.0/tools/generate_proxy.cpp 2016-02-16 21:21:39.493248947 +0100 | |
120 | @@ -121,7 +121,7 @@ void generate_proxy(Xml::Document &doc, | |
121 | ||
122 | string marshname = "_" + signal.get("name") + "_stub"; | |
123 | ||
124 | - body << tab << tab << "connect_signal(" | |
125 | + body << tab << tab << "DBus_connect_signal(" | |
126 | << ifaceclass << ", " << signal.get("name") << ", " << stub_name(signal.get("name")) | |
127 | << ");" << endl; | |
128 | } |