feedc0de/sdbus-cpp
1
0
Fork 0
forked from Kistler-Group/sdbus-cpp
Code Pull Requests Activity

refactor: rename request_slot tag to return_slot

Browse Source
This commit is contained in:
Stanislav Angelovic
2024-04-24 20:20:29 +02:00
committed by Stanislav Angelovič
parent 84932a6985
commit dc0c2562b8
15 changed files with 31 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Connection.cpp
+1 -1
View File
@@ -198,7 +198,7 @@ void Connection::addObjectManager(const std::string& objectPath, floating_slot_t
SDBUS_THROW_ERROR_IF(r < 0, "Failed to add object manager", -r);
}
Slot Connection::addObjectManager(const std::string& objectPath, request_slot_t)
Slot Connection::addObjectManager(const std::string& objectPath, return_slot_t)
{
sd_bus_slot *slot{};
src/Connection.h
+1 -1
View File
@@ -90,7 +90,7 @@ namespace sdbus::internal {
void addObjectManager(const std::string& objectPath) override;
void addObjectManager(const std::string& objectPath, floating_slot_t) override;
Slot addObjectManager(const std::string& objectPath, request_slot_t) override;
Slot addObjectManager(const std::string& objectPath, return_slot_t) override;
void setMethodCallTimeout(uint64_t timeout) override;
uint64_t getMethodCallTimeout() const override;
src/IConnection.h
+1 -1
View File
@@ -86,7 +86,7 @@ namespace sdbus::internal {
, const std::vector<std::string>& interfaces ) = 0;
using sdbus::IConnection::addObjectManager;
[[nodiscard]] virtual Slot addObjectManager(const std::string& objectPath, request_slot_t) = 0;
[[nodiscard]] virtual Slot addObjectManager(const std::string& objectPath, return_slot_t) = 0;
[[nodiscard]] virtual Slot registerSignalHandler( const std::string& sender
, const std::string& objectPath
src/Object.cpp
+3 -3
View File
@@ -49,12 +49,12 @@ Object::Object(sdbus::internal::IConnection& connection, std::string objectPath)
void Object::addVTable(std::string interfaceName, std::vector<VTableItem> vtable)
{
auto slot = Object::addVTable(std::move(interfaceName), std::move(vtable), request_slot);
auto slot = Object::addVTable(std::move(interfaceName), std::move(vtable), return_slot);
vtables_.push_back(std::move(slot));
}
Slot Object::addVTable(std::string interfaceName, std::vector<VTableItem> vtable, request_slot_t)
Slot Object::addVTable(std::string interfaceName, std::vector<VTableItem> vtable, return_slot_t)
{
SDBUS_CHECK_INTERFACE_NAME(interfaceName);
@@ -121,7 +121,7 @@ void Object::emitInterfacesRemovedSignal(const std::vector<std::string>& interfa
void Object::addObjectManager()
{
objectManagerSlot_ = connection_.addObjectManager(objectPath_, request_slot);
objectManagerSlot_ = connection_.addObjectManager(objectPath_, return_slot);
}
void Object::removeObjectManager()
src/Object.h
+1 -1
View File
@@ -46,7 +46,7 @@ namespace sdbus::internal {
Object(sdbus::internal::IConnection& connection, std::string objectPath);
void addVTable(std::string interfaceName, std::vector<VTableItem> vtable) override;
Slot addVTable(std::string interfaceName, std::vector<VTableItem> vtable, request_slot_t) override;
Slot addVTable(std::string interfaceName, std::vector<VTableItem> vtable, return_slot_t) override;
void unregister() override;
sdbus::Signal createSignal(const std::string& interfaceName, const std::string& signalName) override;
src/Proxy.cpp
+2 -2
View File
@@ -136,7 +136,7 @@ void Proxy::registerSignalHandler( const std::string& interfaceName
, const std::string& signalName
, signal_handler signalHandler )
{
auto slot = Proxy::registerSignalHandler(interfaceName, signalName, std::move(signalHandler), request_slot);
auto slot = Proxy::registerSignalHandler(interfaceName, signalName, std::move(signalHandler), return_slot);
floatingSignalSlots_.push_back(std::move(slot));
}
@@ -144,7 +144,7 @@ void Proxy::registerSignalHandler( const std::string& interfaceName
Slot Proxy::registerSignalHandler( const std::string& interfaceName
, const std::string& signalName
, signal_handler signalHandler
, request_slot_t )
, return_slot_t )
{
SDBUS_CHECK_INTERFACE_NAME(interfaceName);
SDBUS_CHECK_MEMBER_NAME(signalName);
src/Proxy.h
+1 -1
View File
@@ -65,7 +65,7 @@ namespace sdbus::internal {
Slot registerSignalHandler( const std::string& interfaceName
, const std::string& signalName
, signal_handler signalHandler
, request_slot_t ) override;
, return_slot_t ) override;
void unregister() override;
sdbus::IConnection& getConnection() const override;