Remove a dead virtual method from proxy object

Change-Id: Ib86fec7f731f947b1103682af1fa12f4bd91dfb2

diff --git a/dali/internal/event/actors/actor-impl.cpp b/dali/internal/event/actors/actor-impl.cpp
index 0e48d60..5ff09c1 100644 (file)
--- a/dali/internal/event/actors/actor-impl.cpp
+++ b/dali/internal/event/actors/actor-impl.cpp
@@ -2320,11 +2320,6 @@ bool Actor::IsNodeConnected() const
   return connected;
 }
 
-bool Actor::IsSceneObjectRemovable() const
-{
-  return false;
-}
-
 unsigned int Actor::GetDefaultPropertyCount() const
 {
   return DEFAULT_PROPERTY_COUNT;

diff --git a/dali/internal/event/actors/actor-impl.h b/dali/internal/event/actors/actor-impl.h
index bb92041..83b649f 100644 (file)
--- a/dali/internal/event/actors/actor-impl.h
+++ b/dali/internal/event/actors/actor-impl.h
@@ -1143,11 +1143,6 @@ protected:
 public: // Default property extensions from ProxyObject
 
   /**
-   * @copydoc Dali::Internal::ProxyObject::IsSceneObjectRemovable()
-   */
-  virtual bool IsSceneObjectRemovable() const;
-
-  /**
    * @copydoc Dali::Internal::ProxyObject::GetDefaultPropertyCount()
    */
   virtual unsigned int GetDefaultPropertyCount() const;

diff --git a/dali/internal/event/animation/active-constraint-base.cpp b/dali/internal/event/animation/active-constraint-base.cpp
index 6deb37f..121ed80 100644 (file)
--- a/dali/internal/event/animation/active-constraint-base.cpp
+++ b/dali/internal/event/animation/active-constraint-base.cpp
@@ -315,11 +315,6 @@ unsigned int ActiveConstraintBase::GetTag() const
   return mTag;
 }
 
-bool ActiveConstraintBase::IsSceneObjectRemovable() const
-{
-  return true; // The constraint removed when target SceneGraph::PropertyOwner is destroyed
-}
-
 unsigned int ActiveConstraintBase::GetDefaultPropertyCount() const
 {
   return DEFAULT_PROPERTY_COUNT;

diff --git a/dali/internal/event/animation/active-constraint-base.h b/dali/internal/event/animation/active-constraint-base.h
index 1d34066..de4e751 100644 (file)
--- a/dali/internal/event/animation/active-constraint-base.h
+++ b/dali/internal/event/animation/active-constraint-base.h
@@ -192,11 +192,6 @@ public:
 public: // Default property extensions from ProxyObject
 
   /**
-   * @copydoc Dali::Internal::ProxyObject::IsSceneObjectRemovable()
-   */
-  virtual bool IsSceneObjectRemovable() const;
-
-  /**
    * @copydoc Dali::Internal::ProxyObject::GetDefaultPropertyCount()
    */
   virtual unsigned int GetDefaultPropertyCount() const;

diff --git a/dali/internal/event/animation/path-impl.h b/dali/internal/event/animation/path-impl.h
index bc57570..6d1f1c0 100644 (file)
--- a/dali/internal/event/animation/path-impl.h
+++ b/dali/internal/event/animation/path-impl.h
@@ -73,11 +73,6 @@ private:
   virtual void ProxyDestroyed(ProxyObject& proxy){}
 
   /**
-   * @copydoc Dali::Internal::ProxyObject::IsSceneObjectRemovable()
-   */
-  virtual bool IsSceneObjectRemovable() const{ return false;}
-
-  /**
    * @copydoc Dali::Internal::ProxyObject::GetDefaultPropertyCount()
    */
   virtual unsigned int GetDefaultPropertyCount() const;

diff --git a/dali/internal/event/common/proxy-object.h b/dali/internal/event/common/proxy-object.h
index c42be6c..b0e3bbe 100644 (file)
--- a/dali/internal/event/common/proxy-object.h
+++ b/dali/internal/event/common/proxy-object.h
@@ -120,13 +120,6 @@ public:
   ProxyObject();
 
   /**
-   * Query whether the proxy object removes (& re-adds) its associated scene-object.
-   * Otherwise the scene-object lifetime is expected to match that of the proxy.
-   * @return True if scene-objects are removed.
-   */
-  virtual bool IsSceneObjectRemovable() const = 0;
-
-  /**
    * Add an observer to the proxy.
    * @param[in] observer The observer to add.
    */

diff --git a/dali/internal/event/effects/shader-effect-impl.cpp b/dali/internal/event/effects/shader-effect-impl.cpp
index c98419e..f16eeae 100644 (file)
--- a/dali/internal/event/effects/shader-effect-impl.cpp
+++ b/dali/internal/event/effects/shader-effect-impl.cpp
@@ -392,11 +392,6 @@ void ShaderEffect::Disconnect()
   }
 }
 
