Remove redundant #include path component.

Using the parent '../' path component in #include statements makes
the codebase more rigid and is redundant due to proper -I use.

Signed-off-by: Jon A. Cruz <jonc@osg.samsung.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Bryce Harrington <bryce@osg.samsung.com>
dev
Jon Cruz 10 years ago committed by Bryce Harrington
parent b7e07846bd
commit 4678bab13c
  1. 2
      clients/calibrator.c
  2. 4
      clients/desktop-shell.c
  3. 2
      clients/dnd.c
  4. 2
      clients/image.c
  5. 6
      clients/ivi-shell-user-interface.c
  6. 2
      clients/multi-resource.c
  7. 2
      clients/presentation-shm.c
  8. 2
      clients/screenshot.c
  9. 2
      clients/simple-damage.c
  10. 2
      clients/simple-egl.c
  11. 2
      clients/simple-shm.c
  12. 2
      clients/simple-touch.c
  13. 2
      clients/terminal.c
  14. 2
      clients/weston-info.c
  15. 4
      clients/window.c
  16. 6
      clients/window.h
  17. 2
      desktop-shell/shell.c
  18. 2
      ivi-shell/ivi-layout.c
  19. 6
      src/compositor-wayland.c
  20. 4
      src/compositor-x11.c
  21. 2
      src/compositor.c
  22. 2
      src/input.c
  23. 2
      src/screen-share.c
  24. 2
      src/screenshooter.c
  25. 2
      tests/bad-buffer-test.c
  26. 2
      tests/buffer-count-test.c
  27. 4
      tests/ivi_layout-internal-test.c
  28. 4
      tests/ivi_layout-test-plugin.c
  29. 2
      tests/matrix-test.c
  30. 2
      tests/surface-global-test.c
  31. 2
      tests/surface-test.c
  32. 2
      tests/vertex-clip-test.c
  33. 2
      tests/weston-test-client-helper.c
  34. 4
      tests/weston-test.c

@ -35,7 +35,7 @@
#include <wayland-client.h> #include <wayland-client.h>
#include "window.h" #include "window.h"
#include "../shared/matrix.h" #include "shared/matrix.h"
#define ARRAY_LENGTH(a) (sizeof (a) / sizeof (a)[0]) #define ARRAY_LENGTH(a) (sizeof (a) / sizeof (a)[0])

@ -43,8 +43,8 @@
#include <wayland-client.h> #include <wayland-client.h>
#include "window.h" #include "window.h"
#include "../shared/cairo-util.h" #include "shared/cairo-util.h"
#include "../shared/config-parser.h" #include "shared/config-parser.h"
#include "desktop-shell-client-protocol.h" #include "desktop-shell-client-protocol.h"

@ -40,7 +40,7 @@
#include <wayland-cursor.h> #include <wayland-cursor.h>
#include "window.h" #include "window.h"
#include "../shared/cairo-util.h" #include "shared/cairo-util.h"
struct dnd_drag; struct dnd_drag;

