Fix assetion error in FocusManager

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

diff --git a/base/dali-toolkit/public-api/builder/builder.h b/base/dali-toolkit/public-api/builder/builder.h
index 723b675..5f33075 100644 (file)
--- a/base/dali-toolkit/public-api/builder/builder.h
+++ b/base/dali-toolkit/public-api/builder/builder.h
@@ -1,21 +1,22 @@
 #ifndef __DALI_TOOLKIT_UIBUILDER_H__
 #define __DALI_TOOLKIT_UIBUILDER_H__
 
-//
-// Copyright (c) 2014 Samsung Electronics Co., Ltd.
-//
-// Licensed under the Flora License, Version 1.0 (the License);
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://floralicense.org/license/
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an AS IS BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
+/*
+ * Copyright (c) 2014 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.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
 
 // INTERNAL INCLUDES
 #include <dali/dali.h>
@@ -100,9 +101,11 @@ typedef std::map<std::string, Property::Value> PropertyValueMap;
   static Builder New();
 
   /**
-   * Virtual destructor.
+   * @brief Destructor
+   *
+   * This is non-virtual since derived Handle types must not contain data or virtual methods.
    */
-  virtual ~Builder();
+  ~Builder();
 
   /**
    * UI string data format
@@ -250,16 +253,6 @@ typedef std::map<std::string, Property::Value> PropertyValueMap;
   Animation CreateAnimation( const std::string& animationName, const PropertyValueMap& map, Dali::Actor sourceActor );
 
   /**
-   * @deprecated Use Create()
-   */
-  BaseHandle CreateFromStyle( const std::string& styleName );
-
-  /**
-   * @deprecated Use Create()
-   */
-  BaseHandle CreateFromStyle( const std::string& styleName, const PropertyValueMap& map );
-
-  /**
    * @brief Creates an object (e.g. an actor) from the set of known style templates
    *
    * e.g.
@@ -325,54 +318,6 @@ typedef std::map<std::string, Property::Value> PropertyValueMap;
   void AddActors( const std::string &sectionName, Actor toActor );
 
   /**
-   * @deprecated Font as a separate asset is no longer supported
-   * Get's a Font asset previously created at load time
-   * An empty handle is returned otherwise.
-   * @pre The Builder has been initialized.
-   * @param name The name given to a Font in the loaded representation
-   * @return A handle to a Font if found, otherwise empty.
-   */
-  Font GetFont( const std::string &name ) const;
-
-  /**
-   * Get's a TextStyle asset previously created at load time
-   * @pre The Builder has been initialized.
-   * @param name The name given to a TextStyle in the loaded representation
-   * @return a Created TextStyle if found, otherwise return a TextStyle created by Default constructor
-   */
-  TextStyle GetTextStyle( const std::string &name ) const;
-
-  /**
-   * @deprecated Images as a separate asset is no longer supported
-   * Get's an Image asset previously created at load time
-   * An empty handle is returned otherwise.
-   * @pre The Builder has been initialized.
-   * @param name The name given to an Image in the loaded representation
-   * @return A handle to an Image if found, otherwise empty
-   */
-  Image GetImage( const std::string &name ) const;
-
-  /**
-   * @deprecated Actors no longer held by builder
-   * Get's an Actor previously created at load time
-   * An empty handle is returned otherwise.
-   * @pre The Builder has been initialized.
-   * @param name The name given to an Actor in the loaded representation
-   * @return A handle to an Actor if found, otherwise empty
-   */
-  Actor GetActor( const std::string &name ) const;
-
-  /**
-   * @deprecated Animations no longer held by builder
-   * Get's an Animation previously created at load time
-   * An empty handle is returned otherwise.
-   * @pre The Builder has been initialized.
-   * @param name The name given to an Animation in the loaded representation
-   * @return A handle to an Animation if found, otherwise empty
-   */
-  Animation GetAnimation( const std::string &name ) const;
-
-  /**
    * Create a render task set.
    * @pre The Builder has been initialized.
    * @param name The library name of the render task set.
@@ -397,13 +342,6 @@ typedef std::map<std::string, Property::Value> PropertyValueMap;
    */
   FrameBufferImage GetFrameBufferImage( const std::string &name );
 
-  /**
-   * @deprecated. Builder no longer holds actor handles/references
-   * Provides a list of the top level actors previously created at load time
-   * @return A container of Actors found at the top level of the loaded representation
-   */
-  ActorContainer GetTopLevelActors( void ) const;
-
 private:
   Builder(Internal::Builder *impl);