QmlDesigner: Make inErrorState() private

This method should be only for internal use, since it is
different from errors.isEmpty(), because the rewriter is only inErrorState
if parsing/rewriting fails, not if there is a semantic error.

Change-Id: Ib021e5e80750a4edcb4661755e85e6880fd6617c
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>

4 files changed, 5 insertions, 5 deletions

diff --git a/src/plugins/qmldesigner/assetexporterplugin/assetexporterview.cpp b/src/plugins/qmldesigner/assetexporterplugin/assetexporterview.cpp
index 81dc1ce486..a565b46445 100644
--- a/src/plugins/qmldesigner/assetexporterplugin/assetexporterview.cpp
+++ b/src/plugins/qmldesigner/assetexporterplugin/assetexporterview.cpp
@@ -81,7 +81,7 @@ bool AssetExporterView::saveQmlFile(QString *error) const
 
 void AssetExporterView::modelAttached(Model *model)
 {
-    if (model->rewriterView() && model->rewriterView()->inErrorState())
+    if (model->rewriterView() && !model->rewriterView()->errors().isEmpty())
         setState(LoadState::QmlErrorState);
 
     AbstractView::modelAttached(model);
diff --git a/src/plugins/qmldesigner/components/componentcore/designeractionmanager.cpp b/src/plugins/qmldesigner/components/componentcore/designeractionmanager.cpp
index 7f5649ea5f..a0bd7a2389 100644
--- a/src/plugins/qmldesigner/components/componentcore/designeractionmanager.cpp
+++ b/src/plugins/qmldesigner/components/componentcore/designeractionmanager.cpp
@@ -513,7 +513,7 @@ public:
                                                                  ->currentModel();
 
                                        if (currentModel->rewriterView()
-                                           && currentModel->rewriterView()->inErrorState()) {
+                                           && !currentModel->rewriterView()->errors().isEmpty()) {
                                            throw DocumentError{};
                                        }
 
diff --git a/src/plugins/qmldesigner/designercore/imagecache/imagecachecollector.cpp b/src/plugins/qmldesigner/designercore/imagecache/imagecachecollector.cpp
index 429ca328af..0a225d1ab0 100644
--- a/src/plugins/qmldesigner/designercore/imagecache/imagecachecollector.cpp
+++ b/src/plugins/qmldesigner/designercore/imagecache/imagecachecollector.cpp
@@ -96,11 +96,11 @@ void ImageCacheCollector::start(Utils::SmallStringView name,
 
     model->setRewriterView(&rewriterView);
 
-    bool is3DRoot = !rewriterView.inErrorState()
+    bool is3DRoot = rewriterView.errors().isEmpty()
             && (rewriterView.rootModelNode().isSubclassOf("QtQuick3D.Node")
                 || rewriterView.rootModelNode().isSubclassOf("QtQuick3D.Material"));
 
-    if (rewriterView.inErrorState() || (!rewriterView.rootModelNode().metaInfo().isGraphicalItem()
+    if (!rewriterView.errors().isEmpty() || (!rewriterView.rootModelNode().metaInfo().isGraphicalItem()
                                         && !is3DRoot)) {
         if (abortCallback)
             abortCallback(ImageCache::AbortReason::Failed);
diff --git a/src/plugins/qmldesigner/designercore/include/rewriterview.h b/src/plugins/qmldesigner/designercore/include/rewriterview.h
index e3a4af0b75..4e099290cd 100644
--- a/src/plugins/qmldesigner/designercore/include/rewriterview.h
+++ b/src/plugins/qmldesigner/designercore/include/rewriterview.h
@@ -127,7 +127,6 @@ public:
     void addError(const DocumentMessage &error);
 
     void enterErrorState(const QString &errorMessage);
-    bool inErrorState() const { return !m_rewritingErrorMessage.isEmpty(); }
     void leaveErrorState() { m_rewritingErrorMessage.clear(); }
     void resetToLastCorrectQml();
 
@@ -202,6 +201,7 @@ private: //variables
     void setupCanonicalHashes() const;
     void handleLibraryInfoUpdate();
     void handleProjectUpdate();
+    bool inErrorState() const { return !m_rewritingErrorMessage.isEmpty(); }
 
     TextModifier *m_textModifier = nullptr;
     int transactionLevel = 0;