diff --git a/src/plugins/qmldesigner/components/debugview/debugview.cpp b/src/plugins/qmldesigner/components/debugview/debugview.cpp index deb6840e001..2b7823ccbe2 100644 --- a/src/plugins/qmldesigner/components/debugview/debugview.cpp +++ b/src/plugins/qmldesigner/components/debugview/debugview.cpp @@ -85,12 +85,12 @@ void DebugView::importsChanged(const QList &addedImports, const QListsetText(toText()); QStringList imports; foreach (const Import &import, model()->imports()) - imports.append(import.toString()); + imports.append(import.toImportString()); data->setData("QmlDesigner::imports", stringListToArray(imports)); clipboard->setMimeData(data); @@ -208,7 +208,7 @@ void DesignDocumentView::fromText(QString text) QPlainTextEdit textEdit; QString imports; foreach (const Import &import, model()->imports()) - imports += import.toString(true, true) + QLatin1Char('\n'); + imports += QLatin1String("import ") + import.toString(true) + QLatin1Char(';') + QLatin1Char('\n'); textEdit.setPlainText(imports + text); NotIndentingTextEditModifier modifier(&textEdit); diff --git a/src/plugins/qmldesigner/designercore/filemanager/changeimportsvisitor.cpp b/src/plugins/qmldesigner/designercore/filemanager/changeimportsvisitor.cpp index 6d533f8fd50..30604b90581 100644 --- a/src/plugins/qmldesigner/designercore/filemanager/changeimportsvisitor.cpp +++ b/src/plugins/qmldesigner/designercore/filemanager/changeimportsvisitor.cpp @@ -61,9 +61,9 @@ bool ChangeImportsVisitor::add(QmlJS::AST::UiProgram *ast, const Import &import) if (!c.isSpace() && c != QLatin1Char(';')) break; } - replace(insertionPoint+1, 0, QLatin1String("\n") + import.toString(false)); + replace(insertionPoint+1, 0, QLatin1String("\n") + import.toImportString()); } else { - replace(0, 0, import.toString(false) + QLatin1String("\n\n")); + replace(0, 0, import.toImportString() + QLatin1String("\n\n")); } setDidRewriting(true); diff --git a/src/plugins/qmldesigner/designercore/include/import.h b/src/plugins/qmldesigner/designercore/include/import.h index 29a6e04fc1c..3d4b9e78595 100644 --- a/src/plugins/qmldesigner/designercore/include/import.h +++ b/src/plugins/qmldesigner/designercore/include/import.h @@ -56,7 +56,8 @@ public: QString alias() const { return m_alias; } QStringList importPaths() const { return m_importPathList; } - QString toString(bool addSemicolon = false, bool skipAlias = false) const; + QString toString(bool skipAlias = false) const; + QString toImportString() const; bool operator==(const Import &other) const; diff --git a/src/plugins/qmldesigner/designercore/model/import.cpp b/src/plugins/qmldesigner/designercore/model/import.cpp index c49800123f9..cb7abd83718 100644 --- a/src/plugins/qmldesigner/designercore/model/import.cpp +++ b/src/plugins/qmldesigner/designercore/model/import.cpp @@ -48,6 +48,15 @@ Import Import::empty() return Import(QString(), QString(), QString(), QString(), QStringList()); } +QString Import::toImportString() const +{ + QString result = QLatin1String("import "); + + result += toString(false); + + return result; +} + Import::Import(const QString &url, const QString &file, const QString &version, const QString &alias, const QStringList &importPaths): m_url(url), m_file(file), @@ -57,9 +66,9 @@ Import::Import(const QString &url, const QString &file, const QString &version, { } -QString Import::toString(bool addSemicolon, bool skipAlias) const +QString Import::toString(bool skipAlias) const { - QString result = QLatin1String("import "); + QString result; if (isFileImport()) result += '"' + file() + '"'; @@ -74,9 +83,6 @@ QString Import::toString(bool addSemicolon, bool skipAlias) const if (hasAlias() && !skipAlias) result += " as " + alias(); - if (addSemicolon) - result += ';'; - return result; } diff --git a/src/plugins/qmldesigner/designercore/model/rewriteaction.cpp b/src/plugins/qmldesigner/designercore/model/rewriteaction.cpp index 264ca7ea938..a8a7ba3a0c7 100644 --- a/src/plugins/qmldesigner/designercore/model/rewriteaction.cpp +++ b/src/plugins/qmldesigner/designercore/model/rewriteaction.cpp @@ -358,7 +358,7 @@ bool AddImportRewriteAction::execute(QmlDesigner::QmlRefactoring &refactoring, if (!result) qDebug() << "*** AddImportRewriteAction::execute failed in changeImports (" - << m_import.toString() + << m_import.toImportString() << ") **" << info(); return result; @@ -376,7 +376,7 @@ bool RemoveImportRewriteAction::execute(QmlDesigner::QmlRefactoring &refactoring if (!result) qDebug() << "*** RemoveImportRewriteAction::execute failed in changeImports (" - << m_import.toString() + << m_import.toImportString() << ") **" << info(); return result;