diff options
Diffstat (limited to 'src/plugins/cpptools/cpprefactoringchanges.cpp')
| -rw-r--r-- | src/plugins/cpptools/cpprefactoringchanges.cpp | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/src/plugins/cpptools/cpprefactoringchanges.cpp b/src/plugins/cpptools/cpprefactoringchanges.cpp index d81f09a029..b9608c977f 100644 --- a/src/plugins/cpptools/cpprefactoringchanges.cpp +++ b/src/plugins/cpptools/cpprefactoringchanges.cpp @@ -33,6 +33,8 @@ #include "cppqtstyleindenter.h" #include "cppcodeformatter.h" #include "cppmodelmanager.h" +#include "cppworkingcopy.h" + #include <projectexplorer/editorconfiguration.h> #include <utils/qtcassert.h> @@ -45,13 +47,13 @@ class CppTools::CppRefactoringChangesData : public TextEditor::RefactoringChange public: CppRefactoringChangesData(const Snapshot &snapshot) : m_snapshot(snapshot) - , m_modelManager(Internal::CppModelManager::instance()) + , m_modelManager(CppModelManager::instance()) , m_workingCopy(m_modelManager->workingCopy()) {} virtual void indentSelection(const QTextCursor &selection, const QString &fileName, - const TextEditor::BaseTextDocument *textDocument) const + const TextEditor::TextDocument *textDocument) const { const TextEditor::TabSettings &tabSettings = ProjectExplorer::actualTabSettings(fileName, textDocument); @@ -62,7 +64,7 @@ public: virtual void reindentSelection(const QTextCursor &selection, const QString &fileName, - const TextEditor::BaseTextDocument *textDocument) const + const TextEditor::TextDocument *textDocument) const { const TextEditor::TabSettings &tabSettings = ProjectExplorer::actualTabSettings(fileName, textDocument); @@ -73,12 +75,12 @@ public: virtual void fileChanged(const QString &fileName) { - m_modelManager->updateSourceFiles(QStringList(fileName)); + m_modelManager->updateSourceFiles(QSet<QString>() << fileName); } Snapshot m_snapshot; - CppModelManagerInterface *m_modelManager; - CppModelManagerInterface::WorkingCopy m_workingCopy; + CppModelManager *m_modelManager; + WorkingCopy m_workingCopy; }; @@ -92,7 +94,7 @@ CppRefactoringChangesData *CppRefactoringChanges::data() const return static_cast<CppRefactoringChangesData *>(m_data.data()); } -CppRefactoringFilePtr CppRefactoringChanges::file(TextEditor::BaseTextEditorWidget *editor, const Document::Ptr &document) +CppRefactoringFilePtr CppRefactoringChanges::file(TextEditor::TextEditorWidget *editor, const Document::Ptr &document) { CppRefactoringFilePtr result(new CppRefactoringFile(editor)); result->setCppDocument(document); @@ -132,7 +134,7 @@ CppRefactoringFile::CppRefactoringFile(QTextDocument *document, const QString &f : RefactoringFile(document, fileName) { } -CppRefactoringFile::CppRefactoringFile(TextEditor::BaseTextEditorWidget *editor) +CppRefactoringFile::CppRefactoringFile(TextEditor::TextEditorWidget *editor) : RefactoringFile(editor) { } |