Adaptor namespaces fixed.

Change-Id: I1225d56f7c2dfc886fd6f321c015201e23a96871
Signed-off-by: Victor Cebollada <v.cebollada@samsung.com>

diff --git a/text/dali/internal/text-abstraction/bidirectional-support-impl.cpp b/text/dali/internal/text-abstraction/bidirectional-support-impl.cpp
index 1e3cce1..b2e4247 100644 (file)
--- a/text/dali/internal/text-abstraction/bidirectional-support-impl.cpp
+++ b/text/dali/internal/text-abstraction/bidirectional-support-impl.cpp
@@ -24,10 +24,10 @@
 namespace Dali
 {
 
-namespace Internal
+namespace TextAbstraction
 {
 
-namespace TextAbstraction
+namespace Internal
 {
 
 BidirectionalSupport::BidirectionalSupport()
@@ -41,50 +41,50 @@ BidirectionalSupport::~BidirectionalSupport()
 
 }
 
-Dali::TextAbstraction::BidirectionalSupport BidirectionalSupport::Get()
+TextAbstraction::BidirectionalSupport BidirectionalSupport::Get()
 {
-  Dali::TextAbstraction::BidirectionalSupport bidirectionalSupportHandle;
+  TextAbstraction::BidirectionalSupport bidirectionalSupportHandle;
 
-  Dali::SingletonService service( SingletonService::Get() );
-  if ( service )
+  SingletonService service( SingletonService::Get() );
+  if( service )
   {
-     // Check whether the singleton is already created
-     Dali::BaseHandle handle = service.GetSingleton( typeid( Dali::TextAbstraction::BidirectionalSupport ) );
-     if(handle)
-     {
-       // If so, downcast the handle
-       BidirectionalSupport* impl = dynamic_cast< Dali::Internal::TextAbstraction::BidirectionalSupport* >( handle.GetObjectPtr() );
-       bidirectionalSupportHandle = Dali::TextAbstraction::BidirectionalSupport( impl );
-     }
-     else // create and register the object
-     {
-       bidirectionalSupportHandle = Dali::TextAbstraction::BidirectionalSupport( new BidirectionalSupport);
-       service.Register( typeid( bidirectionalSupportHandle ), bidirectionalSupportHandle );
-     }
-   }
-
-   return bidirectionalSupportHandle;
+    // Check whether the singleton is already created
+    BaseHandle handle = service.GetSingleton( typeid( TextAbstraction::BidirectionalSupport ) );
+    if(handle)
+    {
+      // If so, downcast the handle
+      BidirectionalSupport* impl = dynamic_cast< Internal::BidirectionalSupport* >( handle.GetObjectPtr() );
+      bidirectionalSupportHandle = TextAbstraction::BidirectionalSupport( impl );
+    }
+    else // create and register the object
+    {
+      bidirectionalSupportHandle = TextAbstraction::BidirectionalSupport( new BidirectionalSupport );
+      service.Register( typeid( bidirectionalSupportHandle ), bidirectionalSupportHandle );
+    }
+  }
+
+  return bidirectionalSupportHandle;
 }
 
-Dali::TextAbstraction::BidiInfoIndex BidirectionalSupport::CreateInfo( const Dali::TextAbstraction::Character* const paragraph,
-                                                                       Dali::TextAbstraction::Length numberOfCharacters )
+BidiInfoIndex BidirectionalSupport::CreateInfo( const Character* const paragraph,
+                                                Length numberOfCharacters )
 {
   return 0u;
 }
 
-void BidirectionalSupport::DestroyInfo( Dali::TextAbstraction::BidiInfoIndex bidiInfoIndex )
+void BidirectionalSupport::DestroyInfo( BidiInfoIndex bidiInfoIndex )
 {
 }
 
-void BidirectionalSupport::Reorder( Dali::TextAbstraction::BidiInfoIndex bidiInfoIndex,
-                                    Dali::TextAbstraction::CharacterIndex firstCharacterIndex,
-                                    Dali::TextAbstraction::Length numberOfCharacters,
-                                    Dali::TextAbstraction::CharacterIndex* visualToLogicalMap )
+void BidirectionalSupport::Reorder( BidiInfoIndex bidiInfoIndex,
+                                    CharacterIndex firstCharacterIndex,
+                                    Length numberOfCharacters,
+                                    CharacterIndex* visualToLogicalMap )
 {
 }
 
-} // namespace TextAbstraction
-
 } // namespace Internal
 
