From 280fcfb0671e50d6fda9bd456b9b4edc9da98aa9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stanislav=20Angelovi=C4=8D?= Date: Sat, 10 Feb 2024 20:27:14 +0100 Subject: [PATCH] refactor: remove deprecated API stuff (#403) --- include/sdbus-c++/IConnection.h | 65 --------------------------------- src/Connection.cpp | 5 --- src/Connection.h | 1 - 3 files changed, 71 deletions(-) diff --git a/include/sdbus-c++/IConnection.h b/include/sdbus-c++/IConnection.h index 5f579d3..5652be2 100644 --- a/include/sdbus-c++/IConnection.h +++ b/include/sdbus-c++/IConnection.h @@ -138,23 +138,6 @@ namespace sdbus { */ 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 * @@ -355,34 +338,6 @@ namespace sdbus { */ 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 * @@ -440,26 +395,6 @@ namespace sdbus { 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 * diff --git a/src/Connection.cpp b/src/Connection.cpp index bf8b85d..c7f9f77 100644 --- a/src/Connection.cpp +++ b/src/Connection.cpp @@ -188,11 +188,6 @@ ISdBus& Connection::getSdBusInterface() 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) { auto r = sdbus_->sd_bus_add_object_manager(bus_.get(), nullptr, objectPath.c_str()); diff --git a/src/Connection.h b/src/Connection.h index c9fd724..269f74f 100644 --- a/src/Connection.h +++ b/src/Connection.h @@ -91,7 +91,6 @@ namespace sdbus::internal { bool processPendingEvent() override; Message getCurrentlyProcessedMessage() const override; - void addObjectManager(const std::string& objectPath) override; void addObjectManager(const std::string& objectPath, floating_slot_t) override; Slot addObjectManager(const std::string& objectPath, return_slot_t) override;