License conversion from Flora to Apache 2.0

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

diff --git a/dali/internal/event/events/touch-event-processor.h b/dali/internal/event/events/touch-event-processor.h
index a6d9df1..4022045 100644 (file)
--- a/dali/internal/event/events/touch-event-processor.h
+++ b/dali/internal/event/events/touch-event-processor.h
@@ -1,21 +1,22 @@
 #ifndef __DALI_INTERNAL_TOUCH_EVENT_PROCESSOR_H__
 #define __DALI_INTERNAL_TOUCH_EVENT_PROCESSOR_H__
 
-//
-// Copyright (c) 2014 Samsung Electronics Co., Ltd.
-//
-// Licensed under the Flora License, Version 1.0 (the License);
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://floralicense.org/license/
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an AS IS BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
+/*
+ * Copyright (c) 2014 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.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
 
 // INTERNAL INCLUDES
 #include <dali/public-api/render-tasks/render-task.h>
@@ -112,6 +113,11 @@ private:
      */
     void SetActor( Actor* actor );
 
+    /**
+     * Resets the set actor and disconnects any connected signals.
+     */
+    void ResetActor();
+
   private:
 
     // Undefined
@@ -143,7 +149,8 @@ private:
     virtual void ProxyDestroyed(ProxyObject& proxy);
 
   private:
-    Actor* mActor; ///< Raw pointer to an Actor.
+    Actor* mActor;              ///< Raw pointer to an Actor.
+    bool   mActorDisconnected;  ///< Indicates whether the actor has been disconnected from the scene
   };
 
   Stage& mStage; ///< Used to deliver touch events