more renaming things

2 files changed, 17 insertions, 20 deletions

diff --git a/include/sway/tree/container.h b/include/sway/tree/container.h
index 0dfed455..572dd8e3 100644
--- a/include/sway/tree/container.h
+++ b/include/sway/tree/container.h
@@ -88,41 +88,38 @@ struct sway_container {
 };
 
 // TODO only one container create function and pass the type?
-struct sway_container *sway_container_output_create(
+struct sway_container *container_output_create(
                 struct sway_output *sway_output);
 
-struct sway_container *sway_container_workspace_create(
+struct sway_container *container_workspace_create(
                 struct sway_container *output, const char *name);
 
-struct sway_container *sway_container_view_create(
+struct sway_container *container_view_create(
                 struct sway_container *sibling, struct sway_view *sway_view);
 
-struct sway_container *sway_container_output_destroy(
+struct sway_container *container_output_destroy(
                 struct sway_container *output);
 
-struct sway_container *sway_container_view_destroy(struct sway_container *view);
+struct sway_container *container_view_destroy(struct sway_container *view);
 
-struct sway_container *sway_container_set_layout(
+struct sway_container *container_set_layout(
                 struct sway_container *container, enum sway_container_layout layout);
 
-void sway_container_descendents(struct sway_container *root,
+void container_descendents(struct sway_container *root,
                 enum sway_container_type type,
                 void (*func)(struct sway_container *item, void *data), void *data);
 
-// XXX: what is this?
-struct sway_container *next_view_sibling(struct sway_seat *seat);
-
 /**
  * Finds a container based on test criteria. Returns the first container that
  * passes the test.
  */
-struct sway_container *sway_container_find(struct sway_container *container,
+struct sway_container *container_find(struct sway_container *container,
                 bool (*test)(struct sway_container *view, void *data), void *data);
 
 /**
  * Finds a parent container with the given struct sway_containerype.
  */
-struct sway_container *sway_container_parent(struct sway_container *container,
+struct sway_container *container_parent(struct sway_container *container,
                 enum sway_container_type type);
 
 /**
diff --git a/include/sway/tree/layout.h b/include/sway/tree/layout.h
index f73b3880..6980ec9e 100644
--- a/include/sway/tree/layout.h
+++ b/include/sway/tree/layout.h
@@ -30,23 +30,23 @@ struct sway_root {
         } events;
 };
 
-void init_layout(void);
+void layout_init(void);
 
-void add_child(struct sway_container *parent, struct sway_container *child);
+void container_add_child(struct sway_container *parent, struct sway_container *child);
 
-struct sway_container *add_sibling(struct sway_container *parent,
+struct sway_container *container_add_sibling(struct sway_container *parent,
                 struct sway_container *child);
 
-struct sway_container *remove_child(struct sway_container *child);
+struct sway_container *container_remove_child(struct sway_container *child);
 
-enum sway_container_layout default_layout(struct sway_container *output);
+enum sway_container_layout container_get_default_layout(struct sway_container *output);
 
-void sort_workspaces(struct sway_container *output);
+void container_sort_workspaces(struct sway_container *output);
 
-void arrange_windows(struct sway_container *container,
+void container_arrange_windows(struct sway_container *container,
                 double width, double height);
 
-struct sway_container *get_swayc_in_direction(struct sway_container
+struct sway_container *container_get_in_direction(struct sway_container
                 *container, struct sway_seat *seat, enum movement_direction dir);
 
 #endif