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

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

diff --git a/dali/integration-api/events/key-event-integ.cpp b/dali/integration-api/events/key-event-integ.cpp
index 80dc7cc..eac7cd3 100644 (file)
--- a/dali/integration-api/events/key-event-integ.cpp
+++ b/dali/integration-api/events/key-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.
@@ -18,37 +18,56 @@
 // CLASS HEADER
 #include <dali/integration-api/events/key-event-integ.h>
 
+// INTERNAL INCLUDES
+#include <dali/internal/event/events/key-event-impl.h>
+
 namespace Dali
 {
-
 namespace Integration
 {
-
 KeyEvent::KeyEvent()
 : Event(Key),
   keyName(),
+  logicalKey(),
   keyString(),
   keyCode(-1),
   keyModifier(0),
   time(0),
-  state(KeyEvent::Down)
+  state(KeyEvent::DOWN),
+  compose(""),
+  deviceName(""),
+  deviceClass(Device::Class::NONE),
+  deviceSubclass(Device::Subclass::NONE)
 {
 }
 
-KeyEvent::KeyEvent(const std::string& keyName, const std::string& keyString, int keyCode, int keyModifier, unsigned long timeStamp, const State& keyState)
+KeyEvent::KeyEvent(const std::string&           keyName,
+                   const std::string&           logicalKey,
+                   const std::string&           keyString,
+                   int                          keyCode,
+                   int                          keyModifier,
+                   unsigned long                timeStamp,
+                   const State&                 keyState,
+                   const std::string&           compose,
+                   const std::string&           deviceName,
+                   const Device::Class::Type    deviceClass,
+                   const Device::Subclass::Type deviceSubclass)
 : Event(Key),
   keyName(keyName),
+  logicalKey(logicalKey),
   keyString(keyString),
   keyCode(keyCode),
   keyModifier(keyModifier),
   time(timeStamp),
-  state(keyState)
+  state(keyState),
+  compose(compose),
+  deviceName(deviceName),
+  deviceClass(deviceClass),
+  deviceSubclass(deviceSubclass)
 {
 }
 
-KeyEvent::~KeyEvent()
-{
-}
+KeyEvent::~KeyEvent() = default;
 
 } // namespace Integration