From 86269c82b342332f6a1274c4a1f4f135ebc0b5df Mon Sep 17 00:00:00 2001 From: Yuhang Zhao <2546789017@qq.com> Date: Wed, 13 May 2020 13:19:27 +0800 Subject: [PATCH] Avoid name conflicts. They can be compiled but to reduce confusion, let change their names. Signed-off-by: Yuhang Zhao <2546789017@qq.com> --- framelesshelper.cpp | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/framelesshelper.cpp b/framelesshelper.cpp index 1dc3c7d..58e8604 100644 --- a/framelesshelper.cpp +++ b/framelesshelper.cpp @@ -205,9 +205,9 @@ QVector FramelessHelper::getIgnoreObjects(QObject *const obj) const { QVector ret{}; const QVector> objs = m_ignoreObjects.value(obj); if (!objs.isEmpty()) { - for (auto &&obj : qAsConst(objs)) { - if (obj) { - ret.append(obj); + for (auto &&_obj : qAsConst(objs)) { + if (_obj) { + ret.append(_obj); } } } @@ -219,8 +219,8 @@ void FramelessHelper::setIgnoreObjects(QObject *const obj, if (obj) { QVector> objs{}; if (!val.isEmpty()) { - for (auto &&obj : qAsConst(val)) { - objs.append(obj); + for (auto &&_obj : qAsConst(val)) { + objs.append(_obj); } } m_ignoreObjects[obj] = objs; @@ -249,9 +249,9 @@ FramelessHelper::getDraggableObjects(QObject *const obj) const { QVector ret{}; const QVector> objs = m_draggableObjects.value(obj); if (!objs.isEmpty()) { - for (auto &&obj : qAsConst(objs)) { - if (obj) { - ret.append(obj); + for (auto &&_obj : qAsConst(objs)) { + if (_obj) { + ret.append(_obj); } } } @@ -263,8 +263,8 @@ void FramelessHelper::setDraggableObjects(QObject *const obj, if (obj) { QVector> objs{}; if (!val.isEmpty()) { - for (auto &&obj : qAsConst(val)) { - objs.append(obj); + for (auto &&_obj : qAsConst(val)) { + objs.append(_obj); } } m_draggableObjects[obj] = objs;