diff options
Diffstat (limited to 'src/qmldom/qqmldomcompare.cpp')
| -rw-r--r-- | src/qmldom/qqmldomcompare.cpp | 19 |
1 files changed, 14 insertions, 5 deletions
diff --git a/src/qmldom/qqmldomcompare.cpp b/src/qmldom/qqmldomcompare.cpp index 92e18944c0..65b357cc75 100644 --- a/src/qmldom/qqmldomcompare.cpp +++ b/src/qmldom/qqmldomcompare.cpp @@ -8,8 +8,8 @@ QT_BEGIN_NAMESPACE namespace QQmlJS { namespace Dom { -bool domCompare(DomItem &i1, DomItem &i2, function_ref<bool(Path, DomItem &, DomItem &)> change, - function_ref<bool(DomItem &, const PathEls::PathComponent &, DomItem &)> filter, +bool domCompare(const DomItem &i1, const DomItem &i2, function_ref<bool(Path, const DomItem &, const DomItem &)> change, + function_ref<bool(const DomItem &, const PathEls::PathComponent &, const DomItem &)> filter, Path basePath) { DomKind k1 = i1.domKind(); @@ -144,21 +144,26 @@ bool domCompare(DomItem &i1, DomItem &i2, function_ref<bool(Path, DomItem &, Dom if (v1 != v2) return change(basePath, i1, i2); } break; + case DomKind::ScriptElement: { + // TODO: implement me + return false; + + } break; } } return true; } QStringList -domCompareStrList(DomItem &i1, DomItem &i2, - function_ref<bool(DomItem &, const PathEls::PathComponent &, DomItem &)> filter, +domCompareStrList(const DomItem &i1, const DomItem &i2, + function_ref<bool(const DomItem &, const PathEls::PathComponent &, const DomItem &) const> filter, DomCompareStrList stopAtFirstDiff) { QStringList res; bool hasDiff = false; domCompare( i1, i2, - [&res, &hasDiff, stopAtFirstDiff](Path p, DomItem &j1, DomItem &j2) { + [&res, &hasDiff, stopAtFirstDiff](const Path &p, const DomItem &j1, const DomItem &j2) { hasDiff = true; if (!j1) { res.append(QStringLiteral("- %1\n").arg(p.toString())); @@ -206,6 +211,10 @@ domCompareStrList(DomItem &i1, DomItem &i2, .arg(j2.toString())); } } break; + case DomKind::ScriptElement: { + // implement me + break; + } } } } |