Purge underscored header file barriers

[platform/core/uifw/dali-core.git] / dali / internal / event / images / image-impl.h

diff --git a/dali/internal/event/images/image-impl.h b/dali/internal/event/images/image-impl.h
index a730955..88fdd0b 100644 (file)
--- a/dali/internal/event/images/image-impl.h
+++ b/dali/internal/event/images/image-impl.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_INTERNAL_IMAGE_H__
-#define __DALI_INTERNAL_IMAGE_H__
+#ifndef DALI_INTERNAL_IMAGE_H
+#define DALI_INTERNAL_IMAGE_H
 
 /*
- * Copyright (c) 2014 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2019 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.
@@ -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-declarations.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
@@ -187,4 +149,4 @@ inline const Internal::Image& GetImplementation(const Dali::Image& image)
 }
 
 } // namespace Dali
-#endif // __DALI_INTERNAL_IMAGE_H__
+#endif // DALI_INTERNAL_IMAGE_H