diff options
| author | Christian Kamm <christian.d.kamm@nokia.com> | 2011-08-17 11:35:57 +0200 |
|---|---|---|
| committer | Christian Kamm <christian.d.kamm@nokia.com> | 2011-08-19 11:12:09 +0200 |
| commit | 8a6d767a8f2f98ea4e04847f92cff40d661b806f (patch) | |
| tree | 586e5c539adfbb18623246d00dec5e894288c8e1 /src/plugins/qmljseditor/qmljsquickfixassist.cpp | |
| parent | a07acad516b5fa1ac503493b4ec28d595f6e1ea0 (diff) | |
| download | qt-creator-8a6d767a8f2f98ea4e04847f92cff40d661b806f.tar.gz | |
Refactoring changes: Cleanup and improvements.
Previously RefactoringFiles were usually passed around by value.
However, since a RefactoringFile may sometimes own a QTextDocument
(when it was read from a file), that's not great and caused the
file to be reread after every copy.
With this change RefactoringFile becomes noncopyable and is always
owned by a shared pointer.
This change also allowed having const RefactoringFiles which is
useful because they can be safely used from other threads. See
CppRefactoringChanges::fileNoEditor.
Change-Id: I9045921d6d0f6349f9558ff2a3d8317ea172193b
Reviewed-on: http://codereview.qt.nokia.com/3084
Reviewed-by: Leandro T. C. Melo <leandro.melo@nokia.com>
Diffstat (limited to 'src/plugins/qmljseditor/qmljsquickfixassist.cpp')
| -rw-r--r-- | src/plugins/qmljseditor/qmljsquickfixassist.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/plugins/qmljseditor/qmljsquickfixassist.cpp b/src/plugins/qmljseditor/qmljsquickfixassist.cpp index 99a60eaa68..0d30dae873 100644 --- a/src/plugins/qmljseditor/qmljsquickfixassist.cpp +++ b/src/plugins/qmljseditor/qmljsquickfixassist.cpp @@ -51,6 +51,7 @@ QmlJSQuickFixAssistInterface::QmlJSQuickFixAssistInterface(QmlJSTextEditorWidget : DefaultAssistInterface(editor->document(), editor->position(), editor->file(), reason) , m_editor(editor) , m_semanticInfo(editor->semanticInfo()) + , m_currentFile(QmlJSRefactoringChanges::file(m_editor, m_semanticInfo.document)) {} QmlJSQuickFixAssistInterface::~QmlJSQuickFixAssistInterface() @@ -61,9 +62,9 @@ const SemanticInfo &QmlJSQuickFixAssistInterface::semanticInfo() const return m_semanticInfo; } -const QmlJSTools::QmlJSRefactoringFile QmlJSQuickFixAssistInterface::currentFile() const +QmlJSRefactoringFilePtr QmlJSQuickFixAssistInterface::currentFile() const { - return QmlJSRefactoringFile(m_editor, m_semanticInfo.document); + return m_currentFile; } QWidget *QmlJSQuickFixAssistInterface::widget() const |