X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali%2Finternal%2Fevent%2Fimages%2Fresource-image-impl.cpp;h=737eb37237f4e1601fe8490086c3d42be252e1ee;hb=0c45ea0d223dd72f6d0971d04138f227b4ea7c2a;hp=0b0417fa7222fb12178849643bd156bba3e839d2;hpb=ba99c2fc92c63f4a7a513813dfc5e76cc502b831;p=platform%2Fcore%2Fuifw%2Fdali-core.git diff --git a/dali/internal/event/images/resource-image-impl.cpp b/dali/internal/event/images/resource-image-impl.cpp index 0b0417f..737eb37 100644 --- a/dali/internal/event/images/resource-image-impl.cpp +++ b/dali/internal/event/images/resource-image-impl.cpp @@ -38,26 +38,6 @@ namespace Dali namespace Internal { -namespace -{ - -// Signals - -const char* const SIGNAL_IMAGE_LOADING_FINISHED = "imageLoadingFinished"; - - -BaseHandle CreateImage() -{ - ImagePtr image = ResourceImage::New(); - return Dali::Image(image.Get()); -} - -TypeRegistration mType( typeid( Dali::ResourceImage ), typeid( Dali::Image ), CreateImage ); - -Dali::SignalConnectorType signalConnector1( mType, SIGNAL_IMAGE_LOADING_FINISHED, &ResourceImage::DoConnectSignal ); - -} - ResourceImage::ResourceImage() : Image(), mLoadingFinished(), @@ -107,26 +87,6 @@ ResourceImage::~ResourceImage() { } -bool ResourceImage::DoConnectSignal( BaseObject* object, ConnectionTrackerInterface* tracker, const std::string& signalName, FunctorDelegate* functor ) -{ - bool connected( true ); - DALI_ASSERT_DEBUG( dynamic_cast( object ) && "Failed to downcast from BaseObject to ResourceImage.\n" ); - ResourceImage* image = static_cast(object); - - if( 0 == strcmp( signalName.c_str(), SIGNAL_IMAGE_LOADING_FINISHED ) ) - { - image->LoadingFinishedSignal().Connect( tracker, functor ); - } - else - { - // signalName does not match any signal - connected = false; - } - - return connected; -} - - const ImageAttributes& ResourceImage::GetAttributes() const { return mAttributes; @@ -186,6 +146,7 @@ void ResourceImage::Reload() mLoadingState = Dali::ResourceLoadingFailed; } + UploadedSignal().Emit( Dali::Image( this ) ); mLoadingFinished.Emit( Dali::ResourceImage( this ) ); }