diff --git a/Tools/nib2cib/NSPredicateEditor.j b/Tools/nib2cib/NSPredicateEditor.j index 2ef4ea8a1..add06a19b 100644 --- a/Tools/nib2cib/NSPredicateEditor.j +++ b/Tools/nib2cib/NSPredicateEditor.j @@ -27,12 +27,12 @@ - (id)NS_initWithCoder:(CPCoder)aCoder { self = [super NS_initWithCoder:aCoder]; - + if (self) - { + { _allTemplates = [aCoder decodeObjectForKey:@"NSPredicateTemplates"]; } - + return self; } @@ -59,7 +59,7 @@ - (id)NS_initWithCoder:(CPCoder)aCoder { self = [super init]; - + if (self) { _templateType = [aCoder decodeIntForKey:@"NSPredicateTemplateType"]; @@ -71,7 +71,7 @@ _rightIsWildcard = [aCoder decodeBoolForKey:@"NSPredicateTemplateRightIsWildcard"]; _views = [aCoder decodeObjectForKey:@"NSPredicateTemplateViews"]; } - + return self; } diff --git a/Tools/nib2cib/NSRuleEditor.j b/Tools/nib2cib/NSRuleEditor.j index 8955626f4..fb7be960d 100644 --- a/Tools/nib2cib/NSRuleEditor.j +++ b/Tools/nib2cib/NSRuleEditor.j @@ -32,7 +32,7 @@ - (id)NS_initWithCoder:(CPCoder)aCoder { self = [super NS_initWithCoder:aCoder]; - + if (self) { _alignmentGridWidth = [aCoder decodeFloatForKey:@"NSRuleEditorAlignmentGridWidth"]; @@ -40,20 +40,20 @@ _stringsFilename = [aCoder decodeObjectForKey:@"NSRuleEditorStringsFileName"]; _editable = [aCoder decodeBoolForKey:@"NSRuleEditorEditable"]; _allowsEmptyCompoundRows = [aCoder decodeBoolForKey:@"NSRuleEditorAllowsEmptyCompoundRows"]; - _disallowEmpty = [aCoder decodeBoolForKey:@"NSRuleEditorDisallowEmpty"]; + _disallowEmpty = [aCoder decodeBoolForKey:@"NSRuleEditorDisallowEmpty"]; _nestingMode = [aCoder decodeIntForKey:@"NSRuleEditorNestingMode"]; _typeKeyPath = [aCoder decodeObjectForKey:@"NSRuleEditorRowTypeKeyPath"]; _itemsKeyPath = [aCoder decodeObjectForKey:@"NSRuleEditorItemsKeyPath"]; _valuesKeyPath = [aCoder decodeObjectForKey:@"NSRuleEditorValuesKeyPath"]; _subrowsArrayKeyPath = [aCoder decodeObjectForKey:@"NSRuleEditorSubrowsArrayKeyPath"]; _boundArrayKeyPath = [aCoder decodeObjectForKey:@"NSRuleEditorBoundArrayKeyPath"]; - + //_slicesHolder = [aCoder decodeObjectForKey:@"NSRuleEditorViewSliceHolder"]; _boundArrayOwner = [aCoder decodeObjectForKey:@"NSRuleEditorBoundArrayOwner"]; _slices = [aCoder decodeObjectForKey:@"NSRuleEditorSlices"]; - _ruleDelegate = [aCoder decodeObjectForKey:@"NSRuleEditorDelegate"]; + _ruleDelegate = [aCoder decodeObjectForKey:@"NSRuleEditorDelegate"]; } - + return self; } @@ -99,7 +99,7 @@ { if (self = [super init]) boundArray = [aCoder decodeObjectForKey:@"NSBoundArray"]; - + return self; } diff --git a/Tools/nib2cib/Nib2Cib.j b/Tools/nib2cib/Nib2Cib.j index 424570cb5..6c2fac4d1 100644 --- a/Tools/nib2cib/Nib2Cib.j +++ b/Tools/nib2cib/Nib2Cib.j @@ -40,7 +40,7 @@ var FILE = require("file"), DefaultTheme = "Aristo", BuildTypes = ["Debug", "Release"], DefaultFile = "MainMenu", - AllowedStoredOptionsRe = new RegExp("^(defaultTheme|auxThemes|verbosity|quiet|frameworks|format)$"); + AllowedStoredOptionsRe = new RegExp("^(defaultTheme|auxThemes|verbosity|quiet|frameworks|format)$"), ArgsRe = /"[^\"]+"|'[^\']+'|\S+/g;