DALi Version 1.0.38

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

diff --git a/dali-toolkit/public-api/builder/json-parser.h b/dali-toolkit/public-api/builder/json-parser.h
index a47ea63..c409d64 100644 (file)
--- a/dali-toolkit/public-api/builder/json-parser.h
+++ b/dali-toolkit/public-api/builder/json-parser.h
@@ -1,32 +1,33 @@
 #ifndef __DALI_JSON_PARSER_H__
 #define __DALI_JSON_PARSER_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.
+ *
+ */
 
+// EXTERNAL INCLUDES
 #include <string>
-#include <vector>
 #include <list>
 #include <ostream>
+#include <dali/public-api/object/base-handle.h>
 
 // INTERNAL INCLUDES
 #include <dali-toolkit/public-api/builder/tree-node.h>
-#include <dali/public-api/object/base-handle.h>
 
-namespace Dali DALI_IMPORT_API
+namespace Dali
 {
 
 namespace Toolkit
@@ -40,7 +41,7 @@ class JsonParser;
 /*
  * Parses JSON
  */
-class JsonParser : public BaseHandle
+class DALI_IMPORT_API JsonParser : public BaseHandle
 {
 public:
 
@@ -62,10 +63,12 @@ public:
    */
   JsonParser();
 
-  /*
-   * virtual Destructor
+  /**
+   * @brief Destructor
+   *
+   * This is non-virtual since derived Handle types must not contain data or virtual methods.
    */
-  virtual ~JsonParser();
+  ~JsonParser();
 
   /**
    * Downcast an Object handle to JsonParser if it is a JsonParser.