X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali%2Finternal%2Fevent%2Factors%2Fcustom-actor-internal.h;h=c3b57b3111bb67c033bcf5adc7cdb8e44034bba5;hb=55827866fcb8c7ee47581ac4335a3390472090e8;hp=ade7a2752e2ae716a34176860eede08f18b141e0;hpb=1a76fe580aeb02d0d9fadcaaedb7e30c9b4b0758;p=platform%2Fcore%2Fuifw%2Fdali-core.git diff --git a/dali/internal/event/actors/custom-actor-internal.h b/dali/internal/event/actors/custom-actor-internal.h index ade7a27..c3b57b3 100644 --- a/dali/internal/event/actors/custom-actor-internal.h +++ b/dali/internal/event/actors/custom-actor-internal.h @@ -1,8 +1,8 @@ -#ifndef __DALI_INTERNAL_CUSTOM_ACTOR_H__ -#define __DALI_INTERNAL_CUSTOM_ACTOR_H__ +#ifndef DALI_INTERNAL_CUSTOM_ACTOR_H +#define DALI_INTERNAL_CUSTOM_ACTOR_H /* - * Copyright (c) 2014 Samsung Electronics Co., Ltd. + * Copyright (c) 2019 Samsung Electronics Co., Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -58,6 +58,13 @@ public: return *mImpl; } + /** + * Get the type info associated with this object. + * + * @return The type info + */ + Dali::TypeInfo GetTypeInfo(); + protected: /** @@ -70,9 +77,9 @@ private: /** * @copydoc Internal::Actor::OnStageConnectionExternal */ - virtual void OnStageConnectionExternal() + virtual void OnStageConnectionExternal( int32_t depth ) { - mImpl->OnStageConnection(); + mImpl->OnStageConnection( depth ); } /** @@ -233,17 +240,17 @@ private: /** * Private constructor; see also CustomActor::New() */ - CustomActor(CustomActorImpl& extension); + CustomActor( const SceneGraph::Node& node, CustomActorImpl& extension ); - // Undefined - CustomActor(const CustomActor&); - - // Undefined - CustomActor& operator=(const CustomActor& rhs); + // no default or copy constructor or assignment + CustomActor() = delete; + CustomActor( const CustomActor& ) = delete; + CustomActor& operator=( const CustomActor& rhs ) = delete; protected: CustomActorImplPtr mImpl; + }; } // namespace Internal @@ -270,4 +277,4 @@ inline const Internal::CustomActor& GetImpl(const Dali::CustomActor& actor) } // namespace Dali -#endif // __DALI_INTERNAL_CUSTOM_ACTOR_H__ +#endif // DALI_INTERNAL_CUSTOM_ACTOR_H