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

Retain id when creating a component from an object.

Browse Source 
Task-number: QTCREATORBUG-2666
Reviewed-by: Christian Kamm
This commit is contained in:
Erik Verbruggen
2010-11-11 12:09:15 +01:00
parent 397869c971
commit 6a5f06d463
1 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/plugins/qmljseditor/qmljscomponentfromobjectdef.cpp
View File

@@ -87,7 +87,7 @@ static QString getIdProperty(UiObjectDefinition *def)
class Operation: public QmlJSQuickFixOperation
{
UiObjectDefinition *m_objDef;
QString m_componentName;
QString m_idName, m_componentName;
public:
Operation(const QmlJSQuickFixState &state, UiObjectDefinition *objDef)
@@ -96,12 +96,13 @@ public:
{
Q_ASSERT(m_objDef != 0);
m_componentName = getIdProperty(m_objDef);
m_idName = getIdProperty(m_objDef);
if (m_componentName.isEmpty()) {
if (m_idName.isEmpty()) {
setDescription(QCoreApplication::translate("QmlJSEditor::ComponentFromObjectDef",
"Move Component into separate file"));
} else {
m_componentName = m_idName;
m_componentName[0] = m_componentName.at(0).toUpper();
setDescription(QCoreApplication::translate("QmlJSEditor::ComponentFromObjectDef",
"Move Component into '%1.qml'").arg(m_componentName));
@@ -139,8 +140,13 @@ public:
if (!refactoring->createFile(newFileName, txt))
return;
QString replacement = componentName + QLatin1String(" {\n");
if (!m_idName.isEmpty())
replacement += QLatin1String("id: ") + m_idName
+ QLatin1Char('\n');
Utils::ChangeSet changes;
changes.replace(start, end, componentName + QLatin1String(" {\n"));
changes.replace(start, end, replacement);
currentFile->change(changes);
currentFile->indent(Range(start, end + 1));
}