@ -41,7 +41,7 @@
#include <wayland-client.h> #include <wayland-client.h>
#include "window.h" #include "window.h"
#include "../shared/cairo-util.h" #include "shared/cairo-util.h"
struct image { struct image {
struct window *window; struct window *window;

@ -33,9 +33,9 @@
#include <sys/mman.h> #include <sys/mman.h>
#include <getopt.h> #include <getopt.h>
#include <wayland-cursor.h> #include <wayland-cursor.h>
#include "../shared/cairo-util.h" #include "shared/cairo-util.h"
#include "../shared/config-parser.h" #include "shared/config-parser.h"
#include "../shared/os-compatibility.h" #include "shared/os-compatibility.h"
#include "ivi-application-client-protocol.h" #include "ivi-application-client-protocol.h"
#include "ivi-hmi-controller-client-protocol.h" #include "ivi-hmi-controller-client-protocol.h"

@ -39,7 +39,7 @@
#include <math.h> #include <math.h>
#include <wayland-client.h> #include <wayland-client.h>
#include "../shared/os-compatibility.h" #include "shared/os-compatibility.h"
struct device { struct device {
enum { KEYBOARD, POINTER } type; enum { KEYBOARD, POINTER } type;

@ -36,7 +36,7 @@
#include <time.h> #include <time.h>
#include <wayland-client.h> #include <wayland-client.h>
#include "../shared/os-compatibility.h" #include "shared/os-compatibility.h"
#include "presentation_timing-client-protocol.h" #include "presentation_timing-client-protocol.h"
#define ARRAY_LENGTH(a) (sizeof (a) / sizeof (a)[0]) #define ARRAY_LENGTH(a) (sizeof (a) / sizeof (a)[0])

@ -37,7 +37,7 @@
#include <wayland-client.h> #include <wayland-client.h>
#include "screenshooter-client-protocol.h" #include "screenshooter-client-protocol.h"
#include "../shared/os-compatibility.h" #include "shared/os-compatibility.h"
/* The screenshooter is a good example of a custom object exposed by /* The screenshooter is a good example of a custom object exposed by
* the compositor and serves as a test bed for implementing client * the compositor and serves as a test bed for implementing client

@ -36,7 +36,7 @@
#include <signal.h> #include <signal.h>
#include <wayland-client.h> #include <wayland-client.h>
#include "../shared/os-compatibility.h" #include "shared/os-compatibility.h"
#include "xdg-shell-client-protocol.h" #include "xdg-shell-client-protocol.h"
#include "fullscreen-shell-client-protocol.h" #include "fullscreen-shell-client-protocol.h"
#include "scaler-client-protocol.h" #include "scaler-client-protocol.h"

@ -47,7 +47,7 @@
#include "protocol/ivi-application-client-protocol.h" #include "protocol/ivi-application-client-protocol.h"
#define IVI_SURFACE_ID 9000 #define IVI_SURFACE_ID 9000
#include "../shared/platform.h" #include "shared/platform.h"
#ifndef EGL_EXT_swap_buffers_with_damage #ifndef EGL_EXT_swap_buffers_with_damage
#define EGL_EXT_swap_buffers_with_damage 1 #define EGL_EXT_swap_buffers_with_damage 1

@ -34,7 +34,7 @@
#include <signal.h> #include <signal.h>
#include <wayland-client.h> #include <wayland-client.h>
#include "../shared/os-compatibility.h" #include "shared/os-compatibility.h"
#include "xdg-shell-client-protocol.h" #include "xdg-shell-client-protocol.h"
#include "fullscreen-shell-client-protocol.h" #include "fullscreen-shell-client-protocol.h"

@ -33,7 +33,7 @@
#include <sys/mman.h> #include <sys/mman.h>
#include <wayland-client.h> #include <wayland-client.h>
#include "../shared/os-compatibility.h" #include "shared/os-compatibility.h"
#define ARRAY_LENGTH(a) (sizeof (a) / sizeof (a)[0]) #define ARRAY_LENGTH(a) (sizeof (a) / sizeof (a)[0])

@ -43,7 +43,7 @@
#include <wayland-client.h> #include <wayland-client.h>
#include "../shared/config-parser.h" #include "shared/config-parser.h"
#include "window.h" #include "window.h"
static int option_fullscreen; static int option_fullscreen;

@ -32,7 +32,7 @@
#include <wayland-client.h> #include <wayland-client.h>
#include "../shared/os-compatibility.h" #include "shared/os-compatibility.h"
#include "presentation_timing-client-protocol.h" #include "presentation_timing-client-protocol.h"
#define ARRAY_LENGTH(a) (sizeof (a) / sizeof (a)[0]) #define ARRAY_LENGTH(a) (sizeof (a) / sizeof (a)[0])

@ -66,11 +66,11 @@ typedef void *EGLContext;
#include <linux/input.h> #include <linux/input.h>
#include <wayland-client.h> #include <wayland-client.h>
#include "../shared/cairo-util.h" #include "shared/cairo-util.h"
#include "xdg-shell-client-protocol.h" #include "xdg-shell-client-protocol.h"
#include "text-cursor-position-client-protocol.h" #include "text-cursor-position-client-protocol.h"
#include "workspaces-client-protocol.h" #include "workspaces-client-protocol.h"
#include "../shared/os-compatibility.h" #include "shared/os-compatibility.h"
#include "window.h" #include "window.h"

@ -29,9 +29,9 @@
#include <xkbcommon/xkbcommon.h> #include <xkbcommon/xkbcommon.h>
#include <wayland-client.h> #include <wayland-client.h>
#include <cairo.h> #include <cairo.h>
#include "../shared/config-parser.h" #include "shared/config-parser.h"
#include "../shared/zalloc.h" #include "shared/zalloc.h"
#include "../shared/platform.h" #include "shared/platform.h"
#define ARRAY_LENGTH(a) (sizeof (a) / sizeof (a)[0]) #define ARRAY_LENGTH(a) (sizeof (a) / sizeof (a)[0])

@ -38,7 +38,7 @@
#include "shell.h" #include "shell.h"
#include "desktop-shell-server-protocol.h" #include "desktop-shell-server-protocol.h"
#include "workspaces-server-protocol.h" #include "workspaces-server-protocol.h"
#include "../shared/config-parser.h" #include "shared/config-parser.h"
#include "xdg-shell-server-protocol.h" #include "xdg-shell-server-protocol.h"
#define DEFAULT_NUM_WORKSPACES 1 #define DEFAULT_NUM_WORKSPACES 1

@ -63,7 +63,7 @@
#include "ivi-layout-export.h" #include "ivi-layout-export.h"
#include "ivi-layout-private.h" #include "ivi-layout-private.h"
#include "../shared/os-compatibility.h" #include "shared/os-compatibility.h"
struct link_layer { struct link_layer {
struct ivi_layout_layer *ivilayer; struct ivi_layout_layer *ivilayer;

@ -42,9 +42,9 @@
#include "compositor.h" #include "compositor.h"
#include "gl-renderer.h" #include "gl-renderer.h"
#include "pixman-renderer.h" #include "pixman-renderer.h"
#include "../shared/image-loader.h" #include "shared/image-loader.h"
#include "../shared/os-compatibility.h" #include "shared/os-compatibility.h"
#include "../shared/cairo-util.h" #include "shared/cairo-util.h"
#include "fullscreen-shell-client-protocol.h" #include "fullscreen-shell-client-protocol.h"
#include "presentation_timing-server-protocol.h" #include "presentation_timing-server-protocol.h"

@ -52,8 +52,8 @@
#include "compositor.h" #include "compositor.h"
#include "gl-renderer.h" #include "gl-renderer.h"
#include "pixman-renderer.h" #include "pixman-renderer.h"
#include "../shared/config-parser.h" #include "shared/config-parser.h"
#include "../shared/image-loader.h" #include "shared/image-loader.h"
#include "presentation_timing-server-protocol.h" #include "presentation_timing-server-protocol.h"
#define DEFAULT_AXIS_STEP_DISTANCE wl_fixed_from_int(10) #define DEFAULT_AXIS_STEP_DISTANCE wl_fixed_from_int(10)

@ -61,7 +61,7 @@
#include "compositor.h" #include "compositor.h"
#include "scaler-server-protocol.h" #include "scaler-server-protocol.h"
#include "presentation_timing-server-protocol.h" #include "presentation_timing-server-protocol.h"
#include "../shared/os-compatibility.h" #include "shared/os-compatibility.h"
#include "git-version.h" #include "git-version.h"
#include "version.h" #include "version.h"

@ -34,7 +34,7 @@
#include <fcntl.h> #include <fcntl.h>
#include <limits.h> #include <limits.h>
#include "../shared/os-compatibility.h" #include "shared/os-compatibility.h"
#include "compositor.h" #include "compositor.h"
static void static void

@ -40,7 +40,7 @@
#include <wayland-client.h> #include <wayland-client.h>
#include "compositor.h" #include "compositor.h"
#include "../shared/os-compatibility.h" #include "shared/os-compatibility.h"
#include "fullscreen-shell-client-protocol.h" #include "fullscreen-shell-client-protocol.h"
struct shared_output { struct shared_output {

@ -36,7 +36,7 @@
#include "compositor.h" #include "compositor.h"
#include "screenshooter-server-protocol.h" #include "screenshooter-server-protocol.h"
#include "../wcap/wcap-decode.h" #include "wcap/wcap-decode.h"
struct screenshooter { struct screenshooter {
struct weston_compositor *ec; struct weston_compositor *ec;

@ -28,7 +28,7 @@
#include <unistd.h> #include <unistd.h>
#include "../shared/os-compatibility.h" #include "shared/os-compatibility.h"
#include "weston-test-client-helper.h" #include "weston-test-client-helper.h"
/* tests, that attempt to crash the compositor on purpose */ /* tests, that attempt to crash the compositor on purpose */

@ -32,7 +32,7 @@
#include <GLES2/gl2.h> #include <GLES2/gl2.h>
#include "weston-test-client-helper.h" #include "weston-test-client-helper.h"
#include "../shared/platform.h" #include "shared/platform.h"
#define fail(msg) { fprintf(stderr, "%s failed\n", msg); return -1; } #define fail(msg) { fprintf(stderr, "%s failed\n", msg); return -1; }

@ -31,8 +31,8 @@
#include <string.h> #include <string.h>
#include <stdbool.h> #include <stdbool.h>
#include "../src/compositor.h" #include "src/compositor.h"
#include "../ivi-shell/ivi-layout-export.h" #include "ivi-shell/ivi-layout-export.h"
struct test_context { struct test_context {
struct weston_compositor *compositor; struct weston_compositor *compositor;

@ -31,10 +31,10 @@
#include <signal.h> #include <signal.h>
#include <string.h> #include <string.h>
#include "../src/compositor.h" #include "src/compositor.h"
#include "weston-test-server-protocol.h" #include "weston-test-server-protocol.h"
#include "ivi-test.h" #include "ivi-test.h"
#include "../ivi-shell/ivi-layout-export.h" #include "ivi-shell/ivi-layout-export.h"
struct test_context; struct test_context;

@ -32,7 +32,7 @@
#include <signal.h> #include <signal.h>
#include <time.h> #include <time.h>
#include "../shared/matrix.h" #include "shared/matrix.h"
struct inverse_matrix { struct inverse_matrix {
double LU[16]; /* column-major */ double LU[16]; /* column-major */

@ -27,7 +27,7 @@
#include <assert.h> #include <assert.h>
#include "../src/compositor.h" #include "src/compositor.h"
static void static void
surface_to_from_global(void *data) surface_to_from_global(void *data)

@ -28,7 +28,7 @@
#include <stdio.h> #include <stdio.h>
#include <assert.h> #include <assert.h>
#include "../src/compositor.h" #include "src/compositor.h"
static void static void
surface_transform(void *data) surface_transform(void *data)

@ -30,7 +30,7 @@
#include "weston-test-runner.h" #include "weston-test-runner.h"
#include "../src/vertex-clipping.h" #include "src/vertex-clipping.h"
#define BOUNDING_BOX_TOP_Y 100.0f #define BOUNDING_BOX_TOP_Y 100.0f
#define BOUNDING_BOX_LEFT_X 50.0f #define BOUNDING_BOX_LEFT_X 50.0f

@ -32,7 +32,7 @@
#include <errno.h> #include <errno.h>
#include <sys/mman.h> #include <sys/mman.h>
#include "../shared/os-compatibility.h" #include "shared/os-compatibility.h"
#include "weston-test-client-helper.h" #include "weston-test-client-helper.h"
#define max(a, b) (((a) > (b)) ? (a) : (b)) #define max(a, b) (((a) > (b)) ? (a) : (b))

@ -31,13 +31,13 @@
#include <unistd.h> #include <unistd.h>
#include <string.h> #include <string.h>
#include "../src/compositor.h" #include "src/compositor.h"
#include "weston-test-server-protocol.h" #include "weston-test-server-protocol.h"
#ifdef ENABLE_EGL #ifdef ENABLE_EGL
#include <EGL/egl.h> #include <EGL/egl.h>
#include <EGL/eglext.h> #include <EGL/eglext.h>
#include "../src/weston-egl-ext.h" #include "src/weston-egl-ext.h"
#endif /* ENABLE_EGL */ #endif /* ENABLE_EGL */
struct weston_test { struct weston_test {

Loading…
Cancel
Save