more renaming things

3 files changed, 12 insertions, 12 deletions

diff --git a/sway/commands/layout.c b/sway/commands/layout.c
index e10334e2..e9cfeb8f 100644
--- a/sway/commands/layout.c
+++ b/sway/commands/layout.c
@@ -26,10 +26,10 @@ struct cmd_results *cmd_layout(int argc, char **argv) {
         // TODO: stacks and tabs
 
         if (strcasecmp(argv[0], "default") == 0) {
-                swayc_change_layout(parent, parent->prev_layout);
+                container_set_layout(parent, parent->prev_layout);
                 if (parent->layout == L_NONE) {
-                        struct sway_container *output = sway_container_parent(parent, C_OUTPUT);
-                        swayc_change_layout(parent, default_layout(output));
+                        struct sway_container *output = container_parent(parent, C_OUTPUT);
+                        container_set_layout(parent, container_get_default_layout(output));
                 }
         } else {
                 if (parent->layout != L_TABBED && parent->layout != L_STACKED) {
@@ -37,20 +37,20 @@ struct cmd_results *cmd_layout(int argc, char **argv) {
                 }
 
                 if (strcasecmp(argv[0], "splith") == 0) {
-                        swayc_change_layout(parent, L_HORIZ);
+                        container_set_layout(parent, L_HORIZ);
                 } else if (strcasecmp(argv[0], "splitv") == 0) {
-                        swayc_change_layout(parent, L_VERT);
+                        container_set_layout(parent, L_VERT);
                 } else if (strcasecmp(argv[0], "toggle") == 0 && argc == 2 && strcasecmp(argv[1], "split") == 0) {
                         if (parent->layout == L_HORIZ && (parent->workspace_layout == L_NONE
                                         || parent->workspace_layout == L_HORIZ)) {
-                                swayc_change_layout(parent, L_VERT);
+                                container_set_layout(parent, L_VERT);
                         } else {
-                                swayc_change_layout(parent, L_HORIZ);
+                                container_set_layout(parent, L_HORIZ);
                         }
                 }
         }
 
-        arrange_windows(parent, parent->width, parent->height);
+        container_arrange_windows(parent, parent->width, parent->height);
 
         return cmd_results_new(CMD_SUCCESS, NULL, NULL);
 }
diff --git a/sway/commands/reload.c b/sway/commands/reload.c
index 8cef789b..83ecd75b 100644
--- a/sway/commands/reload.c
+++ b/sway/commands/reload.c
@@ -13,6 +13,6 @@ struct cmd_results *cmd_reload(int argc, char **argv) {
 
         /* load_swaybars(); -- for when it's implemented */
 
-        arrange_windows(&root_container, -1, -1);
+        container_arrange_windows(&root_container, -1, -1);
         return cmd_results_new(CMD_SUCCESS, NULL, NULL);
 }
diff --git a/sway/commands/workspace.c b/sway/commands/workspace.c
index 8b7139a9..8f39e5fc 100644
--- a/sway/commands/workspace.c
+++ b/sway/commands/workspace.c
@@ -23,9 +23,9 @@ struct cmd_results *cmd_workspace(int argc, char **argv) {
                 if (current_container->type == C_WORKSPACE) {
                         old_workspace = current_container;
                 } else {
-                        old_workspace = sway_container_parent(current_container, C_WORKSPACE);
+                        old_workspace = container_parent(current_container, C_WORKSPACE);
                 }
-                old_output = sway_container_parent(current_container, C_OUTPUT);
+                old_output = container_parent(current_container, C_OUTPUT);
         }
 
         for (int i = 0; i < argc; ++i) {
@@ -92,7 +92,7 @@ struct cmd_results *cmd_workspace(int argc, char **argv) {
                 workspace_switch(ws);
                 current_container =
                         sway_seat_get_focus(config->handler_context.seat);
-                struct sway_container *new_output = sway_container_parent(current_container, C_OUTPUT);
+                struct sway_container *new_output = container_parent(current_container, C_OUTPUT);
 
                 if (config->mouse_warping && old_output != new_output) {
                         // TODO: Warp mouse