e_hwc_window: remove the e_hwc_window.h file

Change-Id: I2ae5ba9ff713bc1c0577cedbb0acd1c86f344aa6

diff --git a/src/bin/core/e_client.c b/src/bin/core/e_client.c
index 9fd9d99f6277178a204fa0898ef37c593a917c21..1487cb1761b6f6f6d604153e1489f40a20c99bbb 100644 (file)
--- a/src/bin/core/e_client.c
+++ b/src/bin/core/e_client.c
@@ -8184,7 +8184,7 @@ e_client_virtual_touch_threshold_get(E_Client *ec)
    return priv->virtual_touch.threshold;
 }
 
-E_API E_Hwc_Window *
+E_API void *
 e_client_hwc_window_get(E_Client *ec)
 {
    if (!ec) return NULL;

diff --git a/src/bin/core/e_client_intern.h b/src/bin/core/e_client_intern.h
index a15df36389fe9c1a67693b922d2f93918cfdb406..1a9255ac25dc757633bcceb60fe73add62530dde 100644 (file)
--- a/src/bin/core/e_client_intern.h
+++ b/src/bin/core/e_client_intern.h
@@ -12,6 +12,7 @@
 #include "e_pointer_intern.h"
 #include "e_desk_intern.h"
 #include "e_zone_intern.h"
+#include "e_hwc_window_intern.h"
 
 #include <wayland-server.h>
 

diff --git a/src/bin/displaymgr/e_hwc_intern.h b/src/bin/displaymgr/e_hwc_intern.h
index d580b76aba6b002edf204d1b83b5008fb57201f3..43c7ecde61291815cd0653a62659bf08a393fcb5 100644 (file)
--- a/src/bin/displaymgr/e_hwc_intern.h
+++ b/src/bin/displaymgr/e_hwc_intern.h
@@ -5,6 +5,7 @@
 #include "e_hwc.h"
 #include "e_fps_tracker_intern.h"
 
+typedef struct _E_Hwc_Window                  E_Hwc_Window;
 typedef struct _E_Hwc_Window_Buffer           E_Hwc_Window_Buffer;
 typedef struct _E_Hwc_Window_Target           E_Hwc_Window_Target;
 typedef struct _E_Hwc_Window_Update_Data      E_Hwc_Window_Update_Data;

diff --git a/src/include/e_client.h b/src/include/e_client.h
index b9711576e768960db710565cabd18ca852dc4740..9807d1656aceef149a125589b1fc087eeac2006b 100644 (file)
--- a/src/include/e_client.h
+++ b/src/include/e_client.h
@@ -9,7 +9,6 @@ extern "C" {
 #include <e_pixmap.h>
 #include <e_view_client.h>
 #include <e_util_transform.h>
-#include <e_hwc_window.h>
 
 #include <uuid.h>
 #include <Ecore.h>
@@ -652,7 +651,7 @@ E_API Eina_Bool e_client_vkbd_floating_state_get(E_Client *ec);
 E_API void      e_client_vkbd_vkbd_set(E_Client *ec, Eina_Bool set);
 E_API Eina_Bool e_client_vkbd_vkbd_get(E_Client *ec);
 
-E_API E_Hwc_Window *e_client_hwc_window_get(E_Client *ec);
+E_API void *e_client_hwc_window_get(E_Client *ec);
 
 E_API void e_client_launch_real_done_event_send(E_Client *ec);
 /////////////////////////////////////////////////////////

diff --git a/src/include/e_hwc.h b/src/include/e_hwc.h
index ea7522dfd75a979949c393294e91d0008e20d3bf..14c24cdd6554beaa4e208185b9c8513577dc0284 100644 (file)
--- a/src/include/e_hwc.h
+++ b/src/include/e_hwc.h
@@ -6,7 +6,6 @@ extern "C" {
 #endif
 
 #include <e_types.h>
-#include <e_hwc_window.h>
 
 #include <tdm.h>
 

diff --git a/src/include/e_hwc_window.h b/src/include/e_hwc_window.h
deleted file mode 100644 (file)
index c3b1a3e..0000000
--- a/src/include/e_hwc_window.h
+++ /dev/null
@@ -1,14 +0,0 @@
-#ifndef E_HWC_WINDOW_H
-#define E_HWC_WINDOW_H
-
-#ifdef  __cplusplus
-extern "C" {
-#endif
-
-typedef struct _E_Hwc_Window E_Hwc_Window;
-
-#ifdef  __cplusplus
-}
-#endif
-
-#endif // E_HWC_WINDOW_H

diff --git a/src/include/e_includes.h b/src/include/e_includes.h
index 5e11c547d0458435f29c32e47634ac638185e918..7bb03b5ffa1eafe6a53d52dd09142efde7e4e6ca 100644 (file)
--- a/src/include/e_includes.h
+++ b/src/include/e_includes.h
@@ -25,7 +25,6 @@
 #include "e_hints.h"
 #include "e_output.h"
 #include "e_hwc_windows.h"
-#include "e_hwc_window.h"
 #include "e_hwc.h"
 #include "e_presentation_time.h"
 #include "e_explicit_sync.h"

diff --git a/src/include/meson.build b/src/include/meson.build
index b09b630ba4a022697bf135933781f460344d136f..0a8ae0cbb4b0750a6bd7607be8506cc1a8db308e 100644 (file)
--- a/src/include/meson.build
+++ b/src/include/meson.build
@@ -32,7 +32,6 @@ install_headers([
   'e_comp_wl.h',
   'e_hwc.h',
   'e_hwc_windows.h',
-  'e_hwc_window.h',
   'e_explicit_sync.h',
   'e_info_server_input.h',
   'e_comp_wl_tbm.h',