From 0c3dc49d5c530ebc790f4fe17a8bf8c30fa82f83 Mon Sep 17 00:00:00 2001 From: Jordan Eldredge Date: Tue, 14 Jan 2020 07:25:02 -0800 Subject: [PATCH] Rename Map to MakiMap --- modern/eslint/maki-eslint-utils.js | 1 + modern/src/runtime/Layer.ts | 2 +- modern/src/runtime/{Map.ts => MakiMap.ts} | 4 ++-- modern/src/runtime/Region.ts | 2 +- modern/src/runtime/WindowHolder.ts | 2 +- 5 files changed, 6 insertions(+), 5 deletions(-) rename modern/src/runtime/{Map.ts => MakiMap.ts} (93%) diff --git a/modern/eslint/maki-eslint-utils.js b/modern/eslint/maki-eslint-utils.js index 48634bc3..ef94d4ec 100644 --- a/modern/eslint/maki-eslint-utils.js +++ b/modern/eslint/maki-eslint-utils.js @@ -2,6 +2,7 @@ const { objects } = require("../src/maki-interpreter/objects"); const classNameMappings = { Object: "MakiObject", + Map: "MakiMap", "@{00000000-0000-0000-0000-000000000000}@": null, }; diff --git a/modern/src/runtime/Layer.ts b/modern/src/runtime/Layer.ts index fc122d09..f5e1c202 100644 --- a/modern/src/runtime/Layer.ts +++ b/modern/src/runtime/Layer.ts @@ -1,7 +1,7 @@ import GuiObject from "./GuiObject"; import { unimplementedWarning } from "../utils"; import Region from "./Region"; -import MakiMap from "./Map"; +import MakiMap from "./MakiMap"; class Layer extends GuiObject { /** diff --git a/modern/src/runtime/Map.ts b/modern/src/runtime/MakiMap.ts similarity index 93% rename from modern/src/runtime/Map.ts rename to modern/src/runtime/MakiMap.ts index 6231d764..d9f328c6 100644 --- a/modern/src/runtime/Map.ts +++ b/modern/src/runtime/MakiMap.ts @@ -1,7 +1,7 @@ import MakiObject from "./MakiObject"; import { unimplementedWarning } from "../utils"; -class Map extends MakiObject { +class MakiMap extends MakiObject { /** * getclassname() * @@ -47,4 +47,4 @@ class Map extends MakiObject { } } -export default Map; +export default MakiMap; diff --git a/modern/src/runtime/Region.ts b/modern/src/runtime/Region.ts index eb9e80a7..5e53ece2 100644 --- a/modern/src/runtime/Region.ts +++ b/modern/src/runtime/Region.ts @@ -1,6 +1,6 @@ import MakiObject from "./MakiObject"; import { unimplementedWarning } from "../utils"; -import MakiMap from "./Map"; +import MakiMap from "./MakiMap"; class Region extends MakiObject { /** diff --git a/modern/src/runtime/WindowHolder.ts b/modern/src/runtime/WindowHolder.ts index 11ae2cba..bc37228b 100644 --- a/modern/src/runtime/WindowHolder.ts +++ b/modern/src/runtime/WindowHolder.ts @@ -1,7 +1,7 @@ import GuiObject from "./GuiObject"; import { unimplementedWarning } from "../utils"; import Wac from "./Wac"; -import MakiMap from "./Map"; +import MakiMap from "./MakiMap"; import Region from "./Region"; class WindowHolder extends GuiObject {