Commit b0c9b263 authored by Marco Bubke's avatar Marco Bubke
Browse files

QmlDesigner: Rename function



Change-Id: I5f7ce747e112f2757a1d016b8a1cd9fb1d4f5827
Reviewed-by: default avatarThomas Hartmann <Thomas.Hartmann@digia.com>
parent afcd5c84
...@@ -199,7 +199,7 @@ static ComponentTextModifier *createComponentTextModifier(TextModifier *original ...@@ -199,7 +199,7 @@ static ComponentTextModifier *createComponentTextModifier(TextModifier *original
return new ComponentTextModifier (originalModifier, componentStartOffset, componentEndOffset, rootStartOffset); return new ComponentTextModifier (originalModifier, componentStartOffset, componentEndOffset, rootStartOffset);
} }
bool DesignDocument::loadSubComponent(const ModelNode &componentNode) bool DesignDocument::loadInFileComponent(const ModelNode &componentNode)
{ {
QString componentText = rewriterView()->extractText(QList<ModelNode>() << componentNode).value(componentNode); QString componentText = rewriterView()->extractText(QList<ModelNode>() << componentNode).value(componentNode);
...@@ -340,7 +340,7 @@ void DesignDocument::changeToSubComponent(const ModelNode &componentNode) ...@@ -340,7 +340,7 @@ void DesignDocument::changeToSubComponent(const ModelNode &componentNode)
changeToDocumentModel(); changeToDocumentModel();
} }
bool subComponentLoaded = loadSubComponent(componentNode); bool subComponentLoaded = loadInFileComponent(componentNode);
if (subComponentLoaded) { if (subComponentLoaded) {
Q_ASSERT(m_documentModel); Q_ASSERT(m_documentModel);
......
...@@ -106,6 +106,8 @@ public: ...@@ -106,6 +106,8 @@ public:
void resetToDocumentModel(); void resetToDocumentModel();
void goIntoComponent();
signals: signals:
void displayNameChanged(const QString &newFileName); void displayNameChanged(const QString &newFileName);
void dirtyStateChanged(bool newState); void dirtyStateChanged(bool newState);
...@@ -115,8 +117,6 @@ signals: ...@@ -115,8 +117,6 @@ signals:
void designDocumentClosed(); void designDocumentClosed();
void qmlErrorsChanged(const QList<RewriterView::Error> &errors); void qmlErrorsChanged(const QList<RewriterView::Error> &errors);
void fileToOpen(const QString &path);
public slots: public slots:
void deleteSelected(); void deleteSelected();
void copySelected(); void copySelected();
...@@ -129,7 +129,6 @@ public slots: ...@@ -129,7 +129,6 @@ public slots:
void changeCurrentModelTo(const ModelNode &node); void changeCurrentModelTo(const ModelNode &node);
void changeToSubComponent(const ModelNode &node); void changeToSubComponent(const ModelNode &node);
void changeToExternalSubComponent(const QString &m_oldFileName); void changeToExternalSubComponent(const QString &m_oldFileName);
void goIntoComponent();
private slots: private slots:
void updateFileName(const QString &oldFileName, const QString &newFileName); void updateFileName(const QString &oldFileName, const QString &newFileName);
...@@ -146,7 +145,7 @@ private: // functions ...@@ -146,7 +145,7 @@ private: // functions
ModelNode rootModelNode() const; ModelNode rootModelNode() const;
bool loadSubComponent(const ModelNode &componentNode); bool loadInFileComponent(const ModelNode &componentNode);
private: // variables private: // variables
QWeakPointer<QStackedWidget> m_stackedWidget; QWeakPointer<QStackedWidget> m_stackedWidget;
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment