Change sync attribute getter to match all other sync methods 2.0.3
authorJohannes Schanda <schanda@itestra.de>
Fri, 10 May 2013 11:00:57 +0000 (13:00 +0200)
committerJohannes Schanda <schanda@itestra.de>
Fri, 10 May 2013 11:00:57 +0000 (13:00 +0200)
src/CommonAPI/DBus/DBusAttribute.h
src/CommonAPI/DBus/DBusDaemonProxy.cpp
src/CommonAPI/DBus/DBusDaemonProxy.h

index 04d1e72..4844b87 100644 (file)
@@ -31,11 +31,9 @@ class DBusReadonlyAttribute: public _AttributeType {
                assert(getMethodName);
        }
 
-       CallStatus getValue(ValueType& value) const {
-               CallStatus callStatus;
+       void getValue(CallStatus& callStatus, ValueType& value) const {
                DBusProxyHelper<DBusSerializableArguments<>,
                                                DBusSerializableArguments<ValueType> >::callMethodWithReply(dbusProxy_, getMethodName_, "", callStatus, value);
-               return callStatus;
        }
 
        std::future<CallStatus> getValueAsync(AttributeAsyncCallback attributeAsyncCallback) {
index 539a71e..fe81995 100644 (file)
@@ -15,10 +15,9 @@ StaticInterfaceVersionAttribute::StaticInterfaceVersionAttribute(const uint32_t&
                 version_(majorValue, minorValue) {
 }
 
-CallStatus StaticInterfaceVersionAttribute::getValue(Version& version) const {
+void StaticInterfaceVersionAttribute::getValue(CallStatus& callStatus, Version& version) const {
     version = version_;
-
-    return CallStatus::SUCCESS;
+    callStatus = CallStatus::SUCCESS;
 }
 
 std::future<CallStatus> StaticInterfaceVersionAttribute::getValueAsync(AttributeAsyncCallback attributeAsyncCallback) {
index 9fa2cd2..0053c1b 100644 (file)
@@ -22,7 +22,7 @@ class StaticInterfaceVersionAttribute: public InterfaceVersionAttribute {
  public:
     StaticInterfaceVersionAttribute(const uint32_t& majorValue, const uint32_t& minorValue);
 
-    CallStatus getValue(Version& version) const;
+    void getValue(CallStatus& callStatus, Version& version) const;
     std::future<CallStatus> getValueAsync(AttributeAsyncCallback attributeAsyncCallback);
 
  private: