(ScrollView) Removed unnecessary scale constraints from scroll-view

[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..cee1458 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__
 
 #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>
 
 // INTERNAL INCLUDES
 #include <dali/dali.h>


@@ -100,9 +101,11 @@ typedef std::map<std::string, Property::Value> PropertyValueMap;
   static Builder New();
 
   /**
   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
 
   /**
    * UI string data format