Merge branch 'tizen' into new_text

[platform/core/uifw/dali-toolkit.git] / base / dali-toolkit / internal / controls / text-view / text-view-processor.h

diff --git a/base/dali-toolkit/internal/controls/text-view/text-view-processor.h b/base/dali-toolkit/internal/controls/text-view/text-view-processor.h
index 7114df6..a38eaa7 100644 (file)
--- a/base/dali-toolkit/internal/controls/text-view/text-view-processor.h
+++ b/base/dali-toolkit/internal/controls/text-view/text-view-processor.h
@@ -1,25 +1,25 @@
 #ifndef __DALI_TOOLKIT_INTERNAL_TEXT_VIEW_PROCESSOR_H__
 #define __DALI_TOOLKIT_INTERNAL_TEXT_VIEW_PROCESSOR_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 "text-view-impl.h"
-#include "text-view-processor-types.h"
+#include <dali-toolkit/internal/controls/text-view/text-view-impl.h>
 
 namespace Dali
 {
@@ -97,7 +97,7 @@ void UpdateTextInfo( std::size_t position,
  * Updates the layout data structure by modifying the space between lines.
  *
  * @param[in] lineHeightOffset The new space between lines.
- * @param[in,out] textLayoutInfo Layout info for all groups of characters, words, groups of words, lines and the whole text.
+ * @param[in,out] textLayoutInfo Layout info for all characters, words, lines and the whole text.
  */
 void UpdateTextInfo( float lineHeightOffset,
                      TextLayoutInfo& textLayoutInfo );
@@ -115,13 +115,6 @@ void UpdateTextInfo( const TextStyle& style,
                      TextStyle::Mask mask,
                      TextView::RelayoutData& relayoutData );
 
-/**
- * Traverse all text initializing all non initialized text-actor handles.
- *
- * @param[in,out] relayoutData Natural size (metrics), layout, text-actor info.
- */
-void InitializeTextActorInfo( TextView::RelayoutData& relayoutData );
-
 } // namespace TextViewProcessor
 
 } // namespace Internal