diff options
author | Nikolai Kosjar <nikolai.kosjar@digia.com> | 2014-05-16 15:51:04 -0400 |
---|---|---|
committer | Nikolai Kosjar <nikolai.kosjar@digia.com> | 2014-06-04 16:28:35 +0200 |
commit | ec97d967e63e4c66e0147625b09a658a3f99896c (patch) | |
tree | 77c44744474915153d08b550dcf2b4bedd3f3516 /src/plugins/cpptools/cppsnapshotupdater.cpp | |
parent | 43895b038f1712d4c98b8f81d7248b44f42f27cd (diff) | |
download | qt-creator-ec97d967e63e4c66e0147625b09a658a3f99896c.tar.gz |
CppTools: Rename CppPreprocessor to CppSourceProcessor
...since it does quite a bit more than only preprocessing, as the name
suggests. We use that class to process source files in general. The
output is not a preprocessed source, but a set of CPlusPlus::Documents
with symbols.
Change-Id: I787d0f22f9f042ddf0c99e8c2f0bdb9aa7001735
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
Diffstat (limited to 'src/plugins/cpptools/cppsnapshotupdater.cpp')
-rw-r--r-- | src/plugins/cpptools/cppsnapshotupdater.cpp | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/src/plugins/cpptools/cppsnapshotupdater.cpp b/src/plugins/cpptools/cppsnapshotupdater.cpp index 4d4de1021c..c37473d0c7 100644 --- a/src/plugins/cpptools/cppsnapshotupdater.cpp +++ b/src/plugins/cpptools/cppsnapshotupdater.cpp @@ -27,7 +27,7 @@ ** ****************************************************************************/ -#include "cpppreprocessor.h" +#include "cppsourceprocessor.h" #include "cppsnapshotupdater.h" #include <utils/qtcassert.h> @@ -159,25 +159,25 @@ void SnapshotUpdater::update(CppModelManager::WorkingCopy workingCopy) workingCopy.insert(editorDefinesFileName, m_editorDefines); } - CppPreprocessor preproc(modelManager, m_snapshot); + CppSourceProcessor sourceProcessor(modelManager, m_snapshot); Snapshot globalSnapshot = modelManager->snapshot(); globalSnapshot.remove(fileInEditor()); - preproc.setGlobalSnapshot(globalSnapshot); - preproc.setWorkingCopy(workingCopy); - preproc.setIncludePaths(m_includePaths); - preproc.setFrameworkPaths(m_frameworkPaths); - preproc.run(configurationFileName); + sourceProcessor.setGlobalSnapshot(globalSnapshot); + sourceProcessor.setWorkingCopy(workingCopy); + sourceProcessor.setIncludePaths(m_includePaths); + sourceProcessor.setFrameworkPaths(m_frameworkPaths); + sourceProcessor.run(configurationFileName); if (!m_projectConfigFile.isEmpty()) - preproc.run(m_projectConfigFile); + sourceProcessor.run(m_projectConfigFile); if (m_usePrecompiledHeaders) { foreach (const QString &precompiledHeader, m_precompiledHeaders) - preproc.run(precompiledHeader); + sourceProcessor.run(precompiledHeader); } if (!m_editorDefines.isEmpty()) - preproc.run(editorDefinesFileName); - preproc.run(m_fileInEditor); + sourceProcessor.run(editorDefinesFileName); + sourceProcessor.run(m_fileInEditor); - m_snapshot = preproc.snapshot(); + m_snapshot = sourceProcessor.snapshot(); Snapshot newSnapshot = m_snapshot.simplified(document()); for (Snapshot::const_iterator i = m_snapshot.begin(), ei = m_snapshot.end(); i != ei; ++i) { if (Client::isInjectedFile(i.key())) |