Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 21401ad9 authored by Michael Wright's avatar Michael Wright
Browse files

s/displayID/displayId 

Update local variable names in PointerController so they match the
general code style.

Bug: 254277939
Test: compiles
Change-Id: I7f71e12d48cf76ec8ff8fbaa435c18f9c2277096
parent 8357775f

libs/input/PointerController.cpp

+5 −5
Original line number Diff line number Diff line
@@ -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;