Adding Visual namespace and Visual becomes Visual::Base

[platform/core/uifw/dali-toolkit.git] / dali-toolkit / internal / visuals / image / image-visual.cpp

diff --git a/dali-toolkit/internal/visuals/image/image-visual.cpp b/dali-toolkit/internal/visuals/image/image-visual.cpp
index 569646f..46fd94c 100644 (file)
--- a/dali-toolkit/internal/visuals/image/image-visual.cpp
+++ b/dali-toolkit/internal/visuals/image/image-visual.cpp
@@ -31,9 +31,9 @@
 #include <dali-toolkit/internal/visuals/visual-string-constants.h>
 #include <dali-toolkit/internal/visuals/visual-factory-impl.h>
 #include <dali-toolkit/internal/visuals/visual-factory-cache.h>
 #include <dali-toolkit/internal/visuals/visual-string-constants.h>
 #include <dali-toolkit/internal/visuals/visual-factory-impl.h>
 #include <dali-toolkit/internal/visuals/visual-factory-cache.h>

-#include <dali-toolkit/internal/visuals/visual-impl.h>
-#include <dali-toolkit/internal/visuals/visual-data-impl.h>
+#include <dali-toolkit/internal/visuals/visual-base-impl.h>

 #include <dali-toolkit/internal/visuals/image-atlas-manager.h>
 #include <dali-toolkit/internal/visuals/image-atlas-manager.h>

+#include <dali-toolkit/internal/visuals/visual-base-data-impl.h>

 
 namespace Dali
 {
 
 namespace Dali
 {


@@ -132,7 +132,7 @@ Geometry CreateGeometry( VisualFactoryCache& factoryCache, ImageDimensions gridS
 } //unnamed namespace
 
 ImageVisual::ImageVisual( VisualFactoryCache& factoryCache, ImageAtlasManager& atlasManager )
 } //unnamed namespace
 
 ImageVisual::ImageVisual( VisualFactoryCache& factoryCache, ImageAtlasManager& atlasManager )

-: Visual( factoryCache ),
+: Visual::Base( factoryCache ),

   mAtlasManager( atlasManager ),
   mDesiredSize(),
   mFittingMode( FittingMode::DEFAULT ),
   mAtlasManager( atlasManager ),
   mDesiredSize(),
   mFittingMode( FittingMode::DEFAULT ),


@@ -306,7 +306,7 @@ void ImageVisual::DoInitialize( Actor& actor, const Property::Map& propertyMap )
 
 void ImageVisual::SetSize( const Vector2& size )
 {
 
 void ImageVisual::SetSize( const Vector2& size )
 {

-  Visual::SetSize( size );
+  Visual::Base::SetSize( size );

 }
 
 void ImageVisual::GetNaturalSize( Vector2& naturalSize ) const
 }
 
 void ImageVisual::GetNaturalSize( Vector2& naturalSize ) const


@@ -336,7 +336,7 @@ void ImageVisual::GetNaturalSize( Vector2& naturalSize ) const
 
 void ImageVisual::SetClipRect( const Rect<int>& clipRect )
 {
 
 void ImageVisual::SetClipRect( const Rect<int>& clipRect )
 {

-  Visual::SetClipRect( clipRect );
+  Visual::Base::SetClipRect( clipRect );

 }
 
 void ImageVisual::SetOffset( const Vector2& offset )
 }
 
 void ImageVisual::SetOffset( const Vector2& offset )