summaryrefslogtreecommitdiff
path: root/libs/input/PointerController.cpp
diff options
context:
space:
mode:
author Michael Wright <michaelwr@google.com> 2022-10-22 03:23:55 +0100
committer Michael Wright <michaelwr@google.com> 2022-11-11 14:04:13 +0000
commit21401ad9c017b49614743b16164ef4dba5899563 (patch)
tree8ac1a81b06a4fa84e79c68b299f86f15d5625376 /libs/input/PointerController.cpp
parent8357775f16a66d973bb056b277ab4ca125c15544 (diff)
s/displayID/displayId
Update local variable names in PointerController so they match the general code style. Bug: 254277939 Test: compiles Change-Id: I7f71e12d48cf76ec8ff8fbaa435c18f9c2277096
Diffstat (limited to 'libs/input/PointerController.cpp')
-rw-r--r--libs/input/PointerController.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/libs/input/PointerController.cpp b/libs/input/PointerController.cpp
index 3ae613195197..1f80ba9baa68 100644
--- a/libs/input/PointerController.cpp
+++ b/libs/input/PointerController.cpp
@@ -231,7 +231,7 @@ void PointerController::clearSpots() {
}
void PointerController::clearSpotsLocked() {
- for (auto& [displayID, spotController] : mLocked.spotControllers) {
+ for (auto& [displayId, spotController] : mLocked.spotControllers) {
spotController.clearSpots();
}
}
@@ -243,7 +243,7 @@ void PointerController::setInactivityTimeout(InactivityTimeout inactivityTimeout
void PointerController::reloadPointerResources() {
std::scoped_lock lock(getLock());
- for (auto& [displayID, spotController] : mLocked.spotControllers) {
+ for (auto& [displayId, spotController] : mLocked.spotControllers) {
spotController.reloadSpotResources();
}
@@ -294,13 +294,13 @@ void PointerController::onDisplayViewportsUpdated(std::vector<DisplayViewport>&
std::scoped_lock lock(getLock());
for (auto it = mLocked.spotControllers.begin(); it != mLocked.spotControllers.end();) {
- int32_t displayID = it->first;
- if (!displayIdSet.count(displayID)) {
+ int32_t displayId = it->first;
+ if (!displayIdSet.count(displayId)) {
/*
* Ensures that an in-progress animation won't dereference
* a null pointer to TouchSpotController.
*/
- mContext.removeAnimationCallback(displayID);
+ mContext.removeAnimationCallback(displayId);
it = mLocked.spotControllers.erase(it);
} else {
++it;