use modern construct 'override' in the derive class.

[platform/core/uifw/dali-core.git] / dali / internal / event / size-negotiation / memory-pool-relayout-container.h

diff --git a/dali/internal/event/size-negotiation/memory-pool-relayout-container.h b/dali/internal/event/size-negotiation/memory-pool-relayout-container.h
index 02eda8f..d8272c4 100644 (file)
--- a/dali/internal/event/size-negotiation/memory-pool-relayout-container.h
+++ b/dali/internal/event/size-negotiation/memory-pool-relayout-container.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_INTERNAL_MEMORY_POOL_RELAYOUT_CONTAINER_H__
-#define __DALI_INTERNAL_MEMORY_POOL_RELAYOUT_CONTAINER_H__
+#ifndef DALI_INTERNAL_MEMORY_POOL_RELAYOUT_CONTAINER_H
+#define DALI_INTERNAL_MEMORY_POOL_RELAYOUT_CONTAINER_H
 
 /*
- * Copyright (c) 2015 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.
@@ -60,7 +60,7 @@ public:
   /**
    * Virtual destructor
    */
-  virtual ~MemoryPoolRelayoutContainer();
+  ~MemoryPoolRelayoutContainer() override;
 
   /**
    * @brief Add relayout information to the container if it does'nt already exist
@@ -68,7 +68,7 @@ public:
    * @param actor The actor to relayout
    * @param size The size to relayout
    */
-  virtual void Add( const Dali::Actor& actor, const Vector2& size );
+  void Add( const Dali::Actor& actor, const Vector2& size ) override;
 
   /**
    * @brief Remove information from the container
@@ -108,8 +108,7 @@ public:
   bool Contains( const Dali::Actor& actor );
 
 private:
-
-  typedef Vector< RelayoutInfo* > RelayoutInfoContainer;
+  using RelayoutInfoContainer = Vector<RelayoutInfo*>;
 
   RelayoutInfoContainer mRelayoutInfos;     ///< The list of relayout infos
 
@@ -120,4 +119,4 @@ private:
 
 } // namespace Dali
 
-#endif // __DALI_INTERNAL_MEMORY_POOL_RELAYOUT_CONTAINER_H__
+#endif // DALI_INTERNAL_MEMORY_POOL_RELAYOUT_CONTAINER_H