X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali-toolkit%2Finternal%2Fcontrols%2Fbubble-effect%2Fcolor-adjuster.h;h=27df32e76f1c97494f90f77550f43b2630689f53;hb=5f58a4de80835daf8db03a9e6b9c04cf5f556831;hp=c48dfe76a4470d71503c113948ffa2f5ca33f8d2;hpb=bfdf7a73a4d50dfb60d0f7fa5b214f61c920bf9c;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git diff --git a/dali-toolkit/internal/controls/bubble-effect/color-adjuster.h b/dali-toolkit/internal/controls/bubble-effect/color-adjuster.h index c48dfe7..27df32e 100644 --- a/dali-toolkit/internal/controls/bubble-effect/color-adjuster.h +++ b/dali-toolkit/internal/controls/bubble-effect/color-adjuster.h @@ -1,8 +1,8 @@ -#ifndef __DALI_TOOLKIT_INTERNAL_COLOR_ADJUSTER_H_ -#define __DALI_TOOLKIT_INTERNAL_COLOR_ADJUSTER_H_ +#ifndef DALI_TOOLKIT_INTERNAL_COLOR_ADJUSTER_H +#define DALI_TOOLKIT_INTERNAL_COLOR_ADJUSTER_H /* - * Copyright (c) 2015 Samsung Electronics Co., Ltd. + * Copyright (c) 2016 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. @@ -17,9 +17,14 @@ * limitations under the License. * */ + +// EXTERNAL INCLUDES #include #include +// INTERNAL INCLUDES +#include + #define DALI_COMPOSE_SHADER(STR) #STR namespace Dali @@ -89,10 +94,10 @@ inline Property::Map CreateColorAdjuster() ); Property::Map customShader; - customShader[ "fragmentShader" ] = fragmentShader; + customShader[ Toolkit::Visual::Shader::Property::FRAGMENT_SHADER ] = fragmentShader; Property::Map map; - map[ "shader" ] = customShader; + map[ Toolkit::DevelVisual::Property::SHADER ] = customShader; return map; } @@ -103,4 +108,4 @@ inline Property::Map CreateColorAdjuster() } // namespace Dali -#endif /* __DALI_TOOLKIT_INTERNAL_COLOR_ADJUSTER_H_ */ +#endif // DALI_TOOLKIT_INTERNAL_COLOR_ADJUSTER_H