Merge "TextInput & TextView: Klocwork issues fix" into tizen

[platform/core/uifw/dali-toolkit.git] / base / dali-toolkit / internal / controls / text-input / text-input-handles-impl.cpp

diff --git a/base/dali-toolkit/internal/controls/text-input/text-input-handles-impl.cpp b/base/dali-toolkit/internal/controls/text-input/text-input-handles-impl.cpp
index 5bc85c1..219469c 100644 (file)
--- a/base/dali-toolkit/internal/controls/text-input/text-input-handles-impl.cpp
+++ b/base/dali-toolkit/internal/controls/text-input/text-input-handles-impl.cpp
@@ -1,37 +1,38 @@
-//
-// 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.
-//
-
-// INTERNAL INCLUDES
+/*
+ * 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.
+ *
+ */
+
+// CLASS HEADER
 #include <dali-toolkit/internal/controls/text-input/text-input-handles-impl.h>
-#include <dali-toolkit/internal/controls/text-input/textview-character-positions-impl.h>
 
-#include <dali/dali.h>
+// EXTERNAL INCLUDES
+#include <math.h>
+#include <sstream>
+#include <algorithm>
+#include <dali/public-api/animation/constraints.h>
+#include <dali/integration-api/debug.h>
 
+// INTERNAL INCLUDES
+#include <dali-toolkit/internal/controls/text-input/textview-character-positions-impl.h>
 #include <dali-toolkit/internal/controls/text-input/text-input-impl.h>
 #include <dali-toolkit/internal/controls/text-view/text-processor.h>
 #include <dali-toolkit/internal/controls/text-view/text-view-impl.h>
 #include <dali-toolkit/public-api/controls/buttons/push-button.h>
 #include <dali-toolkit/public-api/controls/alignment/alignment.h>
 
-#include <dali/integration-api/debug.h>
-
-#include <math.h>
-#include <sstream>
-#include <algorithm>
-
 using namespace Dali;
 using namespace std;
 
@@ -67,7 +68,7 @@ Actor CreateGrabArea( const std::string& name, const Vector3& relativeScale )
   return handleGrabArea;
 }
 
-Actor CreateHandle( const Vector3& anchorPoint, const Image& handleImage, const std::string& name )
+ImageActor CreateHandle( const Vector3& anchorPoint, const Image& handleImage, const std::string& name )
 {
   DALI_LOG_INFO(gLogFilter, Debug::Verbose, "TextInputHandles: CreateSelectionHandle\n" );