X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=dali-toolkit%2Finternal%2Fcontrols%2Falignment%2Falignment-impl.h;h=64d352a5feec7d363c4a0d63b1a00fef91a70058;hp=44d058fd43505e33bdb8a64ce99200babdedb0cf;hb=ed11499452da1ccd5fdfa36324881dc66a5281bc;hpb=2ec164cd618f93ccafe17b1d0b8ff16401ed4aef

diff --git a/dali-toolkit/internal/controls/alignment/alignment-impl.h b/dali-toolkit/internal/controls/alignment/alignment-impl.h
index 44d058f..64d352a 100644
--- a/dali-toolkit/internal/controls/alignment/alignment-impl.h
+++ b/dali-toolkit/internal/controls/alignment/alignment-impl.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_TOOLKIT_INTERNAL_ALIGNMENT_H__
-#define __DALI_TOOLKIT_INTERNAL_ALIGNMENT_H__
+#ifndef DALI_TOOLKIT_INTERNAL_ALIGNMENT_H
+#define DALI_TOOLKIT_INTERNAL_ALIGNMENT_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.
@@ -20,7 +20,8 @@
 
 // INTERNAL INCLUDES
 #include <dali-toolkit/public-api/controls/control-impl.h>
-#include <dali-toolkit/public-api/controls/alignment/alignment.h>
+#include <dali-toolkit/devel-api/controls/alignment/alignment.h>
+#include <dali-toolkit/internal/controls/control/control-data-impl.h>
 
 namespace Dali
 {
@@ -82,9 +83,14 @@ public:
 private: // From Control
 
   /**
+   * @copydoc Control::OnInitialize()
+   */
+  virtual void OnInitialize() override;
+
+  /**
    * @copydoc Control::OnRelayout()
    */
-  virtual void OnRelayout( const Vector2& size, RelayoutContainer& container );
+  void OnRelayout( const Vector2& size, RelayoutContainer& container ) override;
 
 private:
 
@@ -139,4 +145,4 @@ inline const Toolkit::Internal::Alignment& GetImpl( const Toolkit::Alignment& al
 
 } // namespace Dali
 
-#endif // __DALI_TOOLKIT_INTERNAL_ALIGNMENT_H__
+#endif // DALI_TOOLKIT_INTERNAL_ALIGNMENT_H