[dali_1.4.21] Merge branch 'devel/master'

[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 530a81a..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) 2016 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.
@@ -25,6 +25,9 @@
 #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>
+
 namespace Dali
 {
 
@@ -118,7 +121,7 @@ class Builder;
  *
  */
 
-class DALI_IMPORT_API Builder : public BaseHandle
+class DALI_TOOLKIT_API Builder : public BaseHandle
  {
  public:
    /**
@@ -187,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.
@@ -445,4 +456,4 @@ private:
 
 } // namespace Dali
 
-#endif // __DALI_TOOLKIT_UIBUILDER_H__
+#endif // DALI_TOOLKIT_UIBUILDER_H