+} // namespace TextAbstraction
+
 } // namespace Dali

diff --git a/text/dali/internal/text-abstraction/bidirectional-support-impl.h b/text/dali/internal/text-abstraction/bidirectional-support-impl.h
index e6fe89f..d4ff5b3 100644 (file)
--- a/text/dali/internal/text-abstraction/bidirectional-support-impl.h
+++ b/text/dali/internal/text-abstraction/bidirectional-support-impl.h
@@ -27,17 +27,17 @@
 namespace Dali
 {
 
-namespace Internal
+namespace TextAbstraction
 {
 
-namespace TextAbstraction
+namespace Internal
 {
 
 /**
  * Implementation of the BidirectionalSupport
  */
 
-class BidirectionalSupport :  public Dali::BaseObject
+class BidirectionalSupport : public Dali::BaseObject
 {
 public:
 
@@ -54,26 +54,26 @@ public:
   /**
    * @copydoc Dali::BidirectionalSupport::Get()
    */
-  static Dali::TextAbstraction::BidirectionalSupport Get();
+  static TextAbstraction::BidirectionalSupport Get();
 
   /**
    * @copydoc Dali::BidirectionalSupport::CreateInfo()
    */
-  Dali::TextAbstraction::BidiInfoIndex CreateInfo( const Dali::TextAbstraction::Character* const paragraph,
-                                                   Dali::TextAbstraction::Length numberOfCharacters );
+  BidiInfoIndex CreateInfo( const Character* const paragraph,
+                            Length numberOfCharacters );
 
   /**
    * @copydoc Dali::BidirectionalSupport::DestroyInfo()
    */
-  void DestroyInfo( Dali::TextAbstraction::BidiInfoIndex bidiInfoIndex );
+  void DestroyInfo( BidiInfoIndex bidiInfoIndex );
 
   /**
    * @copydoc Dali::BidirectionalSupport::Reorder()
    */
-  void Reorder( Dali::TextAbstraction::BidiInfoIndex bidiInfoIndex,
-                Dali::TextAbstraction::CharacterIndex firstCharacterIndex,
-                Dali::TextAbstraction::Length numberOfCharacters,
-                Dali::TextAbstraction::CharacterIndex* visualToLogicalMap );
+  void Reorder( BidiInfoIndex bidiInfoIndex,
+                CharacterIndex firstCharacterIndex,
+                Length numberOfCharacters,
+                CharacterIndex* visualToLogicalMap );
 
 private:
 
@@ -87,23 +87,22 @@ private:
 
 }; // class BidirectionalSupport
 
+} // namespace Internal
 
 } // namespace TextAbstraction
 
-} // namespace Internal
-
-inline static Internal::TextAbstraction::BidirectionalSupport& GetImplementation(Dali::TextAbstraction::BidirectionalSupport& bidirectionalSupport)
+inline static TextAbstraction::Internal::BidirectionalSupport& GetImplementation( TextAbstraction::BidirectionalSupport& bidirectionalSupport )
 {
   DALI_ASSERT_ALWAYS( bidirectionalSupport && "bidirectional support handle is empty" );
   BaseObject& handle = bidirectionalSupport.GetBaseObject();
-  return static_cast<Internal::TextAbstraction::BidirectionalSupport&>(handle);
+  return static_cast<TextAbstraction::Internal::BidirectionalSupport&>(handle);
 }
 
