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

QmlDesigner: Add toImportString and change toString in Import

Browse Source 
Change-Id: Ic6d4fc225b7f1ccc78593b28a0a96dc4fefec614
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
This commit is contained in:
Marco Bubke
2013-08-14 15:05:56 +02:00
parent 8b92500769
commit 1882a7706f
6 changed files with 21 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/qmldesigner/components/debugview/debugview.cpp
View File

@@ -85,12 +85,12 @@ void DebugView::importsChanged(const QList<Import> &addedImports, const QList<Im
QString message; QString message;
message += tr("Added imports:") += lineBreak; message += tr("Added imports:") += lineBreak;
foreach (const Import &import, addedImports) { foreach (const Import &import, addedImports) {
message += import.toString() += lineBreak; message += import.toImportString() += lineBreak;
} }
message += tr("Removed imports:") += lineBreak; message += tr("Removed imports:") += lineBreak;
foreach (const Import &import, removedImports) { foreach (const Import &import, removedImports) {
message += import.toString() += lineBreak; message += import.toImportString() += lineBreak;
} }
log(tr("Imports changed:"), message); log(tr("Imports changed:"), message);

4
src/plugins/qmldesigner/components/integration/designdocumentview.cpp
View File

@@ -151,7 +151,7 @@ void DesignDocumentView::toClipboard() const
data->setText(toText()); data->setText(toText());
QStringList imports; QStringList imports;
foreach (const Import &import, model()->imports()) foreach (const Import &import, model()->imports())
imports.append(import.toString()); imports.append(import.toImportString());
data->setData("QmlDesigner::imports", stringListToArray(imports)); data->setData("QmlDesigner::imports", stringListToArray(imports));
clipboard->setMimeData(data); clipboard->setMimeData(data);
@@ -208,7 +208,7 @@ void DesignDocumentView::fromText(QString text)
QPlainTextEdit textEdit; QPlainTextEdit textEdit;
QString imports; QString imports;
foreach (const Import &import, model()->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); textEdit.setPlainText(imports + text);
NotIndentingTextEditModifier modifier(&textEdit); NotIndentingTextEditModifier modifier(&textEdit);

4
src/plugins/qmldesigner/designercore/filemanager/changeimportsvisitor.cpp
View File

@@ -61,9 +61,9 @@ bool ChangeImportsVisitor::add(QmlJS::AST::UiProgram *ast, const Import &import)
if (!c.isSpace() && c != QLatin1Char(';')) if (!c.isSpace() && c != QLatin1Char(';'))
break; break;
} }
replace(insertionPoint+1, 0, QLatin1String("\n") + import.toString(false)); replace(insertionPoint+1, 0, QLatin1String("\n") + import.toImportString());
} else { } else {
replace(0, 0, import.toString(false) + QLatin1String("\n\n")); replace(0, 0, import.toImportString() + QLatin1String("\n\n"));
} }
setDidRewriting(true); setDidRewriting(true);

3
src/plugins/qmldesigner/designercore/include/import.h
View File

@@ -56,7 +56,8 @@ public:
QString alias() const { return m_alias; } QString alias() const { return m_alias; }
QStringList importPaths() const { return m_importPathList; } 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; bool operator==(const Import &other) const;

16
src/plugins/qmldesigner/designercore/model/import.cpp
View File

@@ -48,6 +48,15 @@ Import Import::empty()
return Import(QString(), QString(), QString(), QString(), QStringList()); 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): Import::Import(const QString &url, const QString &file, const QString &version, const QString &alias, const QStringList &importPaths):
m_url(url), m_url(url),
m_file(file), 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()) if (isFileImport())
result += '"' + file() + '"'; result += '"' + file() + '"';
@@ -74,9 +83,6 @@ QString Import::toString(bool addSemicolon, bool skipAlias) const
if (hasAlias() && !skipAlias) if (hasAlias() && !skipAlias)
result += " as " + alias(); result += " as " + alias();
if (addSemicolon)
result += ';';
return result; return result;
} }

4
src/plugins/qmldesigner/designercore/model/rewriteaction.cpp
View File

@@ -358,7 +358,7 @@ bool AddImportRewriteAction::execute(QmlDesigner::QmlRefactoring &refactoring,
if (!result) if (!result)
qDebug() << "*** AddImportRewriteAction::execute failed in changeImports (" qDebug() << "*** AddImportRewriteAction::execute failed in changeImports ("
<< m_import.toString() << m_import.toImportString()
<< ") **" << ") **"
<< info(); << info();
return result; return result;
@@ -376,7 +376,7 @@ bool RemoveImportRewriteAction::execute(QmlDesigner::QmlRefactoring &refactoring
if (!result) if (!result)
qDebug() << "*** RemoveImportRewriteAction::execute failed in changeImports (" qDebug() << "*** RemoveImportRewriteAction::execute failed in changeImports ("
<< m_import.toString() << m_import.toImportString()
<< ") **" << ") **"
<< info(); << info();
return result; return result;