From 059c8b8c5f8b2cd5a6b27ff55a175d8364925fd6 Mon Sep 17 00:00:00 2001 From: Matan Lurey Date: Tue, 19 Sep 2023 10:24:35 -0700 Subject: [PATCH] Rename `layoutGoals` to `kLayoutGoals` to enforce lints on headers. --- .../darwin/macos/framework/Source/FlutterKeyboardManager.mm | 2 +- shell/platform/darwin/macos/framework/Source/KeyCodeMap.g.mm | 2 +- .../darwin/macos/framework/Source/KeyCodeMap_Internal.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/shell/platform/darwin/macos/framework/Source/FlutterKeyboardManager.mm b/shell/platform/darwin/macos/framework/Source/FlutterKeyboardManager.mm index 2238c300bf9a3..8812df4e948da 100644 --- a/shell/platform/darwin/macos/framework/Source/FlutterKeyboardManager.mm +++ b/shell/platform/darwin/macos/framework/Source/FlutterKeyboardManager.mm @@ -275,7 +275,7 @@ - (void)buildLayout { std::map mandatoryGoalsByChar; std::map usLayoutGoalsByKeyCode; - for (const LayoutGoal& goal : flutter::layoutGoals) { + for (const LayoutGoal& goal : flutter::kLayoutGoals) { if (goal.mandatory) { mandatoryGoalsByChar[goal.keyChar] = goal; } else { diff --git a/shell/platform/darwin/macos/framework/Source/KeyCodeMap.g.mm b/shell/platform/darwin/macos/framework/Source/KeyCodeMap.g.mm index 52229d518b0ab..6fc5c71c78d08 100644 --- a/shell/platform/darwin/macos/framework/Source/KeyCodeMap.g.mm +++ b/shell/platform/darwin/macos/framework/Source/KeyCodeMap.g.mm @@ -245,7 +245,7 @@ const uint64_t kCapsLockPhysicalKey = 0x00070039; const uint64_t kCapsLockLogicalKey = 0x100000104; -const std::vector layoutGoals = { +const std::vector kLayoutGoals = { LayoutGoal{0x31, 0x20, false}, // Space LayoutGoal{0x27, 0x22, false}, // Quote LayoutGoal{0x2b, 0x2c, false}, // Comma diff --git a/shell/platform/darwin/macos/framework/Source/KeyCodeMap_Internal.h b/shell/platform/darwin/macos/framework/Source/KeyCodeMap_Internal.h index 9a7e38659ff4e..15fe906c1bc03 100644 --- a/shell/platform/darwin/macos/framework/Source/KeyCodeMap_Internal.h +++ b/shell/platform/darwin/macos/framework/Source/KeyCodeMap_Internal.h @@ -104,6 +104,6 @@ typedef struct { * All keys that Flutter wants to derive layout for, and guides on how to derive * them. */ -extern const std::vector layoutGoals; +extern const std::vector kLayoutGoals; } // namespace flutter