e_actions: remove e_actions.h file

The symbols in e_actions.h move to e_actions_intern.h

Change-Id: I730ddcd1747a805eb073200ad2d9b5993012a467

diff --git a/src/bin/core/e_client_intern.h b/src/bin/core/e_client_intern.h
index 4ebf08c6c44170c58f62aa2fae27ea7d47edbfb3..55bf64711895ba0adf338ca97cc51af25d325154 100644 (file)
--- a/src/bin/core/e_client_intern.h
+++ b/src/bin/core/e_client_intern.h
@@ -6,6 +6,7 @@
 #include "e_pixmap_intern.h"
 #include "e_comp_wl_capture_intern.h"
 #include "e_comp_wl_intern.h"
+#include "e_actions_intern.h"
 
 #include <wayland-server.h>
 

diff --git a/src/bin/core/e_zone_intern.h b/src/bin/core/e_zone_intern.h
index 13e7ee20b2671e8cd146570023d0648a0403a23a..a7a31179164266b63ec63b2eea3da9c6a29e5acc 100644 (file)
--- a/src/bin/core/e_zone_intern.h
+++ b/src/bin/core/e_zone_intern.h
@@ -3,6 +3,7 @@
 
 #include "e_intern.h"
 #include "e_zone.h"
+#include "e_actions_intern.h"
 
 #include <wayland-server.h>
 

diff --git a/src/bin/windowmgr/e_actions_intern.h b/src/bin/windowmgr/e_actions_intern.h
index 83fc9daed000786eaa64347a8df9b7eca70f772c..78aa12257ce4f8667afd23d53f1fff659cafef41 100644 (file)
--- a/src/bin/windowmgr/e_actions_intern.h
+++ b/src/bin/windowmgr/e_actions_intern.h
@@ -2,7 +2,8 @@
 #define E_ACTIONS_INTERN_H
 
 #include "e_intern.h"
-#include "e_actions.h"
+
+typedef struct _E_Action E_Action;
 
 EINTERN int      e_actions_init(void);
 EINTERN int      e_actions_shutdown(void);

diff --git a/src/include/e_actions.h b/src/include/e_actions.h
deleted file mode 100644 (file)
index ffd8836..0000000
--- a/src/include/e_actions.h
+++ /dev/null
@@ -1,16 +0,0 @@
-#ifndef E_ACTIONS_H
-#define E_ACTIONS_H
-
-#ifdef  __cplusplus
-extern "C" {
-#endif
-
-#include <e_types.h>
-
-typedef struct _E_Action E_Action;
-
-#ifdef  __cplusplus
-}
-#endif
-
-#endif

diff --git a/src/include/e_client.h b/src/include/e_client.h
index 046808e9f94690769cb01905d74af233d18407ab..52bf37f2a37915af9c1555b0d87808105a27270d 100644 (file)
--- a/src/include/e_client.h
+++ b/src/include/e_client.h
@@ -12,7 +12,6 @@ extern "C" {
 #include <e_hwc_window.h>
 #include <e_desk.h>
 #include <e_zone.h>
-#include <e_actions.h>
 #include <e_util_transform.h>
 #include <e_pixmap.h>
 #include <e_config.h>

diff --git a/src/include/e_includes.h b/src/include/e_includes.h
index da6def8809cd1256528b9c161f71c968620a7b3b..2beab686584bcd09dc891c56631d5ec227bd4dfa 100644 (file)
--- a/src/include/e_includes.h
+++ b/src/include/e_includes.h
@@ -14,7 +14,6 @@
 #include "e_layout.h"
 #include "e_theme.h"
 #include "e_dnd.h"
-#include "e_actions.h"
 #include "e_info_server.h"
 #include "e_info_server_input.h"
 #include "e_prefix.h"

diff --git a/src/include/e_zone.h b/src/include/e_zone.h
index 5b179217ecde14727f0c35b0efc6143af36cfa8e..ae6ab683179fcf96c6a9f5859630ea5cd16bbc40 100644 (file)
--- a/src/include/e_zone.h
+++ b/src/include/e_zone.h
@@ -7,7 +7,6 @@ extern "C" {
 
 #include <e_types.h>
 #include <e_client.h>
-#include <e_actions.h>
 #include <e_focus.h>
 #include <e_desk.h>
 #include <e_view.h>

diff --git a/src/include/meson.build b/src/include/meson.build
index 55c3b1e974aa12884f5bb4cc02f0a600e8734b3f..202e967a047320484b6b3677c7e295781cade419 100644 (file)
--- a/src/include/meson.build
+++ b/src/include/meson.build
@@ -1,5 +1,4 @@
 install_headers([
-  'e_actions.h',
   'e_client.h',
   'e_comp.h',
   'e_comp_canvas.h',