Add protected non-virtual destructor in generated classes

This commit is contained in:
sangelovic
2019-06-10 22:54:16 +02:00
parent 7049d00a78
commit ff944c9e95
14 changed files with 51 additions and 6 deletions
+2 -2
View File
@@ -52,7 +52,6 @@ using ComplexType = std::map<
class testing_adaptor
{
protected:
testing_adaptor(sdbus::IObject& object) :
object_(object)
@@ -115,9 +114,10 @@ protected:
object_.registerProperty("action").onInterface(INTERFACE_NAME).withGetter([this](){ return this->action(); }).withSetter([this](const uint32_t& value){ this->action(value); }).withUpdateBehavior(sdbus::Flags::EMITS_INVALIDATION_SIGNAL);
//object_.registerProperty("blocking").onInterface(INTERFACE_NAME)./*withGetter([this](){ return this->blocking(); }).*/withSetter([this](const bool& value){ this->blocking(value); });
object_.registerProperty("blocking").onInterface(INTERFACE_NAME).withGetter([this](){ return this->blocking(); }).withSetter([this](const bool& value){ this->blocking(value); });
}
~testing_adaptor() = default;
public:
void emitSimpleSignal()
{
+2
View File
@@ -45,6 +45,8 @@ protected:
{ this->onSignalWithoutRegistration(s); });
}
~testing_proxy() = default;
virtual void onSimpleSignal() = 0;
virtual void onSignalWithMap(const std::map<int32_t, std::string>& map) = 0;
virtual void onSignalWithVariant(const sdbus::Variant& v) = 0;
+2
View File
@@ -27,6 +27,8 @@ protected:
object_.registerSignal("dataSignal").onInterface(INTERFACE_NAME).withParameters<std::string>();
}
~perftests_adaptor() = default;
public:
void emitDataSignal(const std::string& data)
{
+2
View File
@@ -25,6 +25,8 @@ protected:
proxy_.uponSignal("dataSignal").onInterface(INTERFACE_NAME).call([this](const std::string& data){ this->onDataSignal(data); });
}
~perftests_proxy() = default;
virtual void onDataSignal(const std::string& data) = 0;
public:
@@ -27,6 +27,8 @@ protected:
object_.registerMethod("getCurrentTemperature").onInterface(INTERFACE_NAME).implementedAs([this](){ return this->getCurrentTemperature(); });
}
~thermometer_adaptor() = default;
private:
virtual uint32_t getCurrentTemperature() = 0;
@@ -26,6 +26,8 @@ protected:
{
}
~thermometer_proxy() = default;
public:
uint32_t getCurrentTemperature()
{
+2
View File
@@ -27,6 +27,8 @@ protected:
object_.registerSignal("concatenatedSignal").onInterface(INTERFACE_NAME).withParameters<std::string>();
}
~concatenator_adaptor() = default;
public:
void emitConcatenatedSignal(const std::string& concatenatedString)
{
+2
View File
@@ -26,6 +26,8 @@ protected:
proxy_.uponSignal("concatenatedSignal").onInterface(INTERFACE_NAME).call([this](const std::string& concatenatedString){ this->onConcatenatedSignal(concatenatedString); });
}
~concatenator_proxy() = default;
virtual void onConcatenatedSignal(const std::string& concatenatedString) = 0;
virtual void onConcatenateReply(const std::string& result, const sdbus::Error* error) = 0;
@@ -27,6 +27,8 @@ protected:
object_.registerMethod("getCurrentTemperature").onInterface(INTERFACE_NAME).implementedAs([this](){ return this->getCurrentTemperature(); });
}
~thermometer_adaptor() = default;
private:
virtual uint32_t getCurrentTemperature() = 0;
@@ -55,6 +57,8 @@ protected:
object_.registerMethod("destroyDelegateObject").onInterface(INTERFACE_NAME).implementedAs([this](sdbus::Result<>&& result, sdbus::ObjectPath delegate){ this->destroyDelegateObject(std::move(result), std::move(delegate)); }).withNoReply();
}
~factory_adaptor() = default;
private:
virtual void createDelegateObject(sdbus::Result<sdbus::ObjectPath>&& result) = 0;
virtual void destroyDelegateObject(sdbus::Result<>&& result, sdbus::ObjectPath delegate) = 0;
@@ -26,6 +26,8 @@ protected:
{
}
~thermometer_proxy() = default;
public:
uint32_t getCurrentTemperature()
{
@@ -57,6 +59,8 @@ protected:
{
}
~factory_proxy() = default;
public:
sdbus::ObjectPath createDelegateObject()
{