From fa84524c0c9b93210e4151cf772375696d0080c6 Mon Sep 17 00:00:00 2001 From: Tim Jenssen Date: Tue, 10 Jan 2017 17:08:14 +0100 Subject: [PATCH] QmlDesigner: rename RewriterError -> DocumentMessage Change-Id: I8cbb1b8b83ec10c33e416de96a09281208be8773 Reviewed-by: Thomas Hartmann --- .../components/debugview/debugview.cpp | 6 ++-- .../components/debugview/debugview.h | 2 +- .../components/formeditor/formeditorview.cpp | 2 +- .../components/formeditor/formeditorview.h | 2 +- .../formeditor/formeditorwidget.cpp | 4 +-- .../components/formeditor/formeditorwidget.h | 4 +-- .../components/integration/designdocument.cpp | 4 +-- .../components/integration/designdocument.h | 6 ++-- .../components/texteditor/texteditorview.cpp | 4 +-- .../components/texteditor/texteditorview.h | 2 +- .../designercore/designercore-lib.pri | 4 +-- .../designercore/include/abstractview.h | 6 ++-- .../{rewritererror.h => documentmessage.h} | 12 +++---- .../qmldesigner/designercore/include/model.h | 4 +-- .../designercore/include/rewriterview.h | 18 +++++----- .../instances/nodeinstanceview.cpp | 2 +- .../designercore/model/abstractview.cpp | 6 ++-- ...{rewritererror.cpp => documentmessage.cpp} | 12 +++---- .../qmldesigner/designercore/model/model.cpp | 4 +-- .../qmldesigner/designercore/model/model_p.h | 2 +- .../designercore/model/rewriterview.cpp | 12 +++---- .../designercore/model/texttomodelmerger.cpp | 34 +++++++++---------- .../designercore/model/texttomodelmerger.h | 12 +++---- src/plugins/qmldesigner/designmodewidget.cpp | 2 +- src/plugins/qmldesigner/designmodewidget.h | 2 +- .../qmldesigner/documentwarningwidget.cpp | 14 ++++---- .../qmldesigner/documentwarningwidget.h | 12 +++---- src/plugins/qmldesigner/qmldesignerplugin.qbs | 4 +-- 28 files changed, 99 insertions(+), 99 deletions(-) rename src/plugins/qmldesigner/designercore/include/{rewritererror.h => documentmessage.h} (86%) rename src/plugins/qmldesigner/designercore/model/{rewritererror.cpp => documentmessage.cpp} (88%) diff --git a/src/plugins/qmldesigner/components/debugview/debugview.cpp b/src/plugins/qmldesigner/components/debugview/debugview.cpp index ce4b982267e..df5d935ba6e 100644 --- a/src/plugins/qmldesigner/components/debugview/debugview.cpp +++ b/src/plugins/qmldesigner/components/debugview/debugview.cpp @@ -264,18 +264,18 @@ void DebugView::auxiliaryDataChanged(const ModelNode &node, const PropertyName & } } -void DebugView::documentMessagesChanged(const QList &errors, const QList &warnings) +void DebugView::documentMessagesChanged(const QList &errors, const QList &warnings) { if (isDebugViewEnabled()) { QTextStream message; QString string; message.setString(&string); - foreach (const RewriterError &error, errors) { + foreach (const DocumentMessage &error, errors) { message << error.toString(); } - foreach (const RewriterError &warning, warnings) { + foreach (const DocumentMessage &warning, warnings) { message << warning.toString(); } diff --git a/src/plugins/qmldesigner/components/debugview/debugview.h b/src/plugins/qmldesigner/components/debugview/debugview.h index c25f655d75a..9798cf782d7 100644 --- a/src/plugins/qmldesigner/components/debugview/debugview.h +++ b/src/plugins/qmldesigner/components/debugview/debugview.h @@ -65,7 +65,7 @@ public: void propertiesRemoved(const QList &propertyList) override; void auxiliaryDataChanged(const ModelNode &node, const PropertyName &name, const QVariant &data) override; - void documentMessagesChanged(const QList &errors, const QList &warnings) override; + void documentMessagesChanged(const QList &errors, const QList &warnings) override; void rewriterBeginTransaction() override; void rewriterEndTransaction() override; diff --git a/src/plugins/qmldesigner/components/formeditor/formeditorview.cpp b/src/plugins/qmldesigner/components/formeditor/formeditorview.cpp index e8ffa47a946..b7eac3ebd66 100644 --- a/src/plugins/qmldesigner/components/formeditor/formeditorview.cpp +++ b/src/plugins/qmldesigner/components/formeditor/formeditorview.cpp @@ -284,7 +284,7 @@ void FormEditorView::selectedNodesChanged(const QList &selectedNodeLi m_scene->update(); } -void FormEditorView::documentMessagesChanged(const QList &errors, const QList &warnings) +void FormEditorView::documentMessagesChanged(const QList &errors, const QList &warnings) { if (!errors.isEmpty()) formEditorWidget()->showErrorMessageBox(errors); diff --git a/src/plugins/qmldesigner/components/formeditor/formeditorview.h b/src/plugins/qmldesigner/components/formeditor/formeditorview.h index d4b55fb3b1d..3e971fdecd0 100644 --- a/src/plugins/qmldesigner/components/formeditor/formeditorview.h +++ b/src/plugins/qmldesigner/components/formeditor/formeditorview.h @@ -76,7 +76,7 @@ public: void selectedNodesChanged(const QList &selectedNodeList, const QList &lastSelectedNodeList) override; - virtual void documentMessagesChanged(const QList &errors, const QList &warnings) override; + virtual void documentMessagesChanged(const QList &errors, const QList &warnings) override; void customNotification(const AbstractView *view, const QString &identifier, const QList &nodeList, const QList &data) override; diff --git a/src/plugins/qmldesigner/components/formeditor/formeditorwidget.cpp b/src/plugins/qmldesigner/components/formeditor/formeditorwidget.cpp index 0fb9389262d..7def775f79b 100644 --- a/src/plugins/qmldesigner/components/formeditor/formeditorwidget.cpp +++ b/src/plugins/qmldesigner/components/formeditor/formeditorwidget.cpp @@ -252,7 +252,7 @@ void FormEditorWidget::setFocus() m_graphicsView->setFocus(Qt::OtherFocusReason); } -void FormEditorWidget::showErrorMessageBox(const QList &errors) +void FormEditorWidget::showErrorMessageBox(const QList &errors) { errorWidget()->setErrors(errors); errorWidget()->setVisible(true); @@ -269,7 +269,7 @@ void FormEditorWidget::hideErrorMessageBox() m_toolBox->setDisabled(false); } -void FormEditorWidget::showWarningMessageBox(const QList &warnings) +void FormEditorWidget::showWarningMessageBox(const QList &warnings) { if (!errorWidget()->warningsEnabled()) return; diff --git a/src/plugins/qmldesigner/components/formeditor/formeditorwidget.h b/src/plugins/qmldesigner/components/formeditor/formeditorwidget.h index be6e37b3cec..5a92e1b3013 100644 --- a/src/plugins/qmldesigner/components/formeditor/formeditorwidget.h +++ b/src/plugins/qmldesigner/components/formeditor/formeditorwidget.h @@ -74,10 +74,10 @@ public: void setFocus(); - void showErrorMessageBox(const QList &errors); + void showErrorMessageBox(const QList &errors); void hideErrorMessageBox(); - void showWarningMessageBox(const QList &warnings); + void showWarningMessageBox(const QList &warnings); protected: void wheelEvent(QWheelEvent *event); diff --git a/src/plugins/qmldesigner/components/integration/designdocument.cpp b/src/plugins/qmldesigner/components/integration/designdocument.cpp index 3ae3235468e..84a390a184e 100644 --- a/src/plugins/qmldesigner/components/integration/designdocument.cpp +++ b/src/plugins/qmldesigner/components/integration/designdocument.cpp @@ -165,7 +165,7 @@ Model* DesignDocument::createInFileComponentModel() return model; } -QList DesignDocument::qmlParseWarnings() const +QList DesignDocument::qmlParseWarnings() const { return m_rewriterView->warnings(); } @@ -175,7 +175,7 @@ bool DesignDocument::hasQmlParseWarnings() const return !m_rewriterView->warnings().isEmpty(); } -QList DesignDocument::qmlParseErrors() const +QList DesignDocument::qmlParseErrors() const { return m_rewriterView->errors(); } diff --git a/src/plugins/qmldesigner/components/integration/designdocument.h b/src/plugins/qmldesigner/components/integration/designdocument.h index bb86eb8a745..8dc06aaac17 100644 --- a/src/plugins/qmldesigner/components/integration/designdocument.h +++ b/src/plugins/qmldesigner/components/integration/designdocument.h @@ -77,9 +77,9 @@ public: Model *documentModel() const; QString contextHelpId() const; - QList qmlParseWarnings() const; + QList qmlParseWarnings() const; bool hasQmlParseWarnings() const; - QList qmlParseErrors() const; + QList qmlParseErrors() const; bool hasQmlParseErrors() const; RewriterView *rewriterView() const; @@ -104,7 +104,7 @@ signals: void undoAvailable(bool isAvailable); void redoAvailable(bool isAvailable); void designDocumentClosed(); - void qmlErrorsChanged(const QList &errors); + void qmlErrorsChanged(const QList &errors); public slots: void deleteSelected(); diff --git a/src/plugins/qmldesigner/components/texteditor/texteditorview.cpp b/src/plugins/qmldesigner/components/texteditor/texteditorview.cpp index 20758c46b38..a795e181b69 100644 --- a/src/plugins/qmldesigner/components/texteditor/texteditorview.cpp +++ b/src/plugins/qmldesigner/components/texteditor/texteditorview.cpp @@ -122,12 +122,12 @@ void TextEditorView::customNotification(const AbstractView * /*view*/, const QSt { } -void TextEditorView::documentMessagesChanged(const QList &errors, const QList &) +void TextEditorView::documentMessagesChanged(const QList &errors, const QList &) { if (errors.isEmpty()) { m_widget->clearStatusBar(); } else { - const RewriterError error = errors.first(); + const DocumentMessage error = errors.first(); m_widget->setStatusText(QString("%1 (Line: %2)").arg(error.description()).arg(error.line())); } } diff --git a/src/plugins/qmldesigner/components/texteditor/texteditorview.h b/src/plugins/qmldesigner/components/texteditor/texteditorview.h index 178096481cb..df43b644044 100644 --- a/src/plugins/qmldesigner/components/texteditor/texteditorview.h +++ b/src/plugins/qmldesigner/components/texteditor/texteditorview.h @@ -59,7 +59,7 @@ public: void selectedNodesChanged(const QList &selectedNodeList, const QList &lastSelectedNodeList) override; void customNotification(const AbstractView *view, const QString &identifier, const QList &nodeList, const QList &data) override; - void documentMessagesChanged(const QList &errors, const QList &warnings) override; + void documentMessagesChanged(const QList &errors, const QList &warnings) override; // TextEditorView WidgetInfo widgetInfo() override; diff --git a/src/plugins/qmldesigner/designercore/designercore-lib.pri b/src/plugins/qmldesigner/designercore/designercore-lib.pri index 8243afd5529..2acf4922057 100644 --- a/src/plugins/qmldesigner/designercore/designercore-lib.pri +++ b/src/plugins/qmldesigner/designercore/designercore-lib.pri @@ -15,7 +15,7 @@ include (../../../../share/qtcreator/qml/qmlpuppet/types/types.pri) SOURCES += $$PWD/model/abstractview.cpp \ $$PWD/model/rewriterview.cpp \ - $$PWD/model/rewritererror.cpp \ + $$PWD/model/documentmessage.cpp \ $$PWD/metainfo/metainfo.cpp \ $$PWD/metainfo/metainforeader.cpp \ $$PWD/metainfo/nodemetainfo.cpp \ @@ -84,7 +84,7 @@ HEADERS += $$PWD/include/qmldesignercorelib_global.h \ $$PWD/include/abstractview.h \ $$PWD/include/nodeinstanceview.h \ $$PWD/include/rewriterview.h \ - $$PWD/include/rewritererror.h \ + $$PWD/include/documentmessage.h \ $$PWD/include/metainfo.h \ $$PWD/include/metainforeader.h \ $$PWD/include/nodemetainfo.h \ diff --git a/src/plugins/qmldesigner/designercore/include/abstractview.h b/src/plugins/qmldesigner/designercore/include/abstractview.h index 98bb27982f0..5ab800fd111 100644 --- a/src/plugins/qmldesigner/designercore/include/abstractview.h +++ b/src/plugins/qmldesigner/designercore/include/abstractview.h @@ -30,7 +30,7 @@ #include #include #include -#include +#include #include #include @@ -163,7 +163,7 @@ public: QList allModelNodes() const; - void emitDocumentMessage(const QList &errors, const QList &warnings = QList()); + void emitDocumentMessage(const QList &errors, const QList &warnings = QList()); void emitDocumentMessage(const QString &error); void emitCustomNotification(const QString &identifier); void emitCustomNotification(const QString &identifier, const QList &nodeList); @@ -230,7 +230,7 @@ public: virtual void scriptFunctionsChanged(const ModelNode &node, const QStringList &scriptFunctionList); - virtual void documentMessagesChanged(const QList &errors, const QList &warnings); + virtual void documentMessagesChanged(const QList &errors, const QList &warnings); void changeRootNodeType(const TypeName &type, int majorVersion, int minorVersion); diff --git a/src/plugins/qmldesigner/designercore/include/rewritererror.h b/src/plugins/qmldesigner/designercore/include/documentmessage.h similarity index 86% rename from src/plugins/qmldesigner/designercore/include/rewritererror.h rename to src/plugins/qmldesigner/designercore/include/documentmessage.h index 598e551e959..2c15b1dd0e2 100644 --- a/src/plugins/qmldesigner/designercore/include/rewritererror.h +++ b/src/plugins/qmldesigner/designercore/include/documentmessage.h @@ -35,8 +35,8 @@ class DiagnosticMessage; namespace QmlDesigner { -class RewriterError { - Q_DECLARE_TR_FUNCTIONS(QmlDesigner::RewriterError) +class DocumentMessage { + Q_DECLARE_TR_FUNCTIONS(QmlDesigner::DocumentMessage) public: enum Type { NoError = 0, @@ -45,10 +45,10 @@ public: }; public: - RewriterError(); - RewriterError(const QmlJS::DiagnosticMessage &qmlError, const QUrl &document); - RewriterError(const QString &shortDescription); - RewriterError(Exception *exception); + DocumentMessage(); + DocumentMessage(const QmlJS::DiagnosticMessage &qmlError, const QUrl &document); + DocumentMessage(const QString &shortDescription); + DocumentMessage(Exception *exception); Type type() const { return m_type; } diff --git a/src/plugins/qmldesigner/designercore/include/model.h b/src/plugins/qmldesigner/designercore/include/model.h index 8d9998a8a21..b3a146b1746 100644 --- a/src/plugins/qmldesigner/designercore/include/model.h +++ b/src/plugins/qmldesigner/designercore/include/model.h @@ -27,7 +27,7 @@ #include -#include +#include #include #include @@ -111,7 +111,7 @@ public: TextModifier *textModifier() const; void setTextModifier(TextModifier *textModifier); - void setDocumentMessages(const QList &errors, const QList &warnings); + void setDocumentMessages(const QList &errors, const QList &warnings); protected: Model(); diff --git a/src/plugins/qmldesigner/designercore/include/rewriterview.h b/src/plugins/qmldesigner/designercore/include/rewriterview.h index 3d3ea3b72a1..c7e20fea06e 100644 --- a/src/plugins/qmldesigner/designercore/include/rewriterview.h +++ b/src/plugins/qmldesigner/designercore/include/rewriterview.h @@ -28,7 +28,7 @@ #include "qmldesignercorelib_global.h" #include "exception.h" #include "abstractview.h" -#include "rewritererror.h" +#include "documentmessage.h" #include #include @@ -111,12 +111,12 @@ public: Internal::ModelNodePositionStorage *positionStorage() const; - QList warnings() const; - QList errors() const; + QList warnings() const; + QList errors() const; void clearErrorAndWarnings(); - void setErrors(const QList &errors); - void setWarnings(const QList &warnings); - void addError(const RewriterError &error); + void setErrors(const QList &errors); + void setWarnings(const QList &warnings); + void addError(const DocumentMessage &error); void enterErrorState(const QString &errorMessage); bool inErrorState() const { return !m_rewritingErrorMessage.isEmpty(); } @@ -173,7 +173,7 @@ protected: // functions void applyModificationGroupChanges(); void applyChanges(); void amendQmlText(); - void notifyErrorsAndWarnings(const QList &errors); + void notifyErrorsAndWarnings(const QList &errors); private: //variables TextModifier *m_textModifier = nullptr; @@ -185,8 +185,8 @@ private: //variables QScopedPointer m_positionStorage; QScopedPointer m_modelToTextMerger; QScopedPointer m_textToModelMerger; - QList m_errors; - QList m_warnings; + QList m_errors; + QList m_warnings; RewriterTransaction m_removeDefaultPropertyTransaction; QString m_rewritingErrorMessage; QString m_lastCorrectQmlSource; diff --git a/src/plugins/qmldesigner/designercore/instances/nodeinstanceview.cpp b/src/plugins/qmldesigner/designercore/instances/nodeinstanceview.cpp index e22b745a1e8..3a5e46cd51c 100644 --- a/src/plugins/qmldesigner/designercore/instances/nodeinstanceview.cpp +++ b/src/plugins/qmldesigner/designercore/instances/nodeinstanceview.cpp @@ -1269,7 +1269,7 @@ void NodeInstanceView::token(const TokenCommand &command) void NodeInstanceView::debugOutput(const DebugOutputCommand & command) { - RewriterError error(tr("Qt Quick emulation layer crashed.")); + DocumentMessage error(tr("Qt Quick emulation layer crashed.")); if (command.instanceIds().isEmpty()) { emitDocumentMessage(command.text()); } else { diff --git a/src/plugins/qmldesigner/designercore/model/abstractview.cpp b/src/plugins/qmldesigner/designercore/model/abstractview.cpp index 907156c9186..bc388e25476 100644 --- a/src/plugins/qmldesigner/designercore/model/abstractview.cpp +++ b/src/plugins/qmldesigner/designercore/model/abstractview.cpp @@ -348,7 +348,7 @@ void AbstractView::scriptFunctionsChanged(const ModelNode &/*node*/, const QStri { } -void AbstractView::documentMessagesChanged(const QList &/*errors*/, const QList &/*warnings*/) +void AbstractView::documentMessagesChanged(const QList &/*errors*/, const QList &/*warnings*/) { } @@ -577,10 +577,10 @@ QList AbstractView::allModelNodes() const void AbstractView::emitDocumentMessage(const QString &error) { - emitDocumentMessage( { RewriterError(error) } ); + emitDocumentMessage( { DocumentMessage(error) } ); } -void AbstractView::emitDocumentMessage(const QList &errors, const QList &warnings) +void AbstractView::emitDocumentMessage(const QList &errors, const QList &warnings) { model()->d->setDocumentMessages(errors, warnings); } diff --git a/src/plugins/qmldesigner/designercore/model/rewritererror.cpp b/src/plugins/qmldesigner/designercore/model/documentmessage.cpp similarity index 88% rename from src/plugins/qmldesigner/designercore/model/rewritererror.cpp rename to src/plugins/qmldesigner/designercore/model/documentmessage.cpp index b6bf2ccbced..cbf5843dac6 100644 --- a/src/plugins/qmldesigner/designercore/model/rewritererror.cpp +++ b/src/plugins/qmldesigner/designercore/model/documentmessage.cpp @@ -23,20 +23,20 @@ ** ****************************************************************************/ -#include +#include #include namespace QmlDesigner { -RewriterError::RewriterError(): +DocumentMessage::DocumentMessage(): m_type(NoError), m_line(-1), m_column(-1) { } -RewriterError::RewriterError(Exception *exception): +DocumentMessage::DocumentMessage(Exception *exception): m_type(InternalError), m_line(exception->line()), m_column(-1), @@ -45,7 +45,7 @@ RewriterError::RewriterError(Exception *exception): { } -RewriterError::RewriterError(const QmlJS::DiagnosticMessage &qmlError, const QUrl &document): +DocumentMessage::DocumentMessage(const QmlJS::DiagnosticMessage &qmlError, const QUrl &document): m_type(ParseError), m_line(qmlError.loc.startLine), m_column(qmlError.loc.startColumn), @@ -54,7 +54,7 @@ RewriterError::RewriterError(const QmlJS::DiagnosticMessage &qmlError, const QUr { } -RewriterError::RewriterError(const QString &shortDescription) : +DocumentMessage::DocumentMessage(const QString &shortDescription) : m_type(ParseError), m_line(1), m_column(0), @@ -64,7 +64,7 @@ RewriterError::RewriterError(const QString &shortDescription) : } -QString RewriterError::toString() const +QString DocumentMessage::toString() const { QString str; diff --git a/src/plugins/qmldesigner/designercore/model/model.cpp b/src/plugins/qmldesigner/designercore/model/model.cpp index 9d385e032d4..bf173727bba 100644 --- a/src/plugins/qmldesigner/designercore/model/model.cpp +++ b/src/plugins/qmldesigner/designercore/model/model.cpp @@ -174,7 +174,7 @@ QUrl ModelPrivate::fileUrl() const return m_fileUrl; } -void ModelPrivate::setDocumentMessages(const QList &errors, const QList &warnings) +void ModelPrivate::setDocumentMessages(const QList &errors, const QList &warnings) { foreach (const QPointer &view, m_viewList) view->documentMessagesChanged(errors, warnings); @@ -1948,7 +1948,7 @@ void Model::setTextModifier(TextModifier *textModifier) d->m_textModifier = textModifier; } -void Model::setDocumentMessages(const QList &errors, const QList &warnings) +void Model::setDocumentMessages(const QList &errors, const QList &warnings) { d->setDocumentMessages(errors, warnings); } diff --git a/src/plugins/qmldesigner/designercore/model/model_p.h b/src/plugins/qmldesigner/designercore/model/model_p.h index 6acbfbca53b..882ea0599d9 100644 --- a/src/plugins/qmldesigner/designercore/model/model_p.h +++ b/src/plugins/qmldesigner/designercore/model/model_p.h @@ -158,7 +158,7 @@ public: void notifyCurrentStateChanged(const ModelNode &node); - void setDocumentMessages(const QList &errors, const QList &warnings); + void setDocumentMessages(const QList &errors, const QList &warnings); void notifyRewriterBeginTransaction(); void notifyRewriterEndTransaction(); diff --git a/src/plugins/qmldesigner/designercore/model/rewriterview.cpp b/src/plugins/qmldesigner/designercore/model/rewriterview.cpp index 639d5b1b3a5..e3bc57f75d3 100644 --- a/src/plugins/qmldesigner/designercore/model/rewriterview.cpp +++ b/src/plugins/qmldesigner/designercore/model/rewriterview.cpp @@ -428,7 +428,7 @@ void RewriterView::amendQmlText() emitCustomNotification(EndRewriterAmend); } -void RewriterView::notifyErrorsAndWarnings(const QList &errors) +void RewriterView::notifyErrorsAndWarnings(const QList &errors) { if (m_setWidgetStatusCallback) m_setWidgetStatusCallback(errors.isEmpty()); @@ -441,12 +441,12 @@ Internal::ModelNodePositionStorage *RewriterView::positionStorage() const return m_positionStorage.data(); } -QList RewriterView::warnings() const +QList RewriterView::warnings() const { return m_warnings; } -QList RewriterView::errors() const +QList RewriterView::errors() const { return m_errors; } @@ -458,19 +458,19 @@ void RewriterView::clearErrorAndWarnings() notifyErrorsAndWarnings(m_errors); } -void RewriterView::setWarnings(const QList &warnings) +void RewriterView::setWarnings(const QList &warnings) { m_warnings = warnings; notifyErrorsAndWarnings(m_errors); } -void RewriterView::setErrors(const QList &errors) +void RewriterView::setErrors(const QList &errors) { m_errors = errors; notifyErrorsAndWarnings(m_errors); } -void RewriterView::addError(const RewriterError &error) +void RewriterView::addError(const DocumentMessage &error) { m_errors.append(error); notifyErrorsAndWarnings(m_errors); diff --git a/src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp b/src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp index caed4ef8b01..d52c095f7db 100644 --- a/src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp +++ b/src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp @@ -25,7 +25,7 @@ #include "texttomodelmerger.h" -#include "rewritererror.h" +#include "documentmessage.h" #include "modelnodepositionstorage.h" #include "abstractproperty.h" #include "bindingproperty.h" @@ -886,7 +886,7 @@ void TextToModelMerger::setupUsedImports() m_rewriterView->model()->setUsedImports(usedImports); } -Document::MutablePtr TextToModelMerger::createParsedDocument(const QUrl &url, const QString &data, QList *errors) +Document::MutablePtr TextToModelMerger::createParsedDocument(const QUrl &url, const QString &data, QList *errors) { const QString fileName = url.toLocalFile(); @@ -902,7 +902,7 @@ Document::MutablePtr TextToModelMerger::createParsedDocument(const QUrl &url, co if (!doc->isParsedCorrectly()) { if (errors) { foreach (const QmlJS::DiagnosticMessage &message, doc->diagnosticMessages()) - errors->append(RewriterError(message, QUrl::fromLocalFile(doc->fileName()))); + errors->append(DocumentMessage(message, QUrl::fromLocalFile(doc->fileName()))); } return Document::MutablePtr(); } @@ -930,8 +930,8 @@ bool TextToModelMerger::load(const QString &data, DifferenceHandler &differenceH try { Snapshot snapshot = m_rewriterView->textModifier()->qmljsSnapshot(); - QList errors; - QList warnings; + QList errors; + QList warnings; if (Document::MutablePtr doc = createParsedDocument(url, data, &errors)) { snapshot.insert(doc); m_document = doc; @@ -981,7 +981,7 @@ bool TextToModelMerger::load(const QString &data, DifferenceHandler &differenceH setActive(false); return true; } catch (Exception &e) { - RewriterError error(&e); + DocumentMessage error(&e); // Somehow, the error below gets eaten in upper levels, so printing the // exception info here for debugging purposes: qDebug() << "*** An exception occurred while reading the QML file:" @@ -1947,18 +1947,18 @@ void TextToModelMerger::setupComponent(const ModelNode &node) ModelNode(node).setNodeSource(result); } -void TextToModelMerger::collectLinkErrors(QList *errors, const ReadingContext &ctxt) +void TextToModelMerger::collectLinkErrors(QList *errors, const ReadingContext &ctxt) { foreach (const QmlJS::DiagnosticMessage &diagnosticMessage, ctxt.diagnosticLinkMessages()) { - errors->append(RewriterError(diagnosticMessage, QUrl::fromLocalFile(m_document->fileName()))); + errors->append(DocumentMessage(diagnosticMessage, QUrl::fromLocalFile(m_document->fileName()))); } } -void TextToModelMerger::collectImportErrors(QList *errors) +void TextToModelMerger::collectImportErrors(QList *errors) { if (m_rewriterView->model()->imports().isEmpty()) { const QmlJS::DiagnosticMessage diagnosticMessage(QmlJS::Severity::Error, AST::SourceLocation(0, 0, 0, 0), QCoreApplication::translate("QmlDesigner::TextToModelMerger", "No import statements found")); - errors->append(RewriterError(diagnosticMessage, QUrl::fromLocalFile(m_document->fileName()))); + errors->append(DocumentMessage(diagnosticMessage, QUrl::fromLocalFile(m_document->fileName()))); } bool hasQtQuick = false; @@ -1970,16 +1970,16 @@ void TextToModelMerger::collectImportErrors(QList *errors) } else { const QmlJS::DiagnosticMessage diagnosticMessage(QmlJS::Severity::Error, AST::SourceLocation(0, 0, 0, 0), QCoreApplication::translate("QmlDesigner::TextToModelMerger", "Unsupported QtQuick version")); - errors->append(RewriterError(diagnosticMessage, QUrl::fromLocalFile(m_document->fileName()))); + errors->append(DocumentMessage(diagnosticMessage, QUrl::fromLocalFile(m_document->fileName()))); } } } if (!hasQtQuick) - errors->append(RewriterError(QCoreApplication::translate("QmlDesigner::TextToModelMerger", "No import for Qt Quick found."))); + errors->append(DocumentMessage(QCoreApplication::translate("QmlDesigner::TextToModelMerger", "No import for Qt Quick found."))); } -void TextToModelMerger::collectSemanticErrorsAndWarnings(QList *errors, QList *warnings) +void TextToModelMerger::collectSemanticErrorsAndWarnings(QList *errors, QList *warnings) { Check check(m_document, m_scopeChain->context()); check.disableMessage(StaticAnalysis::ErrPrototypeCycle); @@ -2000,15 +2000,15 @@ void TextToModelMerger::collectSemanticErrorsAndWarnings(QList *e foreach (const StaticAnalysis::Message &message, check()) { if (message.severity == Severity::Error) { if (message.type == StaticAnalysis::ErrUnknownComponent) - warnings->append(RewriterError(message.toDiagnosticMessage(), fileNameUrl)); + warnings->append(DocumentMessage(message.toDiagnosticMessage(), fileNameUrl)); else - errors->append(RewriterError(message.toDiagnosticMessage(), fileNameUrl)); + errors->append(DocumentMessage(message.toDiagnosticMessage(), fileNameUrl)); } if (message.severity == Severity::Warning) { if (message.type == StaticAnalysis::WarnAboutQtQuick1InsteadQtQuick2) - errors->append(RewriterError(message.toDiagnosticMessage(), fileNameUrl)); + errors->append(DocumentMessage(message.toDiagnosticMessage(), fileNameUrl)); else - warnings->append(RewriterError(message.toDiagnosticMessage(), fileNameUrl)); + warnings->append(DocumentMessage(message.toDiagnosticMessage(), fileNameUrl)); } } } diff --git a/src/plugins/qmldesigner/designercore/model/texttomodelmerger.h b/src/plugins/qmldesigner/designercore/model/texttomodelmerger.h index 18d0217822a..c7176afd629 100644 --- a/src/plugins/qmldesigner/designercore/model/texttomodelmerger.h +++ b/src/plugins/qmldesigner/designercore/model/texttomodelmerger.h @@ -39,7 +39,7 @@ namespace QmlDesigner { class RewriterView; -class RewriterError; +class DocumentMessage; namespace Internal { @@ -52,7 +52,7 @@ class TextToModelMerger TextToModelMerger &operator=(const TextToModelMerger&); public: - static QmlJS::Document::MutablePtr createParsedDocument(const QUrl &url, const QString &data, QList *errors); + static QmlJS::Document::MutablePtr createParsedDocument(const QUrl &url, const QString &data, QList *errors); TextToModelMerger(RewriterView *reWriterView); bool isActive() const; @@ -136,10 +136,10 @@ public: private: void setupCustomParserNode(const ModelNode &node); void setupComponent(const ModelNode &node); - void collectLinkErrors(QList *errors, const ReadingContext &ctxt); - void collectImportErrors(QList *errors); - void collectSemanticErrorsAndWarnings(QList *errors, - QList *warnings); + void collectLinkErrors(QList *errors, const ReadingContext &ctxt); + void collectImportErrors(QList *errors); + void collectSemanticErrorsAndWarnings(QList *errors, + QList *warnings); void populateQrcMapping(const QString &filePath); static QString textAt(const QmlJS::Document::Ptr &doc, diff --git a/src/plugins/qmldesigner/designmodewidget.cpp b/src/plugins/qmldesigner/designmodewidget.cpp index a60c54c9e2a..35eb6dab440 100644 --- a/src/plugins/qmldesigner/designmodewidget.cpp +++ b/src/plugins/qmldesigner/designmodewidget.cpp @@ -232,7 +232,7 @@ void DesignModeWidget::showTextEdit() m_centralTabWidget->setCurrentIndex(m_centralTabWidget->currentIndex() == 0 ? 1 : 0); } -void DesignModeWidget::showWarningMessageBox(const QList &warnings) +void DesignModeWidget::showWarningMessageBox(const QList &warnings) { Q_ASSERT(!warnings.isEmpty()); warningWidget()->setWarnings(warnings); diff --git a/src/plugins/qmldesigner/designmodewidget.h b/src/plugins/qmldesigner/designmodewidget.h index ec78be11d7e..b9ab745af30 100644 --- a/src/plugins/qmldesigner/designmodewidget.h +++ b/src/plugins/qmldesigner/designmodewidget.h @@ -81,7 +81,7 @@ public: void disableWidgets(); void showTextEdit(); - void showWarningMessageBox(const QList &warnings); + void showWarningMessageBox(const QList &warnings); bool gotoCodeWasClicked(); CrumbleBar* crumbleBar() const; diff --git a/src/plugins/qmldesigner/documentwarningwidget.cpp b/src/plugins/qmldesigner/documentwarningwidget.cpp index 475ab5c3dd5..56246a09a87 100644 --- a/src/plugins/qmldesigner/documentwarningwidget.cpp +++ b/src/plugins/qmldesigner/documentwarningwidget.cpp @@ -41,7 +41,7 @@ namespace QmlDesigner { -static QString errorToString(const RewriterError &error) +static QString errorToString(const DocumentMessage &error) { return QString("Line: %1: %2").arg(error.line()).arg(error.description()); } @@ -125,8 +125,8 @@ void DocumentWarningWidget::refreshContent() } QString messageString; - RewriterError message = m_messages.at(m_currentMessage); - if (message.type() == RewriterError::ParseError) { + DocumentMessage message = m_messages.at(m_currentMessage); + if (message.type() == DocumentMessage::ParseError) { messageString += errorToString(message); m_navigateLabel->setText(generateNavigateLinks()); m_navigateLabel->show(); @@ -190,7 +190,7 @@ bool DocumentWarningWidget::gotoCodeWasClicked() return m_gotoCodeWasClicked; } -void DocumentWarningWidget::emitGotoCodeClicked(const RewriterError &message) +void DocumentWarningWidget::emitGotoCodeClicked(const DocumentMessage &message) { m_gotoCodeWasClicked = true; emit gotoCodeClicked(message.url().toLocalFile(), message.line(), message.column() - 1); @@ -209,21 +209,21 @@ void DocumentWarningWidget::ignoreCheckBoxToggled(bool b) QmlDesignerPlugin::instance()->setSettings(settings); } -void DocumentWarningWidget::setErrors(const QList &errors) +void DocumentWarningWidget::setErrors(const QList &errors) { Q_ASSERT(!errors.empty()); m_mode = ErrorMode; setMessages(errors); } -void DocumentWarningWidget::setWarnings(const QList &warnings) +void DocumentWarningWidget::setWarnings(const QList &warnings) { Q_ASSERT(!warnings.empty()); m_mode = WarningMode; setMessages(warnings); } -void DocumentWarningWidget::setMessages(const QList &messages) +void DocumentWarningWidget::setMessages(const QList &messages) { m_messages.clear(); m_messages = messages; diff --git a/src/plugins/qmldesigner/documentwarningwidget.h b/src/plugins/qmldesigner/documentwarningwidget.h index 1161d719167..b8e5b892736 100644 --- a/src/plugins/qmldesigner/documentwarningwidget.h +++ b/src/plugins/qmldesigner/documentwarningwidget.h @@ -26,7 +26,7 @@ #pragma once #include -#include +#include QT_BEGIN_NAMESPACE class QLabel; @@ -49,19 +49,19 @@ class DocumentWarningWidget : public Utils::FakeToolTip public: explicit DocumentWarningWidget(QWidget *parent); - void setErrors(const QList &errors); - void setWarnings(const QList &warnings); + void setErrors(const QList &errors); + void setWarnings(const QList &warnings); bool warningsEnabled() const; bool gotoCodeWasClicked(); - void emitGotoCodeClicked(const RewriterError &message); + void emitGotoCodeClicked(const DocumentMessage &message); signals: void gotoCodeClicked(const QString filePath, int codeLine, int codeColumn); protected: bool eventFilter(QObject *object, QEvent *event) override; void showEvent(QShowEvent *event) override; private: - void setMessages(const QList &messages); + void setMessages(const QList &messages); void moveToParentCenter(); void refreshContent(); QString generateNavigateLinks(); @@ -72,7 +72,7 @@ private: QLabel *m_navigateLabel; QCheckBox *m_ignoreWarningsCheckBox; QPushButton *m_continueButton; - QList m_messages; + QList m_messages; int m_currentMessage = 0; Mode m_mode = NoMode; bool m_gotoCodeWasClicked = false; diff --git a/src/plugins/qmldesigner/qmldesignerplugin.qbs b/src/plugins/qmldesigner/qmldesignerplugin.qbs index 23587235d75..1e6cbf4a9cb 100644 --- a/src/plugins/qmldesigner/qmldesignerplugin.qbs +++ b/src/plugins/qmldesigner/qmldesignerplugin.qbs @@ -272,7 +272,7 @@ Project { "include/qmlobjectnode.h", "include/qmlstate.h", "include/removebasestateexception.h", - "include/rewritererror.h", + "include/documentmessage.h", "include/rewriterview.h", "include/rewritingexception.h", "include/signalhandlerproperty.h", @@ -349,7 +349,7 @@ Project { "model/rewriteaction.h", "model/rewriteactioncompressor.cpp", "model/rewriteactioncompressor.h", - "model/rewritererror.cpp", + "model/documentmessage.cpp", "model/rewriterview.cpp", "model/signalhandlerproperty.cpp", "model/textmodifier.cpp",