From 20491c0f31d70e254c56f171c69b95f3d4ad2813 Mon Sep 17 00:00:00 2001 From: Jens Lorenz Date: Wed, 11 Jun 2014 18:14:58 +0200 Subject: * Bug #100 - removed projecttypes.h which causes compiling conflicts Signed-off-by: Jens Lorenz --- .../genivi/NodeStateManager/ConsumerDBusProxy.h | 37 +++++++--------------- 1 file changed, 12 insertions(+), 25 deletions(-) (limited to 'AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/ConsumerDBusProxy.h') diff --git a/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/ConsumerDBusProxy.h b/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/ConsumerDBusProxy.h index a753d63..2e08248 100644 --- a/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/ConsumerDBusProxy.h +++ b/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/ConsumerDBusProxy.h @@ -1,24 +1,11 @@ /* -* This file was generated by the CommonAPI Generators. -* Used org.genivi.commonapi.core 2.1.2.201309301424. -* Used org.franca.core 0.8.9.201308271211. +* 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) 2012, BMW AG -* -* This file is part of GENIVI Project AudioManager. -* -* Contributions are licensed to the GENIVI Alliance under one or more -* Contribution License Agreements. -* -* \copyright -* 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 Aleksandar Donchev, aleksander.donchev@partner.bmw.de BMW 2013 -* -* For further information see http://www.genivi.org/. +* 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 @@ -88,20 +75,20 @@ class ConsumerDBusProxy: virtual public ConsumerProxyBase, virtual public Common virtual std::future GetSessionStateAsync(const std::string& SessionName, const int32_t& SeatID, GetSessionStateAsyncCallback callback); virtual void SetSessionState(const std::string& SessionName, const std::string& SessionOwner, const int32_t& SessionState, const int32_t& SeatID, CommonAPI::CallStatus& callStatus, int32_t& ErrorCode); virtual std::future SetSessionStateAsync(const std::string& SessionName, const std::string& SessionOwner, const int32_t& SessionState, const int32_t& SeatID, SetSessionStateAsyncCallback callback); - + virtual void getOwnVersion(uint16_t& ownVersionMajor, uint16_t& ownVersionMinor) const; private: - CommonAPI::DBus::DBusFreedesktopReadonlyAttribute bootMode_; - CommonAPI::DBus::DBusFreedesktopReadonlyAttribute restartReason_; - CommonAPI::DBus::DBusFreedesktopReadonlyAttribute shutdownReason_; - CommonAPI::DBus::DBusFreedesktopReadonlyAttribute wakeUpReason_; + CommonAPI::DBus::DBusReadonlyAttribute bootMode_; + CommonAPI::DBus::DBusReadonlyAttribute restartReason_; + CommonAPI::DBus::DBusReadonlyAttribute shutdownReason_; + CommonAPI::DBus::DBusReadonlyAttribute wakeUpReason_; CommonAPI::DBus::DBusEvent nodeApplicationMode_; CommonAPI::DBus::DBusEvent sessionStateChanged_; CommonAPI::DBus::DBusEvent nodeState_; - + }; -- cgit v1.2.1