diff --git a/src/plugins/qmldesigner/components/navigator/navigatortreemodel.cpp b/src/plugins/qmldesigner/components/navigator/navigatortreemodel.cpp index db3fb2183d1..9b85ba64e68 100644 --- a/src/plugins/qmldesigner/components/navigator/navigatortreemodel.cpp +++ b/src/plugins/qmldesigner/components/navigator/navigatortreemodel.cpp @@ -32,7 +32,6 @@ #include #include #include -#include #include #include #include diff --git a/src/plugins/qmldesigner/components/propertyeditor/propertyeditorview.cpp b/src/plugins/qmldesigner/components/propertyeditor/propertyeditorview.cpp index 109f5807abc..bc6b6e94adc 100644 --- a/src/plugins/qmldesigner/components/propertyeditor/propertyeditorview.cpp +++ b/src/plugins/qmldesigner/components/propertyeditor/propertyeditorview.cpp @@ -39,7 +39,6 @@ #include #include -#include #include #include diff --git a/src/plugins/qmldesigner/designercore/designercore-lib.pri b/src/plugins/qmldesigner/designercore/designercore-lib.pri index 66dd1419690..a3a59cc8db8 100644 --- a/src/plugins/qmldesigner/designercore/designercore-lib.pri +++ b/src/plugins/qmldesigner/designercore/designercore-lib.pri @@ -16,6 +16,7 @@ include (../../../../share/qtcreator/qml/qmlpuppet/types/types.pri) SOURCES += $$PWD/model/abstractview.cpp \ $$PWD/model/rewriterview.cpp \ + $$PWD/model/rewritererror.cpp \ $$PWD/metainfo/metainfo.cpp \ $$PWD/metainfo/metainforeader.cpp \ $$PWD/metainfo/nodemetainfo.cpp \ @@ -83,6 +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/metainfo.h \ $$PWD/include/metainforeader.h \ $$PWD/include/nodemetainfo.h \ diff --git a/src/plugins/qmldesigner/designercore/include/rewritererror.h b/src/plugins/qmldesigner/designercore/include/rewritererror.h new file mode 100644 index 00000000000..598e551e959 --- /dev/null +++ b/src/plugins/qmldesigner/designercore/include/rewritererror.h @@ -0,0 +1,78 @@ +/**************************************************************************** +** +** Copyright (C) 2016 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ +** +** This file is part of Qt Creator. +** +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3 as published by the Free Software +** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-3.0.html. +** +****************************************************************************/ + +#pragma once + +#include "exception.h" +#include +#include + +namespace QmlJS { +class DiagnosticMessage; +} + +namespace QmlDesigner { + +class RewriterError { + Q_DECLARE_TR_FUNCTIONS(QmlDesigner::RewriterError) +public: + enum Type { + NoError = 0, + InternalError = 1, + ParseError = 2 + }; + +public: + RewriterError(); + RewriterError(const QmlJS::DiagnosticMessage &qmlError, const QUrl &document); + RewriterError(const QString &shortDescription); + RewriterError(Exception *exception); + + Type type() const + { return m_type; } + + int line() const + { return m_line; } + + int column() const + { return m_column; } + + QString description() const + { return m_description; } + + QUrl url() const + { return m_url; } + + QString toString() const; + +private: + Type m_type; + int m_line; + int m_column; + QString m_description; + QUrl m_url; +}; + +} //QmlDesigner diff --git a/src/plugins/qmldesigner/designercore/include/rewriterview.h b/src/plugins/qmldesigner/designercore/include/rewriterview.h index ed343cf4783..eb741f35004 100644 --- a/src/plugins/qmldesigner/designercore/include/rewriterview.h +++ b/src/plugins/qmldesigner/designercore/include/rewriterview.h @@ -28,13 +28,12 @@ #include "qmldesignercorelib_global.h" #include "exception.h" #include "abstractview.h" +#include "rewritererror.h" #include #include namespace QmlJS { -class DiagnosticMessage; -class LookupContext; class Document; class ScopeChain; } @@ -51,45 +50,6 @@ class ModelNodePositionStorage; } //Internal -class RewriterError { -public: - enum Type { - NoError = 0, - InternalError = 1, - ParseError = 2 - }; - -public: - RewriterError(); - RewriterError(const QmlJS::DiagnosticMessage &qmlError, const QUrl &document); - RewriterError(const QString &shortDescription); - RewriterError(Exception *exception); - - Type type() const - { return m_type; } - - int line() const - { return m_line; } - - int column() const - { return m_column; } - - QString description() const - { return m_description; } - - QUrl url() const - { return m_url; } - - QString toString() const; - -private: - Type m_type; - int m_line; - int m_column; - QString m_description; - QUrl m_url; -}; - class QMLDESIGNERCORE_EXPORT RewriterView : public AbstractView { Q_OBJECT diff --git a/src/plugins/qmldesigner/designercore/model/rewritererror.cpp b/src/plugins/qmldesigner/designercore/model/rewritererror.cpp new file mode 100644 index 00000000000..b6bf2ccbced --- /dev/null +++ b/src/plugins/qmldesigner/designercore/model/rewritererror.cpp @@ -0,0 +1,102 @@ +/**************************************************************************** +** +** Copyright (C) 2016 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ +** +** This file is part of Qt Creator. +** +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3 as published by the Free Software +** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-3.0.html. +** +****************************************************************************/ + +#include + +#include + +namespace QmlDesigner { + +RewriterError::RewriterError(): + m_type(NoError), + m_line(-1), + m_column(-1) +{ +} + +RewriterError::RewriterError(Exception *exception): + m_type(InternalError), + m_line(exception->line()), + m_column(-1), + m_description(exception->description()), + m_url(exception->file()) +{ +} + +RewriterError::RewriterError(const QmlJS::DiagnosticMessage &qmlError, const QUrl &document): + m_type(ParseError), + m_line(qmlError.loc.startLine), + m_column(qmlError.loc.startColumn), + m_description(qmlError.message), + m_url(document) +{ +} + +RewriterError::RewriterError(const QString &shortDescription) : + m_type(ParseError), + m_line(1), + m_column(0), + m_description(shortDescription), + m_url() +{ +} + + +QString RewriterError::toString() const +{ + QString str; + + if (m_type == ParseError) + str += tr("Error parsing"); + else if (m_type == InternalError) + str += tr("Internal error"); + + if (url().isValid()) { + if (!str.isEmpty()) + str += QLatin1Char(' '); + + str += QString("\"%1\"").arg(url().toString()); + } + + if (line() != -1) { + if (!str.isEmpty()) + str += QLatin1Char(' '); + str += tr("line %1").arg(line()); + } + + if (column() != -1) { + if (!str.isEmpty()) + str += QLatin1Char(' '); + + str += tr("column %1").arg(column()); + } + + if (!str.isEmpty()) + QStringLiteral(": "); + str += description(); + + return str; +} +} //QmlDesigner diff --git a/src/plugins/qmldesigner/designercore/model/rewriterview.cpp b/src/plugins/qmldesigner/designercore/model/rewriterview.cpp index 4b3179001cc..058c6192323 100644 --- a/src/plugins/qmldesigner/designercore/model/rewriterview.cpp +++ b/src/plugins/qmldesigner/designercore/model/rewriterview.cpp @@ -45,77 +45,6 @@ using namespace QmlDesigner::Internal; namespace QmlDesigner { -RewriterError::RewriterError(): - m_type(NoError), - m_line(-1), - m_column(-1) -{ -} - -RewriterError::RewriterError(Exception *exception): - m_type(InternalError), - m_line(exception->line()), - m_column(-1), - m_description(exception->description()), - m_url(exception->file()) -{ -} - -RewriterError::RewriterError(const QmlJS::DiagnosticMessage &qmlError, const QUrl &document): - m_type(ParseError), - m_line(qmlError.loc.startLine), - m_column(qmlError.loc.startColumn), - m_description(qmlError.message), - m_url(document) -{ -} - -RewriterError::RewriterError(const QString &shortDescription) : - m_type(ParseError), - m_line(1), - m_column(0), - m_description(shortDescription), - m_url() -{ -} - - -QString RewriterError::toString() const -{ - QString str; - - if (m_type == ParseError) - str += RewriterView::tr("Error parsing"); - else if (m_type == InternalError) - str += RewriterView::tr("Internal error"); - - if (url().isValid()) { - if (!str.isEmpty()) - str += QLatin1Char(' '); - - str += RewriterView::tr("\"%1\"").arg(url().toString()); - } - - if (line() != -1) { - if (!str.isEmpty()) - str += QLatin1Char(' '); - str += RewriterView::tr("line %1").arg(line()); - } - - if (column() != -1) { - if (!str.isEmpty()) - str += QLatin1Char(' '); - - str += RewriterView::tr("column %1").arg(column()); - } - - if (!str.isEmpty()) - QStringLiteral(": "); - str += description(); - - return str; -} - RewriterView::RewriterView(DifferenceHandling differenceHandling, QObject *parent): AbstractView(parent), m_differenceHandling(differenceHandling), diff --git a/src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp b/src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp index 57158f3c67e..9879adffa01 100644 --- a/src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp +++ b/src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp @@ -25,6 +25,7 @@ #include "texttomodelmerger.h" +#include "rewritererror.h" #include "modelnodepositionstorage.h" #include "abstractproperty.h" #include "bindingproperty.h" diff --git a/src/plugins/qmldesigner/designmodewidget.cpp b/src/plugins/qmldesigner/designmodewidget.cpp index 086275de49e..8cd51266036 100644 --- a/src/plugins/qmldesigner/designmodewidget.cpp +++ b/src/plugins/qmldesigner/designmodewidget.cpp @@ -24,12 +24,12 @@ ****************************************************************************/ #include "designmodewidget.h" + #include "styledoutputpaneplaceholder.h" #include "qmldesignerplugin.h" #include "crumblebar.h" #include "documentwarningwidget.h" -#include #include #include diff --git a/src/plugins/qmldesigner/documentwarningwidget.h b/src/plugins/qmldesigner/documentwarningwidget.h index 7ae3fbc741d..d4fcf4ce6e4 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;