-inline static const  Internal::TextAbstraction::BidirectionalSupport& GetImplementation(const Dali::TextAbstraction::BidirectionalSupport& bidirectionalSupport)
+inline static const TextAbstraction::Internal::BidirectionalSupport& GetImplementation( const TextAbstraction::BidirectionalSupport& bidirectionalSupport )
 {
   DALI_ASSERT_ALWAYS( bidirectionalSupport && "bidirectional support handle is empty" );
   const BaseObject& handle = bidirectionalSupport.GetBaseObject();
-  return static_cast<const Internal::TextAbstraction::BidirectionalSupport&>(handle);
+  return static_cast<const TextAbstraction::Internal::BidirectionalSupport&>(handle);
 }
 
 } // namespace Dali

diff --git a/text/dali/internal/text-abstraction/segmentation-impl.cpp b/text/dali/internal/text-abstraction/segmentation-impl.cpp
index 6f4fe14..2e59013 100644 (file)
--- a/text/dali/internal/text-abstraction/segmentation-impl.cpp
+++ b/text/dali/internal/text-abstraction/segmentation-impl.cpp
@@ -28,10 +28,10 @@
 namespace Dali
 {
 
-namespace Internal
+namespace TextAbstraction
 {
 
-namespace TextAbstraction
+namespace Internal
 {
 
 Segmentation::Segmentation()
@@ -45,47 +45,47 @@ Segmentation::~Segmentation()
 
 }
 
-Dali::TextAbstraction::Segmentation Segmentation::Get()
+TextAbstraction::Segmentation Segmentation::Get()
 {
-  Dali::TextAbstraction::Segmentation segmentationHandle;
+  TextAbstraction::Segmentation segmentationHandle;
 
-  Dali::SingletonService service( SingletonService::Get() );
-  if ( service )
+  SingletonService service( SingletonService::Get() );
+  if( service )
   {
-     // Check whether the singleton is already created
-     Dali::BaseHandle handle = service.GetSingleton( typeid( Dali::TextAbstraction::Segmentation ) );
-     if(handle)
-     {
-       // If so, downcast the handle
-       Segmentation* impl = dynamic_cast< Dali::Internal::TextAbstraction::Segmentation* >( handle.GetObjectPtr() );
-       segmentationHandle = Dali::TextAbstraction::Segmentation( impl );
-     }
-     else // create and register the object
-     {
-       segmentationHandle = Dali::TextAbstraction::Segmentation( new Segmentation);
-       service.Register( typeid( segmentationHandle ), segmentationHandle );
-     }
-   }
+    // Check whether the singleton is already created
+    Dali::BaseHandle handle = service.GetSingleton( typeid( TextAbstraction::Segmentation ) );
+    if( handle )
+    {
+      // If so, downcast the handle
+      Segmentation* impl = dynamic_cast< Internal::Segmentation* >( handle.GetObjectPtr() );
+      segmentationHandle = TextAbstraction::Segmentation( impl );
+    }
+    else // create and register the object
+    {
+      segmentationHandle = TextAbstraction::Segmentation( new Segmentation);
+      service.Register( typeid( segmentationHandle ), segmentationHandle );
+    }
+  }
 
    return segmentationHandle;
 }
 
-void Segmentation::GetLineBreakPositions( const Dali::TextAbstraction::Character* const text,
-                                          Dali::TextAbstraction::Length numberOfCharacters,
-                                          Dali::TextAbstraction::LineBreakInfo* breakInfo )
+void Segmentation::GetLineBreakPositions( const Character* const text,
+                                          Length numberOfCharacters,
+                                          LineBreakInfo* breakInfo )
 {
   set_linebreaks_utf32( text, numberOfCharacters, NULL, breakInfo );
 }
 
-void Segmentation::GetWordBreakPositions( const Dali::TextAbstraction::Character* const text,
-                                          Dali::TextAbstraction::Length numberOfCharacters,
-                                          Dali::TextAbstraction::WordBreakInfo* breakInfo )
+void Segmentation::GetWordBreakPositions( const Character* const text,
+                                          Length numberOfCharacters,
+                                          WordBreakInfo* breakInfo )
 {
   set_wordbreaks_utf32( text, numberOfCharacters, NULL, breakInfo );
 }
 
-} // namespace TextAbstraction
-
 } // namespace Internal
 
