Revert "Revert "WheelEvent class pimpling""

[platform/core/uifw/dali-adaptor.git] / dali / devel-api / adaptor-framework / event-feeder.h

diff --git a/dali/devel-api/adaptor-framework/event-feeder.h b/dali/devel-api/adaptor-framework/event-feeder.h
index 2a10220..e1648a6 100644 (file)
--- a/dali/devel-api/adaptor-framework/event-feeder.h
+++ b/dali/devel-api/adaptor-framework/event-feeder.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_EVENT_FEEDER_H_
-#define __DALI_EVENT_FEEDER_H_
+#ifndef DALI_EVENT_FEEDER_H
+#define DALI_EVENT_FEEDER_H
 
 /*
- * Copyright (c) 2015 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,14 +18,14 @@
  *
  */
 
-// EXTERNAL INCLUDES
-#include <dali/public-api/common/dali-common.h>
+// INTERNAL INCLUDES
+#include <dali/public-api/dali-adaptor-common.h>
 
 namespace Dali
 {
 
+class WheelEvent;
 struct KeyEvent;
-struct WheelEvent;
 struct TouchPoint;
 
 namespace EventFeeder
@@ -39,7 +39,7 @@ namespace EventFeeder
  *
  * @note For testing/automation purposes only.
  */
-DALI_IMPORT_API void FeedTouchPoint( TouchPoint& point, int timeStamp );
+DALI_ADAPTOR_API void FeedTouchPoint( TouchPoint& point, int timeStamp );
 
 /**
  * Feed a wheel event to the adaptor.
@@ -48,7 +48,7 @@ DALI_IMPORT_API void FeedTouchPoint( TouchPoint& point, int timeStamp );
  *
  * @note For testing/automation purposes only.
  */
-DALI_IMPORT_API void FeedWheelEvent( WheelEvent& wheelEvent );
+DALI_ADAPTOR_API void FeedWheelEvent( WheelEvent& wheelEvent );
 
 /**
  * Feed a key event to the adaptor.
@@ -57,10 +57,10 @@ DALI_IMPORT_API void FeedWheelEvent( WheelEvent& wheelEvent );
  *
  * @note For testing/automation purposes only.
  */
-DALI_IMPORT_API void FeedKeyEvent( KeyEvent& keyEvent );
+DALI_ADAPTOR_API void FeedKeyEvent( KeyEvent& keyEvent );
 
 } // namespace EventFeeder
 
 } // namespace Dali
 
-#endif // __DALI_EVENT_FEEDER_H_
+#endif // DALI_EVENT_FEEDER_H