Merge "Clean up the code to build successfully on macOS" into devel/master

[platform/core/uifw/dali-core.git] / dali / integration-api / events / wheel-event-integ.cpp

diff --git a/dali/integration-api/events/wheel-event-integ.cpp b/dali/integration-api/events/wheel-event-integ.cpp
index 3f99995..e72fbcd 100644 (file)
--- a/dali/integration-api/events/wheel-event-integ.cpp
+++ b/dali/integration-api/events/wheel-event-integ.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014 Samsung Electronics Co., Ltd.
+ * 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.
@@ -20,35 +20,31 @@
 
 namespace Dali
 {
-
 namespace Integration
 {
-
 WheelEvent::WheelEvent()
-: Event( Wheel ),
-  type( MOUSE_WHEEL ),
-  direction( 0 ),
-  modifiers( 0 ),
-  point( Vector2::ZERO ),
-  z( 0 ),
-  timeStamp( 0 )
+: Event(Wheel),
+  type(MOUSE_WHEEL),
+  direction(0),
+  modifiers(0),
+  point(Vector2::ZERO),
+  delta(0),
+  timeStamp(0)
 {
 }
 
-WheelEvent::WheelEvent( Type type, int direction, unsigned int modifiers, Vector2 point, int z, unsigned int timeStamp )
-: Event( Wheel ),
-  type( type ),
-  direction( direction ),
-  modifiers( modifiers ),
-  point( point ),
-  z( z ),
-  timeStamp( timeStamp )
+WheelEvent::WheelEvent(Type type, int direction, unsigned int modifiers, Vector2 point, int delta, unsigned int timeStamp)
+: Event(Wheel),
+  type(type),
+  direction(direction),
+  modifiers(modifiers),
+  point(point),
+  delta(delta),
+  timeStamp(timeStamp)
 {
 }
 
-WheelEvent::~WheelEvent()
-{
-}
+WheelEvent::~WheelEvent() = default;
 
 } // namespace Integration