diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2024-05-15 15:27:36 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-05-15 15:27:36 +0300 |
| commit | 4ddaeb377271361f4a104774709d4ba31568e9de (patch) | |
| tree | 0c19f415cb30983169a1a6aa3559b83841ee78e3 /indra/llcommon/llkeybind.cpp | |
| parent | 26f70456d1e9059c48d25e08fc07f893315b1f3c (diff) | |
| parent | 363b89947c580e1056cb5f4ae32ebfd9eaf12a17 (diff) | |
Merge pull request #1477 from secondlife/marchcat/x-c-merge
Maint X -> Maint C merge
Diffstat (limited to 'indra/llcommon/llkeybind.cpp')
| -rw-r--r-- | indra/llcommon/llkeybind.cpp | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/indra/llcommon/llkeybind.cpp b/indra/llcommon/llkeybind.cpp index b89160cc55..e36c1d0a4c 100644 --- a/indra/llcommon/llkeybind.cpp +++ b/indra/llcommon/llkeybind.cpp @@ -1,25 +1,25 @@ -/** +/** * @file llkeybind.cpp * @brief Information about key combinations. * * $LicenseInfo:firstyear=2019&license=viewerlgpl$ * Second Life Viewer Source Code * Copyright (C) 2019, Linden Research, Inc. - * + * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; * version 2.1 of the License only. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. - * + * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - * + * * Linden Research, Inc., 945 Battery Street, San Francisco, CA 94111 USA * $/LicenseInfo$ */ @@ -207,7 +207,7 @@ bool LLKeyBind::operator!=(const LLKeyBind& rhs) bool LLKeyBind::isEmpty() const { - for (const LLKeyData& key_data : mData) + for (const LLKeyData& key_data : mData) { if (!key_data.isEmpty()) return false; } @@ -225,7 +225,7 @@ LLKeyBind::data_vector_t::const_iterator LLKeyBind::endNonEmpty() const LLSD LLKeyBind::asLLSD() const { LLSD data; - for (const LLKeyData& key_data : mData) + for (const LLKeyData& key_data : mData) { // append intermediate entries even if empty to not affect visual // representation @@ -242,7 +242,7 @@ bool LLKeyBind::canHandle(EMouseClickType mouse, KEY key, MASK mask) const return false; } - for (const LLKeyData& key_data : mData) + for (const LLKeyData& key_data : mData) { if (key_data.canHandle(mouse, key, mask)) { @@ -266,7 +266,7 @@ bool LLKeyBind::hasKeyData(EMouseClickType mouse, KEY key, MASK mask, bool ignor { if (mouse != CLICK_NONE || key != KEY_NONE) { - for (const LLKeyData& key_data : mData) + for (const LLKeyData& key_data : mData) { if (key_data.mKey == key && key_data.mMask == mask @@ -353,7 +353,7 @@ void LLKeyBind::replaceKeyData(const LLKeyData& data, U32 index) { // if both click and key are none (isEmpty()), we are inserting a placeholder, we don't want to reset anything // otherwise reset identical key - for (LLKeyData& key_data : mData) + for (LLKeyData& key_data : mData) { if (key_data.mKey == data.mKey && key_data.mMouse == data.mMouse |