Merge "Add Text input style changed signal." into devel/master

[platform/core/uifw/dali-toolkit.git] / dali-toolkit / internal / visuals / debug / debug-visual.cpp

diff --git a/dali-toolkit/internal/visuals/debug/debug-visual.cpp b/dali-toolkit/internal/visuals/debug/debug-visual.cpp
index 679bf3b..d3af3ca 100644 (file)
--- a/dali-toolkit/internal/visuals/debug/debug-visual.cpp
+++ b/dali-toolkit/internal/visuals/debug/debug-visual.cpp
@@ -1,5 +1,5 @@
 /*
- * 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.
@@ -19,11 +19,12 @@
 // CLASS HEADER
 #include "debug-visual.h"
 
-//INTERNAL INCLUDES
+// INTERNAL INCLUDES
+#include <dali-toolkit/public-api/visuals/visual-properties.h>
 #include <dali-toolkit/internal/visuals/visual-factory-impl.h>
 #include <dali-toolkit/internal/visuals/visual-factory-cache.h>
-#include <dali-toolkit/internal/visuals/visual-data-impl.h>
 #include <dali-toolkit/internal/visuals/visual-string-constants.h>
+#include <dali-toolkit/internal/visuals/visual-base-data-impl.h>
 
 namespace Dali
 {
@@ -65,7 +66,7 @@ void main()\n
 
 
 DebugVisual::DebugVisual( VisualFactoryCache& factoryCache )
-: Visual( factoryCache )
+: Visual::Base( factoryCache )
 {
 }
 
@@ -80,19 +81,19 @@ void DebugVisual::DoSetOnStage( Actor& actor )
 void DebugVisual::DoCreatePropertyMap( Property::Map& map ) const
 {
   map.Clear();
-  map.Insert( RENDERER_TYPE, DEBUG_RENDERER );
+  map.Insert( Toolkit::Visual::Property::TYPE, Toolkit::Visual::DEBUG );
 }
 
 void DebugVisual::InitializeRenderer()
 {
-  mImpl->mRenderer = mFactoryCache.GetDebugVisual();
+  mImpl->mRenderer = mFactoryCache.GetDebugRenderer();
   if( !mImpl->mRenderer )
   {
     Geometry geometry = CreateQuadWireframeGeometry();
     Shader shader = Shader::New( VERTEX_SHADER, FRAGMENT_SHADER );
 
     mImpl->mRenderer = Renderer::New( geometry, shader);
-    mFactoryCache.CacheDebugVisual( mImpl->mRenderer );
+    mFactoryCache.CacheDebugRenderer( mImpl->mRenderer );
   }
 }
 
@@ -121,7 +122,7 @@ Geometry DebugVisual::CreateQuadWireframeGeometry()
   Geometry geometry = Geometry::New();
   geometry.AddVertexBuffer( quadVertices );
   geometry.SetIndexBuffer( indexData, sizeof(indexData)/sizeof(indexData[0]) );
-  geometry.SetGeometryType( Geometry::LINES );
+  geometry.SetType( Geometry::LINES );
 
   return geometry;
 }