Merge "Remove extension from shader." into devel/new_mesh

[platform/core/uifw/dali-core.git] / dali / integration-api / resource-request.h

diff --git a/dali/integration-api/resource-request.h b/dali/integration-api/resource-request.h
index fe2950e..6690c64 100644 (file)
--- a/dali/integration-api/resource-request.h
+++ b/dali/integration-api/resource-request.h
@@ -1,24 +1,26 @@
 #ifndef __DALI_INTEGRATION_RESOURCE_REQUEST_H__
 #define __DALI_INTEGRATION_RESOURCE_REQUEST_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/integration-api/resource-types.h>
+#include <dali/public-api/object/ref-object.h>
 
 namespace Dali
 {
@@ -50,7 +52,7 @@ enum LoadResourcePriority
 /**
  * Used to request a resource from the native filesystem.
  */
-class DALI_IMPORT_API ResourceRequest
+class ResourceRequest
 {
 public:
 
@@ -77,12 +79,12 @@ public:
   }
 
   /**
-   * Used to save a resource in the native filesystem.
+   * Used to request or save a resource from/to the native filesystem.
    * @param[in] newId         A unique ID for this request.
-   * @param[in] resourceType  The type of resource to save.
-   * @param[in] resourcePath  The location where the resource should be saved.
-   * @param[in] resourcePtr   The resource itself.
-   * @param[in] savePriority  The priority of the save request.
+   * @param[in] resourceType  The type of resource.
+   * @param[in] resourcePath  The location of the resource / where the resource should be saved.
+   * @param[in] resourcePtr   The resource to decode / save.
+   * @param[in] savePriority  The priority of the request.
    */
   ResourceRequest(ResourceId newId,
                   const ResourceType& resourceType,