From: Michael Stapelberg <michael@stapelberg.de>
Date: Sun, 21 Nov 2010 15:34:45 +0000 (+0100)
Subject: ipc: s/floating-nodes/floating_nodes for consistency
X-Git-Tag: tree-pr1~81
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=f53fafe100ad43f4525d5605ad0c6c7c13219f7f;p=i3%2Fi3

ipc: s/floating-nodes/floating_nodes for consistency
---

diff --git a/src/ipc.c b/src/ipc.c
index b8409a92..fd4f4fd8 100644
--- 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 1e57994f..3d392c46 100644
--- 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 f3942243..fdf7bb21 100644
--- 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 2fcfc064..d241cfae 100644
--- 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];
     }