(Touch) Updated programming guide, Automated Tests & KeyboardFocusManager to use...

[platform/core/uifw/dali-toolkit.git] / docs / content / example-code / properties.cpp

diff --git a/docs/content/example-code/properties.cpp b/docs/content/example-code/properties.cpp
index dcbb47f..300d276 100644 (file)
--- a/docs/content/example-code/properties.cpp
+++ b/docs/content/example-code/properties.cpp
@@ -67,9 +67,9 @@ public:
     // Set another property to set the image-map
     Property::Map imageMap;
     imageMap[ "rendererType" ] = "image";
-    imageMap[ "imageUrl" ]     = IMAGE_CARDS;
-    imageMap[ "width" ]        = 100;
-    imageMap[ "height" ]       = 100;
+    imageMap[ "url" ]          = IMAGE_CARDS;
+    imageMap[ "desiredWidth" ]        = 100;
+    imageMap[ "desiredHeight" ]       = 100;
     mImageView.SetProperty( ImageView::Property::IMAGE, imageMap );
 
     // Add the image view to the stage
@@ -79,7 +79,7 @@ public:
     mTagPropertyIndex = mImageView.RegisterProperty( TAG_PROPERTY_NAME, 0, Property::READ_WRITE /* Event-side only, i.e. not animatable */ );
 
     // Connect to the touch-event
-    mImageView.TouchedSignal().Connect( this, &PropertyController::OnTouched );
+    mImageView.TouchSignal().Connect( this, &PropertyController::OnTouched );
 
     // Create text label
     mTagText = Toolkit::TextLabel::New( "0" );
@@ -95,7 +95,7 @@ public:
    * param[in] touch The touch-event
    * return Set to true if the signal was consumed correctly
    */
-  bool OnTouched( Actor actor, const TouchEvent& touch )
+  bool OnTouched( Actor actor, const TouchData& touch )
   {
     int touchedCount = 0;