From ee39b85a9e26fe5c2e9c00417324c333fb0335aa Mon Sep 17 00:00:00 2001 From: Josh Tynjala Date: Tue, 26 Apr 2022 13:20:43 -0700 Subject: [PATCH] Fix compatibility with older Haxe --- src/lime/tools/ApplicationData.hx | 14 --------- src/lime/tools/ApplicationDataDefaults.hx | 16 ++++++++++ src/lime/tools/MetaData.hx | 15 --------- src/lime/tools/MetaDataDefaults.hx | 17 ++++++++++ src/lime/tools/ProjectXMLParser.hx | 10 +++--- src/lime/tools/WindowData.hx | 36 --------------------- src/lime/tools/WindowDataDefaults.hx | 38 +++++++++++++++++++++++ tools/CommandLineTools.hx | 12 +++---- 8 files changed, 82 insertions(+), 76 deletions(-) create mode 100644 src/lime/tools/ApplicationDataDefaults.hx create mode 100644 src/lime/tools/MetaDataDefaults.hx create mode 100644 src/lime/tools/WindowDataDefaults.hx diff --git a/src/lime/tools/ApplicationData.hx b/src/lime/tools/ApplicationData.hx index 27ebc759f..bf5876f89 100644 --- a/src/lime/tools/ApplicationData.hx +++ b/src/lime/tools/ApplicationData.hx @@ -10,17 +10,3 @@ typedef ApplicationData = @:optional var swfVersion:Float; @:optional var url:String; } - -@:dox(hide) class _ApplicationDataType -{ - public static var fields:ApplicationData = - { - file: "", - init: "", - main: "", - path: "", - preloader: "", - swfVersion: 0.0, - url: "" - } -} diff --git a/src/lime/tools/ApplicationDataDefaults.hx b/src/lime/tools/ApplicationDataDefaults.hx new file mode 100644 index 000000000..50559844b --- /dev/null +++ b/src/lime/tools/ApplicationDataDefaults.hx @@ -0,0 +1,16 @@ +package lime.tools; + +@:dox(hide) +class ApplicationDataDefaults +{ + public static var fields:ApplicationData = + { + file: "", + init: "", + main: "", + path: "", + preloader: "", + swfVersion: 0.0, + url: "" + } +} diff --git a/src/lime/tools/MetaData.hx b/src/lime/tools/MetaData.hx index 0d890ec7f..1849064f0 100644 --- a/src/lime/tools/MetaData.hx +++ b/src/lime/tools/MetaData.hx @@ -11,18 +11,3 @@ typedef MetaData = @:optional var title:String; @:optional var version:String; } - -@:dox(hide) class _MetaDataType -{ - public static var fields:MetaData = - { - buildNumber: "", - company: "", - companyId: "", - companyUrl: "", - description: "", - packageName: "", - title: "", - version: "" - } -} diff --git a/src/lime/tools/MetaDataDefaults.hx b/src/lime/tools/MetaDataDefaults.hx new file mode 100644 index 000000000..250b1f265 --- /dev/null +++ b/src/lime/tools/MetaDataDefaults.hx @@ -0,0 +1,17 @@ +package lime.tools; + +@:dox(hide) +class MetaDataDefaults +{ + public static var fields:MetaData = + { + buildNumber: "", + company: "", + companyId: "", + companyUrl: "", + description: "", + packageName: "", + title: "", + version: "" + } +} diff --git a/src/lime/tools/ProjectXMLParser.hx b/src/lime/tools/ProjectXMLParser.hx index 2304e3529..576592d4a 100644 --- a/src/lime/tools/ProjectXMLParser.hx +++ b/src/lime/tools/ProjectXMLParser.hx @@ -439,11 +439,11 @@ class ProjectXMLParser extends HXProject name = "packageName"; } - if (Reflect.hasField(ApplicationData._ApplicationDataType.fields, name)) + if (Reflect.hasField(ApplicationDataDefaults.fields, name)) { Reflect.setField(app, name, value); } - else if (Reflect.hasField(MetaData._MetaDataType.fields, name)) + else if (Reflect.hasField(MetaDataDefaults.fields, name)) { Reflect.setField(meta, name, value); } @@ -856,7 +856,7 @@ class ProjectXMLParser extends HXProject name = "packageName"; } - if (Reflect.hasField(MetaData._MetaDataType.fields, name)) + if (Reflect.hasField(MetaDataDefaults.fields, name)) { Reflect.setField(meta, name, value); } @@ -2006,11 +2006,11 @@ class ProjectXMLParser extends HXProject Reflect.setField(windows[id], "colorDepth", Std.parseInt(value)); default: - if (Reflect.hasField(WindowData._WindowDataType.fields, name)) + if (Reflect.hasField(WindowDataDefaults.fields, name)) { Reflect.setField(windows[id], name, value == "true"); } - else if (Reflect.hasField(WindowData._WindowDataType.fields, formatAttributeName(name))) + else if (Reflect.hasField(WindowDataDefaults.fields, formatAttributeName(name))) { Reflect.setField(windows[id], formatAttributeName(name), value == "true"); } diff --git a/src/lime/tools/WindowData.hx b/src/lime/tools/WindowData.hx index 843e9b0bb..c6141bafb 100644 --- a/src/lime/tools/WindowData.hx +++ b/src/lime/tools/WindowData.hx @@ -32,39 +32,3 @@ typedef WindowData = @:optional var maximized:Bool; @:optional var hidden:Bool; } - -@:dox(hide) class _WindowDataType -{ - public static var fields:WindowData = - { - width: 0, - height: 0, - x: 0.0, - y: 0.0, - background: 0, - parameters: "", - fps: 0, - hardware: false, - display: 0, - resizable: false, - borderless: false, - vsync: false, - fullscreen: false, - allowHighDPI: false, - alwaysOnTop: false, - antialiasing: 0, - orientation: Orientation.AUTO, - allowShaders: false, - requireShaders: false, - depthBuffer: false, - stencilBuffer: false, - title: "", - #if (js && html5) - element: null, - #end - colorDepth: 0, - minimized: false, - maximized: false, - hidden: false - } -} diff --git a/src/lime/tools/WindowDataDefaults.hx b/src/lime/tools/WindowDataDefaults.hx new file mode 100644 index 000000000..965c4d8a1 --- /dev/null +++ b/src/lime/tools/WindowDataDefaults.hx @@ -0,0 +1,38 @@ +package lime.tools; + +@:dox(hide) +class WindowDataDefaults +{ + public static var fields:WindowData = + { + width: 0, + height: 0, + x: 0.0, + y: 0.0, + background: 0, + parameters: "", + fps: 0, + hardware: false, + display: 0, + resizable: false, + borderless: false, + vsync: false, + fullscreen: false, + allowHighDPI: false, + alwaysOnTop: false, + antialiasing: 0, + orientation: Orientation.AUTO, + allowShaders: false, + requireShaders: false, + depthBuffer: false, + stencilBuffer: false, + title: "", + #if (js && html5) + element: null, + #end + colorDepth: 0, + minimized: false, + maximized: false, + hidden: false + } +} diff --git a/tools/CommandLineTools.hx b/tools/CommandLineTools.hx index cd0a6d681..955c4907a 100644 --- a/tools/CommandLineTools.hx +++ b/tools/CommandLineTools.hx @@ -1860,9 +1860,9 @@ class CommandLineTools var fieldValue = Reflect.field(project, field); var typeValue:Dynamic = switch (field) { - case "app": ApplicationData._ApplicationDataType.fields; - case "meta": MetaData._MetaDataType.fields; - case "window": WindowData._WindowDataType.fields; + case "app": ApplicationDataDefaults.fields; + case "meta": MetaDataDefaults.fields; + case "window": WindowDataDefaults.fields; default: fieldValue; }; @@ -2130,9 +2130,9 @@ class CommandLineTools var fieldReference = Reflect.field(overrides, fieldName); var typeValue:Dynamic = switch (fieldName) { - case "app": ApplicationData._ApplicationDataType.fields; - case "meta": MetaData._MetaDataType.fields; - case "window": WindowData._WindowDataType.fields; + case "app": ApplicationDataDefaults.fields; + case "meta": MetaDataDefaults.fields; + case "window": WindowDataDefaults.fields; default: fieldReference; };