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/ConsumerStubDefault.h | 41 +++++++++------------- 1 file changed, 16 insertions(+), 25 deletions(-) (limited to 'AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/ConsumerStubDefault.h') diff --git a/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/ConsumerStubDefault.h b/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/ConsumerStubDefault.h index 57de061..80dc926 100644 --- a/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/ConsumerStubDefault.h +++ b/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/ConsumerStubDefault.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 @@ -26,6 +13,7 @@ #ifndef ORG_GENIVI_NODESTATEMANAGER_Consumer_STUB_DEFAULT_H_ #define ORG_GENIVI_NODESTATEMANAGER_Consumer_STUB_DEFAULT_H_ + #include #include @@ -43,12 +31,14 @@ namespace NodeStateManager { * that would be defined for this service, and/or if you do not need any non-default * behaviour. */ -class ConsumerStubDefault : public ConsumerStub { - public: +class ConsumerStubDefault : public virtual ConsumerStub { +public: ConsumerStubDefault(); ConsumerStubRemoteEvent* initStubAdapter(const std::shared_ptr& stubAdapter); + const CommonAPI::Version& getInterfaceVersion(std::shared_ptr clientId); + virtual const int32_t& getBootModeAttribute(); virtual const int32_t& getBootModeAttribute(const std::shared_ptr clientId); virtual void setBootModeAttribute(int32_t value); @@ -99,9 +89,9 @@ class ConsumerStubDefault : public ConsumerStub { virtual void fireNodeApplicationModeEvent(const int32_t& ApplicationModeId); virtual void fireSessionStateChangedEvent(const std::string& SessionStateName, const int32_t& SeatID, const int32_t& SessionState); virtual void fireNodeStateEvent(const int32_t& NodeState); - - protected: + +protected: virtual bool trySetBootModeAttribute(int32_t value); virtual bool validateBootModeAttributeRequestedValue(const int32_t& value); virtual bool trySetRestartReasonAttribute(int32_t value); @@ -110,8 +100,7 @@ class ConsumerStubDefault : public ConsumerStub { virtual bool validateShutdownReasonAttributeRequestedValue(const int32_t& value); virtual bool trySetWakeUpReasonAttribute(int32_t value); virtual bool validateWakeUpReasonAttributeRequestedValue(const int32_t& value); - std::shared_ptr stubAdapter_; - private: +private: class RemoteEventHandler: public ConsumerStubRemoteEvent { public: RemoteEventHandler(ConsumerStubDefault* defaultStub); @@ -131,6 +120,8 @@ class ConsumerStubDefault : public ConsumerStub { int32_t restartReasonAttributeValue_; int32_t shutdownReasonAttributeValue_; int32_t wakeUpReasonAttributeValue_; + + CommonAPI::Version interfaceVersion_; }; } // namespace NodeStateManager -- cgit v1.2.1