X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=dali-toolkit%2Finternal%2Ftext%2Fdecorator%2Ftext-decorator.cpp;h=bee7d9aef5066cfc1d9618676a7bbbe8a5c7613f;hp=56948c5ca8de5e1dca8acef90f39d5a046e75d32;hb=01c086f17e2af89f6c6b1bd30a0240da2fda1e75;hpb=9808ae4c46337178721866e7ec163eebe0d1c85a

diff --git a/dali-toolkit/internal/text/decorator/text-decorator.cpp b/dali-toolkit/internal/text/decorator/text-decorator.cpp
index 56948c5..bee7d9a 100644
--- a/dali-toolkit/internal/text/decorator/text-decorator.cpp
+++ b/dali-toolkit/internal/text/decorator/text-decorator.cpp
@@ -23,7 +23,7 @@
 #include <dali/public-api/actors/layer.h>
 #include <dali/public-api/adaptor-framework/timer.h>
 #include <dali/devel-api/common/stage.h>
-#include <dali/public-api/events/touch-data.h>
+#include <dali/public-api/events/touch-event.h>
 #include <dali/public-api/events/pan-gesture.h>
 #include <dali/public-api/object/property-notification.h>
 #include <dali/public-api/rendering/geometry.h>
@@ -1229,7 +1229,7 @@ struct Decorator::Impl : public ConnectionTracker
 
         if( ! mQuadVertices )
         {
-          mQuadVertices = PropertyBuffer::New( mQuadVertexFormat );
+          mQuadVertices = VertexBuffer::New( mQuadVertexFormat );
         }
 
         mQuadVertices.SetData( &vertices[ 0 ], vertices.Size() );
@@ -1363,7 +1363,7 @@ struct Decorator::Impl : public ConnectionTracker
     }
   }
 
-  bool OnGrabHandleTouched( Actor actor, const TouchData& touch )
+  bool OnGrabHandleTouched( Actor actor, const TouchEvent& touch )
   {
     HandleImpl& grabHandle = mHandle[GRAB_HANDLE];
 
@@ -1389,7 +1389,7 @@ struct Decorator::Impl : public ConnectionTracker
     return false;
   }
 
-  bool OnHandleOneTouched( Actor actor, const TouchData& touch )
+  bool OnHandleOneTouched( Actor actor, const TouchEvent& touch )
   {
     HandleImpl& primarySelectionHandle = mHandle[LEFT_SELECTION_HANDLE];
 
@@ -1419,7 +1419,7 @@ struct Decorator::Impl : public ConnectionTracker
     return false;
   }
 
-  bool OnHandleTwoTouched( Actor actor, const TouchData& touch )
+  bool OnHandleTwoTouched( Actor actor, const TouchEvent& touch )
   {
     HandleImpl& secondarySelectionHandle = mHandle[RIGHT_SELECTION_HANDLE];
 
@@ -1903,7 +1903,7 @@ struct Decorator::Impl : public ConnectionTracker
   CursorImpl          mCursor[CURSOR_COUNT];
   HandleImpl          mHandle[HANDLE_TYPE_COUNT];
 
-  PropertyBuffer      mQuadVertices;
+  VertexBuffer        mQuadVertices;
   Geometry            mQuadGeometry;
   QuadContainer       mHighlightQuadList;         ///< Sub-selections that combine to create the complete selection highlight.