modify license, permission and remove ^M char

[platform/framework/native/uifw.git] / src / ui / FUi_TouchLongPressGestureDetector.cpp

diff --git a/src/ui/FUi_TouchLongPressGestureDetector.cpp b/src/ui/FUi_TouchLongPressGestureDetector.cpp
index 9723146..0c7203c 100644 (file)
--- a/src/ui/FUi_TouchLongPressGestureDetector.cpp
+++ b/src/ui/FUi_TouchLongPressGestureDetector.cpp
@@ -2,14 +2,14 @@
 // Open Service Platform
 // Copyright (c) 2012-2013 Samsung Electronics Co., Ltd.
 //
-// Licensed under the Flora License, Version 1.0 (the License);
+// 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://floralicense.org/license/
+//     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,
+// 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.
@@ -67,7 +67,7 @@ _TouchLongPressGestureDetector::_TouchLongPressGestureDetector(void)
        __pLongPressInfoList = new (std::nothrow) ArrayListT<_LongPressInfo*>;
        SysTryReturnVoidResult(NID_UI, __pLongPressInfoList, E_OUT_OF_MEMORY, "[E_OUT_OF_MEMORY] Memory allocation failed.");
 
-       int __duration = static_cast<int>(elm_config_longpress_timeout_get());
+       int __duration = static_cast<int>(elm_config_longpress_timeout_get() * 1000);
        if (__duration == 0)
        {
                __duration = 500;