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

refactor: remove deprecated API stuff (#403)

Browse Source
This commit is contained in:
Stanislav Angelovič
2024-02-10 20:27:14 +01:00
parent 0074c79e7f
commit 280fcfb067
3 changed files with 0 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

65
include/sdbus-c++/IConnection.h
View File

@ -138,23 +138,6 @@ namespace sdbus {
*/ */
virtual sd_event *getSdEventLoop() = 0; virtual sd_event *getSdEventLoop() = 0;
/*!
* @brief Adds an ObjectManager at the specified D-Bus object path
*
* Creates an ObjectManager interface at the specified object path on
* the connection. This is a convenient way to interrogate a connection
* to see what objects it has.
*
* This call creates a floating registration. The ObjectManager will
* be there for the object path until the connection is destroyed.
*
* Another, recommended way to add object managers is directly through
* IObject API.
*
* @throws sdbus::Error in case of failure
*/
[[deprecated("Use one of other addObjectManager overloads")]] virtual void addObjectManager(const std::string& objectPath) = 0;
/*! /*!
* @brief Returns fd's, I/O events and timeout data to be used in an external event loop * @brief Returns fd's, I/O events and timeout data to be used in an external event loop
* *
@ -355,34 +338,6 @@ namespace sdbus {
*/ */
virtual void addMatchAsync(const std::string& match, message_handler callback, message_handler installCallback, floating_slot_t) = 0; virtual void addMatchAsync(const std::string& match, message_handler callback, message_handler installCallback, floating_slot_t) = 0;
/*!
* @copydoc IConnection::enterEventLoop()
*
* @deprecated This function has been replaced by enterEventLoop()
*/
[[deprecated("This function has been replaced by enterEventLoop()")]] void enterProcessingLoop();
/*!
* @copydoc IConnection::enterEventLoopAsync()
*
* @deprecated This function has been replaced by enterEventLoopAsync()
*/
[[deprecated("This function has been replaced by enterEventLoopAsync()")]] void enterProcessingLoopAsync();
/*!
* @copydoc IConnection::leaveEventLoop()
*
* @deprecated This function has been replaced by leaveEventLoop()
*/
[[deprecated("This function has been replaced by leaveEventLoop()")]] void leaveProcessingLoop();
/*!
* @copydoc IConnection::getEventLoopPollData()
*
* @deprecated This function has been replaced by getEventLoopPollData()
*/
[[nodiscard]] [[deprecated("This function has been replaced by getEventLoopPollData()")]] PollData getProcessLoopPollData() const;
/*! /*!
* @struct PollData * @struct PollData
* *
@ -440,26 +395,6 @@ namespace sdbus {
return setMethodCallTimeout(microsecs.count()); return setMethodCallTimeout(microsecs.count());
} }
inline void IConnection::enterProcessingLoop()
{
enterEventLoop();
}
inline void IConnection::enterProcessingLoopAsync()
{
enterEventLoopAsync();
}
inline void IConnection::leaveProcessingLoop()
{
leaveEventLoop();
}
inline IConnection::PollData IConnection::getProcessLoopPollData() const
{
return getEventLoopPollData();
}
/*! /*!
* @brief Creates/opens D-Bus system bus connection * @brief Creates/opens D-Bus system bus connection
* *

5
src/Connection.cpp
View File

@ -188,11 +188,6 @@ ISdBus& Connection::getSdBusInterface()
return *sdbus_.get(); return *sdbus_.get();
} }
void Connection::addObjectManager(const std::string& objectPath)
{
Connection::addObjectManager(objectPath, floating_slot);
}
void Connection::addObjectManager(const std::string& objectPath, floating_slot_t) void Connection::addObjectManager(const std::string& objectPath, floating_slot_t)
{ {
auto r = sdbus_->sd_bus_add_object_manager(bus_.get(), nullptr, objectPath.c_str()); auto r = sdbus_->sd_bus_add_object_manager(bus_.get(), nullptr, objectPath.c_str());

1
src/Connection.h
View File

@ -91,7 +91,6 @@ namespace sdbus::internal {
bool processPendingEvent() override; bool processPendingEvent() override;
Message getCurrentlyProcessedMessage() const override; Message getCurrentlyProcessedMessage() const override;
void addObjectManager(const std::string& objectPath) override;
void addObjectManager(const std::string& objectPath, floating_slot_t) override; void addObjectManager(const std::string& objectPath, floating_slot_t) override;
Slot addObjectManager(const std::string& objectPath, return_slot_t) override; Slot addObjectManager(const std::string& objectPath, return_slot_t) override;