Renamed SimpleDBus Interface class to RemoteInterface

MANIFEST.in

@@ -142,7 +142,7 @@ include simpledbus/include/simpledbus/base/Path.h
 include simpledbus/include/simpledbus/external/kvn_safe_callback.hpp
 include simpledbus/include/simpledbus/external/logfwd.hpp
 include simpledbus/include/simpledbus/interfaces/ObjectManager.h
-include simpledbus/src/advanced/Interface.cpp
+include simpledbus/src/advanced/RemoteInterface.cpp
 include simpledbus/src/advanced/Proxy.cpp
 include simpledbus/src/base/Connection.cpp
 include simpledbus/src/base/Exceptions.cpp

simpleble/CMakeLists.txt

@@ -208,7 +208,7 @@ elseif(CMAKE_SYSTEM_NAME STREQUAL "Linux")
     )
 
     target_sources(simpleble PRIVATE
-        ${CMAKE_CURRENT_SOURCE_DIR}/../simpledbus/src/advanced/Interface.cpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/../simpledbus/src/advanced/RemoteInterface.cpp
         ${CMAKE_CURRENT_SOURCE_DIR}/../simpledbus/src/advanced/Proxy.cpp
         ${CMAKE_CURRENT_SOURCE_DIR}/../simpledbus/src/base/Connection.cpp
         ${CMAKE_CURRENT_SOURCE_DIR}/../simpledbus/src/base/Exceptions.cpp

simplebluez/CMakeLists.txt

@@ -63,7 +63,7 @@ set(SIMPLEBLUEZ_SRC
     ${CMAKE_CURRENT_SOURCE_DIR}/src/interfaces/Device1.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/src/interfaces/Battery1.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/src/interfaces/AgentManager1.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/../simpledbus/src/advanced/Interface.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/../simpledbus/src/advanced/RemoteInterface.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/../simpledbus/src/advanced/Proxy.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/../simpledbus/src/base/Connection.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/../simpledbus/src/base/Exceptions.cpp

simplebluez/include/simplebluez/Adapter.h

@@ -35,7 +35,7 @@ class Adapter : public SimpleDBus::Proxy {
 
   private:
     std::shared_ptr<SimpleDBus::Proxy> path_create(const std::string& path) override;
-    std::shared_ptr<SimpleDBus::Interface> interfaces_create(const std::string& interface_name) override;
+    std::shared_ptr<SimpleDBus::RemoteInterface> interfaces_create(const std::string& interface_name) override;
 
     std::shared_ptr<Adapter1> adapter1();
 };

simplebluez/include/simplebluez/Characteristic.h

@@ -39,7 +39,7 @@ class Characteristic : public SimpleDBus::Proxy {
 
   private:
     std::shared_ptr<SimpleDBus::Proxy> path_create(const std::string& path) override;
-    std::shared_ptr<SimpleDBus::Interface> interfaces_create(const std::string& interface_name) override;
+    std::shared_ptr<SimpleDBus::RemoteInterface> interfaces_create(const std::string& interface_name) override;
 
     std::shared_ptr<GattCharacteristic1> gattcharacteristic1();
 };

simplebluez/include/simplebluez/Descriptor.h

@@ -27,7 +27,7 @@ class Descriptor : public SimpleDBus::Proxy {
     void clear_on_value_changed();
 
   private:
-    std::shared_ptr<SimpleDBus::Interface> interfaces_create(const std::string& interface_name) override;
+    std::shared_ptr<SimpleDBus::RemoteInterface> interfaces_create(const std::string& interface_name) override;
 
     std::shared_ptr<GattDescriptor1> gattdescriptor1();
 };

simplebluez/include/simplebluez/Device.h

@@ -56,7 +56,7 @@ class Device : public SimpleDBus::Proxy {
 
   private:
     std::shared_ptr<SimpleDBus::Proxy> path_create(const std::string& path) override;
-    std::shared_ptr<SimpleDBus::Interface> interfaces_create(const std::string& interface_name) override;
+    std::shared_ptr<SimpleDBus::RemoteInterface> interfaces_create(const std::string& interface_name) override;
 
     std::shared_ptr<Device1> device1();
     std::shared_ptr<Battery1> battery1();

simplebluez/include/simplebluez/ProxyOrg.h

@@ -17,7 +17,7 @@ class ProxyOrg : public SimpleDBus::Proxy {
 
   private:
     std::shared_ptr<SimpleDBus::Proxy> path_create(const std::string& path) override;
-    std::shared_ptr<SimpleDBus::Interface> interfaces_create(const std::string& interface_name) override;
+    std::shared_ptr<SimpleDBus::RemoteInterface> interfaces_create(const std::string& interface_name) override;
 };
 
 }  // namespace SimpleBluez

simplebluez/include/simplebluez/ProxyOrgBluez.h

@@ -20,7 +20,7 @@ class ProxyOrgBluez : public SimpleDBus::Proxy {
 
   private:
     std::shared_ptr<SimpleDBus::Proxy> path_create(const std::string& path) override;
-    std::shared_ptr<SimpleDBus::Interface> interfaces_create(const std::string& interface_name) override;
+    std::shared_ptr<SimpleDBus::RemoteInterface> interfaces_create(const std::string& interface_name) override;
     std::shared_ptr<AgentManager1> agentmanager1();
 };
 

simplebluez/include/simplebluez/Service.h

@@ -21,7 +21,7 @@ class Service : public SimpleDBus::Proxy {
 
   private:
     std::shared_ptr<SimpleDBus::Proxy> path_create(const std::string& path) override;
-    std::shared_ptr<SimpleDBus::Interface> interfaces_create(const std::string& interface_name) override;
+    std::shared_ptr<SimpleDBus::RemoteInterface> interfaces_create(const std::string& interface_name) override;
 
     std::shared_ptr<GattService1> gattservice1();
 };

simplebluez/include/simplebluez/interfaces/Adapter1.h

@@ -1,14 +1,14 @@
 #pragma once
 
-#include <simpledbus/advanced/Interface.h>
+#include <simpledbus/advanced/RemoteInterface.h>
 
 #include <optional>
 #include <string>
 #include <vector>
 
 namespace SimpleBluez {
 
-class Adapter1 : public SimpleDBus::Interface {
+class Adapter1 : public SimpleDBus::RemoteInterface {
   public:
     // ----- TYPES -----
     struct DiscoveryFilter {

simplebluez/include/simplebluez/interfaces/Agent1.h

@@ -1,14 +1,14 @@
 #pragma once
 
-#include <simpledbus/advanced/Interface.h>
+#include <simpledbus/advanced/RemoteInterface.h>
 #include <simpledbus/external/kvn_safe_callback.hpp>
 
 #include <cstdint>
 #include <string>
 
 namespace SimpleBluez {
 
-class Agent1 : public SimpleDBus::Interface {
+class Agent1 : public SimpleDBus::RemoteInterface {
   public:
     Agent1(std::shared_ptr<SimpleDBus::Connection> conn, std::string path);
     virtual ~Agent1() = default;

simplebluez/include/simplebluez/interfaces/AgentManager1.h

@@ -1,12 +1,12 @@
 #pragma once
 
-#include <simpledbus/advanced/Interface.h>
+#include <simpledbus/advanced/RemoteInterface.h>
 
 #include <string>
 
 namespace SimpleBluez {
 
-class AgentManager1 : public SimpleDBus::Interface {
+class AgentManager1 : public SimpleDBus::RemoteInterface {
   public:
     AgentManager1(std::shared_ptr<SimpleDBus::Connection> conn, std::string path);
     virtual ~AgentManager1() = default;

simplebluez/include/simplebluez/interfaces/Battery1.h

@@ -1,13 +1,13 @@
 #pragma once
 
-#include <simpledbus/advanced/Interface.h>
+#include <simpledbus/advanced/RemoteInterface.h>
 #include <simpledbus/external/kvn_safe_callback.hpp>
 
 #include <string>
 
 namespace SimpleBluez {
 
-class Battery1 : public SimpleDBus::Interface {
+class Battery1 : public SimpleDBus::RemoteInterface {
   public:
     Battery1(std::shared_ptr<SimpleDBus::Connection> conn, std::string path);
     virtual ~Battery1();

simplebluez/include/simplebluez/interfaces/Device1.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include <simpledbus/advanced/Interface.h>
+#include <simpledbus/advanced/RemoteInterface.h>
 #include <simpledbus/external/kvn_safe_callback.hpp>
 
 #include <string>
@@ -9,7 +9,7 @@
 
 namespace SimpleBluez {
 
-class Device1 : public SimpleDBus::Interface {
+class Device1 : public SimpleDBus::RemoteInterface {
   public:
     Device1(std::shared_ptr<SimpleDBus::Connection> conn, std::string path);
     virtual ~Device1();

simplebluez/include/simplebluez/interfaces/GattCharacteristic1.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include <simpledbus/advanced/Interface.h>
+#include <simpledbus/advanced/RemoteInterface.h>
 #include <simpledbus/external/kvn_safe_callback.hpp>
 
 #include <simplebluez/Types.h>
@@ -9,7 +9,7 @@
 
 namespace SimpleBluez {
 
-class GattCharacteristic1 : public SimpleDBus::Interface {
+class GattCharacteristic1 : public SimpleDBus::RemoteInterface {
   public:
     typedef enum { REQUEST = 0, COMMAND } WriteType;
 

simplebluez/include/simplebluez/interfaces/GattDescriptor1.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include <simpledbus/advanced/Interface.h>
+#include <simpledbus/advanced/RemoteInterface.h>
 #include <simpledbus/external/kvn_safe_callback.hpp>
 
 #include <simplebluez/Types.h>
@@ -9,7 +9,7 @@
 
 namespace SimpleBluez {
 
-class GattDescriptor1 : public SimpleDBus::Interface {
+class GattDescriptor1 : public SimpleDBus::RemoteInterface {
   public:
     GattDescriptor1(std::shared_ptr<SimpleDBus::Connection> conn, std::string path);
     virtual ~GattDescriptor1();

simplebluez/include/simplebluez/interfaces/GattService1.h

@@ -1,12 +1,12 @@
 #pragma once
 
-#include <simpledbus/advanced/Interface.h>
+#include <simpledbus/advanced/RemoteInterface.h>
 
 #include <string>
 
 namespace SimpleBluez {
 
-class GattService1 : public SimpleDBus::Interface {
+class GattService1 : public SimpleDBus::RemoteInterface {
   public:
     GattService1(std::shared_ptr<SimpleDBus::Connection> conn, std::string path);
     virtual ~GattService1() = default;

simplebluez/src/Adapter.cpp

@@ -15,13 +15,13 @@ std::shared_ptr<SimpleDBus::Proxy> Adapter::path_create(const std::string& path)
     return std::static_pointer_cast<SimpleDBus::Proxy>(child);
 }
 
-std::shared_ptr<SimpleDBus::Interface> Adapter::interfaces_create(const std::string& interface_name) {
+std::shared_ptr<SimpleDBus::RemoteInterface> Adapter::interfaces_create(const std::string& interface_name) {
     if (interface_name == "org.bluez.Adapter1") {
-        return std::static_pointer_cast<SimpleDBus::Interface>(std::make_shared<Adapter1>(_conn, _path));
+        return std::static_pointer_cast<SimpleDBus::RemoteInterface>(std::make_shared<Adapter1>(_conn, _path));
     }
 
-    auto interface = std::make_shared<SimpleDBus::Interface>(_conn, _bus_name, _path, interface_name);
-    return std::static_pointer_cast<SimpleDBus::Interface>(interface);
+    auto interface = std::make_shared<SimpleDBus::RemoteInterface>(_conn, _bus_name, _path, interface_name);
+    return std::static_pointer_cast<SimpleDBus::RemoteInterface>(interface);
 }
 
 std::shared_ptr<Adapter1> Adapter::adapter1() {

simplebluez/src/Agent.cpp

@@ -7,7 +7,7 @@ using namespace SimpleBluez;
 Agent::Agent(std::shared_ptr<SimpleDBus::Connection> conn, const std::string& bus_name, const std::string& path)
     : Proxy(conn, bus_name, path) {
     _interfaces.emplace(std::make_pair(
-        "org.bluez.Agent1", std::static_pointer_cast<SimpleDBus::Interface>(std::make_shared<Agent1>(_conn, _path))));
+        "org.bluez.Agent1", std::static_pointer_cast<SimpleDBus::RemoteInterface>(std::make_shared<Agent1>(_conn, _path))));
 }
 
 std::string Agent::capabilities() const {

simplebluez/src/Bluez.cpp

@@ -13,7 +13,7 @@ using namespace SimpleBluez;
 #endif
 
 Bluez::Bluez() : Proxy(std::make_shared<SimpleDBus::Connection>(DBUS_BUS), "org.bluez", "/") {
-    _interfaces["org.freedesktop.DBus.ObjectManager"] = std::static_pointer_cast<SimpleDBus::Interface>(
+    _interfaces["org.freedesktop.DBus.ObjectManager"] = std::static_pointer_cast<SimpleDBus::RemoteInterface>(
         std::make_shared<SimpleDBus::ObjectManager>(_conn, "org.bluez", "/"));
 
     object_manager()->InterfacesAdded = [&](std::string path, SimpleDBus::Holder options) { path_add(path, options); };

simplebluez/src/Characteristic.cpp

@@ -15,13 +15,13 @@ std::shared_ptr<SimpleDBus::Proxy> Characteristic::path_create(const std::string
     return std::static_pointer_cast<SimpleDBus::Proxy>(child);
 }
 
-std::shared_ptr<SimpleDBus::Interface> Characteristic::interfaces_create(const std::string& interface_name) {
+std::shared_ptr<SimpleDBus::RemoteInterface> Characteristic::interfaces_create(const std::string& interface_name) {
     if (interface_name == "org.bluez.GattCharacteristic1") {
-        return std::static_pointer_cast<SimpleDBus::Interface>(std::make_shared<GattCharacteristic1>(_conn, _path));
+        return std::static_pointer_cast<SimpleDBus::RemoteInterface>(std::make_shared<GattCharacteristic1>(_conn, _path));
     }
 
-    auto interface = std::make_shared<SimpleDBus::Interface>(_conn, _bus_name, _path, interface_name);
-    return std::static_pointer_cast<SimpleDBus::Interface>(interface);
+    auto interface = std::make_shared<SimpleDBus::RemoteInterface>(_conn, _bus_name, _path, interface_name);
+    return std::static_pointer_cast<SimpleDBus::RemoteInterface>(interface);
 }
 
 std::vector<std::shared_ptr<Descriptor>> Characteristic::descriptors() { return children_casted<Descriptor>(); }

simplebluez/src/Descriptor.cpp

@@ -8,13 +8,13 @@ Descriptor::Descriptor(std::shared_ptr<SimpleDBus::Connection> conn, const std::
 
 Descriptor::~Descriptor() {}
 
-std::shared_ptr<SimpleDBus::Interface> Descriptor::interfaces_create(const std::string& interface_name) {
+std::shared_ptr<SimpleDBus::RemoteInterface> Descriptor::interfaces_create(const std::string& interface_name) {
     if (interface_name == "org.bluez.GattDescriptor1") {
-        return std::static_pointer_cast<SimpleDBus::Interface>(std::make_shared<GattDescriptor1>(_conn, _path));
+        return std::static_pointer_cast<SimpleDBus::RemoteInterface>(std::make_shared<GattDescriptor1>(_conn, _path));
     }
 
-    auto interface = std::make_shared<SimpleDBus::Interface>(_conn, _bus_name, _path, interface_name);
-    return std::static_pointer_cast<SimpleDBus::Interface>(interface);
+    auto interface = std::make_shared<SimpleDBus::RemoteInterface>(_conn, _bus_name, _path, interface_name);
+    return std::static_pointer_cast<SimpleDBus::RemoteInterface>(interface);
 }
 
 std::shared_ptr<GattDescriptor1> Descriptor::gattdescriptor1() {

simplebluez/src/Device.cpp

@@ -22,15 +22,15 @@ std::shared_ptr<SimpleDBus::Proxy> Device::path_create(const std::string& path)
     }
 }
 
-std::shared_ptr<SimpleDBus::Interface> Device::interfaces_create(const std::string& interface_name) {
+std::shared_ptr<SimpleDBus::RemoteInterface> Device::interfaces_create(const std::string& interface_name) {
     if (interface_name == "org.bluez.Device1") {
-        return std::static_pointer_cast<SimpleDBus::Interface>(std::make_shared<Device1>(_conn, _path));
+        return std::static_pointer_cast<SimpleDBus::RemoteInterface>(std::make_shared<Device1>(_conn, _path));
     } else if (interface_name == "org.bluez.Battery1") {
-        return std::static_pointer_cast<SimpleDBus::Interface>(std::make_shared<Battery1>(_conn, _path));
+        return std::static_pointer_cast<SimpleDBus::RemoteInterface>(std::make_shared<Battery1>(_conn, _path));
     }
 
-    auto interface = std::make_shared<SimpleDBus::Interface>(_conn, _bus_name, _path, interface_name);
-    return std::static_pointer_cast<SimpleDBus::Interface>(interface);
+    auto interface = std::make_shared<SimpleDBus::RemoteInterface>(_conn, _bus_name, _path, interface_name);
+    return std::static_pointer_cast<SimpleDBus::RemoteInterface>(interface);
 }
 
 std::shared_ptr<Device1> Device::device1() {

simplebluez/src/ProxyOrg.cpp

@@ -19,7 +19,7 @@ std::shared_ptr<SimpleDBus::Proxy> ProxyOrg::path_create(const std::string& path
     return std::static_pointer_cast<SimpleDBus::Proxy>(child);
 }
 
-std::shared_ptr<SimpleDBus::Interface> ProxyOrg::interfaces_create(const std::string& interface_name) {
-    auto interface = std::make_shared<SimpleDBus::Interface>(_conn, _bus_name, _path, interface_name);
-    return std::static_pointer_cast<SimpleDBus::Interface>(interface);
+std::shared_ptr<SimpleDBus::RemoteInterface> ProxyOrg::interfaces_create(const std::string& interface_name) {
+    auto interface = std::make_shared<SimpleDBus::RemoteInterface>(_conn, _bus_name, _path, interface_name);
+    return std::static_pointer_cast<SimpleDBus::RemoteInterface>(interface);
 }

simplebluez/src/ProxyOrgBluez.cpp

@@ -12,13 +12,13 @@ std::shared_ptr<SimpleDBus::Proxy> ProxyOrgBluez::path_create(const std::string&
     return std::static_pointer_cast<SimpleDBus::Proxy>(child);
 }
 
-std::shared_ptr<SimpleDBus::Interface> ProxyOrgBluez::interfaces_create(const std::string& interface_name) {
+std::shared_ptr<SimpleDBus::RemoteInterface> ProxyOrgBluez::interfaces_create(const std::string& interface_name) {
     if (interface_name == "org.bluez.AgentManager1") {
-        return std::static_pointer_cast<SimpleDBus::Interface>(std::make_shared<AgentManager1>(_conn, _path));
+        return std::static_pointer_cast<SimpleDBus::RemoteInterface>(std::make_shared<AgentManager1>(_conn, _path));
     }
 
-    auto interface = std::make_shared<SimpleDBus::Interface>(_conn, _bus_name, _path, interface_name);
-    return std::static_pointer_cast<SimpleDBus::Interface>(interface);
+    auto interface = std::make_shared<SimpleDBus::RemoteInterface>(_conn, _bus_name, _path, interface_name);
+    return std::static_pointer_cast<SimpleDBus::RemoteInterface>(interface);
 }
 
 std::shared_ptr<AgentManager1> ProxyOrgBluez::agentmanager1() {

simplebluez/src/Service.cpp

@@ -12,13 +12,13 @@ std::shared_ptr<SimpleDBus::Proxy> Service::path_create(const std::string& path)
     return std::static_pointer_cast<SimpleDBus::Proxy>(child);
 }
 
-std::shared_ptr<SimpleDBus::Interface> Service::interfaces_create(const std::string& interface_name) {
+std::shared_ptr<SimpleDBus::RemoteInterface> Service::interfaces_create(const std::string& interface_name) {
     if (interface_name == "org.bluez.GattService1") {
-        return std::static_pointer_cast<SimpleDBus::Interface>(std::make_shared<GattService1>(_conn, _path));
+        return std::static_pointer_cast<SimpleDBus::RemoteInterface>(std::make_shared<GattService1>(_conn, _path));
     }
 
-    auto interface = std::make_shared<SimpleDBus::Interface>(_conn, _bus_name, _path, interface_name);
-    return std::static_pointer_cast<SimpleDBus::Interface>(interface);
+    auto interface = std::make_shared<SimpleDBus::RemoteInterface>(_conn, _bus_name, _path, interface_name);
+    return std::static_pointer_cast<SimpleDBus::RemoteInterface>(interface);
 }
 
 std::shared_ptr<GattService1> Service::gattservice1() {

simplebluez/src/interfaces/Adapter1.cpp

@@ -3,7 +3,7 @@
 using namespace SimpleBluez;
 
 Adapter1::Adapter1(std::shared_ptr<SimpleDBus::Connection> conn, std::string path)
-    : SimpleDBus::Interface(conn, "org.bluez", path, "org.bluez.Adapter1") {}
+    : SimpleDBus::RemoteInterface(conn, "org.bluez", path, "org.bluez.Adapter1") {}
 
 void Adapter1::StartDiscovery() {
     auto msg = create_method_call("StartDiscovery");

simplebluez/src/interfaces/Agent1.cpp

@@ -3,7 +3,7 @@
 using namespace SimpleBluez;
 
 Agent1::Agent1(std::shared_ptr<SimpleDBus::Connection> conn, std::string path)
-    : SimpleDBus::Interface(conn, "org.bluez", path, "org.bluez.Agent1") {}
+    : SimpleDBus::RemoteInterface(conn, "org.bluez", path, "org.bluez.Agent1") {}
 
 void Agent1::message_handle(SimpleDBus::Message& msg) {
     if (msg.get_type() == SimpleDBus::Message::Type::METHOD_CALL) {

simplebluez/src/interfaces/AgentManager1.cpp

@@ -5,7 +5,7 @@ using namespace SimpleBluez;
 #include <iostream>
 
 AgentManager1::AgentManager1(std::shared_ptr<SimpleDBus::Connection> conn, std::string path)
-    : SimpleDBus::Interface(conn, "org.bluez", path, "org.bluez.AgentManager1") {}
+    : SimpleDBus::RemoteInterface(conn, "org.bluez", path, "org.bluez.AgentManager1") {}
 
 void AgentManager1::RegisterAgent(std::string agent, std::string capability) {
     auto msg = create_method_call("RegisterAgent");

simplebluez/src/interfaces/Battery1.cpp

@@ -5,7 +5,7 @@
 using namespace SimpleBluez;
 
 Battery1::Battery1(std::shared_ptr<SimpleDBus::Connection> conn, std::string path)
-    : SimpleDBus::Interface(conn, "org.bluez", path, "org.bluez.Battery1") {}
+    : SimpleDBus::RemoteInterface(conn, "org.bluez", path, "org.bluez.Battery1") {}
 
 Battery1::~Battery1() { OnPercentageChanged.unload(); }