-bool ShaderEffect::IsSceneObjectRemovable() const
-{
-  return false; // The Shader is not removed during this proxy's lifetime
-}
-
 unsigned int ShaderEffect::GetDefaultPropertyCount() const
 {
   return DEFAULT_PROPERTY_COUNT;

diff --git a/dali/internal/event/effects/shader-effect-impl.h b/dali/internal/event/effects/shader-effect-impl.h
index 690d779..25f7e05 100644 (file)
--- a/dali/internal/event/effects/shader-effect-impl.h
+++ b/dali/internal/event/effects/shader-effect-impl.h
@@ -135,11 +135,6 @@ public:
 public: // Default property extensions from ProxyObject
 
   /**
-   * @copydoc Dali::Internal::ProxyObject::IsSceneObjectRemovable()
-   */
-  virtual bool IsSceneObjectRemovable() const;
-
-  /**
    * @copydoc Dali::Internal::ProxyObject::GetDefaultPropertyCount()
    */
   virtual unsigned int GetDefaultPropertyCount() const;

diff --git a/dali/internal/event/events/gesture-detector-impl.cpp b/dali/internal/event/events/gesture-detector-impl.cpp
index ea366e0..f9c0076 100644 (file)
--- a/dali/internal/event/events/gesture-detector-impl.cpp
+++ b/dali/internal/event/events/gesture-detector-impl.cpp
@@ -182,11 +182,6 @@ void GestureDetector::ProxyDestroyed(ProxyObject& proxy)
   }
 }
 
-bool GestureDetector::IsSceneObjectRemovable() const
-{
-  return false;
-}
-
 unsigned int GestureDetector::GetDefaultPropertyCount() const
 {
   return 0;

diff --git a/dali/internal/event/events/gesture-detector-impl.h b/dali/internal/event/events/gesture-detector-impl.h
index 3d85fcc..6d2e659 100644 (file)
--- a/dali/internal/event/events/gesture-detector-impl.h
+++ b/dali/internal/event/events/gesture-detector-impl.h
@@ -163,11 +163,6 @@ private:
 private: // Default property extensions from ProxyObject
 
   /**
-   * @copydoc Dali::Internal::ProxyObject::IsSceneObjectRemovable()
-   */
-  virtual bool IsSceneObjectRemovable() const;
-
-  /**
    * @copydoc Dali::Internal::ProxyObject::GetDefaultPropertyCount()
    */
   virtual unsigned int GetDefaultPropertyCount() const;

diff --git a/dali/internal/event/events/pan-gesture-detector-impl.cpp b/dali/internal/event/events/pan-gesture-detector-impl.cpp
index 00c1efb..57be6fc 100644 (file)
--- a/dali/internal/event/events/pan-gesture-detector-impl.cpp
+++ b/dali/internal/event/events/pan-gesture-detector-impl.cpp
@@ -324,11 +324,6 @@ void PanGestureDetector::OnActorDestroyed(Object& object)
   // Do nothing
 }
 
