From ef01956c7ce1db10ab43e6e0fe99a20d9df3c450 Mon Sep 17 00:00:00 2001 From: Thomas Hartmann Date: Thu, 12 Nov 2020 16:57:52 +0100 Subject: [PATCH] QmlDesigner: Rename method Change-Id: I43e85703b8a09c33a0685487a42ae333439d9beb Reviewed-by: Tim Jenssen --- .../qmldesigner/designercore/model/texttomodelmerger.cpp | 8 ++++---- .../qmldesigner/designercore/model/texttomodelmerger.h | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp b/src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp index 4684ca087f6..66752e27e3e 100644 --- a/src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp +++ b/src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp @@ -973,7 +973,7 @@ bool TextToModelMerger::load(const QString &data, DifferenceHandler &differenceH { qCInfo(rewriterBenchmark) << Q_FUNC_INFO; - const bool justSanityCheck = !differenceHandler.isValidator(); + const bool justSanityCheck = !differenceHandler.isAmender(); QElapsedTimer time; if (rewriterBenchmark().isInfoEnabled()) @@ -1135,10 +1135,10 @@ void TextToModelMerger::syncNode(ModelNode &modelNode, } if (isComponentType(typeName) || isImplicitComponent) - setupComponentDelayed(modelNode, differenceHandler.isValidator()); + setupComponentDelayed(modelNode, differenceHandler.isAmender()); if (isCustomParserType(typeName)) - setupCustomParserNodeDelayed(modelNode, differenceHandler.isValidator()); + setupCustomParserNodeDelayed(modelNode, differenceHandler.isAmender()); context->enterScope(astNode); @@ -1245,7 +1245,7 @@ void TextToModelMerger::syncNode(ModelNode &modelNode, if (!defaultPropertyItems.isEmpty()) { if (isComponentType(modelNode.type())) - setupComponentDelayed(modelNode, differenceHandler.isValidator()); + setupComponentDelayed(modelNode, differenceHandler.isAmender()); if (defaultPropertyName.isEmpty()) { qWarning() << "No default property for node type" << modelNode.type() << ", ignoring child items."; } else { diff --git a/src/plugins/qmldesigner/designercore/model/texttomodelmerger.h b/src/plugins/qmldesigner/designercore/model/texttomodelmerger.h index c729d2aeddc..71856eff320 100644 --- a/src/plugins/qmldesigner/designercore/model/texttomodelmerger.h +++ b/src/plugins/qmldesigner/designercore/model/texttomodelmerger.h @@ -210,7 +210,7 @@ public: ReadingContext *context) = 0; virtual void propertyAbsentFromQml(AbstractProperty &modelProperty) = 0; virtual void idsDiffer(ModelNode &modelNode, const QString &qmlId) = 0; - virtual bool isValidator() const = 0; + virtual bool isAmender() const = 0; protected: TextToModelMerger *m_merger; @@ -262,7 +262,7 @@ public: ReadingContext *context) override; void propertyAbsentFromQml(AbstractProperty &modelProperty) override; void idsDiffer(ModelNode &modelNode, const QString &qmlId) override; - bool isValidator() const override {return false; } + bool isAmender() const override {return false; } }; class ModelAmender: public DifferenceHandler @@ -311,7 +311,7 @@ public: ReadingContext *context) override; void propertyAbsentFromQml(AbstractProperty &modelProperty) override; void idsDiffer(ModelNode &modelNode, const QString &qmlId) override; - bool isValidator() const override {return true; } + bool isAmender() const override {return true; } }; } //Internal