From c3b4006f6b11578020238b1aa3d51eeab80d29e3 Mon Sep 17 00:00:00 2001
From: Michael Stapelberg <michael@stapelberg.de>
Date: Sat, 2 Apr 2011 21:49:35 +0200
Subject: [PATCH] Rename new_container to workspace_layout

---
 src/cfgparse.l |  2 +-
 src/cfgparse.y | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/cfgparse.l b/src/cfgparse.l
index 7295fed9..a2d62e54 100644
--- a/src/cfgparse.l
+++ b/src/cfgparse.l
@@ -96,7 +96,7 @@ default_orientation             { return TOK_ORIENTATION; }
 horizontal                      { return TOK_HORIZ; }
 vertical                        { return TOK_VERT; }
 auto                            { return TOK_AUTO; }
-new_container                   { return TOKNEWCONTAINER; }
+workspace_layout                { return TOK_WORKSPACE_LAYOUT; }
 new_window                      { return TOKNEWWINDOW; }
 normal                          { return TOK_NORMAL; }
 none                            { return TOK_NONE; }
diff --git a/src/cfgparse.y b/src/cfgparse.y
index 75e68122..721c5698 100644
--- a/src/cfgparse.y
+++ b/src/cfgparse.y
@@ -228,7 +228,7 @@ void parse_file(const char *f) {
 %token TOK_HORIZ "horizontal"
 %token TOK_VERT "vertical"
 %token TOK_AUTO "auto"
-%token TOKNEWCONTAINER "new_container"
+%token TOK_WORKSPACE_LAYOUT "workspace_layout"
 %token TOKNEWWINDOW "new_window"
 %token TOK_NORMAL "normal"
 %token TOK_NONE "none"
@@ -256,7 +256,7 @@ line:
         | mode
         | floating_modifier
         | orientation
-        | new_container
+        | workspace_layout
         | new_window
         | focus_follows_mouse
         | workspace_bar
@@ -394,8 +394,8 @@ direction:
         | TOK_AUTO      { $<number>$ = NO_ORIENTATION; }
         ;
 
-new_container:
-        TOKNEWCONTAINER WHITESPACE layout_mode
+workspace_layout:
+        TOK_WORKSPACE_LAYOUT WHITESPACE layout_mode
         {
                 DLOG("new containers will be in mode %d\n", $<number>3);
                 config.default_layout = $<number>3;
@@ -419,7 +419,7 @@ new_container:
                 }
 #endif
         }
-        | TOKNEWCONTAINER WHITESPACE TOKSTACKLIMIT WHITESPACE TOKSTACKLIMIT WHITESPACE NUMBER
+        | TOK_WORKSPACE_LAYOUT WHITESPACE TOKSTACKLIMIT WHITESPACE TOKSTACKLIMIT WHITESPACE NUMBER
         {
                 DLOG("stack-limit %d with val %d\n", $<number>5, $<number>7);
                 config.container_stack_limit = $<number>5;