DALi signals refactor to remove V2 naming

[platform/core/uifw/dali-toolkit.git] / optional / dali-toolkit / public-api / controls / image-view / masked-image-view.h

diff --git a/optional/dali-toolkit/public-api/controls/image-view/masked-image-view.h b/optional/dali-toolkit/public-api/controls/image-view/masked-image-view.h
index e160cbc..f914279 100644 (file)
--- a/optional/dali-toolkit/public-api/controls/image-view/masked-image-view.h
+++ b/optional/dali-toolkit/public-api/controls/image-view/masked-image-view.h
@@ -21,7 +21,7 @@
 // INTERNAL INCLUDES
 #include <dali-toolkit/public-api/controls/control.h>
 
-namespace Dali DALI_IMPORT_API
+namespace Dali
 {
 
 namespace Toolkit
@@ -50,7 +50,7 @@ class MaskedImageView;
  * avoided by calling Pause() e.g. when the source & mask positions are not being modified. The Resume() method can then be called
  * to continue the masking operation when required.
  */
-class MaskedImageView : public Control
+class DALI_IMPORT_API MaskedImageView : public Control
 {
 public:
 
@@ -266,7 +266,7 @@ public:
 public: /* Signals */
 
   /// @brief Finished signal type.
-  typedef SignalV2< void (MaskedImageView& source) > MaskedImageViewSignal;
+  typedef Signal< void (MaskedImageView& source) > MaskedImageViewSignal;
 
   /**
    * @brief Signal emitted when the render task which targets the
@@ -277,13 +277,6 @@ public: /* Signals */
    */
   MaskedImageViewSignal& MaskFinishedSignal();
 
-  /**
-   * @deprecated Use MaskFinishedSignal() instead.
-   * Signal emitted when the render task which targets the frame buffer of the masked image has finished.
-   * @return the signal.
-   */
-  Dali::RenderTask::RenderTaskSignalV2& RenderFinishedSignal();
-
 public: // Not intended for application developers
 
   /**
@@ -291,14 +284,14 @@ public: // Not intended for application developers
    *
    * @param[in]  implementation  The Control implementation.
    */
-  MaskedImageView(Internal::MaskedImageView& implementation);
+  DALI_INTERNAL MaskedImageView(Internal::MaskedImageView& implementation);
 
   /**
    * @brief Allows the creation of this Control from an Internal::CustomActor pointer.
    *
    * @param[in]  internal  A pointer to the internal CustomActor.
    */
-  MaskedImageView(Dali::Internal::CustomActor* internal);
+  explicit DALI_INTERNAL MaskedImageView(Dali::Internal::CustomActor* internal);
 };
 
 } // namespace Toolkit