Avoid name conflicts.

They can be compiled but to reduce confusion, let change their names.

Signed-off-by: Yuhang Zhao <2546789017@qq.com>
This commit is contained in:
Yuhang Zhao 2020-05-13 13:19:27 +08:00
parent 921b87ab2e
commit 86269c82b3
1 changed files with 10 additions and 10 deletions

View File

@ -205,9 +205,9 @@ QVector<QObject *> FramelessHelper::getIgnoreObjects(QObject *const obj) const {
QVector<QObject *> ret{}; QVector<QObject *> ret{};
const QVector<QPointer<QObject>> objs = m_ignoreObjects.value(obj); const QVector<QPointer<QObject>> objs = m_ignoreObjects.value(obj);
if (!objs.isEmpty()) { if (!objs.isEmpty()) {
for (auto &&obj : qAsConst(objs)) { for (auto &&_obj : qAsConst(objs)) {
if (obj) { if (_obj) {
ret.append(obj); ret.append(_obj);
} }
} }
} }
@ -219,8 +219,8 @@ void FramelessHelper::setIgnoreObjects(QObject *const obj,
if (obj) { if (obj) {
QVector<QPointer<QObject>> objs{}; QVector<QPointer<QObject>> objs{};
if (!val.isEmpty()) { if (!val.isEmpty()) {
for (auto &&obj : qAsConst(val)) { for (auto &&_obj : qAsConst(val)) {
objs.append(obj); objs.append(_obj);
} }
} }
m_ignoreObjects[obj] = objs; m_ignoreObjects[obj] = objs;
@ -249,9 +249,9 @@ FramelessHelper::getDraggableObjects(QObject *const obj) const {
QVector<QObject *> ret{}; QVector<QObject *> ret{};
const QVector<QPointer<QObject>> objs = m_draggableObjects.value(obj); const QVector<QPointer<QObject>> objs = m_draggableObjects.value(obj);
if (!objs.isEmpty()) { if (!objs.isEmpty()) {
for (auto &&obj : qAsConst(objs)) { for (auto &&_obj : qAsConst(objs)) {
if (obj) { if (_obj) {
ret.append(obj); ret.append(_obj);
} }
} }
} }
@ -263,8 +263,8 @@ void FramelessHelper::setDraggableObjects(QObject *const obj,
if (obj) { if (obj) {
QVector<QPointer<QObject>> objs{}; QVector<QPointer<QObject>> objs{};
if (!val.isEmpty()) { if (!val.isEmpty()) {
for (auto &&obj : qAsConst(val)) { for (auto &&_obj : qAsConst(val)) {
objs.append(obj); objs.append(_obj);
} }
} }
m_draggableObjects[obj] = objs; m_draggableObjects[obj] = objs;