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=25d9ea4a22af786e993a213483b0b2a85a07ea6c;hb=ed11499452da1ccd5fdfa36324881dc66a5281bc;hpb=e2eda444afbe82e9591fe198eef339227f90a616

diff --git a/dali-toolkit/internal/controls/alignment/alignment-impl.h b/dali-toolkit/internal/controls/alignment/alignment-impl.h
index 25d9ea4..64d352a 100644
--- a/dali-toolkit/internal/controls/alignment/alignment-impl.h
+++ b/dali-toolkit/internal/controls/alignment/alignment-impl.h
@@ -1,25 +1,27 @@
-#ifndef __DALI_TOOLKIT_INTERNAL_ALIGNMENT_H__
-#define __DALI_TOOLKIT_INTERNAL_ALIGNMENT_H__
-
-//
-// Copyright (c) 2014 Samsung Electronics Co., Ltd.
-//
-// Licensed under the Flora License, Version 1.0 (the License);
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://floralicense.org/license/
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an AS IS BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
+#ifndef DALI_TOOLKIT_INTERNAL_ALIGNMENT_H
+#define DALI_TOOLKIT_INTERNAL_ALIGNMENT_H
+
+/*
+ * 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.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
 
 // 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
 {
@@ -36,7 +38,7 @@ namespace Internal
  * Alignment is a control to position and resize actors inside other container actors.
  * @see Dali::Toolkit::Alignment for more details.
  */
-class Alignment : public ControlImpl
+class Alignment : public Control
 {
 public:
 
@@ -81,9 +83,14 @@ public:
 private: // From Control
 
   /**
-   * @copydoc Toolkit::ControlImpl::OnRelaidOut()
+   * @copydoc Control::OnInitialize()
+   */
+  virtual void OnInitialize() override;
+
+  /**
+   * @copydoc Control::OnRelayout()
    */
-  virtual void OnRelaidOut( Vector2 size, ActorSizeContainer& container );
+  void OnRelayout( const Vector2& size, RelayoutContainer& container ) override;
 
 private:
 
@@ -138,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