Merge "Change BuildRequires of dali2-toolkit to Requires" into devel/master

[platform/core/uifw/dali-toolkit.git] / dali-toolkit / internal / text / rendering / vector-based / vector-based-renderer.h

diff --git a/dali-toolkit/internal/text/rendering/vector-based/vector-based-renderer.h b/dali-toolkit/internal/text/rendering/vector-based/vector-based-renderer.h
index 9d95655..8726ae9 100644 (file)
--- a/dali-toolkit/internal/text/rendering/vector-based/vector-based-renderer.h
+++ b/dali-toolkit/internal/text/rendering/vector-based/vector-based-renderer.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_TOOLKIT_TEXT_VECTOR_BASED_RENDERER_H__
-#define __DALI_TOOLKIT_TEXT_VECTOR_BASED_RENDERER_H__
+#ifndef DALI_TOOLKIT_TEXT_VECTOR_BASED_RENDERER_H
+#define DALI_TOOLKIT_TEXT_VECTOR_BASED_RENDERER_H
 
 /*
- * Copyright (c) 2016 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2021 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.
@@ -23,13 +23,10 @@
 
 namespace Dali
 {
-
 namespace Toolkit
 {
-
 namespace Text
 {
-
 /**
  * @brief A vector-based renderer
  *
@@ -37,7 +34,6 @@ namespace Text
 class VectorBasedRenderer : public Renderer
 {
 public:
-
   /**
    * @brief Create the renderer.
    */
@@ -46,12 +42,13 @@ public:
   /**
    * @copydoc Renderer::Render()
    */
-  virtual Actor Render( ViewInterface& view,
-                        float& alignmentOffset,
-                        int depth );
+  virtual Actor Render(ViewInterface&  view,
+                       Actor           textControl,             // Functionality not supported but defined in interface
+                       Property::Index animatablePropertyIndex, // Functionality not supported but defined in interface
+                       float&          alignmentOffset,
+                       int             depth);
 
 protected:
-
   /**
    * @brief Constructor.
    */
@@ -63,15 +60,13 @@ protected:
   virtual ~VectorBasedRenderer();
 
 private:
-
   // Undefined
-  VectorBasedRenderer( const VectorBasedRenderer& handle );
+  VectorBasedRenderer(const VectorBasedRenderer& handle);
 
   // Undefined
-  VectorBasedRenderer& operator=( const VectorBasedRenderer& handle );
+  VectorBasedRenderer& operator=(const VectorBasedRenderer& handle);
 
 private:
-
   struct Impl;
   Impl* mImpl;
 };
@@ -82,4 +77,4 @@ private:
 
 } // namespace Dali
 
-#endif // __DALI_TOOLKIT_TEXT_VECTOR_BASED_RENDERER_H__
+#endif // DALI_TOOLKIT_TEXT_VECTOR_BASED_RENDERER_H