Purge underscored header file barriers

[platform/core/uifw/dali-core.git] / dali / internal / event / actors / custom-actor-internal.h

diff --git a/dali/internal/event/actors/custom-actor-internal.h b/dali/internal/event/actors/custom-actor-internal.h
index 377e297..c3b57b3 100644 (file)
--- 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 );
   }
 
   /**
@@ -151,11 +158,11 @@ private:
   }
 
   /**
-   * @copydoc Internal::Actor::OnMouseWheelEvent
+   * @copydoc Internal::Actor::OnWheelEvent
    */
-  virtual bool OnMouseWheelEvent(const MouseWheelEvent& event)
+  virtual bool OnWheelEvent(const WheelEvent& event)
   {
-    return mImpl->OnMouseWheelEvent(event);
+    return mImpl->OnWheelEvent(event);
   }
 
   /**
@@ -169,7 +176,7 @@ private:
   /**
    * @copydoc Internal::Actor::OnSetResizePolicy
    */
-  virtual void OnSetResizePolicy( ResizePolicy policy, Dimension dimension )
+  virtual void OnSetResizePolicy( ResizePolicy::Type policy, Dimension::Type dimension )
   {
     mImpl->OnSetResizePolicy( policy, dimension );
   }
@@ -185,7 +192,7 @@ private:
   /**
    * @copydoc Internal::Actor::CalculateChildSize
    */
-  virtual float CalculateChildSize( const Dali::Actor& child, Dimension dimension )
+  virtual float CalculateChildSize( const Dali::Actor& child, Dimension::Type dimension )
   {
     return mImpl->CalculateChildSize( child, dimension );
   }
@@ -209,7 +216,7 @@ private:
   /**
    * @copydoc Internal::Actor::RelayoutDependentOnChildren
    */
-  virtual bool RelayoutDependentOnChildren( Dimension dimension = ALL_DIMENSIONS )
+  virtual bool RelayoutDependentOnChildren( Dimension::Type dimension = Dimension::ALL_DIMENSIONS )
   {
     return mImpl->RelayoutDependentOnChildren( dimension );
   }
@@ -217,7 +224,7 @@ private:
   /**
    * @copydoc Internal::Actor::OnCalculateRelayoutSize
    */
-  virtual void OnCalculateRelayoutSize( Dimension dimension )
+  virtual void OnCalculateRelayoutSize( Dimension::Type dimension )
   {
     return mImpl->OnCalculateRelayoutSize( dimension );
   }
@@ -225,7 +232,7 @@ private:
   /**
    * @copydoc Internal::Actor::OnLayoutNegotiated
    */
-  virtual void OnLayoutNegotiated( float size, Dimension dimension )
+  virtual void OnLayoutNegotiated( float size, Dimension::Type dimension )
   {
     return mImpl->OnLayoutNegotiated( size, dimension );
   }
@@ -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