X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali%2Finternal%2Fevent%2Fimages%2Fimage-impl.h;h=de6df5078790e81d689d14299734df28c7a8d8d9;hb=95354af5ef0a4f8e55cb2503c06dd15a86e02b8f;hp=e6b3af120aef536a16452a627f662cc36f8952cb;hpb=67f05fa704463e240cbbf6030cb27f6bdf6137b4;p=platform%2Fcore%2Fuifw%2Fdali-core.git

diff --git a/dali/internal/event/images/image-impl.h b/dali/internal/event/images/image-impl.h
index e6b3af1..de6df50 100644
--- a/dali/internal/event/images/image-impl.h
+++ b/dali/internal/event/images/image-impl.h
@@ -25,8 +25,6 @@
 #include <dali/public-api/images/image.h>
 #include <dali/public-api/object/base-object.h>
 #include <dali/internal/event/rendering/texture-impl.h>
-#include <dali/internal/event/resources/resource-client.h>
-#include <dali/internal/event/resources/resource-ticket-observer.h>
 
 namespace Dali
 {
@@ -43,7 +41,7 @@ typedef IntrusivePtr<Image> ImagePtr;
  * When the Image object is created, resource loading will be attempted.
  * Provided this is successful, the resource will exist until the Image is destroyed.
  */
-class Image : public BaseObject, public ResourceTicketObserver
+class Image : public BaseObject
 {
 public:
 
@@ -53,24 +51,6 @@ public:
   Dali::Image::ImageSignalType& UploadedSignal() { return mUploaded; }
 
   /**
-   * Connects a callback function with the object's signals.
-   * @param[in] object The object providing the signal.
-   * @param[in] tracker Used to disconnect the signal.
-   * @param[in] signalName The signal to connect to.
-   * @param[in] functor A newly allocated FunctorDelegate.
-   * @return True if the signal was connected.
-   * @post If a signal was connected, ownership of functor was passed to CallbackBase. Otherwise the caller is responsible for deleting the unused functor.
-   */
-  static bool DoConnectSignal( BaseObject* object, ConnectionTrackerInterface* tracker, const std::string& signalName, FunctorDelegate* functor );
-
-  /**
-   * returns the Id used for lookups
-   * @note if LoadPolicy::OnDemand is used and Image is off Stage, this will return 0.
-   * @return the unique ID of the image data resource. This is actually also the same as Dali Texture id.
-   */
-  ResourceId GetResourceId() const;
-
-  /**
    * Get the width of the image.
    * Only to be used after the image has finished loading.
    * (Ticket's LoadingSucceeded callback was called)
@@ -97,28 +77,11 @@ public:
   /**
    * Returns a pointer to the internal texture used by the image
    */
-  NewTexture* GetTexture() const
+  Texture* GetTexture() const
   {
     return mTexture.Get();
   }
 
-public: // From ResourceTicketObserver
-
-  /**
-   * @copydoc Dali::Internal::ResourceTicketObserver::ResourceLoadingFailed()
-   */
-  virtual void ResourceLoadingFailed(const ResourceTicket& ticket);
-
-  /**
-   * @copydoc Dali::Internal::ResourceTicketObserver::ResourceLoadingSucceeded()
-   */
-  virtual void ResourceLoadingSucceeded(const ResourceTicket& ticket);
-
-  /**
-   * @copydoc Dali::Internal::ResourceTicketObserver::ResourceUploaded()
-   */
-  virtual void ResourceUploaded(const ResourceTicket& ticket);
-
 public:
 
   /**
@@ -150,8 +113,7 @@ protected:
 
 protected:
 
-  ResourceTicketPtr mTicket;              ///< smart pointer to the ticket object that gets completed when load finishes
-  NewTexturePtr mTexture;                 ///< smart pointer to the texture used by the image
+  TexturePtr mTexture;  ///< smart pointer to the texture used by the image
 
   unsigned int mWidth;     ///< natural width of the image
   unsigned int mHeight;    ///< natural height of the image