+} // namespace TextAbstraction
+
 } // namespace Dali

diff --git a/text/dali/internal/text-abstraction/segmentation-impl.h b/text/dali/internal/text-abstraction/segmentation-impl.h
index 12d771d..de1fb32 100644 (file)
--- a/text/dali/internal/text-abstraction/segmentation-impl.h
+++ b/text/dali/internal/text-abstraction/segmentation-impl.h
@@ -27,17 +27,17 @@
 namespace Dali
 {
 
-namespace Internal
+namespace TextAbstraction
 {
 
-namespace TextAbstraction
+namespace Internal
 {
 
 /**
  * Implementation of the Segmentation
  */
 
-class Segmentation :  public Dali::BaseObject
+class Segmentation : public Dali::BaseObject
 {
 public:
 
@@ -54,22 +54,22 @@ public:
   /**
    * @copydoc Dali::Segmentation::Get()
    */
-  static Dali::TextAbstraction::Segmentation Get();
+  static TextAbstraction::Segmentation Get();
 
   /**
    * @copydoc Dali::Segmentation::GetLineBreakPositions()
    */
-  void GetLineBreakPositions( const Dali::TextAbstraction::Character* const text,
-                              Dali::TextAbstraction::Length numberOfCharacters,
-                              Dali::TextAbstraction::LineBreakInfo* breakInfo );
+  void GetLineBreakPositions( const Character* const text,
+                              Length numberOfCharacters,
+                              LineBreakInfo* breakInfo );
 
 
   /**
    * @copydoc Dali::Segmentation::GetWordBreakPositions()
    */
-  void GetWordBreakPositions( const Dali::TextAbstraction::Character* const text,
-                              Dali::TextAbstraction::Length numberOfCharacters,
-                              Dali::TextAbstraction::WordBreakInfo* breakInfo );
+  void GetWordBreakPositions( const Character* const text,
+                              Length numberOfCharacters,
+                              WordBreakInfo* breakInfo );
 
 private:
 
@@ -83,23 +83,22 @@ private:
 
 }; // class Segmentation
 
+} // namespace Internal
 
 } // namespace TextAbstraction
 
-} // namespace Internal
-
-inline static Internal::TextAbstraction::Segmentation& GetImplementation(Dali::TextAbstraction::Segmentation& reordering)
+inline static TextAbstraction::Internal::Segmentation& GetImplementation( TextAbstraction::Segmentation& segmentation )
 {
-  DALI_ASSERT_ALWAYS( reordering && "reordering handle is empty" );
-  BaseObject& handle = reordering.GetBaseObject();
-  return static_cast<Internal::TextAbstraction::Segmentation&>(handle);
+  DALI_ASSERT_ALWAYS( segmentation && "segmentation handle is empty" );
+  BaseObject& handle = segmentation.GetBaseObject();
+  return static_cast<TextAbstraction::Internal::Segmentation&>( handle );
 }
 
-inline static const  Internal::TextAbstraction::Segmentation& GetImplementation(const Dali::TextAbstraction::Segmentation& reordering)
+inline static const TextAbstraction::Internal::Segmentation& GetImplementation( const TextAbstraction::Segmentation& segmentation )
 {
-  DALI_ASSERT_ALWAYS( reordering && "reordering handle is empty" );
-  const BaseObject& handle = reordering.GetBaseObject();
-  return static_cast<const Internal::TextAbstraction::Segmentation&>(handle);
+  DALI_ASSERT_ALWAYS( segmentation && "segmentation handle is empty" );
+  const BaseObject& handle = segmentation.GetBaseObject();
+  return static_cast<const TextAbstraction::Internal::Segmentation&>( handle );
 }
 
 } // namespace Dali

