Merge "Remove extension from shader." into devel/new_mesh

[platform/core/uifw/dali-core.git] / dali / public-api / actors / layer.cpp

diff --git a/dali/public-api/actors/layer.cpp b/dali/public-api/actors/layer.cpp
index ca32115..300ee69 100644 (file)
--- a/dali/public-api/actors/layer.cpp
+++ b/dali/public-api/actors/layer.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2015 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.
@@ -27,12 +27,6 @@ namespace Dali
 
 using Dali::Layer;
 
-const char* const Layer::ACTION_RAISE = "raise";
-const char* const Layer::ACTION_LOWER = "lower";
-const char* const Layer::ACTION_RAISE_TO_TOP = "raise-to-top";
-const char* const Layer::ACTION_LOWER_TO_BOTTOM = "lower-to-bottom";
-
-
 Layer::Layer()
 {
 }
@@ -144,11 +138,6 @@ bool Layer::IsDepthTestDisabled() const
   return GetImplementation(*this).IsDepthTestDisabled();
 }
 
-float Layer::ZValue(const Vector3& position, float sortModifier)
-{
-  return Internal::Layer::ZValue( position, sortModifier );
-}
-
 void Layer::SetSortFunction(SortFunctionType function)
 {
   GetImplementation(*this).SetSortFunction(function);
@@ -180,4 +169,3 @@ Layer::Layer(Internal::Layer* internal)
 }
 
 } // namespace Dali
-