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

CppTools: Rename SnapshotUpdater to BuiltinEditorDocumentParser

Browse Source 
Change-Id: I554b5e9e3f1ef7c167fa45b5cd0c230fdf63073b
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
This commit is contained in:
Nikolai Kosjar
2014-08-19 15:46:50 +02:00
committed by Erik Verbruggen
parent 7e71a299ef
commit 7d35212f60
14 changed files with 84 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/plugins/cppeditor/cppeditor.cpp
View File

@@ -1020,10 +1020,10 @@ void CppEditorWidget::onFilePathChanged()
additionalDirectives = ProjectExplorer::SessionManager::value(
projectFile + QLatin1Char(',') + filePath).toString().toUtf8();
QSharedPointer<SnapshotUpdater> updater
= d->m_modelManager->cppEditorSupport(editor())->snapshotUpdater();
updater->setProjectPart(d->m_modelManager->projectPartForProjectFile(projectFile));
updater->setEditorDefines(additionalDirectives);
QSharedPointer<BuiltinEditorDocumentParser> parser
= d->m_modelManager->cppEditorSupport(editor())->documentParser();
parser->setProjectPart(d->m_modelManager->projectPartForProjectFile(projectFile));
parser->setEditorDefines(additionalDirectives);
}
d->m_preprocessorButton->setProperty("highlightWidget", !additionalDirectives.trimmed().isEmpty());
d->m_preprocessorButton->update();
@@ -1088,12 +1088,12 @@ void CppEditorWidget::showPreProcessorWidget()
CppPreProcessorDialog preProcessorDialog(this, textDocument()->filePath(), projectParts);
if (preProcessorDialog.exec() == QDialog::Accepted) {
QSharedPointer<SnapshotUpdater> updater
= d->m_modelManager->cppEditorSupport(editor())->snapshotUpdater();
QSharedPointer<BuiltinEditorDocumentParser> parser
= d->m_modelManager->cppEditorSupport(editor())->documentParser();
const QString &additionals = preProcessorDialog.additionalPreProcessorDirectives();
updater->setProjectPart(preProcessorDialog.projectPart());
updater->setEditorDefines(additionals.toUtf8());
updater->update(d->m_modelManager->workingCopy());
parser->setProjectPart(preProcessorDialog.projectPart());
parser->setEditorDefines(additionals.toUtf8());
parser->update(d->m_modelManager->workingCopy());
d->m_preprocessorButton->setProperty("highlightWidget", !additionals.trimmed().isEmpty());
d->m_preprocessorButton->update();