From ed227f5664196d85194d63d01a5382499867a386 Mon Sep 17 00:00:00 2001 From: Mikkel Oscar Lyderik Date: Sun, 24 Jan 2016 15:55:58 +0100 Subject: [PATCH] swaybar: move headers to include/bar --- {swaybar => include/bar}/bar.h | 0 {swaybar => include/bar}/config.h | 0 {swaybar => include/bar}/ipc.h | 0 {swaybar => include/bar}/render.h | 0 {swaybar => include/bar}/status_line.h | 0 swaybar/bar.c | 10 +++++----- swaybar/config.c | 2 +- swaybar/ipc.c | 4 ++-- swaybar/main.c | 2 +- swaybar/render.c | 6 +++--- swaybar/status_line.c | 4 ++-- 11 files changed, 14 insertions(+), 14 deletions(-) rename {swaybar => include/bar}/bar.h (100%) rename {swaybar => include/bar}/config.h (100%) rename {swaybar => include/bar}/ipc.h (100%) rename {swaybar => include/bar}/render.h (100%) rename {swaybar => include/bar}/status_line.h (100%) diff --git a/swaybar/bar.h b/include/bar/bar.h similarity index 100% rename from swaybar/bar.h rename to include/bar/bar.h diff --git a/swaybar/config.h b/include/bar/config.h similarity index 100% rename from swaybar/config.h rename to include/bar/config.h diff --git a/swaybar/ipc.h b/include/bar/ipc.h similarity index 100% rename from swaybar/ipc.h rename to include/bar/ipc.h diff --git a/swaybar/render.h b/include/bar/render.h similarity index 100% rename from swaybar/render.h rename to include/bar/render.h diff --git a/swaybar/status_line.h b/include/bar/status_line.h similarity index 100% rename from swaybar/status_line.h rename to include/bar/status_line.h diff --git a/swaybar/bar.c b/swaybar/bar.c index fc01863b..d80c9af3 100644 --- a/swaybar/bar.c +++ b/swaybar/bar.c @@ -8,11 +8,11 @@ #include "ipc-client.h" #include "list.h" #include "log.h" -#include "ipc.h" -#include "render.h" -#include "config.h" -#include "status_line.h" -#include "bar.h" +#include "bar/ipc.h" +#include "bar/render.h" +#include "bar/config.h" +#include "bar/status_line.h" +#include "bar/bar.h" static void bar_init(struct bar *bar) { bar->config = init_config(); diff --git a/swaybar/config.c b/swaybar/config.c index 28b609e6..92251831 100644 --- a/swaybar/config.c +++ b/swaybar/config.c @@ -3,7 +3,7 @@ #include "wayland-desktop-shell-client-protocol.h" #include "log.h" -#include "config.h" +#include "bar/config.h" uint32_t parse_color(const char *color) { if (color[0] != '#') { diff --git a/swaybar/ipc.c b/swaybar/ipc.c index 547041ce..4104103d 100644 --- a/swaybar/ipc.c +++ b/swaybar/ipc.c @@ -4,8 +4,8 @@ #include "ipc-client.h" #include "list.h" #include "log.h" -#include "config.h" -#include "ipc.h" +#include "bar/config.h" +#include "bar/ipc.h" static void ipc_parse_config(struct config *config, const char *payload) { json_object *bar_config = json_tokener_parse(payload); diff --git a/swaybar/main.c b/swaybar/main.c index fc5acdae..737ee647 100644 --- a/swaybar/main.c +++ b/swaybar/main.c @@ -5,7 +5,7 @@ #include #include "ipc-client.h" #include "log.h" -#include "bar.h" +#include "bar/bar.h" /* global bar state */ struct bar swaybar; diff --git a/swaybar/render.c b/swaybar/render.c index f3ce6010..bac44075 100644 --- a/swaybar/render.c +++ b/swaybar/render.c @@ -4,9 +4,9 @@ #include "client/pango.h" #include "client/window.h" -#include "config.h" -#include "status_line.h" -#include "render.h" +#include "bar/config.h" +#include "bar/status_line.h" +#include "bar/render.h" /* internal spacing */ diff --git a/swaybar/status_line.c b/swaybar/status_line.c index 6b630c49..ba6de6a1 100644 --- a/swaybar/status_line.c +++ b/swaybar/status_line.c @@ -4,8 +4,8 @@ #include #include "log.h" -#include "config.h" -#include "status_line.h" +#include "bar/config.h" +#include "bar/status_line.h" #define I3JSON_MAXDEPTH 4 #define I3JSON_UNKNOWN 0