* Bug #100 - removed projecttypes.h which causes compiling conflicts

[profile/ivi/genivi/genivi-audio-manager.git] / AudioManagerDaemon / src-gen / org / genivi / NodeStateManager / ConsumerDBusProxy.cpp

diff --git a/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/ConsumerDBusProxy.cpp b/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/ConsumerDBusProxy.cpp
index 202680d..6971e07 100644 (file)
--- a/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/ConsumerDBusProxy.cpp
+++ b/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/ConsumerDBusProxy.cpp
@@ -1,10 +1,15 @@
 /*
 * This file was generated by the CommonAPI Generators.
+* Used org.genivi.commonapi.core 2.1.5.201312121915.
+* Used org.franca.core 0.8.11.201401091023.
 *
- * Copyright (C) 2013, BMW AG
- *
- * \author Christian Linke, christian.linke@bmw.de BMW 2012,2013
+* This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
+* If a copy of the MPL was not distributed with this file, You can obtain one at
+* http://mozilla.org/MPL/2.0/.
 */
+/**
+ * @author Christian Linke
+ */
 #include "ConsumerDBusProxy.h"
 
 namespace org {
@@ -12,12 +17,13 @@ namespace genivi {
 namespace NodeStateManager {
 
 std::shared_ptr<CommonAPI::DBus::DBusProxy> createConsumerDBusProxy(
+                    const std::shared_ptr<CommonAPI::DBus::DBusFactory>& factory,
                     const std::string& commonApiAddress,
                     const std::string& interfaceName,
                     const std::string& busName,
                     const std::string& objectPath,
                     const std::shared_ptr<CommonAPI::DBus::DBusProxyConnection>& dbusProxyConnection) {
-    return std::make_shared<ConsumerDBusProxy>(commonApiAddress, interfaceName, busName, objectPath, dbusProxyConnection);
+    return std::make_shared<ConsumerDBusProxy>(factory, commonApiAddress, interfaceName, busName, objectPath, dbusProxyConnection);
 }
 
 __attribute__((constructor)) void registerConsumerDBusProxy(void) {
@@ -26,21 +32,22 @@ __attribute__((constructor)) void registerConsumerDBusProxy(void) {
 }
 
 ConsumerDBusProxy::ConsumerDBusProxy(
+                    const std::shared_ptr<CommonAPI::DBus::DBusFactory>& factory,
                     const std::string& commonApiAddress,
                     const std::string& interfaceName,
                     const std::string& busName,
                     const std::string& objectPath,
                     const std::shared_ptr<CommonAPI::DBus::DBusProxyConnection>& dbusProxyconnection):
-        CommonAPI::DBus::DBusProxy(commonApiAddress, interfaceName, busName, objectPath, dbusProxyconnection)
-,        bootMode_(*this, interfaceName.c_str(), "BootMode"),
-        restartReason_(*this, interfaceName.c_str(), "RestartReason"),
-        shutdownReason_(*this, interfaceName.c_str(), "ShutdownReason"),
-        wakeUpReason_(*this, interfaceName.c_str(), "WakeUpReason")
+        CommonAPI::DBus::DBusProxy(factory, commonApiAddress, interfaceName, busName, objectPath, dbusProxyconnection)
+,bootMode_(*this, "i", "getBootModeAttribute"),
+restartReason_(*this, "i", "getRestartReasonAttribute"),
+shutdownReason_(*this, "i", "getShutdownReasonAttribute"),
+wakeUpReason_(*this, "i", "getWakeUpReasonAttribute")
 ,        nodeApplicationMode_(*this, "NodeApplicationMode", "i"),
-                        sessionStateChanged_(*this, "SessionStateChanged", "sii"),
-                        nodeState_(*this, "NodeState", "i")
-                 {
-}
+        sessionStateChanged_(*this, "SessionStateChanged", "sii"),
+        nodeState_(*this, "NodeState", "i")
+    {
+    }
 
 ConsumerDBusProxy::BootModeAttribute& ConsumerDBusProxy::getBootModeAttribute() {
     return bootMode_;
@@ -88,7 +95,7 @@ void ConsumerDBusProxy::LifecycleRequestComplete(const uint32_t& RequestId, cons
         *this,
         "LifecycleRequestComplete",
         "ui",
-        RequestId, Status, 
+        RequestId, Status,
         callStatus
         , ErrorCode);
 }
@@ -141,7 +148,7 @@ void ConsumerDBusProxy::UnRegisterSession(const std::string& SessionName, const
         *this,
         "UnRegisterSession",
         "ssi",
-        SessionName, SessionOwner, SeatID, 
+        SessionName, SessionOwner, SeatID,
         callStatus
         , ErrorCode);
 }
@@ -160,7 +167,7 @@ void ConsumerDBusProxy::RegisterSession(const std::string& SessionName, const st
         *this,
         "RegisterSession",
         "ssii",
-        SessionName, SessionOwner, SeatID, SessionState, 
+        SessionName, SessionOwner, SeatID, SessionState,
         callStatus
         , ErrorCode);
 }
@@ -179,7 +186,7 @@ void ConsumerDBusProxy::UnRegisterShutdownClient(const std::string& BusName, con
         *this,
         "UnRegisterShutdownClient",
         "ssu",
-        BusName, ObjName, ShutdownMode, 
+        BusName, ObjName, ShutdownMode,
         callStatus
         , ErrorCode);
 }
@@ -198,7 +205,7 @@ void ConsumerDBusProxy::RegisterShutdownClient(const std::string& BusName, const
         *this,
         "RegisterShutdownClient",
         "ssuu",
-        BusName, ObjName, ShutdownMode, TimeoutMs, 
+        BusName, ObjName, ShutdownMode, TimeoutMs,
         callStatus
         , ErrorCode);
 }
@@ -234,7 +241,7 @@ void ConsumerDBusProxy::GetSessionState(const std::string& SessionName, const in
         *this,
         "GetSessionState",
         "si",
-        SessionName, SeatID, 
+        SessionName, SeatID,
         callStatus
         , SessionState, ErrorCode);
 }
@@ -253,7 +260,7 @@ void ConsumerDBusProxy::SetSessionState(const std::string& SessionName, const st
         *this,
         "SetSessionState",
         "ssii",
-        SessionName, SessionOwner, SessionState, SeatID, 
+        SessionName, SessionOwner, SessionState, SeatID,
         callStatus
         , ErrorCode);
 }
@@ -267,6 +274,8 @@ std::future<CommonAPI::CallStatus> ConsumerDBusProxy::SetSessionStateAsync(const
         std::move(callback));
 }
 
+
+
 void ConsumerDBusProxy::getOwnVersion(uint16_t& ownVersionMajor, uint16_t& ownVersionMinor) const {
     ownVersionMajor = 1;
     ownVersionMinor = 0;