Commit 4678bab1 authored by Jon Cruz's avatar Jon Cruz Committed by Bryce Harrington

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: default avatarJon A. Cruz <jonc@osg.samsung.com>
Reviewed-by: Peter Hutterer's avatarPeter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: default avatarBryce Harrington <bryce@osg.samsung.com>
parent b7e07846
......@@ -35,7 +35,7 @@
#include <wayland-client.h>
#include "window.h"
#include "../shared/matrix.h"
#include "shared/matrix.h"
#define ARRAY_LENGTH(a) (sizeof (a) / sizeof (a)[0])
......
......@@ -43,8 +43,8 @@
#include <wayland-client.h>
#include "window.h"
#include "../shared/cairo-util.h"
#include "../shared/config-parser.h"
#include "shared/cairo-util.h"
#include "shared/config-parser.h"
#include "desktop-shell-client-protocol.h"
......
......@@ -40,7 +40,7 @@
#include <wayland-cursor.h>
#include "window.h"
#include "../shared/cairo-util.h"
#include "shared/cairo-util.h"
struct dnd_drag;
......
......@@ -41,7 +41,7 @@
#include <wayland-client.h>
#include "window.h"
#include "../shared/cairo-util.h"
#include "shared/cairo-util.h"
struct image {
struct window *window;
......
......@@ -33,9 +33,9 @@
#include <sys/mman.h>
#include <getopt.h>
#include <wayland-cursor.h>
#include "../shared/cairo-util.h"
#include "../shared/config-parser.h"
#include "../shared/os-compatibility.h"
#include "shared/cairo-util.h"
#include "shared/config-parser.h"
#include "shared/os-compatibility.h"
#include "ivi-application-client-protocol.h"
#include "ivi-hmi-controller-client-protocol.h"
......
......@@ -39,7 +39,7 @@
#include <math.h>
#include <wayland-client.h>
#include "../shared/os-compatibility.h"
#include "shared/os-compatibility.h"
struct device {
enum { KEYBOARD, POINTER } type;
......
......@@ -36,7 +36,7 @@
#include <time.h>
#include <wayland-client.h>
#include "../shared/os-compatibility.h"
#include "shared/os-compatibility.h"
#include "presentation_timing-client-protocol.h"
#define ARRAY_LENGTH(a) (sizeof (a) / sizeof (a)[0])
......
......@@ -37,7 +37,7 @@
#include <wayland-client.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 compositor and serves as a test bed for implementing client
......
......@@ -36,7 +36,7 @@
#include <signal.h>
#include <wayland-client.h>
#include "../shared/os-compatibility.h"
#include "shared/os-compatibility.h"
#include "xdg-shell-client-protocol.h"
#include "fullscreen-shell-client-protocol.h"
#include "scaler-client-protocol.h"
......
......@@ -47,7 +47,7 @@
#include "protocol/ivi-application-client-protocol.h"
#define IVI_SURFACE_ID 9000
#include "../shared/platform.h"
#include "shared/platform.h"
#ifndef EGL_EXT_swap_buffers_with_damage
#define EGL_EXT_swap_buffers_with_damage 1
......
......@@ -34,7 +34,7 @@
#include <signal.h>
#include <wayland-client.h>
#include "../shared/os-compatibility.h"
#include "shared/os-compatibility.h"
#include "xdg-shell-client-protocol.h"
#include "fullscreen-shell-client-protocol.h"
......
......@@ -33,7 +33,7 @@
#include <sys/mman.h>
#include <wayland-client.h>
#include "../shared/os-compatibility.h"
#include "shared/os-compatibility.h"
#define ARRAY_LENGTH(a) (sizeof (a) / sizeof (a)[0])
......
......@@ -43,7 +43,7 @@
#include <wayland-client.h>
#include "../shared/config-parser.h"
#include "shared/config-parser.h"
#include "window.h"
static int option_fullscreen;
......
......@@ -32,7 +32,7 @@
#include <wayland-client.h>
#include "../shared/os-compatibility.h"
#include "shared/os-compatibility.h"
#include "presentation_timing-client-protocol.h"
#define ARRAY_LENGTH(a) (sizeof (a) / sizeof (a)[0])
......
......@@ -66,11 +66,11 @@ typedef void *EGLContext;
#include <linux/input.h>
#include <wayland-client.h>
#include "../shared/cairo-util.h"
#include "shared/cairo-util.h"
#include "xdg-shell-client-protocol.h"
#include "text-cursor-position-client-protocol.h"
#include "workspaces-client-protocol.h"
#include "../shared/os-compatibility.h"
#include "shared/os-compatibility.h"
#include "window.h"
......
......@@ -29,9 +29,9 @@
#include <xkbcommon/xkbcommon.h>
#include <wayland-client.h>
#include <cairo.h>
#include "../shared/config-parser.h"
#include "../shared/zalloc.h"
#include "../shared/platform.h"
#include "shared/config-parser.h"
#include "shared/zalloc.h"
#include "shared/platform.h"
#define ARRAY_LENGTH(a) (sizeof (a) / sizeof (a)[0])
......
......@@ -38,7 +38,7 @@
#include "shell.h"
#include "desktop-shell-server-protocol.h"
#include "workspaces-server-protocol.h"
#include "../shared/config-parser.h"
#include "shared/config-parser.h"
#include "xdg-shell-server-protocol.h"
#define DEFAULT_NUM_WORKSPACES 1
......
......@@ -63,7 +63,7 @@
#include "ivi-layout-export.h"
#include "ivi-layout-private.h"
#include "../shared/os-compatibility.h"
#include "shared/os-compatibility.h"
struct link_layer {
struct ivi_layout_layer *ivilayer;
......
......@@ -42,9 +42,9 @@
#include "compositor.h"
#include "gl-renderer.h"
#include "pixman-renderer.h"
#include "../shared/image-loader.h"
#include "../shared/os-compatibility.h"
#include "../shared/cairo-util.h"
#include "shared/image-loader.h"
#include "shared/os-compatibility.h"
#include "shared/cairo-util.h"
#include "fullscreen-shell-client-protocol.h"
#include "presentation_timing-server-protocol.h"
......
......@@ -52,8 +52,8 @@
#include "compositor.h"
#include "gl-renderer.h"
#include "pixman-renderer.h"
#include "../shared/config-parser.h"
#include "../shared/image-loader.h"
#include "shared/config-parser.h"
#include "shared/image-loader.h"
#include "presentation_timing-server-protocol.h"
#define DEFAULT_AXIS_STEP_DISTANCE wl_fixed_from_int(10)
......
......@@ -61,7 +61,7 @@
#include "compositor.h"
#include "scaler-server-protocol.h"
#include "presentation_timing-server-protocol.h"
#include "../shared/os-compatibility.h"
#include "shared/os-compatibility.h"
#include "git-version.h"
#include "version.h"
......
......@@ -34,7 +34,7 @@
#include <fcntl.h>
#include <limits.h>
#include "../shared/os-compatibility.h"
#include "shared/os-compatibility.h"
#include "compositor.h"
static void
......
......@@ -40,7 +40,7 @@
#include <wayland-client.h>
#include "compositor.h"
#include "../shared/os-compatibility.h"
#include "shared/os-compatibility.h"
#include "fullscreen-shell-client-protocol.h"
struct shared_output {
......
......@@ -36,7 +36,7 @@
#include "compositor.h"
#include "screenshooter-server-protocol.h"
#include "../wcap/wcap-decode.h"
#include "wcap/wcap-decode.h"
struct screenshooter {
struct weston_compositor *ec;
......
......@@ -28,7 +28,7 @@
#include <unistd.h>
#include "../shared/os-compatibility.h"
#include "shared/os-compatibility.h"
#include "weston-test-client-helper.h"
/* tests, that attempt to crash the compositor on purpose */
......
......@@ -32,7 +32,7 @@
#include <GLES2/gl2.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; }
......
......@@ -31,8 +31,8 @@
#include <string.h>
#include <stdbool.h>
#include "../src/compositor.h"
#include "../ivi-shell/ivi-layout-export.h"
#include "src/compositor.h"
#include "ivi-shell/ivi-layout-export.h"
struct test_context {
struct weston_compositor *compositor;
......
......@@ -31,10 +31,10 @@
#include <signal.h>
#include <string.h>
#include "../src/compositor.h"
#include "src/compositor.h"
#include "weston-test-server-protocol.h"
#include "ivi-test.h"
#include "../ivi-shell/ivi-layout-export.h"
#include "ivi-shell/ivi-layout-export.h"
struct test_context;
......
......@@ -32,7 +32,7 @@
#include <signal.h>
#include <time.h>
#include "../shared/matrix.h"
#include "shared/matrix.h"
struct inverse_matrix {
double LU[16]; /* column-major */
......
......@@ -27,7 +27,7 @@
#include <assert.h>
#include "../src/compositor.h"
#include "src/compositor.h"
static void
surface_to_from_global(void *data)
......
......@@ -28,7 +28,7 @@
#include <stdio.h>
#include <assert.h>
#include "../src/compositor.h"
#include "src/compositor.h"
static void
surface_transform(void *data)
......
......@@ -30,7 +30,7 @@
#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_LEFT_X 50.0f
......
......@@ -32,7 +32,7 @@
#include <errno.h>
#include <sys/mman.h>
#include "../shared/os-compatibility.h"
#include "shared/os-compatibility.h"
#include "weston-test-client-helper.h"
#define max(a, b) (((a) > (b)) ? (a) : (b))
......
......@@ -31,13 +31,13 @@
#include <unistd.h>
#include <string.h>
#include "../src/compositor.h"
#include "src/compositor.h"
#include "weston-test-server-protocol.h"
#ifdef ENABLE_EGL
#include <EGL/egl.h>
#include <EGL/eglext.h>
#include "../src/weston-egl-ext.h"
#include "src/weston-egl-ext.h"
#endif /* ENABLE_EGL */
struct weston_test {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment