[dali_1.2.37] Merge branch 'devel/master'

[platform/core/uifw/dali-core.git] / dali / internal / event / events / gesture-processor.h

diff --git a/dali/internal/event/events/gesture-processor.h b/dali/internal/event/events/gesture-processor.h
index 2469f33..8b661b3 100644 (file)
--- a/dali/internal/event/events/gesture-processor.h
+++ b/dali/internal/event/events/gesture-processor.h
@@ -21,7 +21,7 @@
 // INTERNAL INCLUDES
 #include <dali/internal/event/events/gesture-detector-impl.h>
 #include <dali/internal/event/events/hit-test-algorithm-impl.h>
-#include <dali/internal/event/common/proxy-object.h>
+#include <dali/internal/event/common/object-impl.h>
 
 namespace Dali
 {
@@ -34,7 +34,7 @@ namespace Internal
 /**
  * Base class for the different Gesture Processors.
  */
-class GestureProcessor : public ProxyObject::Observer
+class GestureProcessor : public Object::Observer
 {
 protected:
 
@@ -141,25 +141,25 @@ private:
 
   /**
    * This will never get called as we do not observe objects that have not been added to the scene.
-   * @param[in] proxy The proxy object.
-   * @see ProxyObject::Observer::SceneObjectAdded()
+   * @param[in] object The object object.
+   * @see Object::Observer::SceneObjectAdded()
    */
-  virtual void SceneObjectAdded(ProxyObject& proxy) { }
+  virtual void SceneObjectAdded(Object& object) { }
 
   /**
    * This will be called when the actor is removed from the stage, we should clear and stop
    * observing it.
-   * @param[in] proxy The proxy object.
-   * @see ProxyObject::Observer::SceneObjectRemoved()
+   * @param[in] object The object object.
+   * @see Object::Observer::SceneObjectRemoved()
    */
-  virtual void SceneObjectRemoved(ProxyObject& proxy);
+  virtual void SceneObjectRemoved(Object& object);
 
   /**
    * This will be called when the actor is destroyed. We should clear the actor.
    * No need to stop observing as the object is being destroyed anyway.
-   * @see ProxyObject::Observer::ProxyDestroyed()
+   * @see Object::Observer::ObjectDestroyed()
    */
-  virtual void ProxyDestroyed(ProxyObject& proxy);
+  virtual void ObjectDestroyed(Object& object);
 
 private: // Data