use modern construct 'override' in the derive class.

[platform/core/uifw/dali-core.git] / dali / integration-api / events / touch-event-integ.h

diff --git a/dali/integration-api/events/touch-event-integ.h b/dali/integration-api/events/touch-event-integ.h
index 8d29df9..1dc354e 100644 (file)
--- a/dali/integration-api/events/touch-event-integ.h
+++ b/dali/integration-api/events/touch-event-integ.h
@@ -1,29 +1,27 @@
-#ifndef __DALI_INTEGRATION_TOUCH_EVENT_H__
-#define __DALI_INTEGRATION_TOUCH_EVENT_H__
+#ifndef DALI_INTEGRATION_TOUCH_EVENT_H
+#define DALI_INTEGRATION_TOUCH_EVENT_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) 2020 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/common/vector-wrapper.h>
-#include <dali/integration-api/events/event.h>
-#include <dali/public-api/events/touch-event.h>
-#include <dali/public-api/events/touch-point.h>
+#include <dali/integration-api/events/multi-point-event-integ.h>
 
-namespace Dali DALI_IMPORT_API
+namespace Dali
 {
 
 namespace Integration
@@ -35,7 +33,7 @@ namespace Integration
  * This class can contain one or many touch points. It also contains the time at which the
  * event occurred.
  */
-struct TouchEvent : public Event
+struct DALI_CORE_API TouchEvent : public MultiPointEvent
 {
   // Construction & Destruction
 
@@ -48,51 +46,16 @@ struct TouchEvent : public Event
    * Constructor
    * @param[in]  time  The time the event occurred.
    */
-  TouchEvent(unsigned long time);
+  TouchEvent(uint32_t time);
 
   /**
    * Virtual destructor
    */
-  virtual ~TouchEvent();
-
-  // Data
-
-  /**
-   * @copydoc Dali::TouchEvent::points
-   */
-  std::vector<TouchPoint> points;
-
-  /**
-   * @copydoc Dali::TouchEvent::time
-   */
-  unsigned long time;
-
-  // Convenience Methods
-
-  /**
-   * Adds a point to the TouchEvent.
-   * @param[in]  point  The point to add.
-   */
-  void AddPoint(const TouchPoint& point);
-
-  /**
-   * @copydoc Dali::TouchEvent::GetPoint()
-   */
-  TouchPoint& GetPoint(unsigned int point);
-
-  /**
-   * @copydoc Dali::TouchEvent::GetPoint()
-   */
-  const TouchPoint& GetPoint(unsigned int point) const;
-
-  /**
-   * @copydoc Dali::TouchEvent::GetPointCount() const
-   */
-  unsigned int GetPointCount() const;
+  ~TouchEvent() override;
 };
 
 } // namespace Integration
 
 } // namespace Dali
 
-#endif // __DALI_INTEGRATION_TOUCH_EVENT_H__
+#endif // DALI_INTEGRATION_TOUCH_EVENT_H