more renaming things

1 files changed, 8 insertions, 8 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);
 }