Merge "Changed 'virtual' function override declarations to 'override' in automated...

[platform/core/uifw/dali-toolkit.git] / dali-toolkit / devel-api / builder / builder.h

diff --git a/dali-toolkit/devel-api/builder/builder.h b/dali-toolkit/devel-api/builder/builder.h
index f3975f6..e7f460d 100755 (executable)
--- a/dali-toolkit/devel-api/builder/builder.h
+++ b/dali-toolkit/devel-api/builder/builder.h
@@ -2,7 +2,7 @@
 #define DALI_TOOLKIT_UIBUILDER_H
 
 /*
- * Copyright (c) 2019 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2020 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.
@@ -23,7 +23,6 @@
 #include <dali/public-api/animation/animation.h>
 #include <dali/public-api/animation/linear-constrainer.h>
 #include <dali/devel-api/animation/path-constrainer.h>
-#include <dali/public-api/images/frame-buffer-image.h>
 
 // INTERNAL INCLUDES
 #include <dali-toolkit/public-api/dali-toolkit-common.h>
@@ -245,7 +244,7 @@ class DALI_TOOLKIT_API Builder : public BaseHandle
    *
    * e.g.
    *   Property::Map map;
-   *   map["ACTOR"] = actor.GetName();       // replaces '{ACTOR} in the template
+   *   map["ACTOR"] = actor.GetProperty< std::string >( Dali::Actor::Property::NAME );       // replaces '{ACTOR} in the template
    *   Animation a = builder.CreateAnimation( "wobble");
    *
    * @pre The Builder has been initialized.
@@ -281,7 +280,7 @@ class DALI_TOOLKIT_API Builder : public BaseHandle
    * The animation is applied to a specific actor.
    * e.g.
    *   Property::Map map;
-   *   map["ACTOR"] = actor.GetName();       // replaces '{ACTOR} in the template
+   *   map["ACTOR"] = actor.GetProperty< std::string >( Dali::Actor::Property::NAME );       // replaces '{ACTOR} in the template
    *   Actor myInstance = builder.Create( "templateActorTree" )
    *   Animation a = builder.CreateAnimation( "wobble", myInstance);
    *
@@ -394,15 +393,6 @@ class DALI_TOOLKIT_API Builder : public BaseHandle
   void CreateRenderTask( const std::string &name );
 
   /**
-   * Get or create FrameBufferImage from the FrameBufferImage instance library.
-   * An empty handle is returned otherwise.
-   * @pre The Builder has been initialized.
-   * @param name The name of a FrameBufferImage in the loaded representation
-   * @return A handle to a FrameBufferImage if found, otherwise empty
-   */
-  FrameBufferImage GetFrameBufferImage( const std::string &name );
-
-  /**
    * Get or create Path from the Path instance library.
    * An empty handle is returned otherwise.
    * @pre The Builder has been initialized.