X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;ds=inline;f=dali-toolkit%2Finternal%2Fcontrols%2Falignment%2Falignment-impl.h;h=7145781a0d76a3e17393504611ba650d96eef1c2;hb=b1e8521ad77e7b4e62b59613b2edef64429130e9;hp=3788d84b0d7260b174cbb2af717bfdb6b5cdff13;hpb=f4d559ea999cbbc44b1ecd489c4ca3711d37feca;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git diff --git a/dali-toolkit/internal/controls/alignment/alignment-impl.h b/dali-toolkit/internal/controls/alignment/alignment-impl.h index 3788d84..7145781 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,7 @@ // INTERNAL INCLUDES #include -#include +#include namespace Dali { @@ -84,7 +84,7 @@ private: // From Control /** * @copydoc Control::OnRelayout() */ - virtual void OnRelayout( const Vector2& size, ActorSizeContainer& container ); + virtual void OnRelayout( const Vector2& size, RelayoutContainer& container ); private: @@ -139,4 +139,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