feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

QmlDesigner: Rename method

Browse Source 
Change-Id: I43e85703b8a09c33a0685487a42ae333439d9beb
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
This commit is contained in:
Thomas Hartmann
2020-11-12 16:57:52 +01:00
committed by Tim Jenssen
parent c038abb0ab
commit ef01956c7c
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp
View File

@@ -973,7 +973,7 @@ bool TextToModelMerger::load(const QString &data, DifferenceHandler &differenceH
{ {
qCInfo(rewriterBenchmark) << Q_FUNC_INFO; qCInfo(rewriterBenchmark) << Q_FUNC_INFO;
const bool justSanityCheck = !differenceHandler.isValidator(); const bool justSanityCheck = !differenceHandler.isAmender();
QElapsedTimer time; QElapsedTimer time;
if (rewriterBenchmark().isInfoEnabled()) if (rewriterBenchmark().isInfoEnabled())
@@ -1135,10 +1135,10 @@ void TextToModelMerger::syncNode(ModelNode &modelNode,
} }
if (isComponentType(typeName) || isImplicitComponent) if (isComponentType(typeName) || isImplicitComponent)
setupComponentDelayed(modelNode, differenceHandler.isValidator()); setupComponentDelayed(modelNode, differenceHandler.isAmender());
if (isCustomParserType(typeName)) if (isCustomParserType(typeName))
setupCustomParserNodeDelayed(modelNode, differenceHandler.isValidator()); setupCustomParserNodeDelayed(modelNode, differenceHandler.isAmender());
context->enterScope(astNode); context->enterScope(astNode);
@@ -1245,7 +1245,7 @@ void TextToModelMerger::syncNode(ModelNode &modelNode,
if (!defaultPropertyItems.isEmpty()) { if (!defaultPropertyItems.isEmpty()) {
if (isComponentType(modelNode.type())) if (isComponentType(modelNode.type()))
setupComponentDelayed(modelNode, differenceHandler.isValidator()); setupComponentDelayed(modelNode, differenceHandler.isAmender());
if (defaultPropertyName.isEmpty()) { if (defaultPropertyName.isEmpty()) {
qWarning() << "No default property for node type" << modelNode.type() << ", ignoring child items."; qWarning() << "No default property for node type" << modelNode.type() << ", ignoring child items.";
} else { } else {

6
src/plugins/qmldesigner/designercore/model/texttomodelmerger.h
View File

@@ -210,7 +210,7 @@ public:
ReadingContext *context) = 0; ReadingContext *context) = 0;
virtual void propertyAbsentFromQml(AbstractProperty &modelProperty) = 0; virtual void propertyAbsentFromQml(AbstractProperty &modelProperty) = 0;
virtual void idsDiffer(ModelNode &modelNode, const QString &qmlId) = 0; virtual void idsDiffer(ModelNode &modelNode, const QString &qmlId) = 0;
virtual bool isValidator() const = 0; virtual bool isAmender() const = 0;
protected: protected:
TextToModelMerger *m_merger; TextToModelMerger *m_merger;
@@ -262,7 +262,7 @@ public:
ReadingContext *context) override; ReadingContext *context) override;
void propertyAbsentFromQml(AbstractProperty &modelProperty) override; void propertyAbsentFromQml(AbstractProperty &modelProperty) override;
void idsDiffer(ModelNode &modelNode, const QString &qmlId) 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 class ModelAmender: public DifferenceHandler
@@ -311,7 +311,7 @@ public:
ReadingContext *context) override; ReadingContext *context) override;
void propertyAbsentFromQml(AbstractProperty &modelProperty) override; void propertyAbsentFromQml(AbstractProperty &modelProperty) override;
void idsDiffer(ModelNode &modelNode, const QString &qmlId) override; void idsDiffer(ModelNode &modelNode, const QString &qmlId) override;
bool isValidator() const override {return true; } bool isAmender() const override {return true; }
}; };
} //Internal } //Internal