Merge "Clean up the code to build successfully on macOS" into devel/master

[platform/core/uifw/dali-core.git] / dali / public-api / size-negotiation / relayout-container.h

diff --git a/dali/public-api/size-negotiation/relayout-container.h b/dali/public-api/size-negotiation/relayout-container.h
index 3a8341a..515b6b3 100644 (file)
--- a/dali/public-api/size-negotiation/relayout-container.h
+++ b/dali/public-api/size-negotiation/relayout-container.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_RELAYOUT_CONTAINER_H__
-#define __DALI_RELAYOUT_CONTAINER_H__
+#ifndef DALI_RELAYOUT_CONTAINER_H
+#define DALI_RELAYOUT_CONTAINER_H
 
 /*
- * Copyright (c) 2015 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2020 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.
@@ -24,10 +24,13 @@
 
 namespace Dali
 {
+/**
+ * @addtogroup dali_core_size_negotiation
+ * @{
+ */
 
 class RelayoutContainer;
-typedef RelayoutContainer* RelayoutContainerPtr;
-
+using RelayoutContainerPtr = RelayoutContainer*;
 
 /**
  * @brief Interface to encapsulate information required for relayout.
@@ -36,19 +39,18 @@ typedef RelayoutContainer* RelayoutContainerPtr;
 class RelayoutContainer
 {
 public:
-
   /**
    * @brief Default constructor.
    *
    * @SINCE_1_0.0
    */
-  RelayoutContainer() {}
+  RelayoutContainer() = default;
 
   /**
    * @brief Virtual destructor.
    * @SINCE_1_0.0
    */
-  virtual ~RelayoutContainer() {}
+  virtual ~RelayoutContainer() = default;
 
   /**
    * @brief Adds relayout information to the container if it doesn't already exist.
@@ -57,10 +59,12 @@ public:
    * @param actor The actor to relayout
    * @param size The size to relayout
    */
-  virtual void Add( const Actor& actor, const Vector2& size ) = 0;
-
+  virtual void Add(const Actor& actor, const Vector2& size) = 0;
 };
 
+/**
+ * @}
+ */
 } // namespace Dali
 
-#endif // __DALI_RELAYOUT_CONTAINER_H__
+#endif // DALI_RELAYOUT_CONTAINER_H