diff --git a/text/dali/internal/text-abstraction/shaping-impl.cpp b/text/dali/internal/text-abstraction/shaping-impl.cpp
index 20cd3f2..44f4c27 100644 (file)
--- a/text/dali/internal/text-abstraction/shaping-impl.cpp
+++ b/text/dali/internal/text-abstraction/shaping-impl.cpp
@@ -24,15 +24,14 @@
 namespace Dali
 {
 
-namespace Internal
-{
-
 namespace TextAbstraction
 {
 
+namespace Internal
+{
 
 Shaping::Shaping()
-:mPlugin(NULL)
+: mPlugin( NULL )
 {
 
 }
@@ -42,31 +41,33 @@ Shaping::~Shaping()
 
 }
 
-Dali::TextAbstraction::Shaping Shaping::Get()
+TextAbstraction::Shaping Shaping::Get()
 {
-  Dali::TextAbstraction::Shaping shapingHandle;
+  TextAbstraction::Shaping shapingHandle;
 
-  Dali::SingletonService service( SingletonService::Get() );
-  if ( service )
+  SingletonService service( SingletonService::Get() );
+  if( service )
   {
-     // Check whether the singleton is already created
-     Dali::BaseHandle handle = service.GetSingleton( typeid( Dali::TextAbstraction::Shaping ) );
-     if(handle)
-     {
-       // If so, downcast the handle
-       Shaping* impl = dynamic_cast< Dali::Internal::TextAbstraction::Shaping* >( handle.GetObjectPtr() );
-       shapingHandle = Dali::TextAbstraction::Shaping( impl );
-     }
-     else // create and register the object
-     {
-       shapingHandle = Dali::TextAbstraction::Shaping( new Shaping);
-       service.Register( typeid( shapingHandle ), shapingHandle );
-     }
-   }
+    // Check whether the singleton is already created
+    Dali::BaseHandle handle = service.GetSingleton( typeid( TextAbstraction::Shaping ) );
+    if( handle )
+    {
+      // If so, downcast the handle
+      Shaping* impl = dynamic_cast< Internal::Shaping* >( handle.GetObjectPtr() );
+      shapingHandle = TextAbstraction::Shaping( impl );
+    }
+    else // create and register the object
+    {
+      shapingHandle = TextAbstraction::Shaping( new Shaping );
+      service.Register( typeid( shapingHandle ), shapingHandle );
+    }
+  }
 
-   return shapingHandle;
+  return shapingHandle;
 }
 
-} // namespace Shaping
 } // namespace Internal
+
+} // namespace TextAbstraction
+
 } // namespace Dali

diff --git a/text/dali/internal/text-abstraction/shaping-impl.h b/text/dali/internal/text-abstraction/shaping-impl.h
index cfdd625..1e47f03 100644 (file)
--- a/text/dali/internal/text-abstraction/shaping-impl.h
+++ b/text/dali/internal/text-abstraction/shaping-impl.h
@@ -27,17 +27,16 @@
 namespace Dali
 {
 
-namespace Internal
+namespace TextAbstraction
 {
 
-namespace TextAbstraction
+namespace Internal
 {
 
 /**
  * Implementation of the Shaping
  */
-
-class Shaping :  public Dali::BaseObject
+class Shaping : public Dali::BaseObject
 {
 public:
 
@@ -54,7 +53,7 @@ public:
   /**
    * @copydoc Dali::Shaping::Get()
    */
-  static Dali::TextAbstraction::Shaping Get();
+  static TextAbstraction::Shaping Get();
 
 private:
 
@@ -68,23 +67,22 @@ private:
 
 }; // class Shaping
 
+} // namespace Internal
 
 } // namespace TextAbstraction
 
-} // namespace Internal
-
-inline static Internal::TextAbstraction::Shaping& GetImplementation(Dali::TextAbstraction::Shaping& shaping)
+inline static TextAbstraction::Internal::Shaping& GetImplementation( TextAbstraction::Shaping& shaping )
 {
   DALI_ASSERT_ALWAYS( shaping && "shaping handle is empty" );
   BaseObject& handle = shaping.GetBaseObject();
-  return static_cast<Internal::TextAbstraction::Shaping&>(handle);
+  return static_cast<TextAbstraction::Internal::Shaping&>( handle );
 }
 
