From 11f92353c853d5b5753b94609a560cef534366d1 Mon Sep 17 00:00:00 2001
From: Aparajita Fishman <aparajita@vasudevaserver.org>
Date: Fri, 11 Mar 2011 08:37:23 -0500
Subject: [PATCH] Removed layoutMode references

---
 Tools/nib2cib/Converter.j | 14 ++++++--------
 Tools/nib2cib/main.j      |  9 +--------
 2 files changed, 7 insertions(+), 16 deletions(-)

diff --git a/Tools/nib2cib/Converter.j b/Tools/nib2cib/Converter.j
index 1e9f3fd6c..bd6bae4b2 100644
--- a/Tools/nib2cib/Converter.j
+++ b/Tools/nib2cib/Converter.j
@@ -40,12 +40,11 @@ ConverterConversionException = @"ConverterConversionException";
 
 @implementation Converter : CPObject
 {
-    CPString            inputPath       @accessors(readonly);
-    CPString            outputPath      @accessors;
-    CPString            resourcesPath   @accessors;
-    ConverterLayoutMode layoutMode      @accessors(readonly);
-    NibFormat           format          @accessors(readonly);
-    CPTheme             theme           @accessors(readonly);
+    CPString     inputPath       @accessors(readonly);
+    CPString     outputPath      @accessors;
+    CPString     resourcesPath   @accessors;
+    NibFormat    format          @accessors(readonly);
+    CPTheme      theme           @accessors(readonly);
 }
 
 + (Converter)sharedConverter
@@ -56,7 +55,7 @@ ConverterConversionException = @"ConverterConversionException";
     return SharedConverter;
 }
 
-- (id)initWithInputPath:(CPString)aPath format:(NibFormat)nibFormat layoutMode:(ConverterLayoutMode)aLayoutMode theme:(CPTheme)aTheme
+- (id)initWithInputPath:(CPString)aPath format:(NibFormat)nibFormat theme:(CPTheme)aTheme
 {
     self = [super init];
 
@@ -64,7 +63,6 @@ ConverterConversionException = @"ConverterConversionException";
     {
         inputPath = aPath;
         format = nibFormat;
-        layoutMode = aLayoutMode;
         theme = aTheme;
     }
 
diff --git a/Tools/nib2cib/main.j b/Tools/nib2cib/main.j
index c997c169d..de6bd6b9a 100644
--- a/Tools/nib2cib/main.j
+++ b/Tools/nib2cib/main.j
@@ -54,11 +54,6 @@ parser.option("--mac", "format")
     .def(NibFormatUndetermined)
     .help("Set format to Mac");
 
-parser.option("--legacy", "layoutMode")
-    .set(ConverterModeLegacy)
-    .def(ConverterModeNew)
-    .help("Use legacy code that does not preserve view positioning/sizing");
-
 parser.option("-t", "--theme-dir", "themeDir")
     .set()
     .help("A <theme>.build directory to use for theme attribute values");
@@ -135,7 +130,7 @@ function main(args)
     if (!FILE.exists(inputFile))
         fail("No such file: " + FILE.canonical(inputFile));
 
-    if (options.layoutMode === ConverterModeNew && !haveFontInfo())
+    if (!haveFontInfo())
         fail("The fontinfo package is not installed, please install it.");
 
     var configPath = setSystemFontAndSize(options.configFile || "", inputFile),
@@ -158,7 +153,6 @@ function main(args)
     CPLog.info("Format      : " + ["Auto", "Mac", "iPhone"][options.format]);
     CPLog.info("Resources   : " + (options.resources || ""));
     CPLog.info("Frameworks  : " + options.frameworks);
-    CPLog.info("Layout Mode : " + (options.layoutMode === ConverterModeLegacy ? "legacy" : "new"));
     CPLog.info("Theme       : " + themeName);
     CPLog.info("Config file : " + (configPath || ""));
     CPLog.info("System Font : " + [CPFont systemFontSize] + "px " + [CPFont systemFontFace]);
@@ -166,7 +160,6 @@ function main(args)
 
     var converter = [[Converter alloc] initWithInputPath:inputFile
                                                   format:options.format
-                                              layoutMode:options.layoutMode
                                                    theme:theme];
 
     if (options.resources)