-bool PanGestureDetector::IsSceneObjectRemovable() const
-{
-  return false;
-}
-
 unsigned int PanGestureDetector::GetDefaultPropertyCount() const
 {
   return DEFAULT_PROPERTY_COUNT;

diff --git a/dali/internal/event/events/pan-gesture-detector-impl.h b/dali/internal/event/events/pan-gesture-detector-impl.h
index ae0e069..8648455 100644 (file)
--- a/dali/internal/event/events/pan-gesture-detector-impl.h
+++ b/dali/internal/event/events/pan-gesture-detector-impl.h
@@ -209,11 +209,6 @@ private:
   // Default property extensions from ProxyObject
 
   /**
-   * @copydoc Dali::Internal::ProxyObject::IsSceneObjectRemovable()
-   */
-  virtual bool IsSceneObjectRemovable() const;
-
-  /**
    * @copydoc Dali::Internal::ProxyObject::GetDefaultPropertyCount()
    */
   virtual unsigned int GetDefaultPropertyCount() const;

diff --git a/dali/internal/event/modeling/animatable-mesh-impl.cpp b/dali/internal/event/modeling/animatable-mesh-impl.cpp
index 9ba7606..d8e3309 100644 (file)
--- a/dali/internal/event/modeling/animatable-mesh-impl.cpp
+++ b/dali/internal/event/modeling/animatable-mesh-impl.cpp
@@ -203,11 +203,6 @@ MeshIPtr AnimatableMesh::GetMesh()
 
 bool AnimatableMesh::Supports( Capability capability ) const
 {
-  return false;
-}
-
-bool AnimatableMesh::IsSceneObjectRemovable() const
-{
   return false; // The scene object is permanently "on stage" whilst this object is alive
 }
 

diff --git a/dali/internal/event/modeling/animatable-mesh-impl.h b/dali/internal/event/modeling/animatable-mesh-impl.h
index ecc6289..8d96601 100644 (file)
--- a/dali/internal/event/modeling/animatable-mesh-impl.h
+++ b/dali/internal/event/modeling/animatable-mesh-impl.h
@@ -155,11 +155,6 @@ public: // Implementation of ProxyObject
   virtual bool Supports( Capability capability ) const;
 
   /**
-   * @copydoc Dali::Internal::ProxyObject::IsSceneObjectRemovable()
-   */
-  virtual bool IsSceneObjectRemovable() const;
-
-  /**
    * @copydoc Dali::Internal::ProxyObject::GetDefaultPropertyCount()
    */
   virtual unsigned int GetDefaultPropertyCount() const;

diff --git a/dali/internal/event/object/custom-object-internal.cpp b/dali/internal/event/object/custom-object-internal.cpp
index f5963f6..77dc526 100644 (file)
--- a/dali/internal/event/object/custom-object-internal.cpp
+++ b/dali/internal/event/object/custom-object-internal.cpp
@@ -42,11 +42,6 @@ CustomObject* CustomObject::New()
   return new CustomObject();
 }
 
-bool CustomObject::IsSceneObjectRemovable() const
-{
-  return false;
-}
-
 const SceneGraph::PropertyOwner* CustomObject::GetSceneObject() const
 {
   return mUpdateObject;

diff --git a/dali/internal/event/object/custom-object-internal.h b/dali/internal/event/object/custom-object-internal.h
index c47eb56..9778f0a 100644 (file)
--- a/dali/internal/event/object/custom-object-internal.h
+++ b/dali/internal/event/object/custom-object-internal.h
@@ -43,11 +43,6 @@ public:
   static CustomObject* New();
 
   /**
-   * @copydoc Dali::Internal::ProxyObject::IsSceneObjectRemovable()
-   */
-  virtual bool IsSceneObjectRemovable() const;
-
-  /**
    * @copydoc Dali::Internal::ProxyObject::GetSceneObject()
    */
   virtual const SceneGraph::PropertyOwner* GetSceneObject() const;

diff --git a/dali/internal/event/render-tasks/render-task-impl.cpp b/dali/internal/event/render-tasks/render-task-impl.cpp
index 5b955e0..71e441b 100644 (file)
--- a/dali/internal/event/render-tasks/render-task-impl.cpp
+++ b/dali/internal/event/render-tasks/render-task-impl.cpp
@@ -452,11 +452,6 @@ void RenderTask::DiscardSceneObject()
  ********************************************************************************
  ********************************************************************************/
 
-bool RenderTask::IsSceneObjectRemovable() const
-{
-  return false; // The scene object is permanently "on stage" whilst this object is alive
-}
-
 unsigned int RenderTask::GetDefaultPropertyCount() const
 {
   return DEFAULT_PROPERTY_COUNT;

diff --git a/dali/internal/event/render-tasks/render-task-impl.h b/dali/internal/event/render-tasks/render-task-impl.h
index 5895375..c45b347 100644 (file)
--- a/dali/internal/event/render-tasks/render-task-impl.h
+++ b/dali/internal/event/render-tasks/render-task-impl.h
@@ -234,11 +234,6 @@ public: // Used by RenderTaskList, which owns the SceneGraph::RenderTasks
 public: // Implementation of ProxyObject
 
   /**
-   * @copydoc Dali::Internal::ProxyObject::IsSceneObjectRemovable()
-   */
-  virtual bool IsSceneObjectRemovable() const;
-
-  /**
    * @copydoc Dali::Internal::ProxyObject::GetDefaultPropertyCount()
    */
   virtual unsigned int GetDefaultPropertyCount() const;