-inline static const  Internal::TextAbstraction::Shaping& GetImplementation(const Dali::TextAbstraction::Shaping& shaping)
+inline static const TextAbstraction::Internal::Shaping& GetImplementation( const TextAbstraction::Shaping& shaping )
 {
   DALI_ASSERT_ALWAYS( shaping && "shaping handle is empty" );
   const BaseObject& handle = shaping.GetBaseObject();
-  return static_cast<const Internal::TextAbstraction::Shaping&>(handle);
+  return static_cast<const TextAbstraction::Internal::Shaping&>( handle );
 }
 
 } // namespace Dali

diff --git a/text/dali/public-api/text-abstraction/bidirectional-support.cpp b/text/dali/public-api/text-abstraction/bidirectional-support.cpp
index 8d7c380..40a7d78 100644 (file)
--- a/text/dali/public-api/text-abstraction/bidirectional-support.cpp
+++ b/text/dali/public-api/text-abstraction/bidirectional-support.cpp
@@ -35,14 +35,14 @@ BidirectionalSupport::~BidirectionalSupport()
 {
 }
 
-BidirectionalSupport::BidirectionalSupport( Dali::Internal::TextAbstraction::BidirectionalSupport* implementation )
+BidirectionalSupport::BidirectionalSupport( Internal::BidirectionalSupport* implementation )
 : BaseHandle( implementation )
 {
 }
 
 BidirectionalSupport BidirectionalSupport::Get()
 {
-  return Dali::Internal::TextAbstraction::BidirectionalSupport::Get();
+  return Internal::BidirectionalSupport::Get();
 }
 
 BidiInfoIndex BidirectionalSupport::CreateInfo( const Character* const paragraph,

diff --git a/text/dali/public-api/text-abstraction/bidirectional-support.h b/text/dali/public-api/text-abstraction/bidirectional-support.h
index eee8084..c95b698 100644 (file)
--- a/text/dali/public-api/text-abstraction/bidirectional-support.h
+++ b/text/dali/public-api/text-abstraction/bidirectional-support.h
@@ -27,19 +27,21 @@
 namespace Dali
 {
 
-namespace Internal DALI_INTERNAL
+namespace TextAbstraction
 {
 
-namespace TextAbstraction
+namespace Internal DALI_INTERNAL
 {
+
 class BidirectionalSupport;
-} // TextAbstraction
+
 } // Internal
 
+} // TextAbstraction
+
 namespace TextAbstraction
 {
 
-
 /**
  * BidirectionalSupport API
  *
@@ -67,7 +69,7 @@ public:
    *
    * @param[in] implementation a pointer to the internal bidirectional support object.
    */
-  explicit DALI_INTERNAL BidirectionalSupport( Dali::Internal::TextAbstraction::BidirectionalSupport* implementation );
+  explicit DALI_INTERNAL BidirectionalSupport( Internal::BidirectionalSupport* implementation );
 
   /**
    * @brief Retrieve a handle to the BidirectionalSupport instance.

diff --git a/text/dali/public-api/text-abstraction/segmentation.cpp b/text/dali/public-api/text-abstraction/segmentation.cpp
index a339819..68b469d 100644 (file)
--- a/text/dali/public-api/text-abstraction/segmentation.cpp
+++ b/text/dali/public-api/text-abstraction/segmentation.cpp
@@ -35,14 +35,14 @@ Segmentation::~Segmentation()
 {
 }
 
-Segmentation::Segmentation( Dali::Internal::TextAbstraction::Segmentation* implementation )
+Segmentation::Segmentation( Internal::Segmentation* implementation )
 : BaseHandle( implementation )
 {
 }
 
 Segmentation Segmentation::Get()
 {
-  return Dali::Internal::TextAbstraction::Segmentation::Get();
+  return Internal::Segmentation::Get();
 }
 
 void Segmentation::GetLineBreakPositions( const Character* const text,

diff --git a/text/dali/public-api/text-abstraction/segmentation.h b/text/dali/public-api/text-abstraction/segmentation.h
index 1dd25bb..63d5107 100644 (file)
--- a/text/dali/public-api/text-abstraction/segmentation.h
+++ b/text/dali/public-api/text-abstraction/segmentation.h
@@ -27,15 +27,18 @@
 namespace Dali
 {
 
-namespace Internal DALI_INTERNAL
+namespace TextAbstraction
 {
 
-namespace TextAbstraction
+namespace Internal DALI_INTERNAL
 {
+
 class Segmentation;
-} // TextAbstraction
+
 } // Internal
 
+} // TextAbstraction
+
 namespace TextAbstraction
 {
 
@@ -66,7 +69,7 @@ public:
    *
    * @param[in] implementation A pointer to the internal segmentation object.
    */
-  explicit DALI_INTERNAL Segmentation( Dali::Internal::TextAbstraction::Segmentation* implementation );
+  explicit DALI_INTERNAL Segmentation( Internal::Segmentation* implementation );
 
   /**
    * @brief Retrieve a handle to the Segmentation instance.

diff --git a/text/dali/public-api/text-abstraction/shaping.cpp b/text/dali/public-api/text-abstraction/shaping.cpp
index 49e3bd8..2339adc 100644 (file)
--- a/text/dali/public-api/text-abstraction/shaping.cpp
+++ b/text/dali/public-api/text-abstraction/shaping.cpp
@@ -30,17 +30,19 @@ namespace TextAbstraction
 Shaping::Shaping()
 {
 }
+
 Shaping::~Shaping()
 {
 }
-Shaping::Shaping(Dali::Internal::TextAbstraction::Shaping *impl)
-  : BaseHandle(impl)
+
+Shaping::Shaping( Internal::Shaping *impl )
+: BaseHandle( impl )
 {
 }
 
 Shaping Shaping::Get()
 {
-  return Dali::Internal::TextAbstraction::Shaping::Get();
+  return Internal::Shaping::Get();
 }
 
 

diff --git a/text/dali/public-api/text-abstraction/shaping.h b/text/dali/public-api/text-abstraction/shaping.h
index 2d59681..1562bc1 100644 (file)
--- a/text/dali/public-api/text-abstraction/shaping.h
+++ b/text/dali/public-api/text-abstraction/shaping.h
@@ -22,19 +22,21 @@
 namespace Dali
 {
 
-namespace Internal DALI_INTERNAL
+namespace TextAbstraction
 {
 
-namespace TextAbstraction
+namespace Internal DALI_INTERNAL
 {
+
 class Shaping;
-} // TextAbstraction
+
 } // Internal
 
+} // TextAbstraction
+
 namespace TextAbstraction
 {
 
-
 /**
  *   Shaping API
  *
@@ -44,32 +46,32 @@ class DALI_IMPORT_API Shaping : public BaseHandle
 
 public:
 
-    /**
-     * @brief Create an uninitialized TextAbstraction handle.
-     *
-     */
-    Shaping();
-
-    /**
-     * @brief Destructor
-     *
-     * This is non-virtual since derived Handle types must not contain data or virtual methods.
-     */
-    ~Shaping();
-
-    /**
-     * @brief This constructor is used by Shaping::Get().
-     *
-     * @param[in] shaping  A pointer to the internal shaping object.
-     */
-    explicit DALI_INTERNAL Shaping( Dali::Internal::TextAbstraction::Shaping* shaping);
-
-    /**
-     * @brief Retrieve a handle to the Shaping instance.
-     *
-     * @return A handle to the Shaping
-     */
-    static Shaping Get();
+  /**
+   * @brief Create an uninitialized TextAbstraction handle.
+   *
+   */
+  Shaping();
+
+  /**
+   * @brief Destructor
+   *
+   * This is non-virtual since derived Handle types must not contain data or virtual methods.
+   */
+  ~Shaping();
+
+  /**
+   * @brief This constructor is used by Shaping::Get().
+   *
+   * @param[in] shaping  A pointer to the internal shaping object.
+   */
+  explicit DALI_INTERNAL Shaping( Internal::Shaping* shaping);
+
+  /**
+   * @brief Retrieve a handle to the Shaping instance.
+   *
+   * @return A handle to the Shaping
+   */
+  static Shaping Get();
 
 };