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

QmlDesigner: remove DesignDocument::changeToExternalSubComponent()

Browse Source 
This function did nothing but call EditorManager::openEditor(), so we can
call it directly instead. It was not used consistently anyway.

Change-Id: I639ef346164be9260e887faac5dc6651ccfd92c5
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
This commit is contained in:
Thomas Hartmann
2013-08-02 13:51:07 +02:00
parent b108f72bc7
commit 934291077c
3 changed files with 3 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/plugins/qmldesigner/components/integration/designdocument.cpp
View File

@@ -306,11 +306,6 @@ void DesignDocument::changeToSubComponent(const ModelNode &componentNode)
attachRewriterToModel(); attachRewriterToModel();
} }
void DesignDocument::changeToExternalSubComponent(const QString &fileName)
{
Core::EditorManager::openEditor(fileName, Core::Id(), Core::EditorManager::DoNotMakeVisible);
}
void DesignDocument::attachRewriterToModel() void DesignDocument::attachRewriterToModel()
{ {
QApplication::setOverrideCursor(QCursor(Qt::WaitCursor)); QApplication::setOverrideCursor(QCursor(Qt::WaitCursor));

1
src/plugins/qmldesigner/components/integration/designdocument.h
View File

@@ -119,7 +119,6 @@ public slots:
void updateActiveQtVersion(); void updateActiveQtVersion();
void changeToSubComponentAndPushOnCrumblePath(const ModelNode &componentNode); void changeToSubComponentAndPushOnCrumblePath(const ModelNode &componentNode);
void changeToSubComponent(const ModelNode &componentNode); void changeToSubComponent(const ModelNode &componentNode);
void changeToExternalSubComponent(const QString &m_oldFileName);
private slots: private slots:
void updateFileName(const QString &oldFileName, const QString &newFileName); void updateFileName(const QString &oldFileName, const QString &newFileName);

5
src/plugins/qmldesigner/documentmanager.cpp
View File

@@ -102,13 +102,14 @@ static inline void openFileForComponent(const ModelNode &node)
if (node.metaInfo().isFileComponent()) { if (node.metaInfo().isFileComponent()) {
//getWidthHeight(node, width, height); //getWidthHeight(node, width, height);
getProperties(node, propertyHash); getProperties(node, propertyHash);
currentDesignDocument()->changeToExternalSubComponent(node.metaInfo().componentFileName()); Core::EditorManager::openEditor(node.metaInfo().componentFileName(), Core::Id(), Core::EditorManager::DoNotMakeVisible);
} else if (node.metaInfo().isView() && } else if (node.metaInfo().isView() &&
node.hasNodeProperty("delegate") && node.hasNodeProperty("delegate") &&
node.nodeProperty("delegate").modelNode().metaInfo().isFileComponent()) { node.nodeProperty("delegate").modelNode().metaInfo().isFileComponent()) {
//getWidthHeight(node, width, height); //getWidthHeight(node, width, height);
getProperties(node, propertyHash); getProperties(node, propertyHash);
currentDesignDocument()->changeToExternalSubComponent(node.nodeProperty("delegate").modelNode().metaInfo().componentFileName()); Core::EditorManager::openEditor(node.nodeProperty("delegate").modelNode().metaInfo().componentFileName(),
Core::Id(), Core::EditorManager::DoNotMakeVisible);
} }
ModelNode rootModelNode = currentDesignDocument()->rewriterView()->rootModelNode(); ModelNode rootModelNode = currentDesignDocument()->rewriterView()->rootModelNode();
applyProperties(rootModelNode, propertyHash); applyProperties(rootModelNode, propertyHash);