Purge underscored header file barriers

[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
old mode 100644 (file)
new mode 100755 (executable)
index 39fed86..f3975f6
--- a/dali-toolkit/devel-api/builder/builder.h
+++ b/dali-toolkit/devel-api/builder/builder.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_TOOLKIT_UIBUILDER_H__
-#define __DALI_TOOLKIT_UIBUILDER_H__
+#ifndef DALI_TOOLKIT_UIBUILDER_H
+#define DALI_TOOLKIT_UIBUILDER_H
 
 /*
- * Copyright (c) 2015 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2019 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.
@@ -24,7 +24,9 @@
 #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>
-#include <dali/public-api/shader-effects/shader-effect.h>
+
+// INTERNAL INCLUDES
+#include <dali-toolkit/public-api/dali-toolkit-common.h>
 
 namespace Dali
 {
@@ -119,7 +121,7 @@ class Builder;
  *
  */
 
-class DALI_IMPORT_API Builder : public BaseHandle
+class DALI_TOOLKIT_API Builder : public BaseHandle
  {
  public:
    /**
@@ -188,6 +190,14 @@ class DALI_IMPORT_API Builder : public BaseHandle
   void AddConstant( const std::string& key, const Property::Value& value );
 
   /**
+   * @brief Gets all currently defined configurations.
+   *
+   * @pre The Builder has been initialized.
+   * @return A reference to the currently defined configurations.
+   */
+  const Property::Map& GetConfigurations() const;
+
+  /**
    * @brief Gets all currently defined constants.
    *
    * e.g.
@@ -384,15 +394,6 @@ class DALI_IMPORT_API Builder : public BaseHandle
   void CreateRenderTask( const std::string &name );
 
   /**
-   * Get or create ShaderEffect from the ShaderEffect instance library.
-   * An empty handle is returned otherwise.
-   * @pre The Builder has been initialized.
-   * @param name The name of a ShaderEffect in the loaded representation
-   * @return A handle to a ShaderEffect if found, otherwise empty
-   */
-  ShaderEffect GetShaderEffect( 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.
@@ -455,4 +456,4 @@ private:
 
 } // namespace Dali
 
-#endif // __DALI_TOOLKIT_UIBUILDER_H__
+#endif // DALI_TOOLKIT_UIBUILDER_H