ipc: s/floating-nodes/floating_nodes for consistency

diff --git a/src/ipc.c b/src/ipc.c
index b8409a929fd7d4c303b55934eaced98bf0553d85..fd4f4fd8e1e6ab94e012b3f7e10593b4de7cfeec 100644 (file)
--- a/src/ipc.c
+++ b/src/ipc.c
@@ -206,7 +206,7 @@ void dump_node(yajl_gen gen, struct Con *con, bool inplace_restart) {
         }
         y(array_close);
 
-        ystr("floating-nodes");
+        ystr("floating_nodes");
         y(array_open);
         TAILQ_FOREACH(node, &(con->floating_head), floating_windows) {
                 dump_node(gen, node, inplace_restart);

diff --git a/testcases/t/16-nestedcons.t b/testcases/t/16-nestedcons.t
index 1e57994f84b039ef6a623096ab519b458a9b08b4..3d392c460da5277232db866fa4718e6c5603f53d 100644 (file)
--- a/testcases/t/16-nestedcons.t
+++ b/testcases/t/16-nestedcons.t
@@ -26,7 +26,7 @@ my $expected = {
     focused => 0,
     urgent => 0,
     border => 0,
-    'floating-nodes' => ignore(),
+    'floating_nodes' => ignore(),
 };
 
 cmp_deeply($tree, $expected, 'root node OK');

diff --git a/testcases/t/22-split.t b/testcases/t/22-split.t
index f3942243950889ee69a010b886a807f83a7b2ba3..fdf7bb211f75191570cfa70b6054d3871a7857cb 100644 (file)
--- a/testcases/t/22-split.t
+++ b/testcases/t/22-split.t
@@ -76,7 +76,7 @@ sub sum_nodes {
     return 0 if !@{$nodes};
 
     my @children = (map { @{$_->{nodes}} } @{$nodes},
-                    map { @{$_->{'floating-nodes'}} } @{$nodes});
+                    map { @{$_->{'floating_nodes'}} } @{$nodes});
 
     return @{$nodes} + sum_nodes(\@children);
 }

diff --git a/testcases/t/lib/i3test.pm b/testcases/t/lib/i3test.pm
index 2fcfc06449d0e3bb81b56e24cff1b1da76a6d2af..d241cfae871a933a28187d77d2ad5cbc8643d5cc 100644 (file)
--- a/testcases/t/lib/i3test.pm
+++ b/testcases/t/lib/i3test.pm
@@ -112,7 +112,7 @@ sub get_focused {
         $lf = $focused[0];
         last unless defined($con->{focus});
         @focused = @{$con->{focus}};
-        @cons = grep { $_->{id} == $lf } (@{$con->{nodes}}, @{$con->{'floating-nodes'}});
+        @cons = grep { $_->{id} == $lf } (@{$con->{nodes}}, @{$con->{'floating_nodes'}});
         $con = $cons[0];
     }