summaryrefslogtreecommitdiff
path: root/src/plugins/cpptools/cpprefactoringchanges.cpp
diff options
context:
space:
mode:
authorChristian Kamm <christian.d.kamm@nokia.com>2011-08-10 09:50:04 +0200
committerChristian Kamm <christian.d.kamm@nokia.com>2011-08-16 11:13:12 +0200
commit8f14bc0ea23495dfb1dae7aea1910e470281ee26 (patch)
tree9e0580da96ff5010d4c4b17c1ab67a709c917a31 /src/plugins/cpptools/cpprefactoringchanges.cpp
parent13c8f9eaaae4adf7d4dc92cc6cb1f0d5cd3995b0 (diff)
downloadqt-creator-8f14bc0ea23495dfb1dae7aea1910e470281ee26.tar.gz
C++: Synchronize function decl/def refactoring.
When editing a function declaration or definition the code model may realize the same changes have to be applied somewhere else. A refactoring marker will pop up that can be clicked to perform the changes. Alternatively, press enter to apply. Change-Id: I2299a2ecfb6a8f87d4853fc7cfa99486f890a1d3 Reviewed-on: http://codereview.qt.nokia.com/2909 Reviewed-by: Leandro T. C. Melo <leandro.melo@nokia.com>
Diffstat (limited to 'src/plugins/cpptools/cpprefactoringchanges.cpp')
-rw-r--r--src/plugins/cpptools/cpprefactoringchanges.cpp19
1 files changed, 12 insertions, 7 deletions
diff --git a/src/plugins/cpptools/cpprefactoringchanges.cpp b/src/plugins/cpptools/cpprefactoringchanges.cpp
index 5388312886..c92aa862d2 100644
--- a/src/plugins/cpptools/cpprefactoringchanges.cpp
+++ b/src/plugins/cpptools/cpprefactoringchanges.cpp
@@ -110,13 +110,13 @@ CppRefactoringFile::CppRefactoringFile(const QString &fileName, CppRefactoringCh
m_cppDocument = snapshot.document(fileName);
}
-CppRefactoringFile::CppRefactoringFile(TextEditor::BaseTextEditorWidget *editor, CPlusPlus::Document::Ptr document)
- : RefactoringFile()
- , m_cppDocument(document)
-{
- m_fileName = document->fileName();
- m_editor = editor;
-}
+CppRefactoringFile::CppRefactoringFile(QTextDocument *document, const QString &fileName)
+ : RefactoringFile(document, fileName)
+{ }
+
+CppRefactoringFile::CppRefactoringFile(TextEditor::BaseTextEditorWidget *editor)
+ : RefactoringFile(editor)
+{ }
Document::Ptr CppRefactoringFile::cppDocument() const
{
@@ -134,6 +134,11 @@ Document::Ptr CppRefactoringFile::cppDocument() const
return m_cppDocument;
}
+void CppRefactoringFile::setCppDocument(Document::Ptr document)
+{
+ m_cppDocument = document;
+}
+
Scope *CppRefactoringFile::scopeAt(unsigned index) const
{
unsigned line, column;